Group classes into folders, Dolphin is too big in the meantime for having a flat directory hierarchy. dolphin/src/CMakeLists.txt will be cleaned up later.

svn path=/trunk/KDE/kdebase/apps/; revision=911065

src/CMakeLists.txt

@@ -18,8 +18,8 @@ endif (Nepomuk_FOUND)
 ########### next target ###############
 
 set(dolphinprivate_LIB_SRCS
-    additionalinfodialog.cpp
-    applyviewpropsjob.cpp
+    settings/additionalinfodialog.cpp
+    settings/applyviewpropsjob.cpp
     dolphincontroller.cpp
     dolphindetailsview.cpp
     dolphiniconsview.cpp
@@ -28,33 +28,33 @@ set(dolphinprivate_LIB_SRCS
     dolphindirlister.cpp
     dolphinfileitemdelegate.cpp
     dolphinmodel.cpp
-    dolphinsettings.cpp
+    settings/dolphinsettings.cpp
     dolphinsortfilterproxymodel.cpp
-    dolphintooltip.cpp
+    tooltips/dolphintooltip.cpp
     dolphincategorydrawer.cpp
     dolphinview.cpp
     dolphinviewactionhandler.cpp
     dolphinviewautoscroller.cpp
     draganddrophelper.cpp
     folderexpander.cpp
-    ktooltip.cpp
-    kformattedballoontipdelegate.cpp
+    tooltips/ktooltip.cpp
+    tooltips/kformattedballoontipdelegate.cpp
     renamedialog.cpp
     selectiontoggle.cpp
     selectionmanager.cpp
-    tooltipmanager.cpp
+    tooltips/tooltipmanager.cpp
     viewproperties.cpp
-    viewpropertiesdialog.cpp
-    viewpropsprogressinfo.cpp
+    settings/viewpropertiesdialog.cpp
+    settings/viewpropsprogressinfo.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphinprivate_LIB_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_library(dolphinprivate SHARED ${dolphinprivate_LIB_SRCS})
 
@@ -90,62 +90,62 @@ install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 ##########################################
 
 set(dolphin_SRCS
-    columnviewsettingspage.cpp
-    commentwidget.cpp
-    commenteditwidget.cpp
-    detailsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    panels/information/commentwidget.cpp
+    panels/information/commenteditwidget.cpp
+    settings/detailsviewsettingspage.cpp
     dolphinapplication.cpp
-    dolphinfontrequester.cpp
+    settings/dolphinfontrequester.cpp
     dolphinmainwindow.cpp
     dolphinnewmenu.cpp
     dolphinviewcontainer.cpp
     dolphinstatusbar.cpp
     dolphindirlister.cpp
     dolphincontextmenu.cpp
-    dolphinfileplacesview.cpp
-    dolphinsettingsdialog.cpp
+    panels/places/dolphinfileplacesview.cpp
+    settings/dolphinsettingsdialog.cpp
     filterbar.cpp
-    generalsettingspage.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
-    infosidebarpage.cpp
-    ktreeview.cpp
+    settings/generalsettingspage.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
+    panels/information/infosidebarpage.cpp
+    panels/folders/ktreeview.cpp
     main.cpp
-    metadatawidget.cpp
-    metatextlabel.cpp
+    panels/information/metadatawidget.cpp
+    panels/information/metatextlabel.cpp
     pixmapviewer.cpp
-    settingspagebase.cpp
-    sidebarpage.cpp
-    startupsettingspage.cpp
+    settings/settingspagebase.cpp
+    panels/sidebarpage.cpp
+    settings/startupsettingspage.cpp
     statusbarspaceinfo.cpp
     statusbarmessagelabel.cpp
-    treeviewcontextmenu.cpp
-    treeviewsidebarpage.cpp
-    sidebartreeview.cpp
-    viewsettingspage.cpp
-    viewsettingspagebase.cpp
+    panels/folders/treeviewcontextmenu.cpp
+    panels/folders/treeviewsidebarpage.cpp
+    panels/folders/sidebartreeview.cpp
+    settings/viewsettingspage.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
     )
 
 kde4_add_kcfg_files(dolphin_SRCS
-    dolphin_folderspanelsettings.kcfgc)
+    panels/folders/dolphin_folderspanelsettings.kcfgc)
 
 if(Nepomuk_FOUND)
 set(dolphin_SRCS
   ${dolphin_SRCS}
-  nepomukmassupdatejob.cpp
-  tagcloud/tagcloud.cpp
-  tagcloud/resourcetaggingwidget.cpp
-  tagcloud/taggingpopup.cpp
-  tagcloud/newtagdialog.cpp
+  panels/information/nepomukmassupdatejob.cpp
+  panels/information/tagcloud.cpp
+  panels/information/resourcetaggingwidget.cpp
+  panels/information/taggingpopup.cpp
+  panels/information/newtagdialog.cpp
 )
-kde4_add_ui_files(dolphin_SRCS tagcloud/newtagdialog.ui)
+kde4_add_ui_files(dolphin_SRCS panels/information/newtagdialog.ui)
 
 endif(Nepomuk_FOUND)
 
 if(NOT WIN32)
-   set(dolphin_SRCS ${dolphin_SRCS} terminalsidebarpage.cpp)
+   set(dolphin_SRCS ${dolphin_SRCS} panels/terminal/terminalsidebarpage.cpp)
 endif(NOT WIN32)
 
 qt4_add_dbus_adaptor(dolphin_SRCS
@@ -171,25 +171,23 @@ install(TARGETS dolphin ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 set(kcm_dolphin_PART_SRCS
     kcmdolphin.cpp
-    columnviewsettingspage.cpp
-    detailsviewsettingspage.cpp
-    dolphinfontrequester.cpp
-#    dolphinsettings.cpp
-    generalviewsettingspage.cpp
-    iconsizegroupbox.cpp
-    iconsviewsettingspage.cpp
+    settings/columnviewsettingspage.cpp
+    settings/detailsviewsettingspage.cpp
+    settings/dolphinfontrequester.cpp
+    settings/generalviewsettingspage.cpp
+    settings/iconsizegroupbox.cpp
+    settings/iconsviewsettingspage.cpp
     pixmapviewer.cpp
-    viewsettingspagebase.cpp
-#    viewproperties.cpp
+    settings/viewsettingspagebase.cpp
     zoomlevelinfo.cpp
 )
 
 kde4_add_kcfg_files(kcm_dolphin_PART_SRCS
-    dolphin_columnmodesettings.kcfgc
-    dolphin_directoryviewpropertysettings.kcfgc
-    dolphin_detailsmodesettings.kcfgc
-    dolphin_iconsmodesettings.kcfgc
-    dolphin_generalsettings.kcfgc)
+    settings/dolphin_columnmodesettings.kcfgc
+    settings/dolphin_directoryviewpropertysettings.kcfgc
+    settings/dolphin_detailsmodesettings.kcfgc
+    settings/dolphin_iconsmodesettings.kcfgc
+    settings/dolphin_generalsettings.kcfgc)
 
 kde4_add_plugin(kcm_dolphin ${kcm_dolphin_PART_SRCS})
 
@@ -203,6 +201,6 @@ install(TARGETS kcm_dolphin DESTINATION ${PLUGIN_INSTALL_DIR} )
 ########### install files ###############
 
 install( FILES  dolphin.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES  dolphin_directoryviewpropertysettings.kcfg dolphin_generalsettings.kcfg dolphin_columnmodesettings.kcfg dolphin_iconsmodesettings.kcfg dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
+install( FILES  settings/dolphin_directoryviewpropertysettings.kcfg settings/dolphin_generalsettings.kcfg settings/dolphin_columnmodesettings.kcfg settings/dolphin_iconsmodesettings.kcfg settings/dolphin_detailsmodesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 install( FILES  dolphinui.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin )
 install( FILES kcmdolphin.desktop DESTINATION ${SERVICES_INSTALL_DIR} )

src/dolphincolumnview.cpp

@@ -21,7 +21,7 @@
 
 #include "dolphincolumnwidget.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "zoomlevelinfo.h"
 
 #include "dolphin_columnmodesettings.h"

src/dolphincolumnwidget.cpp

@@ -24,14 +24,14 @@
 #include "dolphincontroller.h"
 #include "dolphindirlister.h"
 #include "dolphinsortfilterproxymodel.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_columnmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "selectionmanager.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 
 #include <kcolorscheme.h>
 #include <kdirlister.h>

src/dolphincontextmenu.cpp

@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"

src/dolphindetailsview.cpp

@@ -23,7 +23,7 @@
 #include "dolphinmodel.h"
 #include "dolphincontroller.h"
 #include "dolphinfileitemdelegate.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinviewautoscroller.h"
 #include "draganddrophelper.h"

src/dolphiniconsview.cpp

@@ -21,7 +21,7 @@
 
 #include "dolphincategorydrawer.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewautoscroller.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"

src/dolphinmainwindow.cpp

@@ -25,20 +25,20 @@
 #include <config-nepomuk.h>
 
 #include "dolphinapplication.h"
-#include "dolphinfileplacesview.h"
+#include "panels/places/dolphinfileplacesview.h"
 #include "dolphinnewmenu.h"
-#include "dolphinsettings.h"
-#include "dolphinsettingsdialog.h"
+#include "settings/dolphinsettings.h"
+#include "settings/dolphinsettingsdialog.h"
 #include "dolphinstatusbar.h"
 #include "dolphinviewcontainer.h"
-#include "infosidebarpage.h"
-#include "metadatawidget.h"
+#include "panels/information/infosidebarpage.h"
+#include "panels/information/metadatawidget.h"
 #include "mainwindowadaptor.h"
-#include "treeviewsidebarpage.h"
+#include "panels/folders/treeviewsidebarpage.h"
 #include "viewproperties.h"
 
 #ifndef Q_OS_WIN
-#include "terminalsidebarpage.h"
+#include "panels/terminal/terminalsidebarpage.h"
 #endif
 
 #include "dolphin_generalsettings.h"

src/dolphinmainwindow.h

@@ -23,7 +23,7 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include "dolphinview.h"
-#include "sidebarpage.h"
+#include "panels/sidebarpage.h"
 
 #include <config-nepomuk.h>
 

src/dolphinstatusbar.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"

src/dolphinview.cpp

@@ -57,12 +57,12 @@
 #include "dolphindetailsview.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphiniconsview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"
 #include "folderexpander.h"
 #include "renamedialog.h"
-#include "tooltipmanager.h"
+#include "tooltips/tooltipmanager.h"
 #include "viewproperties.h"
 #include "zoomlevelinfo.h"
 

src/dolphinviewactionhandler.cpp

@@ -19,7 +19,7 @@
 
 #include "dolphinviewactionhandler.h"
 
-#include "viewpropertiesdialog.h"
+#include "settings/viewpropertiesdialog.h"
 #include "dolphinview.h"
 #include "zoomlevelinfo.h"
 

src/dolphinviewcontainer.cpp

@@ -58,7 +58,7 @@
 #include "filterbar.h"
 #include "kurlnavigator.h"
 #include "viewproperties.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,

src/folderexpander.cpp

@@ -20,7 +20,7 @@
 #include "folderexpander.h"
 #include "dolphinview.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 
 #include <QtCore/QTimer>

src/kcmdolphin.cpp

@@ -19,10 +19,10 @@
 
 #include "kcmdolphin.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <ktabwidget.h>
 #include <kdialog.h>

src/panels/folders/sidebartreeview.h

@@ -21,7 +21,7 @@
 #define SIDEBARTREEVIEW_H
 
 #include <kurl.h>
-#include <ktreeview.h>
+#include <panels/folders/ktreeview.h>
 
 /**
  * @brief Tree view widget which is used for the sidebar panel.

src/panels/folders/treeviewsidebarpage.cpp

@@ -22,7 +22,7 @@
 #include "dolphinmodel.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
 #include "draganddrophelper.h"

src/panels/folders/treeviewsidebarpage.h

@@ -21,7 +21,7 @@
 #define TREEVIEWSIDEBARPAGE_H
 
 #include <kurl.h>
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class KDirLister;
 class DolphinModel;

src/panels/information/infosidebarpage.cpp

@@ -45,7 +45,7 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "metadatawidget.h"
 #include "metatextlabel.h"
 #include "pixmapviewer.h"

src/panels/information/infosidebarpage.h

@@ -20,7 +20,7 @@
 #ifndef INFOSIDEBARPAGE_H
 #define INFOSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 #include <QtGui/QPushButton>
 #include <QtGui/QPixmap>

src/panels/information/metadatawidget.cpp

@@ -43,7 +43,7 @@
 #include <nepomuk/variant.h>
 #include <nepomuk/kratingwidget.h>
 #include <Soprano/Vocabulary/Xesam>
-#include "tagcloud/resourcetaggingwidget.h"
+#include "resourcetaggingwidget.h"
 #endif
 
 
@@ -66,7 +66,7 @@ public:
     CommentWidget* editComment;
     KRatingWidget* ratingWidget;
     Nepomuk::ResourceTaggingWidget* tagWidget;
-    
+
     // shared data between the GUI-thread and
     // the loader-thread (see LoadFilesThread):
     QMutex mutex;
@@ -77,7 +77,7 @@ public:
         QList<Nepomuk::Resource> fileRes;
         QMap<KUrl, Nepomuk::Resource> files;
     } sharedData;
-    
+
     /**
      * Loads the meta data of files and writes
      * the result into a shared data pool that
@@ -89,13 +89,13 @@ public:
         LoadFilesThread(SharedData* sharedData, QMutex* mutex);
         void setFiles(const KUrl::List& urls);
         virtual void run();
-        
+
     private:
         SharedData* m_sharedData;
         QMutex* m_mutex;
         KUrl::List m_urls;
     };
-    
+
     LoadFilesThread* loadFilesThread;
 #endif
 };
@@ -126,7 +126,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
     QMutexLocker locker( m_mutex );
     const KUrl::List urls = m_urls;
     locker.unlock();
-    
+
     bool first = true;
     QList<Nepomuk::Resource> fileRes;
     QMap<KUrl, Nepomuk::Resource> files;
@@ -152,7 +152,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
         }
         first = false;
     }
-    
+
     locker.relock();
     m_sharedData->rating = rating;
     m_sharedData->comment = comment;
@@ -174,7 +174,7 @@ MetaDataWidget::MetaDataWidget(QWidget* parent) :
     connect(d->ratingWidget, SIGNAL(ratingChanged(unsigned int)), this, SLOT(slotRatingChanged(unsigned int)));
     connect(d->editComment, SIGNAL(commentChanged(const QString&)), this, SLOT(slotCommentChanged(const QString&)));
     connect( d->tagWidget, SIGNAL( tagClicked( const Nepomuk::Tag& ) ), this, SLOT( slotTagClicked( const Nepomuk::Tag& ) ) );
-    
+
     d->sharedData.rating = 0;
     d->loadFilesThread = new Private::LoadFilesThread(&d->sharedData, &d->mutex);
     connect(d->loadFilesThread, SIGNAL(finished()), this, SLOT(slotLoadingFinished()));

src/panels/information/resourcetaggingwidget.cpp

@@ -20,7 +20,7 @@
 #include "resourcetaggingwidget.h"
 #include "tagcloud.h"
 #include "taggingpopup.h"
-#include "../nepomukmassupdatejob.h"
+#include "nepomukmassupdatejob.h"
 
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QContextMenuEvent>

src/panels/terminal/terminalsidebarpage.h

@@ -20,7 +20,7 @@
 #ifndef TERMINALSIDEBARPAGE_H
 #define TERMINALSIDEBARPAGE_H
 
-#include <sidebarpage.h>
+#include <panels/sidebarpage.h>
 
 class TerminalInterface;
 class QVBoxLayout;

src/settings/columnviewsettingspage.h

@@ -20,7 +20,7 @@
 #ifndef COLUMNVIEWSETTINGSPAGE_H
 #define COLUMNVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class DolphinFontRequester;

src/settings/detailsviewsettingspage.cpp

@@ -20,12 +20,12 @@
 #include "detailsviewsettingspage.h"
 
 #include "iconsizegroupbox.h"
+#include "dolphinfontrequester.h"
 #include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "zoomlevelinfo.h"
 
 #include <kdialog.h>
-#include <dolphinfontrequester.h>
 #include <klocale.h>
 
 #include <QButtonGroup>

src/settings/detailsviewsettingspage.h

@@ -20,7 +20,7 @@
 #ifndef DETAILSVIEWSETTINGSPAGE_H
 #define DETAILSVIEWSETTINGSPAGE_H
 
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;

src/settings/dolphinsettingsdialog.cpp

@@ -20,8 +20,8 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include "dolphinapplication.h"
-#include "dolphinmainwindow.h"
+#include <dolphinapplication.h>
+#include <dolphinmainwindow.h>
 #include "generalsettingspage.h"
 #include "startupsettingspage.h"
 #include "viewsettingspage.h"

src/settings/generalsettingspage.cpp

@@ -20,7 +20,7 @@
 
 #include "generalsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 
 #include "dolphin_generalsettings.h"
 

src/settings/generalsettingspage.h

@@ -20,7 +20,7 @@
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class QLineEdit;

src/settings/generalviewsettingspage.cpp

@@ -19,7 +19,7 @@
 
 #include "generalviewsettingspage.h"
 #include "dolphinmainwindow.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinviewcontainer.h"
 #include "viewproperties.h"
 

src/settings/generalviewsettingspage.h

@@ -21,7 +21,7 @@
 #define GENERALVIEWSETTINGSPAGE_H
 
 #include <kurl.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinMainWindow;
 class QCheckBox;

src/settings/iconsviewsettingspage.cpp

@@ -20,7 +20,7 @@
 #include "iconsviewsettingspage.h"
 
 #include "dolphinfontrequester.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "iconsizegroupbox.h"
 #include "zoomlevelinfo.h"
 

src/settings/iconsviewsettingspage.h

@@ -21,7 +21,7 @@
 #define ICONSVIEWSETTINGSPAGE_H
 
 #include <dolphiniconsview.h>
-#include <viewsettingspagebase.h>
+#include <settings/viewsettingspagebase.h>
 
 class DolphinFontRequester;
 class IconSizeGroupBox;

src/settings/startupsettingspage.cpp

@@ -19,7 +19,7 @@
 
 #include "startupsettingspage.h"
 
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "dolphinviewcontainer.h"

src/settings/startupsettingspage.h

@@ -19,7 +19,7 @@
 #ifndef STARTUPSETTINGSPAGE_H
 #define STARTUPSETTINGSPAGE_H
 
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class DolphinMainWindow;
 class KLineEdit;

src/settings/viewpropertiesdialog.cpp

@@ -22,7 +22,7 @@
 
 #include "additionalinfodialog.h"
 #include "dolphinview.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

src/settings/viewsettingspage.cpp

@@ -20,12 +20,12 @@
 
 #include "viewsettingspage.h"
 
-#include "columnviewsettingspage.h"
-#include "detailsviewsettingspage.h"
+#include "settings/columnviewsettingspage.h"
+#include "settings/detailsviewsettingspage.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-#include "generalviewsettingspage.h"
-#include "iconsviewsettingspage.h"
+#include "settings/generalviewsettingspage.h"
+#include "settings/iconsviewsettingspage.h"
 
 #include <QtGui/QBoxLayout>
 #include <QtGui/QLayout>

src/settings/viewsettingspage.h

@@ -21,7 +21,7 @@
 #define VIEWSETTINGSPAGE_H
 
 #include <QtGui/QWidget>
-#include <settingspagebase.h>
+#include <settings/settingspagebase.h>
 
 class ViewSettingsPageBase;
 class DolphinMainWindow;

src/tooltips/dolphintooltip.h

@@ -22,8 +22,8 @@
 #ifndef DOLPHINTOOLTIP_H
 #define DOLPHINTOOLTIP_H
 
-#include "ktooltip.h"
-#include "kformattedballoontipdelegate.h"
+#include <tooltips/ktooltip.h>
+#include <tooltips/kformattedballoontipdelegate.h>
 
 #include <kio/previewjob.h>
 #include <QtCore/QObject>

src/tooltips/kformattedballoontipdelegate.h

@@ -21,7 +21,7 @@
 #ifndef KFORMATTEDBALLOONTIPDELEGATE_H
 #define KFORMATTEDBALLOONTIPDELEGATE_H
 
-#include "ktooltip.h"
+#include <tooltips/ktooltip.h>
 #include <QPainter>
 
 class KFormattedBalloonTipDelegate : public KToolTipDelegate