From 2a5cb33ec4e67e62a314cc7950c121d14689cb6f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 21 Mar 2026 14:57:34 +0900 Subject: [PATCH] Remove use of TDE_VERSION Signed-off-by: Michele Calgaro (cherry picked from commit 6715f2542ef39e3df7b0050aa483b4e4973ac693) --- kate/app/kateapp.cpp | 1 - kate/app/kwritemain.cpp | 1 - kcontrol/kcontrol/main.cpp | 5 ++--- kcontrol/kcontrol/version.h | 2 -- kcontrol/tdefontinst/lib/FcEngine.h | 1 - kdesktop/init.cpp | 1 + khelpcenter/application.cpp | 5 ++--- khelpcenter/khc_indexbuilder.cpp | 5 ++--- khelpcenter/version.h | 6 ------ khotkeys/shared/input.cpp | 1 - tdeioslave/trash/ktrash.cpp | 1 + twin/lib/kdecoration.h | 1 - 12 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 kcontrol/kcontrol/version.h delete mode 100644 khelpcenter/version.h diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 479d0c77c..5b893bfa6 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -29,7 +29,6 @@ #include "../interfaces/application.h" -#include #include #include #include diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 44899a82c..84f1b4737 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -34,7 +34,6 @@ #include -#include #include #include #include diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 2e7fac8be..629c05ea3 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -39,6 +39,7 @@ #include #include #include +#include "tdeversion.h" #include #include "main.h" @@ -47,8 +48,6 @@ #include "global.h" #include "moduleIface.h" -#include "version.h" - KControlApp::KControlApp() : KUniqueApplication() , toplevel(0) @@ -102,7 +101,7 @@ extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDELocale::setMainCatalogue("kcontrol"); TDEAboutData aboutKControl( "kcontrol", I18N_NOOP("Trinity Control Center"), - KCONTROL_VERSION, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, + TDE_VERSION_STRING, I18N_NOOP("The Trinity Control Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2024, The Trinity Control Center Developers")); TQCString argv_0 = argv[0]; diff --git a/kcontrol/kcontrol/version.h b/kcontrol/kcontrol/version.h deleted file mode 100644 index 8612f8240..000000000 --- a/kcontrol/kcontrol/version.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#define KCONTROL_VERSION TDE_VERSION_STRING diff --git a/kcontrol/tdefontinst/lib/FcEngine.h b/kcontrol/tdefontinst/lib/FcEngine.h index 5db48b0c3..bddae137b 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.h +++ b/kcontrol/tdefontinst/lib/FcEngine.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #if (FC_VERSION<20200) diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp index 6bf87f333..8f567b7ac 100644 --- a/kdesktop/init.cpp +++ b/kdesktop/init.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 628b844a5..8e65b7984 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -20,8 +20,7 @@ #include "application.h" #include "mainwindow.h" -#include "version.h" - +#include "tdeversion.h" #include #include @@ -61,7 +60,7 @@ static TDECmdLineOptions options[] = extern "C" int TDE_EXPORT kdemain( int argc, char **argv ) { TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), - HELPCENTER_VERSION, + TDE_VERSION_STRING, I18N_NOOP("The Trinity Help Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2003, The KHelpCenter developers") ); diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index dd0ee5811..57f1254b6 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -21,8 +21,7 @@ #include "khc_indexbuilder.h" -#include "version.h" - +#include "tdeversion.h" #include #include #include @@ -172,7 +171,7 @@ int main( int argc, char **argv ) { TDEAboutData aboutData( "khc_indexbuilder", I18N_NOOP("KHelpCenter Index Builder"), - HELPCENTER_VERSION, + TDE_VERSION_STRING, I18N_NOOP("The TDE Help Center"), TDEAboutData::License_GPL, I18N_NOOP("(c) 2003, The KHelpCenter developers") ); diff --git a/khelpcenter/version.h b/khelpcenter/version.h deleted file mode 100644 index f9dd26a8c..000000000 --- a/khelpcenter/version.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __version_h__ -#define __version_h__ - -#define HELPCENTER_VERSION TDE_VERSION_STRING - -#endif diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 96338b055..de95210a0 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index 4450156f8..814e49d27 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/tdeioslave/trash/ktrash.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index e04c08a51..b2f36fb72 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -30,7 +30,6 @@ DEALINGS IN THE SOFTWARE. #include #include #include -#include class KDecorationOptionsPrivate; class KDecorationBridge;