summaryrefslogtreecommitdiffstats
path: root/katapult/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:23 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:23 -0600
commite7f6c396cd6f903a118447cd894ef63299d8a218 (patch)
tree10991c53e84fc9d69880cc0769e60e499c73939e /katapult/plugins
parent4dfec23a61d2218750724212722e8b850f79e83e (diff)
downloadkatapult-e7f6c396cd6f903a118447cd894ef63299d8a218.zip
katapult-e7f6c396cd6f903a118447cd894ef63299d8a218.tar.gz
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/plugins')
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp4
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/song.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp4
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp4
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/expression.cpp2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp4
-rw-r--r--katapult/plugins/catalogs/documentcatalog/directory.cpp2
-rw-r--r--katapult/plugins/catalogs/execcatalog/actionrun.cpp4
-rw-r--r--katapult/plugins/catalogs/execcatalog/command.cpp2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/actionsearch.cpp4
-rw-r--r--katapult/plugins/catalogs/googlecatalog/query.cpp2
-rw-r--r--katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp4
-rw-r--r--katapult/plugins/catalogs/programcatalog/program.cpp2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp4
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spelling.cpp2
17 files changed, 25 insertions, 25 deletions
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
index d01352c..95fffd7 100644
--- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqpixmap.h>
#include <tqstring.h>
@@ -26,7 +26,7 @@
#include <tqdatastream.h>
#include <kapp.h>
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <katapultitem.h>
diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp
index 5c3d304..cd461ab 100644
--- a/katapult/plugins/catalogs/amarokcatalog/song.cpp
+++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kurl.h>
#include <tqpixmap.h>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
index dbf2605..f6299ad 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/actionopenbookmark.cpp
@@ -19,11 +19,11 @@
***************************************************************************/
#include <kbookmark.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <krun.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tqpixmap.h>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
index 8be1de0..540b3f2 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/bookmark.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <kbookmark.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include "bookmark.h"
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
index 4e35d50..00fa029 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
+++ b/katapult/plugins/catalogs/bookmarkcatalog/mozillabookmark.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqpixmap.h>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
index 7bce3ae..b613c00 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp
@@ -22,11 +22,11 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <krun.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqclipboard.h>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp
index 70f27cb..da765f1 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/expression.cpp
+++ b/katapult/plugins/catalogs/calculatorcatalog/expression.cpp
@@ -22,7 +22,7 @@
***************************************************************************/
#include <kservice.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include "calculatorcatalog.h"
diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
index 6714c0d..95e7511 100644
--- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp
@@ -18,10 +18,10 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "actionopendocument.h"
#include "document.h"
diff --git a/katapult/plugins/catalogs/documentcatalog/directory.cpp b/katapult/plugins/catalogs/documentcatalog/directory.cpp
index 8ee1993..5cff22c 100644
--- a/katapult/plugins/catalogs/documentcatalog/directory.cpp
+++ b/katapult/plugins/catalogs/documentcatalog/directory.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include "directory.h"
diff --git a/katapult/plugins/catalogs/execcatalog/actionrun.cpp b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
index ffc4352..61b383c 100644
--- a/katapult/plugins/catalogs/execcatalog/actionrun.cpp
+++ b/katapult/plugins/catalogs/execcatalog/actionrun.cpp
@@ -25,9 +25,9 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <krun.h>
#include "execcatalog.h"
diff --git a/katapult/plugins/catalogs/execcatalog/command.cpp b/katapult/plugins/catalogs/execcatalog/command.cpp
index 6d615c9..7cb932d 100644
--- a/katapult/plugins/catalogs/execcatalog/command.cpp
+++ b/katapult/plugins/catalogs/execcatalog/command.cpp
@@ -25,7 +25,7 @@
***************************************************************************/
#include <kservice.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
index ac1e825..31c4a64 100644
--- a/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/actionsearch.cpp
@@ -25,9 +25,9 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <krun.h>
diff --git a/katapult/plugins/catalogs/googlecatalog/query.cpp b/katapult/plugins/catalogs/googlecatalog/query.cpp
index aa9c2f8..06f235d 100644
--- a/katapult/plugins/catalogs/googlecatalog/query.cpp
+++ b/katapult/plugins/catalogs/googlecatalog/query.cpp
@@ -25,7 +25,7 @@
***************************************************************************/
#include <kservice.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdeapplication.h>
diff --git a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
index ee0b6e0..f01647b 100644
--- a/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
+++ b/katapult/plugins/catalogs/programcatalog/actionrunprogram.cpp
@@ -18,11 +18,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <krun.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "program.h"
#include "katapultitem.h"
diff --git a/katapult/plugins/catalogs/programcatalog/program.cpp b/katapult/plugins/catalogs/programcatalog/program.cpp
index 0b4eaa7..a5701d5 100644
--- a/katapult/plugins/catalogs/programcatalog/program.cpp
+++ b/katapult/plugins/catalogs/programcatalog/program.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <kservice.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include "program.h"
diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
index e24b900..5b7c815 100644
--- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp
@@ -22,9 +22,9 @@
***************************************************************************/
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqclipboard.h>
diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
index d302b4c..99309ce 100644
--- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp
+++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp
@@ -22,7 +22,7 @@
***************************************************************************/
#include <kservice.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdeapplication.h>