X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingsdlg.h;h=a5543d5bbc9baf353f278a7941c9256b39973cb2;hp=cefc780695a0546daedacf12fbdc737bdc60538d;hb=b8553ef5376b181ddcc105a47d27f09c40cea9cc;hpb=f18d7db990cb23c87fa3586e19b2f8aa5509a66c

diff --git a/src/qtui/settingsdlg.h b/src/qtui/settingsdlg.h
index cefc7806..a5543d5b 100644
--- a/src/qtui/settingsdlg.h
+++ b/src/qtui/settingsdlg.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _SETTINGSDLG_H_
-#define _SETTINGSDLG_H_
+#ifndef SETTINGSDLG_H
+#define SETTINGSDLG_H
 
 #include <QtGui>
 #include "ui_settingsdlg.h"
@@ -28,35 +28,35 @@
 
 class SettingsDlg : public QDialog {
   Q_OBJECT
-  public:
-    SettingsDlg(QWidget *parent = 0);
-    void registerSettingsPage(SettingsPage *);
-    void unregisterSettingsPage(SettingsPage *);
 
-    SettingsPage *currentPage() const;
-
-    //QSize sizeHint() const;
-
-  public slots:
-    void selectPage(const QString &category, const QString &title);
-
-  private slots:
-    void itemSelected();
-    void buttonClicked(QAbstractButton *);
-    bool applyChanges();
-    void undoChanges();
-    void reload();
-    void loadDefaults();
-    void setButtonStates();
-
-  private:
-    Ui::SettingsDlg ui;
-
-    SettingsPage *_currentPage;
-    QHash<QString, SettingsPage *> pages;
-    QHash<SettingsPage *, QTreeWidgetItem *> treeItems;
-
-    //QSize recommendedSize;
+public:
+  SettingsDlg(QWidget *parent = 0);
+  void registerSettingsPage(SettingsPage *);
+  void unregisterSettingsPage(SettingsPage *);
+
+  inline SettingsPage *currentPage() const { return _currentPage; }
+
+public slots:
+  void selectPage(SettingsPage *sp); // const QString &category, const QString &title);
+
+private slots:
+  void itemSelected();
+  void buttonClicked(QAbstractButton *);
+  bool applyChanges();
+  void undoChanges();
+  void reload();
+  void loadDefaults();
+  void setButtonStates();
+  
+private:
+  Ui::SettingsDlg ui;
+  
+  SettingsPage *_currentPage;
+  QHash<SettingsPage *, bool> pageIsLoaded;
+
+  enum {
+    SettingsPageRole = Qt::UserRole
+  };
 };