Mercurial > hg > forks > UniversalIndentGUI

diff src/UiGuiSettings.h @ 751:ac165b6ae67e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Done some refactoring: - Moved includes into the cpp files where possible and using class pre-declarations if possible - Made class member variable names begin with an underscore - Made by uic created header files be used as class members instead of inherting them - Renamed some variables to reflect their purpose better - Added some NULL initializations and added some comments - Rearranged some include and declaration code parts to be consistent and better readable - Updated for QScintilla 2.4.5 - Made UiGuiSettings be accessed via a shared pointer only git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1028 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Thu, 14 Oct 2010 19:52:47 +0000
parents ca1bafc93ee2
children f3631db17328
line wrap: on
line diff
--- a/src/UiGuiSettings.h	Sat Oct 02 12:48:56 2010 +0000
+++ b/src/UiGuiSettings.h	Thu Oct 14 19:52:47 2010 +0000
@@ -20,27 +20,23 @@
 #ifndef UIGUISETTINGS_H
 #define UIGUISETTINGS_H
 
-//TODO: Move to cpp and add pre declarations.
 #include <QObject>
-#include <QString>
-#include <QSettings>
-#include <QPoint>
-#include <QSize>
-#include <QDir>
-#include <QDate>
 #include <QStringList>
-#include <QCoreApplication>
+#include <QMultiMap>
+#include <QSharedPointer>
+
+class QSettings;
+
 
 class UiGuiSettings : public QObject
 {
     Q_OBJECT
 private:
     UiGuiSettings();
-    static UiGuiSettings* instance;
+    static QWeakPointer<UiGuiSettings> _instance;
 
 public:
-    static UiGuiSettings* getInstance();
-    static void deleteInstance();
+    static QSharedPointer<UiGuiSettings> getInstance();
     ~UiGuiSettings();
 
     bool registerObjectProperty(QObject *obj, const QString &propertyName, const QString &settingName);
@@ -70,18 +66,18 @@
     void readAvailableTranslations();
 
     //! Stores the mnemonics of the available translations.
-    QStringList availableTranslations;
+    QStringList _availableTranslations;
 
     //! The settings file.
-    QSettings *qsettings;
+    QSettings *_qsettings;
 
     //! Maps an QObject to a string list containing the property name and the associated setting name.
-    QMap<QObject*, QStringList> registeredObjectProperties;
+    QMap<QObject*, QStringList> _registeredObjectProperties;
 
     //! Maps QObjects to a string list containing the method name and the associated setting name.
-    QMultiMap<QObject*, QStringList> registeredObjectSlots;
+    QMultiMap<QObject*, QStringList> _registeredObjectSlots;
 
-    QString indenterDirctoryStr;
+    QString _indenterDirctoryStr;
 };
 
 #endif // UIGUISETTINGS_H