Merging r780:797 from trunk to branches/0.3.

[quassel.git] / src / qtui / settingsdlg.h

diff --git a/src/qtui/settingsdlg.h b/src/qtui/settingsdlg.h
index ca15811..3cfda43 100644 (file)
--- a/src/qtui/settingsdlg.h
+++ b/src/qtui/settingsdlg.h
@@ -35,6 +35,8 @@ class SettingsDlg : public QDialog {
 
     SettingsPage *currentPage() const;
 
+    //QSize sizeHint() const;
+
   public slots:
     void selectPage(const QString &category, const QString &title);
 
@@ -42,6 +44,7 @@ class SettingsDlg : public QDialog {
     void itemSelected();
     void buttonClicked(QAbstractButton *);
     bool applyChanges();
+    void undoChanges();
     void reload();
     void loadDefaults();
     void setButtonStates();
@@ -51,19 +54,11 @@ class SettingsDlg : public QDialog {
 
     SettingsPage *_currentPage;
     QHash<QString, SettingsPage *> pages;
-};
-
-/*
-class CoreSettingsPage : public QWidget, SettingsInterface {
-  Q_OBJECT
-
-  public:
-
-
-  private:
-    Ui::CoreSettingsPage ui;
+    QHash<SettingsPage *, QTreeWidgetItem *> treeItems;
+    QHash<SettingsPage *, bool> pageIsLoaded;
 
+    //QSize recommendedSize;
 };
-*/
+
 
 #endif