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 /kreversi | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kreversi')
| -rw-r--r-- | kreversi/board.cpp | 2 | ||||
| -rw-r--r-- | kreversi/highscores.cpp | 2 | ||||
| -rw-r--r-- | kreversi/kreversi.cpp | 4 | ||||
| -rw-r--r-- | kreversi/kreversi.kcfg | 2 | ||||
| -rw-r--r-- | kreversi/kzoommainwindow.cpp | 2 | ||||
| -rw-r--r-- | kreversi/qreversigameview.cpp | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/kreversi/board.cpp b/kreversi/board.cpp index 7ac24169..6112c116 100644 --- a/kreversi/board.cpp +++ b/kreversi/board.cpp @@ -45,7 +45,7 @@ #include <kstandarddirs.h> #include <tdeconfig.h> #include <knotifyclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kexthighscore.h> #include <kdebug.h> diff --git a/kreversi/highscores.cpp b/kreversi/highscores.cpp index 74fd1590..9aadd4a5 100644 --- a/kreversi/highscores.cpp +++ b/kreversi/highscores.cpp @@ -19,7 +19,7 @@ #include "highscores.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/kreversi/kreversi.cpp b/kreversi/kreversi.cpp index 24bfc5d8..0d73ba0f 100644 --- a/kreversi/kreversi.cpp +++ b/kreversi/kreversi.cpp @@ -48,8 +48,8 @@ #include <tdeconfig.h> #include <kstandarddirs.h> #include <kstatusbar.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeaction.h> #include <kstdgameaction.h> #include <kkeydialog.h> diff --git a/kreversi/kreversi.kcfg b/kreversi/kreversi.kcfg index 900a3cdf..64fa5039 100644 --- a/kreversi/kreversi.kcfg +++ b/kreversi/kreversi.kcfg @@ -4,7 +4,7 @@ xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > <include>kstandarddirs.h</include> - <include>kglobal.h</include> + <include>tdeglobal.h</include> <kcfgfile name="kreversirc"/> <group name="Game"> <entry name="Grayscale" type="Bool"> diff --git a/kreversi/kzoommainwindow.cpp b/kreversi/kzoommainwindow.cpp index 7500f7cb..f8c3c490 100644 --- a/kreversi/kzoommainwindow.cpp +++ b/kreversi/kzoommainwindow.cpp @@ -23,7 +23,7 @@ #include <tdeaction.h> #include <kstdaction.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kcmenumngr.h> diff --git a/kreversi/qreversigameview.cpp b/kreversi/qreversigameview.cpp index c64932b9..cc88e1e7 100644 --- a/kreversi/qreversigameview.cpp +++ b/kreversi/qreversigameview.cpp @@ -41,7 +41,7 @@ #include <tqwidget.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #if 0 @@ -54,7 +54,7 @@ #include <kstandarddirs.h> #include <tdeconfig.h> #include <knotifyclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kexthighscore.h> #include <kdebug.h> |