From 334c088eb71859686535738e0161acdea4f36c49 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:47:02 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 knetload/devicedialog.cpp | 2 +-
 knetload/knetdock.cpp     | 2 +-
 knetload/knetload.cpp     | 4 ++--
 knetload/main.cpp         | 2 +-
 knetload/scaledialog.cpp  | 2 +-
 knetload/speeddialog.cpp  | 2 +-
 knetload/statpopup.cpp    | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/knetload/devicedialog.cpp b/knetload/devicedialog.cpp
index 37a4cb2..5e1dde9 100644
--- a/knetload/devicedialog.cpp
+++ b/knetload/devicedialog.cpp
@@ -14,7 +14,7 @@
 #include "devicedialog.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 
diff --git a/knetload/knetdock.cpp b/knetload/knetdock.cpp
index 05cf192..87dfa07 100644
--- a/knetload/knetdock.cpp
+++ b/knetload/knetdock.cpp
@@ -13,7 +13,7 @@
 
 #include "knetdock.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KNetDock::KNetDock(int whichDock, bool dirIn, StatPopup* parent,
         const char* name) :
diff --git a/knetload/knetload.cpp b/knetload/knetload.cpp
index 7c7c316..7b363c9 100644
--- a/knetload/knetload.cpp
+++ b/knetload/knetload.cpp
@@ -20,8 +20,8 @@
 #include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tqdir.h>
 
diff --git a/knetload/main.cpp b/knetload/main.cpp
index be6e116..8689180 100644
--- a/knetload/main.cpp
+++ b/knetload/main.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 
 static const char description[] =
diff --git a/knetload/scaledialog.cpp b/knetload/scaledialog.cpp
index 99a5e97..cd45ea1 100644
--- a/knetload/scaledialog.cpp
+++ b/knetload/scaledialog.cpp
@@ -15,7 +15,7 @@
 
 #include <cstdlib>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvalidator.h>
diff --git a/knetload/speeddialog.cpp b/knetload/speeddialog.cpp
index 1b14c96..d9b1bb4 100644
--- a/knetload/speeddialog.cpp
+++ b/knetload/speeddialog.cpp
@@ -15,7 +15,7 @@
 
 #include <cstdlib>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqvalidator.h>
diff --git a/knetload/statpopup.cpp b/knetload/statpopup.cpp
index acd9f74..c12d767 100644
--- a/knetload/statpopup.cpp
+++ b/knetload/statpopup.cpp
@@ -22,10 +22,10 @@
 #include <kcolordialog.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <twin.h>