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 /atlantik/client | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'atlantik/client')
| -rw-r--r-- | atlantik/client/atlantik.cpp | 4 | ||||
| -rw-r--r-- | atlantik/client/configdlg.cpp | 2 | ||||
| -rw-r--r-- | atlantik/client/eventlogwidget.cpp | 2 | ||||
| -rw-r--r-- | atlantik/client/main.cpp | 4 | ||||
| -rw-r--r-- | atlantik/client/selectconfiguration_widget.cpp | 4 | ||||
| -rw-r--r-- | atlantik/client/selectgame_widget.cpp | 2 | ||||
| -rw-r--r-- | atlantik/client/selectserver_widget.cpp | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp index 23e4cd4f..efbf2a0d 100644 --- a/atlantik/client/atlantik.cpp +++ b/atlantik/client/atlantik.cpp @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <knotifydialog.h> #include <kstatusbar.h> diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp index 9703f676..e24244c5 100644 --- a/atlantik/client/configdlg.cpp +++ b/atlantik/client/configdlg.cpp @@ -33,7 +33,7 @@ #include <kicondialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstandarddirs.h> diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp index ae9e7f94..ea80aadc 100644 --- a/atlantik/client/eventlogwidget.cpp +++ b/atlantik/client/eventlogwidget.cpp @@ -20,7 +20,7 @@ #include <tqlayout.h> #include <tqdatetime.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdialogbase.h> #include <tdefiledialog.h> diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp index 52b5a412..3333c88e 100644 --- a/atlantik/client/main.cpp +++ b/atlantik/client/main.cpp @@ -16,9 +16,9 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "main.h" #include "atlantik.h" diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp index 2d500976..eb67a997 100644 --- a/atlantik/client/selectconfiguration_widget.cpp +++ b/atlantik/client/selectconfiguration_widget.cpp @@ -21,9 +21,9 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <atlantic_core.h> diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp index 0eb22877..34636afa 100644 --- a/atlantik/client/selectgame_widget.cpp +++ b/atlantik/client/selectgame_widget.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <knotifyclient.h> diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp index def6beaf..9d8f0e3c 100644 --- a/atlantik/client/selectserver_widget.cpp +++ b/atlantik/client/selectserver_widget.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <kextendedsocket.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include "selectserver_widget.moc" |