* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / settings / viewsettingspage.cpp

diff --git a/src/settings/viewsettingspage.cpp b/src/settings/viewsettingspage.cpp
index 44d32af81b07f8ffe80a7be3d6a0b276e983187d..deb7a31bb6beb3667ccdaa72b2ef6e28181debb0 100644 (file)
--- a/src/settings/viewsettingspage.cpp
+++ b/src/settings/viewsettingspage.cpp
@@ -20,25 +20,18 @@
 
 #include "viewsettingspage.h"
 
 
 #include "viewsettingspage.h"
 

-#include "settings/columnviewsettingspage.h"
-#include "settings/detailsviewsettingspage.h"
-#include "dolphinmainwindow.h"
-#include "dolphinviewcontainer.h"
-#include "settings/generalviewsettingspage.h"
-#include "settings/iconsviewsettingspage.h"
+#include "columnviewsettingspage.h"
+#include "iconsviewsettingspage.h"
+#include "detailsviewsettingspage.h"

 
 

-#include <QtGui/QBoxLayout>
-#include <QtGui/QLayout>
-#include <QtGui/QLabel>
+#include <QVBoxLayout>

 
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <ktabwidget.h>
 
 
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <ktabwidget.h>
 

-
-ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
-                                   QWidget* parent) :
+ViewSettingsPage::ViewSettingsPage(QWidget* parent) :

     SettingsPageBase(parent),
     m_pages()
 {
     SettingsPageBase(parent),
     m_pages()
 {


@@ -48,12 +41,6 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     KTabWidget* tabWidget = new KTabWidget(this);
 
 
     KTabWidget* tabWidget = new KTabWidget(this);
 

-    // initialize 'General' tab
-    const KUrl& url = mainWindow->activeViewContainer()->url();
-    GeneralViewSettingsPage* generalPage = new GeneralViewSettingsPage(url, tabWidget);
-    tabWidget->addTab(generalPage, KIcon("view-choose"), i18nc("@title:tab General settings", "General"));
-    connect(generalPage, SIGNAL(changed()), this, SIGNAL(changed()));
-

     // initialize 'Icons' tab
     IconsViewSettingsPage* iconsPage = new IconsViewSettingsPage(tabWidget);
     tabWidget->addTab(iconsPage, KIcon("view-list-icons"), i18nc("@title:tab", "Icons"));
     // initialize 'Icons' tab
     IconsViewSettingsPage* iconsPage = new IconsViewSettingsPage(tabWidget);
     tabWidget->addTab(iconsPage, KIcon("view-list-icons"), i18nc("@title:tab", "Icons"));


@@ -69,7 +56,6 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     tabWidget->addTab(columnPage, KIcon("view-file-columns"), i18nc("@title:tab", "Column"));
     connect(columnPage, SIGNAL(changed()), this, SIGNAL(changed()));
 
     tabWidget->addTab(columnPage, KIcon("view-file-columns"), i18nc("@title:tab", "Column"));
     connect(columnPage, SIGNAL(changed()), this, SIGNAL(changed()));
 

-    m_pages.append(generalPage);

     m_pages.append(iconsPage);
     m_pages.append(detailsPage);
     m_pages.append(columnPage);
     m_pages.append(iconsPage);
     m_pages.append(detailsPage);
     m_pages.append(columnPage);