diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/detailsviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinmainwindow.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinsettings.cpp | 6 | ||||
| -rw-r--r-- | src/generalsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/generalviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/iconsviewsettingspage.cpp | 2 | ||||
| -rw-r--r-- | src/urlnavigator.cpp | 2 | ||||
| -rw-r--r-- | src/viewproperties.cpp | 2 | ||||
| -rw-r--r-- | src/viewproperties.h | 2 | ||||
| -rw-r--r-- | src/viewpropertiesdialog.cpp | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 8a8d158c9..7b0265d26 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -34,7 +34,7 @@ #include <q3groupbox.h> #include <kvbox.h> #include "dolphinsettings.h" -#include "detailsmodesettings.h" +#include "dolphin_detailsmodesettings.h" #include "dolphindetailsview.h" DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow, diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 99ddcbbef..2cf524bbd 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -33,7 +33,7 @@ #include "dolphinsettings.h"
#include "bookmarkssidebarpage.h"
#include "infosidebarpage.h"
-#include "generalsettings.h"
+#include "dolphin_generalsettings.h"
#include "viewpropertiesdialog.h"
#include "viewproperties.h"
#include "mainwindowadaptor.h"
diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp index db537edc5..7e3388524 100644 --- a/src/dolphinsettings.cpp +++ b/src/dolphinsettings.cpp @@ -30,9 +30,9 @@ #include <klocale.h> #include <kstandarddirs.h> -#include "generalsettings.h" -#include "iconsmodesettings.h" -#include "detailsmodesettings.h" +#include "dolphin_generalsettings.h" +#include "dolphin_iconsmodesettings.h" +#include "dolphin_detailsmodesettings.h" #include <Q3IconView> diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index 1c0965c66..6994af052 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -40,7 +40,7 @@ #include "dolphinsettings.h" #include "dolphinmainwindow.h" #include "dolphinview.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) : SettingsPageBase(parent), diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp index bdaa681a6..e7a2893f7 100644 --- a/src/generalviewsettingspage.cpp +++ b/src/generalviewsettingspage.cpp @@ -21,7 +21,7 @@ #include "generalviewsettingspage.h" #include "dolphinmainwindow.h" #include "dolphinsettings.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" #include "viewproperties.h" #include <assert.h> diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 872047246..3433e8532 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "iconsviewsettingspage.h" -#include "iconsmodesettings.h" +#include "dolphin_iconsmodesettings.h" #include "dolphinsettings.h" #include "pixmapviewer.h" diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index 4ce0fc009..b9290983f 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -23,7 +23,7 @@ #include "bookmarkselector.h" #include "dolphinsettings.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" #include "protocolcombo.h" #include "urlnavigatorbutton.h" diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index 7101bed29..45aadba23 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -31,7 +31,7 @@ #include "viewproperties.h" #include "dolphinsettings.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" #define FILE_NAME "/.directory" diff --git a/src/viewproperties.h b/src/viewproperties.h index e4f7821fc..6683a6d0c 100644 --- a/src/viewproperties.h +++ b/src/viewproperties.h @@ -25,7 +25,7 @@ #include <kurl.h> #include <qdatetime.h> -#include "directoryviewpropertysettings.h" +#include "dolphin_directoryviewpropertysettings.h" class QFile; diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 93c377887..f6578a511 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -23,7 +23,7 @@ #include "dolphinview.h" #include "dolphinsettings.h" #include "dolphinsortfilterproxymodel.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" #include "viewproperties.h" #include <assert.h> |