diff options
| -rw-r--r-- | kate/app/kateapp.cpp | 1 | ||||
| -rw-r--r-- | kate/app/kwritemain.cpp | 1 | ||||
| -rw-r--r-- | kcontrol/kcontrol/main.cpp | 5 | ||||
| -rw-r--r-- | kcontrol/kcontrol/version.h | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/FcEngine.h | 1 | ||||
| -rw-r--r-- | kdesktop/init.cpp | 1 | ||||
| -rw-r--r-- | khelpcenter/application.cpp | 5 | ||||
| -rw-r--r-- | khelpcenter/khc_indexbuilder.cpp | 5 | ||||
| -rw-r--r-- | khelpcenter/version.h | 6 | ||||
| -rw-r--r-- | khotkeys/shared/input.cpp | 1 | ||||
| -rw-r--r-- | tdeioslave/trash/ktrash.cpp | 1 | ||||
| -rw-r--r-- | twin/lib/kdecoration.h | 1 |
12 files changed, 8 insertions, 22 deletions
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 613e9f604..208027810 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -29,7 +29,6 @@ #include "../interfaces/application.h" -#include <tdeversion.h> #include <tdecmdlineargs.h> #include <dcopclient.h> #include <tdeconfig.h> diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 2b0c2ddfb..8c28a63d3 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -34,7 +34,6 @@ #include <tdeio/netaccess.h> -#include <tdeversion.h> #include <dcopclient.h> #include <kurldrag.h> #include <kencodingfiledialog.h> diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index ec824396b..7baecd8c3 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -39,6 +39,7 @@ #include <tdeaboutdata.h> #include <tdeglobalsettings.h> #include <tdeconfig.h> +#include "tdeversion.h" #include <kdebug.h> #include "main.h" @@ -47,8 +48,6 @@ #include "global.h" #include "moduleIface.h" -#include "version.h" - KControlApp::KControlApp() : TDEUniqueApplication() , 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 <tdeapplication.h> -#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 <tqvaluevector.h> #include <tqfont.h> #include <kurl.h> -#include <tdeversion.h> #include <fontconfig/fontconfig.h> #if (FC_VERSION<20200) diff --git a/kdesktop/init.cpp b/kdesktop/init.cpp index 25e3dd717..44fba87b8 100644 --- a/kdesktop/init.cpp +++ b/kdesktop/init.cpp @@ -26,6 +26,7 @@ #include <tdeprocess.h> #include <tdemessagebox.h> #include <tdelocale.h> +#include <tdeversion.h> #include <kdebug.h> #include <kdesktopsettings.h> diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 196df322c..7f95c53dc 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 <tdecmdlineargs.h> #include <tdeaboutdata.h> @@ -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 cea3ad289..b63b43174 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 <tdeaboutdata.h> #include <tdelocale.h> #include <tdecmdlineargs.h> @@ -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 44176ef44..03dbd194a 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -22,7 +22,6 @@ #include <tdeglobalaccel.h> #include <kdebug.h> #include <tdeapplication.h> -#include <tdeversion.h> #include <tqtimer.h> #include <kkeynative.h> 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 <tdeio/job.h> #include <tdecmdlineargs.h> #include <tdelocale.h> +#include <tdeversion.h> #include <kdirnotify_stub.h> #include <kdebug.h> diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 62b42d5ef..dde1f75f6 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -30,7 +30,6 @@ DEALINGS IN THE SOFTWARE. #include <tqobject.h> #include <tqiconset.h> #include <netwm_def.h> -#include <tdeversion.h> class KDecorationOptionsPrivate; class KDecorationBridge; |