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

---
 configdialog/kbfxconfigapp.h           | 6 +++---
 configdialog/kbfxconfigdlgbutton.ui    | 2 +-
 configdialog/kbfxconfigdlgfonts-old.ui | 2 +-
 configdialog/kbfxconfigdlglayout.ui    | 2 +-
 configdialog/kbfxconfigdlgmain.ui      | 2 +-
 configdialog/kbfxconfigdlgplugins.ui   | 2 +-
 configdialog/kbfxconfigdlgthemes.ui    | 2 +-
 configdialog/main.cpp                  | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'configdialog')

diff --git a/configdialog/kbfxconfigapp.h b/configdialog/kbfxconfigapp.h
index ae0194c..506dc8e 100644
--- a/configdialog/kbfxconfigapp.h
+++ b/configdialog/kbfxconfigapp.h
@@ -52,14 +52,14 @@
 #include <kicondialog.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktextedit.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/configdialog/kbfxconfigdlgbutton.ui b/configdialog/kbfxconfigdlgbutton.ui
index 1673f35..366d414 100644
--- a/configdialog/kbfxconfigdlgbutton.ui
+++ b/configdialog/kbfxconfigdlgbutton.ui
@@ -1229,7 +1229,7 @@
     <tabstop>KbfxResizeKicker</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">kbfxpushbutton.h</include>
     <include location="global" impldecl="in declaration">tqstring.h</include>
     <include location="global" impldecl="in declaration">tqpainter.h</include>
diff --git a/configdialog/kbfxconfigdlgfonts-old.ui b/configdialog/kbfxconfigdlgfonts-old.ui
index 95b1a0d..f969308 100644
--- a/configdialog/kbfxconfigdlgfonts-old.ui
+++ b/configdialog/kbfxconfigdlgfonts-old.ui
@@ -1136,7 +1136,7 @@
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeconfig.h</include>
     <include location="global" impldecl="in declaration">kbfxfontchooser.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgfonts-old.ui.h</include>
diff --git a/configdialog/kbfxconfigdlglayout.ui b/configdialog/kbfxconfigdlglayout.ui
index 7c0060f..5f04159 100644
--- a/configdialog/kbfxconfigdlglayout.ui
+++ b/configdialog/kbfxconfigdlglayout.ui
@@ -1052,7 +1052,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlglayout.ui.h</include>
 </includes>
diff --git a/configdialog/kbfxconfigdlgmain.ui b/configdialog/kbfxconfigdlgmain.ui
index 78e7c52..6c9a1eb 100644
--- a/configdialog/kbfxconfigdlgmain.ui
+++ b/configdialog/kbfxconfigdlgmain.ui
@@ -644,7 +644,7 @@
     <include location="global" impldecl="in declaration">tqpainter.h</include>
     <include location="global" impldecl="in declaration">tqimage.h</include>
     <include location="global" impldecl="in declaration">tqpixmap.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgmain.ui.h</include>
 </includes>
 <variables>
diff --git a/configdialog/kbfxconfigdlgplugins.ui b/configdialog/kbfxconfigdlgplugins.ui
index d262944..1bd2038 100644
--- a/configdialog/kbfxconfigdlgplugins.ui
+++ b/configdialog/kbfxconfigdlgplugins.ui
@@ -361,7 +361,7 @@
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
     <include location="global" impldecl="in declaration">kstandarddirs.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tqlistbox.h</include>
     <include location="global" impldecl="in declaration">kbfxplasmapluginloader.h</include>
     <include location="local" impldecl="in implementation">kbfxconfigdlgplugins.ui.h</include>
diff --git a/configdialog/kbfxconfigdlgthemes.ui b/configdialog/kbfxconfigdlgthemes.ui
index 25d7499..660c80b 100644
--- a/configdialog/kbfxconfigdlgthemes.ui
+++ b/configdialog/kbfxconfigdlgthemes.ui
@@ -982,7 +982,7 @@
     <include location="global" impldecl="in declaration">kbfxconfig.h</include>
     <include location="global" impldecl="in declaration">kdebug.h</include>
     <include location="global" impldecl="in declaration">tqstringlist.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
+    <include location="global" impldecl="in declaration">tdemessagebox.h</include>
     <include location="global" impldecl="in declaration">tdeio/netaccess.h</include>
     <include location="global" impldecl="in declaration">tdefiledialog.h</include>
     <include location="global" impldecl="in declaration">ktar.h</include>
diff --git a/configdialog/main.cpp b/configdialog/main.cpp
index 0f5842b..f980748 100644
--- a/configdialog/main.cpp
+++ b/configdialog/main.cpp
@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kuniqueapplication.h>
 
 #include "kbfxconfigapp.h"
-- 
cgit v1.2.1