summaryrefslogtreecommitdiffstats
path: root/src/editorproxy.cpp
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 /src/editorproxy.cpp
parente36b30d13d1f89100fae656adfde2b52234d12b6 (diff)
downloadtdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz
tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/editorproxy.cpp')
-rw-r--r--src/editorproxy.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index a7b7a995..e3e28df4 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -18,10 +18,10 @@
#include <tdetexteditor/view.h>
#include <kxmlguiclient.h>
#include <kxmlguifactory.h>
-#include <kmainwindow.h>
-#include <kactioncollection.h>
+#include <tdemainwindow.h>
+#include <tdeactioncollection.h>
#include <klocale.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include "toplevel.h"
#include "partcontroller.h"