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

---
 languages/sql/sqlactions.cpp      | 2 +-
 languages/sql/sqlactions.h        | 2 +-
 languages/sql/sqlsupport_part.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'languages/sql')

diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp
index 02112d78..37aa6862 100644
--- a/languages/sql/sqlactions.cpp
+++ b/languages/sql/sqlactions.cpp
@@ -17,7 +17,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 
diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h
index 20923a15..248c4d66 100644
--- a/languages/sql/sqlactions.h
+++ b/languages/sql/sqlactions.h
@@ -14,7 +14,7 @@
 
 #include <tdeversion.h>
 #include <kxmlguiclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class SQLSupportPart;
 class KComboBox;
diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp
index d5b6f91c..f61c6bea 100644
--- a/languages/sql/sqlsupport_part.cpp
+++ b/languages/sql/sqlsupport_part.cpp
@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kdevgenericfactory.h>
 #include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/part.h>
 #include <kdialogbase.h>
 #include <tdetexteditor/editinterface.h>
-- 
cgit v1.2.1