Merge branch 'Applications/14.12' into frameworks

[dolphin.git] / src / settings / services / servicessettingspage.h

diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index be5953c64d7abd7f069680e893f0a62727bceca6..a883aa947b720db406a878bc7e944a4a34786c36 100644 (file)
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -21,12 +21,11 @@
 
 #include <settings/settingspagebase.h>
 
-#include <QMap>
 #include <QString>
 
-class QCheckBox;
-class QGroupBox;
-class QListWidget;
+class QListView;
+class QSortFilterProxyModel;
+class ServiceModel;
 
 /**
  * @brief Page for the 'Services' settings of the Dolphin settings dialog.
@@ -40,13 +39,13 @@ public:
     virtual ~ServicesSettingsPage();
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings();
+    virtual void applySettings() Q_DECL_OVERRIDE;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults();
+    virtual void restoreDefaults() Q_DECL_OVERRIDE;
 
 protected:
-    virtual void showEvent(QShowEvent* event);
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
 
 private slots:
     /**
@@ -54,6 +53,7 @@ private slots:
      */
     void loadServices();
 
+private:
     /**
      * Loads installed version control systems.
      */
@@ -61,11 +61,19 @@ private slots:
 
     bool isInServicesList(const QString& service) const;
 
+    /**
+     * Adds a row to the model of m_listView.
+     */
+    void addRow(const QString& icon,
+                const QString& text,
+                const QString& value,
+                bool checked);
+
 private:
     bool m_initialized;
-    QListWidget* m_servicesList;
-    QGroupBox* m_vcsGroupBox;
-    QMap<QString, QCheckBox*> m_vcsPluginsMap;
+    ServiceModel* m_serviceModel;
+    QSortFilterProxyModel* m_sortModel;
+    QListView* m_listView;
     QStringList m_enabledVcsPlugins;
 };