Rename many classes and header files to avoid conflicts with KDE4

12 files changed, 16 insertions, 16 deletions

diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp
index b404a159..848d7394 100644
--- a/vcs/clearcase/clearcasepart.cpp
+++ b/vcs/clearcase/clearcasepart.cpp
@@ -15,7 +15,7 @@
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <klocale.h>
diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h
index db49d8f9..6bc97bf2 100644
--- a/vcs/cvsservice/annotateview.h
+++ b/vcs/cvsservice/annotateview.h
@@ -17,7 +17,7 @@
 #define ANNOTATEVIEW_H
 
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tqtooltip.h>
 
 class TQDateTime;
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index 02e03ca5..49fc31d3 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -15,7 +15,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurlrequester.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui
index a9782494..b4ef3cf2 100644
--- a/vcs/cvsservice/checkoutdialogbase.ui
+++ b/vcs/cvsservice/checkoutdialogbase.ui
@@ -307,6 +307,6 @@
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 173eb07f..936ec2cd 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -17,16 +17,16 @@
 #include <tqwhatsthis.h>
 #include <tqtimer.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 // Because of KShellProcess::quote()
 #include <kprocess.h>
 #include <kiconloader.h>
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 0210ad0a..f2dedc09 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <dcopref.h>
 // CvsService stuff
 #include <repository_stub.h>
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index 16ae5a95..43d80d85 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kservice.h>
 #include <ktempfile.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h
index ce870185..0bd98d71 100644
--- a/vcs/perforce/commitdlg.h
+++ b/vcs/perforce/commitdlg.h
@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 #include <tqtextedit.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kdialogbase.h>
 
 class TDEProcess;
diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp
index 19df30a7..bd19bb54 100644
--- a/vcs/perforce/perforcepart.cpp
+++ b/vcs/perforce/perforcepart.cpp
@@ -15,13 +15,13 @@
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
 #include <tqregexp.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kdevgenericfactory.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 #include <tdeparts/part.h>
 
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index 1e7772ab..6a5ed571 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -34,7 +34,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
 #include <kdebug.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <ktempfile.h>
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index d9d3d6e1..98de5478 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <kapplication.h>
 #include <kdevmainwindow.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqregexp.h>
 
 #include <tdeio/netaccess.h>
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 2af899a1..32a17b9f 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -22,8 +22,8 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdevgenericfactory.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 
 #include "kdevcore.h"
 #include "kdevmainwindow.h"