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/kaiman | |
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/kaiman')
-rw-r--r-- | noatun/modules/kaiman/pref.cpp | 2 | ||||
-rw-r--r-- | noatun/modules/kaiman/userinterface.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp index a53ed72f..249a74e4 100644 --- a/noatun/modules/kaiman/pref.cpp +++ b/noatun/modules/kaiman/pref.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "pref.h" #include "userinterface.h" diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp index 462f5718..56eb389e 100644 --- a/noatun/modules/kaiman/userinterface.cpp +++ b/noatun/modules/kaiman/userinterface.cpp @@ -38,17 +38,17 @@ #include <tqdragobject.h> #include <tqtimer.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kdebug.h> #include <kapplication.h> #include <twin.h> #include <kglobal.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kpopupmenu.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kurldrag.h> #include <sys/types.h> |