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 /konquest | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'konquest')
| -rw-r--r-- | konquest/Konquest.cc | 2 | ||||
| -rw-r--r-- | konquest/fleetdlg.cc | 4 | ||||
| -rw-r--r-- | konquest/gameboard.cc | 6 | ||||
| -rw-r--r-- | konquest/gameenddlg.cc | 2 | ||||
| -rw-r--r-- | konquest/mainwin.cc | 6 | ||||
| -rw-r--r-- | konquest/map_widget.cc | 4 | ||||
| -rw-r--r-- | konquest/newgamedlg.cc | 4 | ||||
| -rw-r--r-- | konquest/planet_info.cc | 4 | ||||
| -rw-r--r-- | konquest/scoredlg.cc | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/konquest/Konquest.cc b/konquest/Konquest.cc index 953852a2..a0c772a8 100644 --- a/konquest/Konquest.cc +++ b/konquest/Konquest.cc @@ -1,5 +1,5 @@ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> diff --git a/konquest/fleetdlg.cc b/konquest/fleetdlg.cc index bfa7a696..5fd71239 100644 --- a/konquest/fleetdlg.cc +++ b/konquest/fleetdlg.cc @@ -1,8 +1,8 @@ #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <math.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/konquest/gameboard.cc b/konquest/gameboard.cc index 2f279f27..69aec42c 100644 --- a/konquest/gameboard.cc +++ b/konquest/gameboard.cc @@ -11,9 +11,9 @@ #include <tqtextedit.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <ctype.h> diff --git a/konquest/gameenddlg.cc b/konquest/gameenddlg.cc index c8c954f4..d999c375 100644 --- a/konquest/gameenddlg.cc +++ b/konquest/gameenddlg.cc @@ -5,7 +5,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include "gameenddlg.h" diff --git a/konquest/mainwin.cc b/konquest/mainwin.cc index 7ccdfe9f..8982974a 100644 --- a/konquest/mainwin.cc +++ b/konquest/mainwin.cc @@ -3,9 +3,9 @@ #include <tqpushbutton.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> -#include <kmenubar.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdemenubar.h> #include <tdetoolbar.h> #include <kiconloader.h> #include <tdeaction.h> diff --git a/konquest/map_widget.cc b/konquest/map_widget.cc index a5bc0069..af39b032 100644 --- a/konquest/map_widget.cc +++ b/konquest/map_widget.cc @@ -4,9 +4,9 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "map_widget.moc" ConquestMap::ConquestMap( Map *newMap, TQWidget *parent ) diff --git a/konquest/newgamedlg.cc b/konquest/newgamedlg.cc index 85672550..b609f1a2 100644 --- a/konquest/newgamedlg.cc +++ b/konquest/newgamedlg.cc @@ -11,8 +11,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/konquest/planet_info.cc b/konquest/planet_info.cc index afc80f72..d4c3cbaa 100644 --- a/konquest/planet_info.cc +++ b/konquest/planet_info.cc @@ -3,10 +3,10 @@ #include <tqpalette.h> #include <tqcolor.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include "planet_info.h" -#include <kglobal.h> +#include <tdeglobal.h> #include "planet_info.moc" PlanetInfo::PlanetInfo( TQWidget *parent, TQPalette palette ) diff --git a/konquest/scoredlg.cc b/konquest/scoredlg.cc index bcbe45ec..a633e3b6 100644 --- a/konquest/scoredlg.cc +++ b/konquest/scoredlg.cc @@ -1,6 +1,6 @@ #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> |