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

---
 kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp    | 4 ++--
 kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp  | 6 +++---
 kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp    | 2 +-
 kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp | 4 ++--
 kcontrol/tdefontinst/lib/FcEngine.cpp               | 2 +-
 kcontrol/tdefontinst/lib/KfiConstants.h             | 2 +-
 kcontrol/tdefontinst/tdefontinst/FontEngine.cpp     | 2 +-
 kcontrol/tdefontinst/tdefontinst/XConfig.cpp        | 2 +-
 kcontrol/tdefontinst/tdeio/KioFonts.cpp             | 4 ++--
 kcontrol/tdefontinst/tdeio/KioFonts.h               | 2 +-
 kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp    | 4 ++--
 kcontrol/tdefontinst/viewpart/FontPreview.cpp       | 2 +-
 kcontrol/tdefontinst/viewpart/FontViewPart.cpp      | 4 ++--
 kcontrol/tdefontinst/viewpart/FontViewerApp.cpp     | 4 ++--
 14 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kcontrol/tdefontinst')

diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
index fb2c07163..9f939324a 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp
@@ -42,7 +42,7 @@
 #include <tqsettings.h>
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kprinter.h>
 #include "Misc.h"
 #include "KFileFontIconView.h"
@@ -52,7 +52,7 @@
 #include <tdetoolbarbutton.h>
 #include <tdestdaccel.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
 #include <tdeio/job.h>
diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
index 55143369f..e393e238b 100644
--- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
@@ -40,10 +40,10 @@
 #include <tqpixmap.h>
 #include <tdeapplication.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kurldrag.h>
diff --git a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
index afd9fa204..7e64e059d 100644
--- a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp
@@ -30,7 +30,7 @@
 #include <tqlayout.h>
 #include <tqframe.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace KFI
 {
diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
index e555dc7fd..4840b7219 100644
--- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
+++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp
@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqvbox.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp
index 8ac8f4fb4..ab89689d9 100644
--- a/kcontrol/tdefontinst/lib/FcEngine.cpp
+++ b/kcontrol/tdefontinst/lib/FcEngine.cpp
@@ -5,7 +5,7 @@
 #include <tqtextstream.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
 #include <math.h>
 #include "FcEngine.h"
diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h
index d7f5ef03f..5e8633539 100644
--- a/kcontrol/tdefontinst/lib/KfiConstants.h
+++ b/kcontrol/tdefontinst/lib/KfiConstants.h
@@ -1,7 +1,7 @@
 #ifndef __KFI_CONSTANTS_H__
 #define __KFI_CONSTANTS_H__
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define KFI_CATALOGUE                "tdefontinst"
 
diff --git a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
index 4fe823c23..0cb0fa776 100644
--- a/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
+++ b/kcontrol/tdefontinst/tdefontinst/FontEngine.cpp
@@ -29,7 +29,7 @@
 
 #include "FontEngine.h"
 #include "Misc.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
index 7572e3894..bb6e49d5e 100644
--- a/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
+++ b/kcontrol/tdefontinst/tdefontinst/XConfig.cpp
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <sys/types.h>
 #include <signal.h>
 
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
index f42d50c0b..949b0d4cb 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp
@@ -51,14 +51,14 @@
 #include <tdeio/connection.h>
 #include <tqtextstream.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <tqdir.h>
 #include <tqdatastream.h>
 #include <tqregexp.h>
 #include <kinstance.h>
 #include <klargefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdesu/su.h>
 #include <kprocess.h>
 #include <kdebug.h>
diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.h b/kcontrol/tdefontinst/tdeio/KioFonts.h
index ec8c69c4e..4f3c465d2 100644
--- a/kcontrol/tdefontinst/tdeio/KioFonts.h
+++ b/kcontrol/tdefontinst/tdeio/KioFonts.h
@@ -33,7 +33,7 @@
 #include <time.h>
 #include <tdeio/slavebase.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqcstring.h>
 #include <tqmap.h>
diff --git a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
index aaf85e940..a053393f4 100644
--- a/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
+++ b/kcontrol/tdefontinst/thumbnail/FontThumbnail.cpp
@@ -32,8 +32,8 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 extern "C"
diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
index 151dfc888..41367d586 100644
--- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontPreview.cpp
@@ -28,7 +28,7 @@
 
 #include "FontPreview.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <stdlib.h>
diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
index d04d1b3dc..2f289649b 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp
@@ -31,7 +31,7 @@
 #include "Misc.h"
 #include "KfiConstants.h"
 #include "KfiPrint.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqframe.h>
@@ -46,7 +46,7 @@
 #include <tqtimer.h>
 #include <tdeio/netaccess.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
index 45aeffe88..df1fa92d2 100644
--- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp
@@ -31,8 +31,8 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
 
-- 
cgit v1.2.1