Rename many classes and header files to avoid conflicts with KDE4

18 files changed, 24 insertions, 24 deletions

diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp
index 2c29bdc..377cfd3 100644
--- a/apps/ktorrent/fileselectdlg.cpp
+++ b/apps/ktorrent/fileselectdlg.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
 #include <kurlrequester.h>
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
index a703c18..1d82e3e 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/apps/ktorrent/fileselectdlgbase.ui
@@ -374,7 +374,7 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp
index f159a60..78dde74 100644
--- a/apps/ktorrent/filterbar.cpp
+++ b/apps/ktorrent/filterbar.cpp
@@ -26,7 +26,7 @@
 #include <kdialog.h>
 #include <klocale.h>
 #include <kpushbutton.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp
index c3fc584..dc1cc47 100644
--- a/apps/ktorrent/groups/groupview.cpp
+++ b/apps/ktorrent/groups/groupview.cpp
@@ -20,12 +20,12 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqheader.h>
 #include <util/log.h>
 #include <interfaces/torrentinterface.h>
diff --git a/apps/ktorrent/groups/groupview.h b/apps/ktorrent/groups/groupview.h
index 1fd9772..5b5d053 100644
--- a/apps/ktorrent/groups/groupview.h
+++ b/apps/ktorrent/groups/groupview.h
@@ -20,7 +20,7 @@
 #ifndef KTGROUPVIEW_H
 #define KTGROUPVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <util/ptrmap.h>
 
 class TDEPopupMenu;
diff --git a/apps/ktorrent/ipfilterwidget.cpp b/apps/ktorrent/ipfilterwidget.cpp
index 5cbab72..5ddf3bc 100644
--- a/apps/ktorrent/ipfilterwidget.cpp
+++ b/apps/ktorrent/ipfilterwidget.cpp
@@ -29,7 +29,7 @@
 #include <tqregexp.h>
 #include <tqvalidator.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tdesocketaddress.h>
 #include <tdefiledialog.h>
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
index d2fe5c3..36ab42c 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/apps/ktorrent/ipfilterwidgetbase.ui
@@ -355,7 +355,7 @@
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp
index 4572b56..dbdefbf 100644
--- a/apps/ktorrent/ktorrent.cpp
+++ b/apps/ktorrent/ktorrent.cpp
@@ -36,7 +36,7 @@
 #include <kmenubar.h>
 #include <kstatusbar.h>
 #include <kkeydialog.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
@@ -44,14 +44,14 @@
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kprogress.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <ksqueezedtextlabel.h>
 #include <kpushbutton.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <interfaces/torrentinterface.h>
diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp
index de31c2c..d55db7d 100644
--- a/apps/ktorrent/ktorrentview.cpp
+++ b/apps/ktorrent/ktorrentview.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kurl.h>
 #include <kurldrag.h>
diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h
index b8b1252..a388c87 100644
--- a/apps/ktorrent/ktorrentview.h
+++ b/apps/ktorrent/ktorrentview.h
@@ -23,7 +23,7 @@
 #ifndef _KTORRENTVIEW_H_
 #define _KTORRENTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 typedef TQValueList<TQCString> QCStringList;
 
diff --git a/apps/ktorrent/ktorrentviewitem.h b/apps/ktorrent/ktorrentviewitem.h
index adf6b3a..575844d 100644
--- a/apps/ktorrent/ktorrentviewitem.h
+++ b/apps/ktorrent/ktorrentviewitem.h
@@ -20,7 +20,7 @@
 #ifndef KTORRENTVIEWITEM_H
 #define KTORRENTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <dcopclient.h>
 #include <util/constants.h>
 
diff --git a/apps/ktorrent/ktorrentviewmenu.h b/apps/ktorrent/ktorrentviewmenu.h
index 1809941..fd850a6 100644
--- a/apps/ktorrent/ktorrentviewmenu.h
+++ b/apps/ktorrent/ktorrentviewmenu.h
@@ -20,7 +20,7 @@
 #ifndef KTORRENTVIEWMENU_H
 #define KTORRENTVIEWMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 		
 class KTorrentView;
 
diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp
index 621561a..e591009 100644
--- a/apps/ktorrent/newui/button.cpp
+++ b/apps/ktorrent/newui/button.cpp
@@ -28,8 +28,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp
index 02e0132..491acda 100644
--- a/apps/ktorrent/torrentcreatordlg.cpp
+++ b/apps/ktorrent/torrentcreatordlg.cpp
@@ -21,7 +21,7 @@
 #include <kpushbutton.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <knuminput.h>
 #include "torrentcreatordlg.h"
 #include "ktorrentcore.h"
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
index 2b62af7..5e9f0e0 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/apps/ktorrent/torrentcreatordlgbase.ui
@@ -531,6 +531,6 @@
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp
index 4fec304..c9864d4 100644
--- a/apps/ktorrent/trayicon.cpp
+++ b/apps/ktorrent/trayicon.cpp
@@ -18,7 +18,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kapplication.h>
 #include "ktorrent.h"
diff --git a/apps/ktorrent/trayicon.h b/apps/ktorrent/trayicon.h
index 06adbc6..a277f79 100644
--- a/apps/ktorrent/trayicon.h
+++ b/apps/ktorrent/trayicon.h
@@ -23,7 +23,7 @@
 
 
 #include <ksystemtray.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tqpainter.h>
 
 #include "ktorrentcore.h"
diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h
index 4885ef2..17aae8d 100644
--- a/apps/ktupnptest/upnptestapp.h
+++ b/apps/ktupnptest/upnptestapp.h
@@ -20,7 +20,7 @@
 #ifndef UPNPTESTAPP_H
 #define UPNPTESTAPP_H
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <libktorrent/util/log.h>
 #include <libktorrent/torrent/globals.h>
 #include <plugins/upnp/upnprouter.h>