summaryrefslogtreecommitdiffstats
path: root/vcs/cvsservice
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:57 -0600
commit5be945600e2d7776e74663f56c2a25a8f57d7891 (patch)
tree9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /vcs/cvsservice
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'vcs/cvsservice')
-rw-r--r--vcs/cvsservice/annotateview.h2
-rw-r--r--vcs/cvsservice/checkoutdialog.cpp2
-rw-r--r--vcs/cvsservice/checkoutdialogbase.ui2
-rw-r--r--vcs/cvsservice/cvspart.cpp6
-rw-r--r--vcs/cvsservice/cvspartimpl.cpp2
-rw-r--r--vcs/cvsservice/diffwidget.cpp2
6 files changed, 8 insertions, 8 deletions
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>