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/winskin | |
| 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/winskin')
| -rw-r--r-- | noatun/modules/winskin/guiSpectrumAnalyser.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/plugin.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/winskin/waDigit.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/waInfo.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/waSkin.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/winskin/waSkinManager.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/winSkinConfig.cpp | 6 |
7 files changed, 11 insertions, 11 deletions
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index 0d2978ee..ee01777a 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -11,7 +11,7 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <tqcolor.h> #include <tqpopupmenu.h> #include <tqpainter.h> diff --git a/noatun/modules/winskin/plugin.cpp b/noatun/modules/winskin/plugin.cpp index 8890c515..8be9cc77 100644 --- a/noatun/modules/winskin/plugin.cpp +++ b/noatun/modules/winskin/plugin.cpp @@ -1,5 +1,5 @@ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "winSkinConfig.h" #include "waSkin.h" diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index 75a89b7e..8e53c45f 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -16,7 +16,7 @@ #include "waSkinModel.h" #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) { diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index b17c308d..25c088e3 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -18,7 +18,7 @@ #include <stdlib.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "waInfo.h" #include "waSkinModel.h" diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 845773b0..41770cbd 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -13,8 +13,8 @@ #include <tdeconfig.h> #include <tqstringlist.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <khelpmenu.h> #include <tdepopupmenu.h> diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index 8230feba..3363292c 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -1,4 +1,4 @@ -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfileinfo.h> #include <tqregexp.h> #include <kstandarddirs.h> diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 667cf81f..c7dad1ae 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -1,18 +1,18 @@ #include <noatun/pref.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> #include <tqlabel.h> #include <tqpixmap.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <tqslider.h> #include <tqframe.h> #include <tqstringlist.h> #include <tdefile.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kurlrequester.h> #include <kurlrequesterdlg.h> |