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

---
 lib/util/execcommand.cpp            | 4 ++--
 lib/util/settings.cpp               | 2 +-
 lib/util/tdescriptactionmanager.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/util')

diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index d62cb2e7..fea82215 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -21,8 +21,8 @@
 
 #include <kprocess.h>
 #include <kprogress.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, 
                           const TQString& workingDir, const TQStringList& env,
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 0b05d445..8673b58d 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "settings.h"
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 20242f1a..c4b44894 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -24,8 +24,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
 #include <tdeaction.h>
-- 
cgit v1.2.3