diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
| commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
| tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /ksim/library | |
| parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
| download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksim/library')
| -rw-r--r-- | ksim/library/chart.cpp | 4 | ||||
| -rw-r--r-- | ksim/library/ksimconfig.cpp | 2 | ||||
| -rw-r--r-- | ksim/library/label.cpp | 4 | ||||
| -rw-r--r-- | ksim/library/pluginglobal.cpp | 2 | ||||
| -rw-r--r-- | ksim/library/pluginloader.cpp | 6 | ||||
| -rw-r--r-- | ksim/library/pluginmodule.cpp | 2 | ||||
| -rw-r--r-- | ksim/library/themeloader.cpp | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 547729c..9995769 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -29,8 +29,8 @@ #include <tqbitmap.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <themeloader.h> diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index 04f4559..b781630 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -19,7 +19,7 @@ #include <kstandarddirs.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "ksimconfig.h" #include "themeloader.h" diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp index 954b03f..b47309b 100644 --- a/ksim/library/label.cpp +++ b/ksim/library/label.cpp @@ -32,8 +32,8 @@ #include <themeloader.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> class KSim::Label::Private diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp index 34a38c3..08ff3c9 100644 --- a/ksim/library/pluginglobal.cpp +++ b/ksim/library/pluginglobal.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kdesktopfile.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> class KSim::Plugin::Private diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp index 2126790..9518bbb 100644 --- a/ksim/library/pluginloader.cpp +++ b/ksim/library/pluginloader.cpp @@ -23,10 +23,10 @@ #include <kdebug.h> #include <klibloader.h> #include <kdesktopfile.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqstringlist.h> diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index eb6f03b..7f450de 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -20,7 +20,7 @@ #include "pluginmodule.h" #include "pluginmodule.moc" -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 0548f73..5bc4038 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -34,9 +34,9 @@ #include <kdebug.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> class KSim::Theme::Private { |