summaryrefslogtreecommitdiffstats
path: root/noatun-plugins/dub
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:54:06 -0600
commit71049a71c6648791e95cf421b19047415a2c4c84 (patch)
tree4f75fdaee1cce5a44f58f1f54980099f50a82b10 /noatun-plugins/dub
parent6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff)
downloadtdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz
tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'noatun-plugins/dub')
-rw-r--r--noatun-plugins/dub/dub/dub.cpp4
-rw-r--r--noatun-plugins/dub/dub/dubapp.cpp4
-rw-r--r--noatun-plugins/dub/dub/dubconfigmodule.cpp4
-rw-r--r--noatun-plugins/dub/dub/dubplaylist.cpp4
-rw-r--r--noatun-plugins/dub/dub/dubplaylistitem.cpp4
-rw-r--r--noatun-plugins/dub/dub/fileselectorwidget.cpp4
-rw-r--r--noatun-plugins/dub/dub/fileselectorwidget.h2
7 files changed, 13 insertions, 13 deletions
diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp
index 55cfbb1..cb67a1b 100644
--- a/noatun-plugins/dub/dub/dub.cpp
+++ b/noatun-plugins/dub/dub/dub.cpp
@@ -24,9 +24,9 @@
#include <kiconloader.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <kurl.h>
diff --git a/noatun-plugins/dub/dub/dubapp.cpp b/noatun-plugins/dub/dub/dubapp.cpp
index 63eb766..4107afd 100644
--- a/noatun-plugins/dub/dub/dubapp.cpp
+++ b/noatun-plugins/dub/dub/dubapp.cpp
@@ -20,9 +20,9 @@
#include <kiconloader.h>
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <noatun/playlist.h>
diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp
index 9de7eee..e6d3c23 100644
--- a/noatun-plugins/dub/dub/dubconfigmodule.cpp
+++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp
@@ -13,8 +13,8 @@
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <kdebug.h>
diff --git a/noatun-plugins/dub/dub/dubplaylist.cpp b/noatun-plugins/dub/dub/dubplaylist.cpp
index e7e1bef..20537a7 100644
--- a/noatun-plugins/dub/dub/dubplaylist.cpp
+++ b/noatun-plugins/dub/dub/dubplaylist.cpp
@@ -13,10 +13,10 @@
//#include dubplaylist.cpp
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <noatun/playlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "dub.h"
#include "dubconfigmodule.h"
diff --git a/noatun-plugins/dub/dub/dubplaylistitem.cpp b/noatun-plugins/dub/dub/dubplaylistitem.cpp
index 065ebe9..50405b3 100644
--- a/noatun-plugins/dub/dub/dubplaylistitem.cpp
+++ b/noatun-plugins/dub/dub/dubplaylistitem.cpp
@@ -18,8 +18,8 @@
#include <tdefile.h>
#include <tdefileitem.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
DubPlaylistItem::DubPlaylistItem(const KFileItem& fItem)
: fileItem(fItem)
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index 437f943..46ee269 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -25,9 +25,9 @@
#include <kurlcombobox.h>
#include <kurlcompletion.h>
#include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h
index 3f32cec..2bfc489 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.h
+++ b/noatun-plugins/dub/dub/fileselectorwidget.h
@@ -27,7 +27,7 @@
#include <kurlcompletion.h>
#include <kcombobox.h>
#include <kprotocolinfo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
class DubPlayListItem;