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

---
 systemsettings/kcmultiwidget.cpp | 6 +++---
 systemsettings/kcmultiwidget.h   | 2 +-
 systemsettings/mainwindow.cpp    | 4 ++--
 systemsettings/modulesview.cpp   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp
index 5bb27e4..e54fef1 100644
--- a/systemsettings/kcmultiwidget.cpp
+++ b/systemsettings/kcmultiwidget.cpp
@@ -31,8 +31,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstdguiitem.h>
@@ -96,7 +96,7 @@ inline void KCMultiWidget::init()
 	setInitialSize(TQSize(640,480));
 	moduleParentComponents.setAutoDelete( true );
 }
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KCMultiWidget::~KCMultiWidget()
 {
diff --git a/systemsettings/kcmultiwidget.h b/systemsettings/kcmultiwidget.h
index a64ce72..2eece35 100644
--- a/systemsettings/kcmultiwidget.h
+++ b/systemsettings/kcmultiwidget.h
@@ -26,7 +26,7 @@
 #include <tqptrdict.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 
 class TDECModuleProxy;
diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp
index 05c9291..2886def 100644
--- a/systemsettings/mainwindow.cpp
+++ b/systemsettings/mainwindow.cpp
@@ -26,7 +26,7 @@
 #include <tqvbox.h>
 #include <tdeaction.h>
 #include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservicegroup.h>
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <tdecmoduleproxy.h>
 #include <kbugreport.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeactionclasses.h>
 #include <tdetoolbarbutton.h>
 #include <tqtabbar.h>
diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp
index 0de5d33..05c6f3f 100644
--- a/systemsettings/modulesview.cpp
+++ b/systemsettings/modulesview.cpp
@@ -21,7 +21,7 @@
 #include "modulesview.h"
 
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservicegroup.h>
 #include <tqlayout.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1