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 /kpoker | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kpoker')
| -rw-r--r-- | kpoker/betbox.cpp | 4 | ||||
| -rw-r--r-- | kpoker/global.h | 2 | ||||
| -rw-r--r-- | kpoker/kpaint.cpp | 2 | ||||
| -rw-r--r-- | kpoker/kpoker.cpp | 6 | ||||
| -rw-r--r-- | kpoker/main.cpp | 2 | ||||
| -rw-r--r-- | kpoker/newgamedlg.cpp | 2 | ||||
| -rw-r--r-- | kpoker/optionsdlg.cpp | 2 | ||||
| -rw-r--r-- | kpoker/playerbox.cpp | 4 | ||||
| -rw-r--r-- | kpoker/top.cpp | 6 |
9 files changed, 15 insertions, 15 deletions
diff --git a/kpoker/betbox.cpp b/kpoker/betbox.cpp index 2ed453e4..01d6fe3c 100644 --- a/kpoker/betbox.cpp +++ b/kpoker/betbox.cpp @@ -18,8 +18,8 @@ #include <tqpushbutton.h> #include <tqlayout.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "betbox.h" diff --git a/kpoker/global.h b/kpoker/global.h index 087f3e2b..a6a25ba5 100644 --- a/kpoker/global.h +++ b/kpoker/global.h @@ -17,7 +17,7 @@ #ifndef __GLOBAL__H__ #define __GLOBAL__H__ -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> extern TDELocale *locale; diff --git a/kpoker/kpaint.cpp b/kpoker/kpaint.cpp index 1669820c..29e11608 100644 --- a/kpoker/kpaint.cpp +++ b/kpoker/kpaint.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> // KDE includes -//#include <kglobal.h> +//#include <tdeglobal.h> #include <kdebug.h> #include <kcarddialog.h> diff --git a/kpoker/kpoker.cpp b/kpoker/kpoker.cpp index 7cfec655..29da61d8 100644 --- a/kpoker/kpoker.cpp +++ b/kpoker/kpoker.cpp @@ -25,13 +25,13 @@ #include <tqlayout.h> // KDE includes -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kaudioplayer.h> #include <kcarddialog.h> diff --git a/kpoker/main.cpp b/kpoker/main.cpp index df81b0d3..c635b1b9 100644 --- a/kpoker/main.cpp +++ b/kpoker/main.cpp @@ -15,7 +15,7 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> diff --git a/kpoker/newgamedlg.cpp b/kpoker/newgamedlg.cpp index 5ac23449..21023ccd 100644 --- a/kpoker/newgamedlg.cpp +++ b/kpoker/newgamedlg.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/kpoker/optionsdlg.cpp b/kpoker/optionsdlg.cpp index 5fdfbfcf..e095bd1d 100644 --- a/kpoker/optionsdlg.cpp +++ b/kpoker/optionsdlg.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> // own includes diff --git a/kpoker/playerbox.cpp b/kpoker/playerbox.cpp index dee8337f..8076554f 100644 --- a/kpoker/playerbox.cpp +++ b/kpoker/playerbox.cpp @@ -20,8 +20,8 @@ #include <tqlayout.h> #include <tqhbox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include "player.h" diff --git a/kpoker/top.cpp b/kpoker/top.cpp index 731d1d6f..76e4029e 100644 --- a/kpoker/top.cpp +++ b/kpoker/top.cpp @@ -21,11 +21,11 @@ // KDE includes #include <tdeapplication.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdestdaccel.h> #include <kstdaction.h> #include <kstdgameaction.h> |