summaryrefslogtreecommitdiffstats
path: root/noatun/modules/kaiman
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:33 -0600
commit5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch)
treeaaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /noatun/modules/kaiman
parent120dff5f18d13aab7d2731de84e64c898728dc60 (diff)
downloadtdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz
tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun/modules/kaiman')
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/userinterface.cpp2
-rw-r--r--noatun/modules/kaiman/userinterface.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/noatun/modules/kaiman/pref.cpp b/noatun/modules/kaiman/pref.cpp
index 4d74d858..08af1b28 100644
--- a/noatun/modules/kaiman/pref.cpp
+++ b/noatun/modules/kaiman/pref.cpp
@@ -19,7 +19,7 @@
#include <klocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <tqdir.h>
#include <tqfileinfo.h>
#include <kglobal.h>
diff --git a/noatun/modules/kaiman/userinterface.cpp b/noatun/modules/kaiman/userinterface.cpp
index ef6d30ce..b174a287 100644
--- a/noatun/modules/kaiman/userinterface.cpp
+++ b/noatun/modules/kaiman/userinterface.cpp
@@ -45,7 +45,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <tdeio/netaccess.h>
diff --git a/noatun/modules/kaiman/userinterface.h b/noatun/modules/kaiman/userinterface.h
index aa681c3c..f4f712a4 100644
--- a/noatun/modules/kaiman/userinterface.h
+++ b/noatun/modules/kaiman/userinterface.h
@@ -21,7 +21,7 @@
#include <noatun/plugin.h>
#include <noatun/app.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "style.h"