diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:58 -0600 |
| commit | f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b (patch) | |
| tree | 01c81e847142fa105954bd829c66706747e6adc7 /kworldwatch | |
| parent | a002e0879f1ee9759db789bde6d9f1cf9b99ea44 (diff) | |
| download | tdetoys-f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b.tar.gz tdetoys-f58c83bd2a477e1f70d9fc0c9e2dae42803dbd2b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kworldwatch')
| -rw-r--r-- | kworldwatch/applet.cpp | 6 | ||||
| -rw-r--r-- | kworldwatch/cities.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/main.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/maploader.cpp | 2 | ||||
| -rw-r--r-- | kworldwatch/mapwidget.cpp | 8 | ||||
| -rw-r--r-- | kworldwatch/zoneclock.cpp | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp index 644fa6d..f358dac 100644 --- a/kworldwatch/applet.cpp +++ b/kworldwatch/applet.cpp @@ -29,11 +29,11 @@ #include <tdeapplication.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <krun.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "mapwidget.h" diff --git a/kworldwatch/cities.cpp b/kworldwatch/cities.cpp index a88c3a6..8179ed3 100644 --- a/kworldwatch/cities.cpp +++ b/kworldwatch/cities.cpp @@ -31,7 +31,7 @@ #include <tqpainter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp index ce56cb2..e113d3a 100644 --- a/kworldwatch/main.cpp +++ b/kworldwatch/main.cpp @@ -39,7 +39,7 @@ #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/kworldwatch/maploader.cpp b/kworldwatch/maploader.cpp index 50b6fa0..ce192f2 100644 --- a/kworldwatch/maploader.cpp +++ b/kworldwatch/maploader.cpp @@ -35,7 +35,7 @@ #include <tqstringlist.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdesktopfile.h> #include <kimageeffect.h> diff --git a/kworldwatch/mapwidget.cpp b/kworldwatch/mapwidget.cpp index 4812a97..5acc5ce 100644 --- a/kworldwatch/mapwidget.cpp +++ b/kworldwatch/mapwidget.cpp @@ -39,10 +39,10 @@ #include <tdecmdlineargs.h> #include <kcolordialog.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tqcursor.h> diff --git a/kworldwatch/zoneclock.cpp b/kworldwatch/zoneclock.cpp index 541e8b4..a2279c2 100644 --- a/kworldwatch/zoneclock.cpp +++ b/kworldwatch/zoneclock.cpp @@ -43,8 +43,8 @@ #include <tqpopupmenu.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> |