summaryrefslogtreecommitdiffstats
path: root/parts/diff
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 /parts/diff
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/diff')
-rw-r--r--parts/diff/diffpart.cpp2
-rw-r--r--parts/diff/diffwidget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp
index 14ce5d0d..3861f202 100644
--- a/parts/diff/diffpart.cpp
+++ b/parts/diff/diffpart.cpp
@@ -17,7 +17,7 @@
#include <klocale.h>
#include <kdevgenericfactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdefiledialog.h>
#include <kprocess.h>
#include <tdeio/jobclasses.h>
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 6b3a2d6d..fea6b497 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/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>