Mercurial > hg > forks > UniversalIndentGUI

diff src/UiGuiSettingsDialog.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/UiGuiSettingsDialog.h	Sat Oct 02 12:48:56 2010 +0000
+++ b/src/UiGuiSettingsDialog.h	Thu Oct 14 19:52:47 2010 +0000
@@ -21,15 +21,19 @@
 #define UIGUISETTINGSDIALOG_H
 
 #include <QDialog>
-#include "ui_UiGuiSettingsDialog.h"
-#include "UiGuiSettings.h"
 
-class UiGuiSettingsDialog : public QDialog, private Ui::SettingsDialog
+namespace Ui {
+	class SettingsDialog;
+}
+class UiGuiSettings;
+
+
+class UiGuiSettingsDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    UiGuiSettingsDialog(QWidget* parent, UiGuiSettings* settings);
+    UiGuiSettingsDialog(QWidget* parent, QSharedPointer<UiGuiSettings> settings);
 
 public slots:
     int showDialog();
@@ -38,10 +42,12 @@
     void writeWidgetValuesToSettings();
 
 private:
+	Ui::SettingsDialog *_settingsDialogForm;
+
     void changeEvent(QEvent *event);
     void initTranslationSelection();
 
-    UiGuiSettings* settings;
+    QSharedPointer<UiGuiSettings> _settings;
 };
 
 #endif // UIGUISETTINGSDIALOG_H