Use one config-dolphin.h.cmake configuration file

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca81b7f07633d588ee7c884891671bb3768598fc..e17b15b6b761ad6169e6ba5c39598ad25af9df91 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,6 @@
 include(ECMAddAppIcon)
 
 include(ECMAddAppIcon)
 

-configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
-
-configure_file(config-kactivities.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kactivities.h)
-
-configure_file(config-packagekit.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-packagekit.h)
-
-configure_file(config-terminal.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-terminal.h)
-
-configure_file(config-kuserfeedback.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kuserfeedback.h)
+configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)

 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"

diff --git a/src/config-baloo.h.cmake b/src/config-baloo.h.cmake
deleted file mode 100644 (file)
index ad95b2f..0000000
--- a/src/config-baloo.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_BALOO

diff --git a/src/config-dolphin.h.cmake b/src/config-dolphin.h.cmake
new file mode 100644 (file)
index 0000000..7580b69
--- /dev/null
+++ b/src/config-dolphin.h.cmake
@@ -0,0 +1,5 @@
+#cmakedefine HAVE_BALOO
+#cmakedefine HAVE_KACTIVITIES
+#cmakedefine HAVE_KUSERFEEDBACK
+#cmakedefine HAVE_PACKAGEKIT
+#cmakedefine HAVE_TERMINAL

diff --git a/src/config-kactivities.h.cmake b/src/config-kactivities.h.cmake
deleted file mode 100644 (file)
index e136858..0000000
--- a/src/config-kactivities.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_KACTIVITIES

diff --git a/src/config-kuserfeedback.h.cmake b/src/config-kuserfeedback.h.cmake
deleted file mode 100644 (file)
index 1e79cc7..0000000
--- a/src/config-kuserfeedback.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_KUSERFEEDBACK

diff --git a/src/config-packagekit.h.cmake b/src/config-packagekit.h.cmake
deleted file mode 100644 (file)
index 780fff5..0000000
--- a/src/config-packagekit.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_PACKAGEKIT

diff --git a/src/config-terminal.h.cmake b/src/config-terminal.h.cmake
deleted file mode 100644 (file)
index ef77ac7..0000000
--- a/src/config-terminal.h.cmake
+++ /dev/null
@@ -1 +0,0 @@
-#cmakedefine HAVE_TERMINAL

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 124ce45357392f034b2a4374f033f1abba2645b3..379a320539d8c29a7656f54f59ba6e730d6c1d75 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -9,7 +9,7 @@
 #include "dolphinmainwindow.h"
 
 #include "dolphinmainwindowadaptor.h"
 #include "dolphinmainwindow.h"
 
 #include "dolphinmainwindowadaptor.h"

-#include "config-terminal.h"
+#include "config-dolphin.h"

 #include "global.h"
 #include "dolphinbookmarkhandler.h"
 #include "dolphindockwidget.h"
 #include "global.h"
 #include "dolphinbookmarkhandler.h"
 #include "dolphindockwidget.h"

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 6e775c5cc3e71d38f4ac3c058b5f569fa9959c30..269072022bc9b83d38cab4d14d12ab9db5755071 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -10,7 +10,7 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include "dolphintabwidget.h"
 #define DOLPHIN_MAINWINDOW_H
 
 #include "dolphintabwidget.h"

-#include <config-baloo.h>
+#include <config-dolphin.h>

 #include <KFileItemActions>
 #include <kio/fileundomanager.h>
 #include <kxmlguiwindow.h>
 #include <KFileItemActions>
 #include <kio/fileundomanager.h>
 #include <kxmlguiwindow.h>

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index f78f85e55c5c75746a39565d42f2d6468f7a98a0..a7767ab3fa54ea2483d25a205ba37a0edf203f61 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -7,7 +7,7 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 

-#include "config-kactivities.h"
+#include "config-dolphin.h"

 #include "dolphinurlnavigator.h"
 #include "views/dolphinview.h"
 
 #include "dolphinurlnavigator.h"
 #include "views/dolphinview.h"
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index a03ab513ac4f3c9a0be9b80232d2506963774998..a16ee1a86a8abcab7d4b4062c794da48b691db78 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -13,7 +13,7 @@
 #include <list>
 
 #include <KFileItem>
 #include <list>
 
 #include <KFileItem>

-#include <config-baloo.h>
+#include <config-dolphin.h>

 
 #include <QObject>
 #include <QSet>
 
 #include <QObject>
 #include <QSet>

diff --git a/src/main.cpp b/src/main.cpp
index ff79778884188c042c093925bd282c096aa505ea..a6758cfbb060a13f64b3c7edc7158c2ab4f89a63 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,7 @@
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"

-#include "config-kuserfeedback.h"
+#include "config-dolphin.h"

 #ifdef HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif
 #ifdef HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #endif

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 38383bd41c41ec64f5699edad8097de621becbec..49388a459a0298e101fea2b66683ef335cee6659 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -8,7 +8,7 @@
 #define INFORMATIONPANELCONTENT_H
 
 #include <KFileItem>
 #define INFORMATIONPANELCONTENT_H
 
 #include <KFileItem>

-#include <config-baloo.h>
+#include <config-dolphin.h>

 
 #include <QPointer>
 #include <QUrl>
 
 #include <QPointer>
 #include <QUrl>

diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp
index d1a2922e8718b058faf84adfcf4bdf57c00e8572..3c4758bd2a734591726a98e281d088738ad545c2 100644 (file)
--- a/src/search/dolphinquery.cpp
+++ b/src/search/dolphinquery.cpp
@@ -8,7 +8,7 @@
 
 #include <QRegularExpression>
 
 
 #include <QRegularExpression>
 

-#include <config-baloo.h>
+#include <config-dolphin.h>

 #ifdef HAVE_BALOO
 #include <Baloo/Query>
 #endif
 #ifdef HAVE_BALOO
 #include <Baloo/Query>
 #endif

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index b6a8006644074e10ee7a228382a15f03eaf74fce..55143e8206624cba7e958db14750aea9d5fa6813 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -15,7 +15,7 @@
 #include <KLocalizedString>
 #include <KMoreToolsMenuFactory>
 #include <KSeparator>
 #include <KLocalizedString>
 #include <KMoreToolsMenuFactory>
 #include <KSeparator>

-#include <config-baloo.h>
+#include <config-dolphin.h>

 #ifdef HAVE_BALOO
 #include <Baloo/Query>
 #include <Baloo/IndexerConfig>
 #ifdef HAVE_BALOO
 #include <Baloo/Query>
 #include <Baloo/IndexerConfig>

diff --git a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
index 01a3a996cffef7531ef3c223f8bb969feab35a9d..3e9b7d0605c343a4bbab48ac61b72b3d7731f56c 100644 (file)
--- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
@@ -17,7 +17,7 @@
 #include <KLocalizedString>
 #include <KShell>
 
 #include <KLocalizedString>
 #include <KShell>
 

-#include "../../../config-packagekit.h"
+#include "../../../config-dolphin.h"

 
 Q_GLOBAL_STATIC_WITH_ARGS(QStringList, binaryPackages, ({QLatin1String("application/vnd.debian.binary-package"),
                                                         QLatin1String("application/x-rpm"),
 
 Q_GLOBAL_STATIC_WITH_ARGS(QStringList, binaryPackages, ({QLatin1String("application/vnd.debian.binary-package"),
                                                         QLatin1String("application/x-rpm"),

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index bd4c5fb02dead78dc608fd97cbfba29f6b3260bf..ea32065e03a5045174c096be70199fd6a175760f 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -14,7 +14,7 @@
 #include "startup/startupsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"
 #include "startup/startupsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"

-#include "config-kuserfeedback.h"
+#include "config-dolphin.h"

 #ifdef HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #ifdef HAVE_KUSERFEEDBACK
 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"

diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 20473c83848351f6f578e3b5a54a98ca3aa86833..aa8fbbe40fab59f8c86ec50162b98a6ecf30177b 100644 (file)
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -6,7 +6,7 @@
 #ifndef CONFIRMATIONSSETTINGSPAGE_H
 #define CONFIRMATIONSSETTINGSPAGE_H
 
 #ifndef CONFIRMATIONSSETTINGSPAGE_H
 #define CONFIRMATIONSSETTINGSPAGE_H
 

-#include "config-terminal.h"
+#include "config-dolphin.h"

 #include "settings/settingspagebase.h"
 
 class QCheckBox;
 #include "settings/settingspagebase.h"
 
 class QCheckBox;

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 69013309dcc1597190f7f3c81adc6906afb17148..0a5011d2fce0bb64af7f4c18155f11dc6be354e3 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -14,7 +14,7 @@
 
 #include <KFileItem>
 #include <KIO/Job>
 
 #include <KFileItem>
 #include <KIO/Job>

-#include <config-baloo.h>
+#include <config-dolphin.h>

 #include <kio/fileundomanager.h>
 #include <kparts/part.h>
 
 #include <kio/fileundomanager.h>
 #include <kparts/part.h>
 

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index 63a20f170f77ea7bd2a9c293e07e9318d94704c6..21e2cb6dd352cc5db32df4beb3d2649334611d29 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -9,7 +9,7 @@
 #ifndef DOLPHINFILEMETADATAWIDGET_H
 #define DOLPHINFILEMETADATAWIDGET_H
 
 #ifndef DOLPHINFILEMETADATAWIDGET_H
 #define DOLPHINFILEMETADATAWIDGET_H
 

-#include <config-baloo.h>
+#include <config-dolphin.h>

 
 #include <QWidget>
 
 
 #include <QWidget>