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

---
 src/blacklisteditdialog.cpp | 2 +-
 src/configuredialog.cpp     | 4 ++--
 src/countdowndialog.cpp     | 2 +-
 src/dbusInterface.cpp       | 2 +-
 src/detaileddialog.cpp      | 2 +-
 src/dummy.cpp               | 2 +-
 src/inactivity.cpp          | 2 +-
 src/infodialog.cpp          | 2 +-
 src/kpowersave.cpp          | 2 +-
 src/logviewer.cpp           | 4 ++--
 src/main.cpp                | 2 +-
 src/screen.h                | 2 +-
 src/settings.cpp            | 2 +-
 src/suspenddialog.cpp       | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/blacklisteditdialog.cpp b/src/blacklisteditdialog.cpp
index d319ae5..85526f5 100644
--- a/src/blacklisteditdialog.cpp
+++ b/src/blacklisteditdialog.cpp
@@ -28,7 +28,7 @@
 #include "blacklisteditdialog.h"
 
 // KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // QT headers:
diff --git a/src/configuredialog.cpp b/src/configuredialog.cpp
index 80c0226..93843ea 100644
--- a/src/configuredialog.cpp
+++ b/src/configuredialog.cpp
@@ -29,8 +29,8 @@
  #include <kaudioplayer.h>
  #include <tdeconfig.h>
  #include <kiconloader.h>
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
  #include <kinputdialog.h>
  #include <tdeaccelmanager.h>
 
diff --git a/src/countdowndialog.cpp b/src/countdowndialog.cpp
index edcbcb4..a3d9ac0 100644
--- a/src/countdowndialog.cpp
+++ b/src/countdowndialog.cpp
@@ -28,7 +28,7 @@
 #include "kpowersave_debug.h"
 
 // KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kprogress.h>
 
diff --git a/src/dbusInterface.cpp b/src/dbusInterface.cpp
index adec4cd..3f75084 100644
--- a/src/dbusInterface.cpp
+++ b/src/dbusInterface.cpp
@@ -27,7 +27,7 @@
  */
  
   // KDE Header
-#include <klocale.h>
+#include <tdelocale.h>
 
 // DBUS - Header
 #include "dbusInterface.h"
diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp
index 40ae521..163ff15 100644
--- a/src/detaileddialog.cpp
+++ b/src/detaileddialog.cpp
@@ -30,7 +30,7 @@
 // KDE headers:
 #include <kled.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT headers:
 #include <tqpushbutton.h>
diff --git a/src/dummy.cpp b/src/dummy.cpp
index 5f5b01f..244ccc4 100644
--- a/src/dummy.cpp
+++ b/src/dummy.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class dummy {
 
diff --git a/src/inactivity.cpp b/src/inactivity.cpp
index 28fe520..6da740d 100644
--- a/src/inactivity.cpp
+++ b/src/inactivity.cpp
@@ -34,7 +34,7 @@ extern "C" {
 }
  
 // KDE Headers
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*! The default constructor of the class autosuspend */
 inactivity::inactivity() {
diff --git a/src/infodialog.cpp b/src/infodialog.cpp
index 38cd262..1205ca0 100644
--- a/src/infodialog.cpp
+++ b/src/infodialog.cpp
@@ -30,7 +30,7 @@
 
 // KDE headers:
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT headers:
 #include <tqcheckbox.h>
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp
index b8a179e..a248da5 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -25,7 +25,7 @@
 #include <kaudioplayer.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kpassivepopup.h>
diff --git a/src/logviewer.cpp b/src/logviewer.cpp
index 2f3e1c9..7d5d7b2 100644
--- a/src/logviewer.cpp
+++ b/src/logviewer.cpp
@@ -30,9 +30,9 @@
 
 // KDE header
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // own header
 #include "logviewer.h"
diff --git a/src/main.cpp b/src/main.cpp
index 35a0852..ca7ad52 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,7 +23,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "kpowersave_debug.h"
diff --git a/src/screen.h b/src/screen.h
index 6d7fe9b..14df1eb 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -29,7 +29,7 @@
 // KDE Header
 #include <dcopref.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT Header
 #include <tqstring.h>
diff --git a/src/settings.cpp b/src/settings.cpp
index d806680..ea1aa4a 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -25,7 +25,7 @@
  */
 
 // KDE Header
-#include <klocale.h>
+#include <tdelocale.h>
 
 // QT Header 
 
diff --git a/src/suspenddialog.cpp b/src/suspenddialog.cpp
index ac05c4b..26469da 100644
--- a/src/suspenddialog.cpp
+++ b/src/suspenddialog.cpp
@@ -25,7 +25,7 @@
  */
  
  // KDE - Headers
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kiconloader.h>
 
  // QT - Headers
-- 
cgit v1.2.3