diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:32 -0600 |
| commit | 793cf2dff35dffe3ec4c7b24252947dde758a1b2 (patch) | |
| tree | 7d9972d99ed281a36418ae9f5fc128e3c951532c /noatun/modules/kjofol-skin | |
| 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/kjofol-skin')
| -rw-r--r-- | noatun/modules/kjofol-skin/Makefile.am | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjbutton.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjloader.cpp | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjprefs.cpp | 4 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjprefs.h | 2 | ||||
| -rw-r--r-- | noatun/modules/kjofol-skin/kjvis.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/noatun/modules/kjofol-skin/Makefile.am b/noatun/modules/kjofol-skin/Makefile.am index 17ff1162..f3e9504a 100644 --- a/noatun/modules/kjofol-skin/Makefile.am +++ b/noatun/modules/kjofol-skin/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/noatun/library \ -I$(top_builddir)/arts/modules/effects \ -I$(top_builddir)/arts/modules/mixers \ -I$(top_builddir)/arts/gui/common \ - -I$(kde_includes)/kio \ + -I$(kde_includes)/tdeio \ -I$(kde_includes)/arts \ $(all_includes) diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp index 795dedfb..7cdfc0e2 100644 --- a/noatun/modules/kjofol-skin/kjbutton.cpp +++ b/noatun/modules/kjofol-skin/kjbutton.cpp @@ -22,7 +22,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> #include <kurl.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <khelpmenu.h> #include <kpopupmenu.h> diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp index 4401ee01..ee8ca247 100644 --- a/noatun/modules/kjofol-skin/kjloader.cpp +++ b/noatun/modules/kjofol-skin/kjloader.cpp @@ -54,7 +54,7 @@ #include <kaction.h> #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <khelpmenu.h> #include <kstdaction.h> #include <kpopupmenu.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp index b6d8e6eb..d93cc5dc 100644 --- a/noatun/modules/kjofol-skin/kjprefs.cpp +++ b/noatun/modules/kjofol-skin/kjprefs.cpp @@ -29,10 +29,10 @@ #include <tqregexp.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kmessagebox.h> #include <kmimemagic.h> diff --git a/noatun/modules/kjofol-skin/kjprefs.h b/noatun/modules/kjofol-skin/kjprefs.h index 0bb4540d..e5181963 100644 --- a/noatun/modules/kjofol-skin/kjprefs.h +++ b/noatun/modules/kjofol-skin/kjprefs.h @@ -9,7 +9,7 @@ #include <tqwidget.h> #include <noatun/pref.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kurlrequester.h> class TQVBoxLayout; diff --git a/noatun/modules/kjofol-skin/kjvis.cpp b/noatun/modules/kjofol-skin/kjvis.cpp index 7ae04d44..527fb673 100644 --- a/noatun/modules/kjofol-skin/kjvis.cpp +++ b/noatun/modules/kjofol-skin/kjvis.cpp @@ -19,7 +19,7 @@ //kde includes #include <kdebug.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpixmapeffect.h> #include <kpixmap.h> |