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

---
 kexi/plugins/tables/kexilookupcolumnpage.cpp      | 4 ++--
 kexi/plugins/tables/kexitabledesignercommands.cpp | 4 ++--
 kexi/plugins/tables/kexitabledesignerview.cpp     | 4 ++--
 kexi/plugins/tables/kexitabledesignerview_p.cpp   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kexi/plugins/tables')

diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 4bd08e5b..1ed65ddc 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -26,9 +26,9 @@
 
 #include <kiconloader.h>
 #include <klocale.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <widget/kexipropertyeditorview.h>
 #include <widget/kexidatasourcecombobox.h>
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index c5368b26..4f6c9ff9 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -25,9 +25,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <kaccelmanager.h>
+#include <tdeaccelmanager.h>
 
 #include <koproperty/property.h>
 
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 62ab4cbf..7fa1c3b3 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kiconeffect.h>
 
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index a9254ba4..761107c2 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaction.h>
-#include <kpopupmenu.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
 #include <kmessagebox.h>
 
 #include <koproperty/set.h>
-- 
cgit v1.2.1