diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:58:20 -0600 |
| commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
| tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /noatun/modules/kjofol-skin | |
| parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
| download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kjofol-skin')
| -rw-r--r-- | noatun/modules/kjofol-skin/kjbutton.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjfont.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjloader.cpp | 6 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjprefs.cpp | 8 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjsliders.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjtextdisplay.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjvis.cpp | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index d027217c..306a82fc 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -18,7 +18,7 @@ #include <tqcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpixmap.h> #include <kpixmapeffect.h> #include <kurl.h> diff --git a/noatun/modules/kjofol-skin/kjfont.cpp b/noatun/modules/kjofol-skin/kjfont.cpp index 7d5a967f..f48010b6 100644 --- a/noatun/modules/kjofol-skin/kjfont.cpp +++ b/noatun/modules/kjofol-skin/kjfont.cpp @@ -14,7 +14,7 @@ #include "kjprefs.h" #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqimage.h> #include <tqpainter.h> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 67bf516c..9db30363 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -58,9 +58,9 @@ #include <khelpmenu.h> #include <kstdaction.h> #include <tdepopupmenu.h> -#include <klocale.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <knotifyclient.h> #include <kpixmapeffect.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index 20ff7750..cb341ea3 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -31,15 +31,15 @@ #include <knuminput.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeio/job.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimemagic.h> #include <knotifyclient.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdefontcombo.h> #include <kcolorcombo.h> diff --git a/noatun/modules/kjofol-skin/kjsliders.cpp b/noatun/modules/kjofol-skin/kjsliders.cpp index eaba2e76..d570249e 100644 --- a/noatun/modules/kjofol-skin/kjsliders.cpp +++ b/noatun/modules/kjofol-skin/kjsliders.cpp @@ -15,7 +15,7 @@ #include "helpers.cpp" // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // arts-includes, needed for pitch diff --git a/noatun/modules/kjofol-skin/kjtextdisplay.cpp b/noatun/modules/kjofol-skin/kjtextdisplay.cpp index 7bacbb13..e75613d2 100644 --- a/noatun/modules/kjofol-skin/kjtextdisplay.cpp +++ b/noatun/modules/kjofol-skin/kjtextdisplay.cpp @@ -14,7 +14,7 @@ #include "kjprefs.h" // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kpixmap.h> #include <kurl.h> diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 527fb673..a7873fe1 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -18,7 +18,7 @@ //kde includes #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kpixmapeffect.h> #include <kpixmap.h> |