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

---
 klaptopdaemon/acpi.cpp           | 4 ++--
 klaptopdaemon/apm.cpp            | 4 ++--
 klaptopdaemon/battery.cpp        | 4 ++--
 klaptopdaemon/buttons.cpp        | 4 ++--
 klaptopdaemon/daemon_state.cpp   | 4 ++--
 klaptopdaemon/daemondock.cpp     | 6 +++---
 klaptopdaemon/kpcmcia.cpp        | 2 +-
 klaptopdaemon/kpcmciainfo.cpp    | 2 +-
 klaptopdaemon/krichtextlabel.cpp | 2 +-
 klaptopdaemon/laptop_check.cpp   | 2 +-
 klaptopdaemon/laptop_daemon.cpp  | 4 ++--
 klaptopdaemon/main.cpp           | 4 ++--
 klaptopdaemon/pcmcia.cpp         | 4 ++--
 klaptopdaemon/portable.cpp       | 2 +-
 klaptopdaemon/power.cpp          | 4 ++--
 klaptopdaemon/profile.cpp        | 4 ++--
 klaptopdaemon/sony.cpp           | 4 ++--
 klaptopdaemon/warning.cpp        | 4 ++--
 18 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'klaptopdaemon')

diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 8f434b0..efcdd67 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -29,13 +29,13 @@
 #include <unistd.h>
 
 // other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index d023c56..2ce09fa 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -30,13 +30,13 @@
 #include <unistd.h>
 
 // other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index fde729a..9bf6be9 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -29,13 +29,13 @@
 #include "portable.h"
 
 // other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krichtextlabel.h>
 
 // other TQt headers:
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 144ce76..eed4b8d 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -26,8 +26,8 @@
 #include "portable.h"
 #include "version.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp
index a8f69b1..477b0fa 100644
--- a/klaptopdaemon/daemon_state.cpp
+++ b/klaptopdaemon/daemon_state.cpp
@@ -32,14 +32,14 @@
 #include <tqtimer.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include "daemon_state.h"
 #include "portable.h"
 #include <tdeaboutdata.h>
 #include <kaudioplayer.h>
 #include <sys/ioctl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <tqsocketnotifier.h>
 #include <tqcursor.h>
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7ef844d..7c8ace6 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -27,7 +27,7 @@
 #include <tqcursor.h>
 
 #include <tqslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <dcopclient.h>
 #include <dcopref.h>
@@ -39,8 +39,8 @@
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
 #include <tqvbox.h>
 #include <tqstringlist.h>
 #include <tqbitmap.h>
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index a17b5f8..941f739 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -27,7 +27,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 3e91f2d..e2e70d5 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 0df5a95..9130c4a 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -22,7 +22,7 @@
 #include <tqstylesheet.h>
 #include <tqsimplerichtext.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 static TQString qrichtextify( const TQString& text )
 {
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 7080798..676a26b 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -27,7 +27,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 static const char description[] =
         I18N_NOOP("TDE laptop daemon starter");
 
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 142b922..97e70ba 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -32,7 +32,7 @@
 #include <tqtimer.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include "laptop_daemon.h"
 #include "portable.h"
@@ -40,7 +40,7 @@
 #include <kaudioplayer.h>
 #include <tdeapplication.h>
 #include <sys/ioctl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <dcopclient.h>
 #include <tqsocketnotifier.h>
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 27d2451..5068a4e 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -22,10 +22,10 @@
  */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 88ee06d..cc66217 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -29,8 +29,8 @@
 #include <tqfileinfo.h> 
 #include <tqlayout.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <stdio.h>
 
 #include "pcmcia.h"
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index b351a1c..bfaa787 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -59,7 +59,7 @@
 //
 
 #include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdio.h>
 #include "portable.h"
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index 0d25e8b..c29c425 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -26,8 +26,8 @@
 #include "portable.h"
 #include "version.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index 9e9a0da..e60109e 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -31,13 +31,13 @@
 #include <sys/ioctl.h>
 
 // other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 
 // other TQt headers:
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 7e097be..02b941a 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 
 // other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
 #include <kiconloader.h>
@@ -39,7 +39,7 @@
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krichtextlabel.h>
 
 // other TQt headers:
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 99b8d6e..5152d05 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -25,9 +25,9 @@
 #include "portable.h"
 #include "version.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
 #include <tdeapplication.h>
-- 
cgit v1.2.3