diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:04:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:04:32 -0600 |
| commit | 793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch) | |
| tree | 7d9972d99ed281a36418ae9f5fc128e3c951532c /noatun/modules/winskin | |
| parent | 04f764aaf273340e1d5811d4216dd8127cacc5db (diff) | |
| download | tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.tar.gz tdemultimedia-793cf2dff35dffe3ec4c7b24252947dde758a1b2.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/winskin')
| -rw-r--r-- | noatun/modules/winskin/fileInfo.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/guiSpectrumAnalyser.cpp | 2 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | noatun/modules/winskin/waSkinManager.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/winskin/winSkinConfig.cpp | 6 |
7 files changed, 10 insertions, 10 deletions
diff --git a/noatun/modules/winskin/fileInfo.cpp b/noatun/modules/winskin/fileInfo.cpp index 6e721cd9..5cd2779f 100644 --- a/noatun/modules/winskin/fileInfo.cpp +++ b/noatun/modules/winskin/fileInfo.cpp @@ -2,7 +2,7 @@ #include <noatun/playlist.h> #include <tqstring.h> -#include <kfilemetainfo.h> +#include <tdefilemetainfo.h> #include "fileInfo.h" diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp index d0447397..0d2978ee 100644 --- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp +++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp @@ -15,7 +15,7 @@ #include <tqcolor.h> #include <tqpopupmenu.h> #include <tqpainter.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "waColor.h" #include "waSkinModel.h" diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp index d18d9ead..75a89b7e 100644 --- a/noatun/modules/winskin/waDigit.cpp +++ b/noatun/modules/winskin/waDigit.cpp @@ -15,7 +15,7 @@ #include "waDigit.h" #include "waSkinModel.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> WaDigit::WaDigit() : WaWidget(_WA_MAPPING_DIGITS) diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp index 80375a90..b17c308d 100644 --- a/noatun/modules/winskin/waInfo.cpp +++ b/noatun/modules/winskin/waInfo.cpp @@ -17,7 +17,7 @@ #include <stdlib.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> #include "waInfo.h" diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp index 4512d067..06b9c010 100644 --- a/noatun/modules/winskin/waSkin.cpp +++ b/noatun/modules/winskin/waSkin.cpp @@ -11,7 +11,7 @@ */ -#include <kconfig.h> +#include <tdeconfig.h> #include <tqstringlist.h> #include <kglobal.h> #include <klocale.h> diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp index f7d9b777..8230feba 100644 --- a/noatun/modules/winskin/waSkinManager.cpp +++ b/noatun/modules/winskin/waSkinManager.cpp @@ -5,9 +5,9 @@ #include <tqdir.h> #include <kdebug.h> #include <kmimetype.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurl.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kzip.h> #include "waSkinManager.h" diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp index 7d2c866d..667cf81f 100644 --- a/noatun/modules/winskin/winSkinConfig.cpp +++ b/noatun/modules/winskin/winSkinConfig.cpp @@ -6,12 +6,12 @@ #include <tqlabel.h> #include <tqpixmap.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqslider.h> #include <tqframe.h> #include <tqstringlist.h> -#include <kfile.h> -#include <kfiledialog.h> +#include <tdefile.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kstandarddirs.h> #include <kurlrequester.h> |