summaryrefslogtreecommitdiffstats
path: root/kommander/widget
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
commit279764bab1514a051db18e14241e9bae62be14d6 (patch)
treec587a443a0a228897e395535e2791dbde757bb3d /kommander/widget
parentee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff)
downloadtdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz
tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kommander/widget')
-rw-r--r--kommander/widget/expression.cpp2
-rw-r--r--kommander/widget/functionlib.cpp6
-rw-r--r--kommander/widget/kommanderfunctions.cpp4
-rw-r--r--kommander/widget/kommanderwidget.cpp4
-rw-r--r--kommander/widget/myprocess.cpp4
-rw-r--r--kommander/widget/parser.cpp2
6 files changed, 11 insertions, 11 deletions
diff --git a/kommander/widget/expression.cpp b/kommander/widget/expression.cpp
index d29d94e8..6ced8689 100644
--- a/kommander/widget/expression.cpp
+++ b/kommander/widget/expression.cpp
@@ -16,7 +16,7 @@
#include "expression.h"
-#include <klocale.h>
+#include <tdelocale.h>
Expression::Expression() : m_start(0), m_error(false)
{
diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp
index 6e8555e1..cd7b6f4c 100644
--- a/kommander/widget/functionlib.cpp
+++ b/kommander/widget/functionlib.cpp
@@ -32,14 +32,14 @@
#include <tqmetaobject.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kcolordialog.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassdlg.h>
using namespace Parse;
diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp
index 4631af85..3d580f88 100644
--- a/kommander/widget/kommanderfunctions.cpp
+++ b/kommander/widget/kommanderfunctions.cpp
@@ -24,8 +24,8 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "kommanderwidget.h"
#include "specials.h"
diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp
index a3442d73..7d80c8db 100644
--- a/kommander/widget/kommanderwidget.cpp
+++ b/kommander/widget/kommanderwidget.cpp
@@ -20,9 +20,9 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
/* QT INCLUDES */
diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp
index bc5fbdc8..45e64790 100644
--- a/kommander/widget/myprocess.cpp
+++ b/kommander/widget/myprocess.cpp
@@ -14,9 +14,9 @@
* *
***************************************************************************/
/* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
/* QT INCLUDES */
#include <tqapplication.h>
diff --git a/kommander/widget/parser.cpp b/kommander/widget/parser.cpp
index 09841908..b5c9d508 100644
--- a/kommander/widget/parser.cpp
+++ b/kommander/widget/parser.cpp
@@ -14,7 +14,7 @@
* *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include "parser.h"
#include "parserdata.h"