Rename many classes and header files to avoid conflicts with KDE4

6 files changed, 7 insertions, 7 deletions

diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc
index 60a3ec2b0..ef77cc1bd 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cc
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <tdefilemetainfo.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kservicetype.h>
 #include <kuserprofile.h>
 #include <tdeio/metainfojob.h>
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 43a6468fc..b872be4a7 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -23,7 +23,7 @@
 #include "konq_infolistviewwidget.h"
 #include "konq_listviewsettings.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h
index c96bff5a0..6ea4e79dd 100644
--- a/konqueror/listview/konq_listviewitems.h
+++ b/konqueror/listview/konq_listviewitems.h
@@ -20,7 +20,7 @@
 #ifndef __konq_listviewitems_h__
 #define __konq_listviewitems_h__
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqstring.h>
 #include <kicontheme.h>
 
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index af7058748..8eb2cd6bf 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -29,7 +29,7 @@
 #include <kdirlister.h>
 #include <klocale.h>
 #include <kprotocolinfo.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurldrag.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
@@ -1508,7 +1508,7 @@ bool KonqBaseListViewWidget::caseInsensitiveSort() const
     return m_pBrowserView->m_pProps->isCaseInsensitiveSort();
 }
 
-// based on isExecuteArea from klistview.cpp
+// based on isExecuteArea from tdelistview.cpp
 int KonqBaseListViewWidget::executeArea( TQListViewItem *_item )
 {
    if ( !_item )
diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h
index 1fc8b0eb7..5c9cade44 100644
--- a/konqueror/listview/konq_listviewwidget.h
+++ b/konqueror/listview/konq_listviewwidget.h
@@ -25,7 +25,7 @@
 
 #include <kurl.h>
 #include <tdefileitem.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdeparts/browserextension.h>
 #include <konq_propsview.h>
 #include "konq_listviewitems.h"
diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h
index 3f08cc3d5..01b85ddf6 100644
--- a/konqueror/listview/konq_treeviewwidget.h
+++ b/konqueror/listview/konq_treeviewwidget.h
@@ -23,7 +23,7 @@
 #include "konq_treeviewitem.h"
 #include <tqdict.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 class KonqListView;