From c46f36d00839916c8b6cde8ed2ca54aeb40dba19 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:23:27 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kommander/editor/assoctexteditorimpl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kommander/editor/assoctexteditorimpl.cpp')

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index f02b779c..4ee27476 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -24,8 +24,8 @@
 #include <kpushbutton.h>
 #include <ktextedit.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
-#include <kactioncollection.h>
+#include <tdepopupmenu.h>
+#include <tdeactioncollection.h>
 #include <kdebug.h>
 
 #include <tdetexteditor/view.h>
-- 
cgit v1.2.3