┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/config-baloo.h.cmake1
-rw-r--r--src/config-dolphin.h.cmake5
-rw-r--r--src/config-kactivities.h.cmake1
-rw-r--r--src/config-kuserfeedback.h.cmake1
-rw-r--r--src/config-packagekit.h.cmake1
-rw-r--r--src/config-terminal.h.cmake1
-rw-r--r--src/dolphinmainwindow.cpp2
-rw-r--r--src/dolphinmainwindow.h2
-rw-r--r--src/dolphinviewcontainer.h2
-rw-r--r--src/kitemviews/kfileitemmodelrolesupdater.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/panels/information/informationpanelcontent.h2
-rw-r--r--src/search/dolphinquery.cpp2
-rw-r--r--src/search/dolphinsearchbox.cpp2
-rw-r--r--src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp2
-rw-r--r--src/settings/dolphinsettingsdialog.cpp2
-rw-r--r--src/settings/general/confirmationssettingspage.h2
-rw-r--r--src/views/dolphinview.h2
-rw-r--r--src/views/tooltips/dolphinfilemetadatawidget.h2
20 files changed, 19 insertions, 27 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ca81b7f07..e17b15b6b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,6 @@
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\"
diff --git a/src/config-baloo.h.cmake b/src/config-baloo.h.cmake
deleted file mode 100644
index ad95b2f07..000000000
--- 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
index 000000000..7580b696c
--- /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
index e136858c9..000000000
--- 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
index 1e79cc74b..000000000
--- 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
index 780fff56e..000000000
--- 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
index ef77ac709..000000000
--- 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 124ce4535..379a32053 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -9,7 +9,7 @@
#include "dolphinmainwindow.h"
#include "dolphinmainwindowadaptor.h"
-#include "config-terminal.h"
+#include "config-dolphin.h"
#include "global.h"
#include "dolphinbookmarkhandler.h"
#include "dolphindockwidget.h"
diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 6e775c5cc..269072022 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -10,7 +10,7 @@
#define DOLPHIN_MAINWINDOW_H
#include "dolphintabwidget.h"
-#include <config-baloo.h>
+#include <config-dolphin.h>
#include <KFileItemActions>
#include <kio/fileundomanager.h>
#include <kxmlguiwindow.h>
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index f78f85e55..a7767ab3f 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -7,7 +7,7 @@
#ifndef DOLPHINVIEWCONTAINER_H
#define DOLPHINVIEWCONTAINER_H
-#include "config-kactivities.h"
+#include "config-dolphin.h"
#include "dolphinurlnavigator.h"
#include "views/dolphinview.h"
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index a03ab513a..a16ee1a86 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -13,7 +13,7 @@
#include <list>
#include <KFileItem>
-#include <config-baloo.h>
+#include <config-dolphin.h>
#include <QObject>
#include <QSet>
diff --git a/src/main.cpp b/src/main.cpp
index ff7977888..a6758cfbb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,7 +12,7 @@
#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
diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index 38383bd41..49388a459 100644
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -8,7 +8,7 @@
#define INFORMATIONPANELCONTENT_H
#include <KFileItem>
-#include <config-baloo.h>
+#include <config-dolphin.h>
#include <QPointer>
#include <QUrl>
diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp
index d1a2922e8..3c4758bd2 100644
--- a/src/search/dolphinquery.cpp
+++ b/src/search/dolphinquery.cpp
@@ -8,7 +8,7 @@
#include <QRegularExpression>
-#include <config-baloo.h>
+#include <config-dolphin.h>
#ifdef HAVE_BALOO
#include <Baloo/Query>
#endif
diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index b6a800664..55143e820 100644
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -15,7 +15,7 @@
#include <KLocalizedString>
#include <KMoreToolsMenuFactory>
#include <KSeparator>
-#include <config-baloo.h>
+#include <config-dolphin.h>
#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 01a3a996c..3e9b7d060 100644
--- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
+++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp
@@ -17,7 +17,7 @@
#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"),
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index bd4c5fb02..ea32065e0 100644
--- 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 "config-kuserfeedback.h"
+#include "config-dolphin.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 20473c838..aa8fbbe40 100644
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -6,7 +6,7 @@
#ifndef CONFIRMATIONSSETTINGSPAGE_H
#define CONFIRMATIONSSETTINGSPAGE_H
-#include "config-terminal.h"
+#include "config-dolphin.h"
#include "settings/settingspagebase.h"
class QCheckBox;
diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 69013309d..0a5011d2f 100644
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -14,7 +14,7 @@
#include <KFileItem>
#include <KIO/Job>
-#include <config-baloo.h>
+#include <config-dolphin.h>
#include <kio/fileundomanager.h>
#include <kparts/part.h>
diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index 63a20f170..21e2cb6dd 100644
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -9,7 +9,7 @@
#ifndef DOLPHINFILEMETADATAWIDGET_H
#define DOLPHINFILEMETADATAWIDGET_H
-#include <config-baloo.h>
+#include <config-dolphin.h>
#include <QWidget>