diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:10 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:10 -0600 |
| commit | 6946130bb142337c633a25f34f11f9cd0e12d5de (patch) | |
| tree | e4d2629cabc5254b98c1c0095d1f45e793edf226 /kgoldrunner/src | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kgoldrunner/src')
| -rw-r--r-- | kgoldrunner/src/data_messages.cpp | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgoldrunner.cpp | 6 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrdialog.cpp | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrdialog.h | 4 | ||||
| -rw-r--r-- | kgoldrunner/src/kgrgame.cpp | 2 | ||||
| -rw-r--r-- | kgoldrunner/src/main.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/kgoldrunner/src/data_messages.cpp b/kgoldrunner/src/data_messages.cpp index 465c9a2f..f905168b 100644 --- a/kgoldrunner/src/data_messages.cpp +++ b/kgoldrunner/src/data_messages.cpp @@ -4,7 +4,7 @@ they will be re-formatted into a .pot file for the translators. */ -#include <klocale.h> +#include <tdelocale.h> dont_call_me() { diff --git a/kgoldrunner/src/kgoldrunner.cpp b/kgoldrunner/src/kgoldrunner.cpp index 665d804f..f8bfcbd0 100644 --- a/kgoldrunner/src/kgoldrunner.cpp +++ b/kgoldrunner/src/kgoldrunner.cpp @@ -6,10 +6,10 @@ #include <tqpainter.h> #include <tqpaintdevicemetrics.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <kkeydialog.h> #include <tdeaccel.h> diff --git a/kgoldrunner/src/kgrdialog.cpp b/kgoldrunner/src/kgrdialog.cpp index 79d19f3a..def7af7d 100644 --- a/kgoldrunner/src/kgrdialog.cpp +++ b/kgoldrunner/src/kgrdialog.cpp @@ -19,7 +19,7 @@ #include "kgrdialog.h" #ifndef KGR_PORTABLE -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif /******************************************************************************/ diff --git a/kgoldrunner/src/kgrdialog.h b/kgoldrunner/src/kgrdialog.h index 1e62a3eb..a3514a1e 100644 --- a/kgoldrunner/src/kgrdialog.h +++ b/kgoldrunner/src/kgrdialog.h @@ -19,10 +19,10 @@ #include <tqmessagebox.h> #else -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #define KGR_DIALOG KDialogBase -#include <kmessagebox.h> +#include <tdemessagebox.h> #endif #include <tqlayout.h> diff --git a/kgoldrunner/src/kgrgame.cpp b/kgoldrunner/src/kgrgame.cpp index 13157225..ffe0987d 100644 --- a/kgoldrunner/src/kgrgame.cpp +++ b/kgoldrunner/src/kgrgame.cpp @@ -30,7 +30,7 @@ #include <kstdguiitem.h> #ifndef KGR_PORTABLE -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #endif /******************************************************************************/ diff --git a/kgoldrunner/src/main.cpp b/kgoldrunner/src/main.cpp index c8057ca8..287f3b85 100644 --- a/kgoldrunner/src/main.cpp +++ b/kgoldrunner/src/main.cpp @@ -6,7 +6,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "kgrconsts.h" #include "kgoldrunner.h" |