Rename many classes and header files to avoid conflicts with KDE4

12 files changed, 15 insertions, 15 deletions

diff --git a/noatun/library/app.cpp b/noatun/library/app.cpp
index 1f05502a..afccd7aa 100644
--- a/noatun/library/app.cpp
+++ b/noatun/library/app.cpp
@@ -26,10 +26,10 @@
 #include <kglobal.h>
 #include <klibloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqfile.h>
 #include <tqimage.h>
 #include <qiomanager.h>
diff --git a/noatun/library/cmodule.cpp b/noatun/library/cmodule.cpp
index 9c3d3232..1820e441 100644
--- a/noatun/library/cmodule.cpp
+++ b/noatun/library/cmodule.cpp
@@ -10,7 +10,7 @@
 #include <tqlayout.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqsplitter.h>
 #include <tqlabel.h>
 #include <tqdragobject.h>
diff --git a/noatun/library/cmodule.h b/noatun/library/cmodule.h
index 52682084..54fbc19e 100644
--- a/noatun/library/cmodule.h
+++ b/noatun/library/cmodule.h
@@ -2,7 +2,7 @@
 #define CMODULE_H
 
 #include <tqframe.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include "noatun/pref.h"
 
 class TDEListView;
diff --git a/noatun/library/effectview.h b/noatun/library/effectview.h
index 5c45fa40..3434ae92 100644
--- a/noatun/library/effectview.h
+++ b/noatun/library/effectview.h
@@ -26,7 +26,7 @@
 #define EFFECTVIEW_H
 
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class EffectList;
 class Effect;
diff --git a/noatun/library/equalizerview.h b/noatun/library/equalizerview.h
index ed495a23..0cec05a9 100644
--- a/noatun/library/equalizerview.h
+++ b/noatun/library/equalizerview.h
@@ -3,7 +3,7 @@
 
 #include <tqwidget.h>
 #include <kdialogbase.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class VBand;
 class TQSlider;
diff --git a/noatun/library/mimetypetree.h b/noatun/library/mimetypetree.h
index 67135c57..c6619293 100644
--- a/noatun/library/mimetypetree.h
+++ b/noatun/library/mimetypetree.h
@@ -14,7 +14,7 @@
 #ifndef MIMETYPETREE_H
 #define MIMETYPETREE_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class MimeTypeTree : public TDEListView
 {
diff --git a/noatun/library/noatun/controls.h b/noatun/library/noatun/controls.h
index dbe249ba..37617183 100644
--- a/noatun/library/noatun/controls.h
+++ b/noatun/library/noatun/controls.h
@@ -3,8 +3,8 @@
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
-#include <ktoolbar.h>
+#include <tdeaction.h>
+#include <tdetoolbar.h>
 #include <tqslider.h>
 #include <tqstringlist.h>
 #include <kdemacros.h>
diff --git a/noatun/library/noatun/stdaction.h b/noatun/library/noatun/stdaction.h
index 2a5ad401..31f5d20c 100644
--- a/noatun/library/noatun/stdaction.h
+++ b/noatun/library/noatun/stdaction.h
@@ -1,8 +1,8 @@
 #ifndef _NOATUNSTDACTION_H_
 #define _NOATUNSTDACTION_H_
 
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <kdemacros.h>
 class TDEPopupMenu;
 
diff --git a/noatun/library/noatun/stereobuttonaction.h b/noatun/library/noatun/stereobuttonaction.h
index d3bad3f9..5ff9e904 100644
--- a/noatun/library/noatun/stereobuttonaction.h
+++ b/noatun/library/noatun/stereobuttonaction.h
@@ -1,7 +1,7 @@
 #ifndef STEREOBUTTONACTION_H
 #define STEREOBUTTONACTION_H
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 namespace NoatunStdAction
 {
diff --git a/noatun/library/noatunstdaction.cpp b/noatun/library/noatunstdaction.cpp
index b99c8ef5..767a3cc9 100644
--- a/noatun/library/noatunstdaction.cpp
+++ b/noatun/library/noatunstdaction.cpp
@@ -7,7 +7,7 @@
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
 #include <tqcursor.h>
 #include <tqmap.h>
diff --git a/noatun/library/pluginmodule.h b/noatun/library/pluginmodule.h
index 52113f62..47519d66 100644
--- a/noatun/library/pluginmodule.h
+++ b/noatun/library/pluginmodule.h
@@ -24,7 +24,7 @@
 #include "noatun/pref.h"
 #include "noatun/pluginloader.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqframe.h>
 #include <tqstringlist.h>
 
diff --git a/noatun/library/video.cpp b/noatun/library/video.cpp
index d227c949..2588a811 100644
--- a/noatun/library/video.cpp
+++ b/noatun/library/video.cpp
@@ -9,7 +9,7 @@
 #include <noatun/engine.h>
 
 #include <tqpopupmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 
 #include "globalvideo.h"