summaryrefslogtreecommitdiffstats
path: root/parts/grepview
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/grepview
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/grepview')
-rw-r--r--parts/grepview/grepviewpart.cpp2
-rw-r--r--parts/grepview/grepviewwidget.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp
index 627d7447..2e7b63e0 100644
--- a/parts/grepview/grepviewpart.cpp
+++ b/parts/grepview/grepviewpart.cpp
@@ -16,7 +16,7 @@
#include <tqwhatsthis.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdialogbase.h>
#include <kiconloader.h>
#include <kprocess.h>
diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp
index acace1b7..f4cb34aa 100644
--- a/parts/grepview/grepviewwidget.cpp
+++ b/parts/grepview/grepviewwidget.cpp
@@ -19,8 +19,8 @@
#include <kprocess.h>
#include <tdeparts/part.h>
#include <tdetexteditor/selectioninterface.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
#include <ktabwidget.h>
#include <kpushbutton.h>
#include <kiconloader.h>