diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:10 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:10 -0600 |
commit | 6946130bb142337c633a25f34f11f9cd0e12d5de (patch) | |
tree | e4d2629cabc5254b98c1c0095d1f45e793edf226 /kmines | |
parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmines')
-rw-r--r-- | kmines/defines.cpp | 2 | ||||
-rw-r--r-- | kmines/dialogs.cpp | 4 | ||||
-rw-r--r-- | kmines/field.cpp | 2 | ||||
-rw-r--r-- | kmines/highscores.cpp | 2 | ||||
-rw-r--r-- | kmines/kzoommainwindow.cpp | 2 | ||||
-rw-r--r-- | kmines/main.cpp | 2 | ||||
-rw-r--r-- | kmines/solver/solver.cpp | 2 | ||||
-rw-r--r-- | kmines/status.cpp | 6 |
8 files changed, 11 insertions, 11 deletions
diff --git a/kmines/defines.cpp b/kmines/defines.cpp index b008de00..9dc0158b 100644 --- a/kmines/defines.cpp +++ b/kmines/defines.cpp @@ -18,7 +18,7 @@ #include "defines.h" -#include <klocale.h> +#include <tdelocale.h> const char *Level::LABELS[NB_TYPES+1] = { I18N_NOOP("Easy"), I18N_NOOP("Normal"), I18N_NOOP("Expert"), diff --git a/kmines/dialogs.cpp b/kmines/dialogs.cpp index b6991d19..21120478 100644 --- a/kmines/dialogs.cpp +++ b/kmines/dialogs.cpp @@ -30,8 +30,8 @@ #include <tqwhatsthis.h> #include <tqcheckbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcombobox.h> #include <knuminput.h> #include <kcolorbutton.h> diff --git a/kmines/field.cpp b/kmines/field.cpp index ff3b4e46..993e1d8f 100644 --- a/kmines/field.cpp +++ b/kmines/field.cpp @@ -25,7 +25,7 @@ #include <tqtimer.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include "settings.h" diff --git a/kmines/highscores.cpp b/kmines/highscores.cpp index 6ad1e617..51324533 100644 --- a/kmines/highscores.cpp +++ b/kmines/highscores.cpp @@ -19,7 +19,7 @@ #include "highscores.h" #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/kmines/kzoommainwindow.cpp b/kmines/kzoommainwindow.cpp index 8c3fef13..758d73d6 100644 --- a/kmines/kzoommainwindow.cpp +++ b/kmines/kzoommainwindow.cpp @@ -22,7 +22,7 @@ #include <tdeaction.h> #include <kstdaction.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kcmenumngr.h> KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name) diff --git a/kmines/main.cpp b/kmines/main.cpp index 602fc044..eee46237 100644 --- a/kmines/main.cpp +++ b/kmines/main.cpp @@ -23,7 +23,7 @@ #include <tdeaccel.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kstdaction.h> diff --git a/kmines/solver/solver.cpp b/kmines/solver/solver.cpp index f8607b79..99070cad 100644 --- a/kmines/solver/solver.cpp +++ b/kmines/solver/solver.cpp @@ -28,7 +28,7 @@ #include <tqlabel.h> #include <kprogress.h> -#include <klocale.h> +#include <tdelocale.h> #include "headerP.h" diff --git a/kmines/status.cpp b/kmines/status.cpp index 3c88961e..69f568cd 100644 --- a/kmines/status.cpp +++ b/kmines/status.cpp @@ -28,13 +28,13 @@ #include <tqtimer.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> #include <kexthighscore.h> |