From 8a0003bfbcc87068737ab1e2b94ae7b2ba73eca1 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Sat, 11 Jun 2022 19:09:45 +0200 Subject: [PATCH] Use one config-dolphin.h.cmake configuration file --- src/CMakeLists.txt | 10 +--------- src/config-baloo.h.cmake | 1 - src/config-dolphin.h.cmake | 5 +++++ src/config-kactivities.h.cmake | 1 - src/config-kuserfeedback.h.cmake | 1 - src/config-packagekit.h.cmake | 1 - src/config-terminal.h.cmake | 1 - src/dolphinmainwindow.cpp | 2 +- src/dolphinmainwindow.h | 2 +- src/dolphinviewcontainer.h | 2 +- src/kitemviews/kfileitemmodelrolesupdater.h | 2 +- src/main.cpp | 2 +- src/panels/information/informationpanelcontent.h | 2 +- src/search/dolphinquery.cpp | 2 +- src/search/dolphinsearchbox.cpp | 2 +- .../servicemenuinstaller/servicemenuinstaller.cpp | 2 +- src/settings/dolphinsettingsdialog.cpp | 2 +- src/settings/general/confirmationssettingspage.h | 2 +- src/views/dolphinview.h | 2 +- src/views/tooltips/dolphinfilemetadatawidget.h | 2 +- 20 files changed, 19 insertions(+), 27 deletions(-) delete mode 100644 src/config-baloo.h.cmake create mode 100644 src/config-dolphin.h.cmake delete mode 100644 src/config-kactivities.h.cmake delete mode 100644 src/config-kuserfeedback.h.cmake delete mode 100644 src/config-packagekit.h.cmake delete mode 100644 src/config-terminal.h.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ca81b7f076..e17b15b6b7 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 ad95b2f078..0000000000 --- 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 0000000000..7580b696c6 --- /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 e136858c94..0000000000 --- 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 1e79cc74bb..0000000000 --- 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 780fff56e8..0000000000 --- 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 ef77ac709d..0000000000 --- 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 124ce45357..379a320539 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 6e775c5cc3..269072022b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -10,7 +10,7 @@ #define DOLPHIN_MAINWINDOW_H #include "dolphintabwidget.h" -#include +#include #include #include #include diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index f78f85e55c..a7767ab3fa 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 a03ab513ac..a16ee1a86a 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/src/main.cpp b/src/main.cpp index ff79778884..a6758cfbb0 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 38383bd41c..49388a459a 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -8,7 +8,7 @@ #define INFORMATIONPANELCONTENT_H #include -#include +#include #include #include diff --git a/src/search/dolphinquery.cpp b/src/search/dolphinquery.cpp index d1a2922e87..3c4758bd2a 100644 --- a/src/search/dolphinquery.cpp +++ b/src/search/dolphinquery.cpp @@ -8,7 +8,7 @@ #include -#include +#include #ifdef HAVE_BALOO #include #endif diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index b6a8006644..55143e8206 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #ifdef HAVE_BALOO #include #include diff --git a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp index 01a3a996cf..3e9b7d0605 100644 --- a/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp +++ b/src/settings/contextmenu/servicemenuinstaller/servicemenuinstaller.cpp @@ -17,7 +17,7 @@ #include #include -#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 bd4c5fb02d..ea32065e03 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 20473c8384..aa8fbbe40f 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 69013309dc..0a5011d2fc 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h index 63a20f170f..21e2cb6dd3 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.h +++ b/src/views/tooltips/dolphinfilemetadatawidget.h @@ -9,7 +9,7 @@ #ifndef DOLPHINFILEMETADATAWIDGET_H #define DOLPHINFILEMETADATAWIDGET_H -#include +#include #include