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/libatlantikui | |
| parent | 8a9553c17f4228afc6e0642c259a83d8dd37027d (diff) | |
| download | tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'atlantik/libatlantikui')
| -rw-r--r-- | atlantik/libatlantikui/auction_widget.cpp | 2 | ||||
| -rw-r--r-- | atlantik/libatlantikui/board.cpp | 2 | ||||
| -rw-r--r-- | atlantik/libatlantikui/estatedetails.cpp | 4 | ||||
| -rw-r--r-- | atlantik/libatlantikui/estateview.cpp | 4 | ||||
| -rw-r--r-- | atlantik/libatlantikui/kwrappedlistviewitem.cpp | 2 | ||||
| -rw-r--r-- | atlantik/libatlantikui/portfolioview.cpp | 4 | ||||
| -rw-r--r-- | atlantik/libatlantikui/token.cpp | 2 | ||||
| -rw-r--r-- | atlantik/libatlantikui/trade_widget.cpp | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp index a7ffcc04..85e3a857 100644 --- a/atlantik/libatlantikui/auction_widget.cpp +++ b/atlantik/libatlantikui/auction_widget.cpp @@ -23,7 +23,7 @@ #include <kdialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <atlantic_core.h> diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp index 89581a35..bc7402a1 100644 --- a/atlantik/libatlantikui/board.cpp +++ b/atlantik/libatlantikui/board.cpp @@ -20,7 +20,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <atlantic_core.h> #include <player.h> diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index 242ae778..45cc4c15 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -22,10 +22,10 @@ #include <tqvgroupbox.h> #include <kdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 4481117c..fe53d63e 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <tdeversion.h> #include <kdialogbase.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kpixmapeffect.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp index f437cf62..94143bca 100644 --- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp +++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <tqstring.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdelistview.h> #include <kwordwrap.h> diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index d0ab8e92..19424e3b 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kiconeffect.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index 791062eb..d6534df5 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "board.h" #include "estate.h" diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp index deb56f30..e8c819aa 100644 --- a/atlantik/libatlantikui/trade_widget.cpp +++ b/atlantik/libatlantikui/trade_widget.cpp @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqspinbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> #include <kdialogbase.h> |