From 279764bab1514a051db18e14241e9bae62be14d6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kommander/executor/instance.cpp | 6 +++---
 kommander/executor/main.cpp     | 6 +++---
 kommander/executor/register.cpp | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kommander/executor')

diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index fbf275a1..bd3ea25d 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -18,9 +18,9 @@
 
  /* KDE INCLUDES */
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 /* QT INCLUDES */
diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp
index 12f2ab01..a82479b3 100644
--- a/kommander/executor/main.cpp
+++ b/kommander/executor/main.cpp
@@ -19,10 +19,10 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 /* QT INCLUDES */
 #include <tqapplication.h>
diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp
index 3cacdbd9..b4a8c259 100644
--- a/kommander/executor/register.cpp
+++ b/kommander/executor/register.cpp
@@ -17,7 +17,7 @@
 #include <dcopinformation.h>
 #include <specialinformation.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void Instance::registerDCOP()
 {
-- 
cgit v1.2.1