summaryrefslogtreecommitdiffstats
path: root/noatun/modules
diff options
context:
space:
mode:
Diffstat (limited to 'noatun/modules')
-rw-r--r--noatun/modules/excellent/userinterface.cpp2
-rw-r--r--noatun/modules/excellent/userinterface.h2
-rw-r--r--noatun/modules/htmlexport/htmlexport.cpp2
-rw-r--r--noatun/modules/htmlexport/htmlexport.h2
-rw-r--r--noatun/modules/infrared/irprefs.cpp2
-rw-r--r--noatun/modules/kaiman/pref.cpp2
-rw-r--r--noatun/modules/kaiman/userinterface.cpp2
-rw-r--r--noatun/modules/kaiman/userinterface.h2
-rw-r--r--noatun/modules/kjofol-skin/kjbutton.cpp2
-rw-r--r--noatun/modules/kjofol-skin/kjguisettingswidget.ui2
-rw-r--r--noatun/modules/kjofol-skin/kjloader.cpp4
-rw-r--r--noatun/modules/kjofol-skin/kjprefs.cpp2
-rw-r--r--noatun/modules/marquis/marquis.cpp2
-rw-r--r--noatun/modules/marquis/marquis.h2
-rw-r--r--noatun/modules/metatag/metatag.cpp6
-rw-r--r--noatun/modules/monoscope/monoscope.cpp2
-rw-r--r--noatun/modules/noatunui/userinterface.cpp2
-rw-r--r--noatun/modules/simple/userinterface.cpp2
-rw-r--r--noatun/modules/simple/userinterface.h4
-rw-r--r--noatun/modules/splitplaylist/view.cpp2
-rw-r--r--noatun/modules/splitplaylist/view.h4
-rw-r--r--noatun/modules/systray/kitsystemtray.cpp4
-rw-r--r--noatun/modules/systray/systray.cpp2
-rw-r--r--noatun/modules/systray/systray.h2
-rw-r--r--noatun/modules/winskin/waSkin.cpp4
25 files changed, 32 insertions, 32 deletions
diff --git a/noatun/modules/excellent/userinterface.cpp b/noatun/modules/excellent/userinterface.cpp
index 7d6c4bfd..612807ab 100644
--- a/noatun/modules/excellent/userinterface.cpp
+++ b/noatun/modules/excellent/userinterface.cpp
@@ -45,7 +45,7 @@
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kpixmapeffect.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <twin.h>
diff --git a/noatun/modules/excellent/userinterface.h b/noatun/modules/excellent/userinterface.h
index c47f05f1..a5aca1a1 100644
--- a/noatun/modules/excellent/userinterface.h
+++ b/noatun/modules/excellent/userinterface.h
@@ -30,7 +30,7 @@
#include <noatun/plugin.h>
#include <noatun/app.h>
#include <noatun/stdaction.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TDEAction;
class TDEPopupMenu;
diff --git a/noatun/modules/htmlexport/htmlexport.cpp b/noatun/modules/htmlexport/htmlexport.cpp
index 27746b69..60792eea 100644
--- a/noatun/modules/htmlexport/htmlexport.cpp
+++ b/noatun/modules/htmlexport/htmlexport.cpp
@@ -1,7 +1,7 @@
#include <klocale.h>
#include <tqregexp.h>
#include <tqtextcodec.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <noatun/stdaction.h>
#include "htmlexport.h"
diff --git a/noatun/modules/htmlexport/htmlexport.h b/noatun/modules/htmlexport/htmlexport.h
index 0c3de125..d9acd313 100644
--- a/noatun/modules/htmlexport/htmlexport.h
+++ b/noatun/modules/htmlexport/htmlexport.h
@@ -14,7 +14,7 @@
#include <tqwhatsthis.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdefiledialog.h>
#include <ktempfile.h>
#include <kcolorbutton.h>
diff --git a/noatun/modules/infrared/irprefs.cpp b/noatun/modules/infrared/irprefs.cpp
index a504b977..c3c2c89d 100644
--- a/noatun/modules/infrared/irprefs.cpp
+++ b/noatun/modules/infrared/irprefs.cpp
@@ -7,7 +7,7 @@
#include <kdialog.h>
#include <klocale.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kcombobox.h>
#include <knuminput.h>
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"
diff --git a/noatun/modules/kjofol-skin/kjbutton.cpp b/noatun/modules/kjofol-skin/kjbutton.cpp
index f6c60256..d027217c 100644
--- a/noatun/modules/kjofol-skin/kjbutton.cpp
+++ b/noatun/modules/kjofol-skin/kjbutton.cpp
@@ -24,7 +24,7 @@
#include <kurl.h>
#include <tdefiledialog.h>
#include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
/*******************************************
* KJButton
diff --git a/noatun/modules/kjofol-skin/kjguisettingswidget.ui b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
index 244e67a2..6088732e 100644
--- a/noatun/modules/kjofol-skin/kjguisettingswidget.ui
+++ b/noatun/modules/kjofol-skin/kjguisettingswidget.ui
@@ -459,7 +459,7 @@
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
<includehint>kcolorcombo.h</includehint>
- <includehint>kfontcombo.h</includehint>
+ <includehint>tdefontcombo.h</includehint>
<includehint>klineedit.h</includehint>
</includehints>
</UI>
diff --git a/noatun/modules/kjofol-skin/kjloader.cpp b/noatun/modules/kjofol-skin/kjloader.cpp
index ee8ca247..67bf516c 100644
--- a/noatun/modules/kjofol-skin/kjloader.cpp
+++ b/noatun/modules/kjofol-skin/kjloader.cpp
@@ -52,12 +52,12 @@
#include <tqvbox.h>
#include <tqlabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <khelpmenu.h>
#include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <kglobalsettings.h>
#include <kglobal.h>
diff --git a/noatun/modules/kjofol-skin/kjprefs.cpp b/noatun/modules/kjofol-skin/kjprefs.cpp
index 590d2f1a..20ff7750 100644
--- a/noatun/modules/kjofol-skin/kjprefs.cpp
+++ b/noatun/modules/kjofol-skin/kjprefs.cpp
@@ -40,7 +40,7 @@
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kglobalsettings.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
#include <kcolorcombo.h>
static TQString expand(TQString s);
diff --git a/noatun/modules/marquis/marquis.cpp b/noatun/modules/marquis/marquis.cpp
index 71612174..f1f46ae8 100644
--- a/noatun/modules/marquis/marquis.cpp
+++ b/noatun/modules/marquis/marquis.cpp
@@ -35,7 +35,7 @@
#include "marquis.h"
#include <noatun/player.h>
#include <noatun/engine.h>
-#include <kaction.h>
+#include <tdeaction.h>
static int getPlayStatus( Player *player )
{
diff --git a/noatun/modules/marquis/marquis.h b/noatun/modules/marquis/marquis.h
index 276ebc9a..00789b43 100644
--- a/noatun/modules/marquis/marquis.h
+++ b/noatun/modules/marquis/marquis.h
@@ -28,7 +28,7 @@
#include <noatun/plugin.h>
#include <noatun/app.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class Player;
diff --git a/noatun/modules/metatag/metatag.cpp b/noatun/modules/metatag/metatag.cpp
index db71f715..c6fc8f92 100644
--- a/noatun/modules/metatag/metatag.cpp
+++ b/noatun/modules/metatag/metatag.cpp
@@ -13,13 +13,13 @@
#include <tqregexp.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kglobal.h>
#include <klineedit.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tdefilemetainfo.h>
extern "C"
diff --git a/noatun/modules/monoscope/monoscope.cpp b/noatun/modules/monoscope/monoscope.cpp
index f7e35778..a66cbbde 100644
--- a/noatun/modules/monoscope/monoscope.cpp
+++ b/noatun/modules/monoscope/monoscope.cpp
@@ -3,7 +3,7 @@
#include <noatun/app.h>
#include <math.h>
#include <tqpainter.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <noatun/stdaction.h>
#include <klocale.h>
diff --git a/noatun/modules/noatunui/userinterface.cpp b/noatun/modules/noatunui/userinterface.cpp
index 9173867e..07d3ec7b 100644
--- a/noatun/modules/noatunui/userinterface.cpp
+++ b/noatun/modules/noatunui/userinterface.cpp
@@ -19,7 +19,7 @@
#include <tqobjectlist.h>
#include <tqobjectdict.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include <kglobal.h>
#include <klocale.h>
diff --git a/noatun/modules/simple/userinterface.cpp b/noatun/modules/simple/userinterface.cpp
index 52552be8..ebac7ce7 100644
--- a/noatun/modules/simple/userinterface.cpp
+++ b/noatun/modules/simple/userinterface.cpp
@@ -24,7 +24,7 @@
#include <klocale.h>
#include <kurldrag.h>
#include <kmenubar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstdguiitem.h>
diff --git a/noatun/modules/simple/userinterface.h b/noatun/modules/simple/userinterface.h
index 7265fa4e..a218f574 100644
--- a/noatun/modules/simple/userinterface.h
+++ b/noatun/modules/simple/userinterface.h
@@ -14,8 +14,8 @@
#include <noatun/controls.h>
#include <noatun/plugin.h>
#include <noatun/video.h>
-#include <kaction.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdemainwindow.h>
#include <kmedia2.h>
#include <tqevent.h>
#include <tqlabel.h>
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 8e150cc1..8c34e254 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -18,7 +18,7 @@
#include <tqtextstream.h>
#include <tqpainter.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <tdefiledialog.h>
#include <tdefileitem.h>
diff --git a/noatun/modules/splitplaylist/view.h b/noatun/modules/splitplaylist/view.h
index 9bff4335..4eef4e9b 100644
--- a/noatun/modules/splitplaylist/view.h
+++ b/noatun/modules/splitplaylist/view.h
@@ -3,8 +3,8 @@
#include <tqevent.h>
#include <tqptrlist.h>
-#include <klistview.h>
-#include <kmainwindow.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
#include <tqrect.h>
#include <tqdict.h>
#include <tdeio/global.h>
diff --git a/noatun/modules/systray/kitsystemtray.cpp b/noatun/modules/systray/kitsystemtray.cpp
index 63a467b6..963a9c69 100644
--- a/noatun/modules/systray/kitsystemtray.cpp
+++ b/noatun/modules/systray/kitsystemtray.cpp
@@ -36,8 +36,8 @@
#include <tqdragobject.h>
#include "kitsystemtray.h"
-#include <kmainwindow.h>
-#include <kpopupmenu.h>
+#include <tdemainwindow.h>
+#include <tdepopupmenu.h>
#include <kxmlguifactory.h>
#include <kiconloader.h>
#include <kurldrag.h>
diff --git a/noatun/modules/systray/systray.cpp b/noatun/modules/systray/systray.cpp
index 0cfde28e..3ef8841c 100644
--- a/noatun/modules/systray/systray.cpp
+++ b/noatun/modules/systray/systray.cpp
@@ -38,7 +38,7 @@
#include <noatun/player.h>
#include <noatun/stdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeconfig.h>
#include <tqfile.h>
#include <kglobal.h>
diff --git a/noatun/modules/systray/systray.h b/noatun/modules/systray/systray.h
index b1dd7aad..80592b07 100644
--- a/noatun/modules/systray/systray.h
+++ b/noatun/modules/systray/systray.h
@@ -32,7 +32,7 @@
#include <tqtimer.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class KitSystemTray;
class TQTimer;
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index 06b9c010..845773b0 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -17,10 +17,10 @@
#include <klocale.h>
#include <kiconloader.h>
#include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kurldrag.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqdragobject.h>
#include <kstandarddirs.h>
#include <twin.h>