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

---
 vcs/subversion/integrator/svnintegratordlg.cpp | 4 ++--
 vcs/subversion/kdevsvnd.cpp                    | 4 ++--
 vcs/subversion/kdevsvnd_widgets.cpp            | 2 +-
 vcs/subversion/subversion_core.cpp             | 6 +++---
 vcs/subversion/subversion_fileinfo.cpp         | 2 +-
 vcs/subversion/subversion_part.cpp             | 4 ++--
 vcs/subversion/subversion_widget.cpp           | 2 +-
 vcs/subversion/svn_blamewidget.cpp             | 4 ++--
 vcs/subversion/svn_fileselectdlg_commit.cpp    | 4 ++--
 vcs/subversion/svn_logviewwidget.cpp           | 4 ++--
 vcs/subversion/svn_tdeio.cpp                   | 6 +++---
 11 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'vcs/subversion')

diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp
index bdba679f..da54b09b 100644
--- a/vcs/subversion/integrator/svnintegratordlg.cpp
+++ b/vcs/subversion/integrator/svnintegratordlg.cpp
@@ -30,8 +30,8 @@
 #include <tdeio/scheduler.h>
 #include <kprocess.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdeio/netaccess.h>
diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp
index 61c814de..c1faf65e 100644
--- a/vcs/subversion/kdevsvnd.cpp
+++ b/vcs/subversion/kdevsvnd.cpp
@@ -19,9 +19,9 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <ktextedit.h>
 #include <kpassdlg.h>
diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp
index 8fd05950..0fd2c20b 100644
--- a/vcs/subversion/kdevsvnd_widgets.cpp
+++ b/vcs/subversion/kdevsvnd_widgets.cpp
@@ -16,7 +16,7 @@
 #include <tqpushbutton.h>
 #include <tqlistview.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f )
 	:SvnSSLTrustPromptBase( parent, name, modal, f )
diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp
index f9344172..e9c89ece 100644
--- a/vcs/subversion/subversion_core.cpp
+++ b/vcs/subversion/subversion_core.cpp
@@ -37,14 +37,14 @@
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tqtextcodec.h>
 #include <tqtextstream.h>
 #include <tqtextbrowser.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 #include <tdeapplication.h>
diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp
index 9d5ef406..45d44d1e 100644
--- a/vcs/subversion/subversion_fileinfo.cpp
+++ b/vcs/subversion/subversion_fileinfo.cpp
@@ -30,7 +30,7 @@
 #include <tqregexp.h>
 
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name)
     : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ),
diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp
index 32a17b9f..f3f43cd9 100644
--- a/vcs/subversion/subversion_part.cpp
+++ b/vcs/subversion/subversion_part.cpp
@@ -20,7 +20,7 @@
 
 #include <tqwhatsthis.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdevgenericfactory.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
@@ -52,7 +52,7 @@
 #include <tqwidget.h>
 #include <kdevplugininfo.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using namespace SvnGlobal;
 
diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp
index e635d600..95b31f6b 100644
--- a/vcs/subversion/subversion_widget.cpp
+++ b/vcs/subversion/subversion_widget.cpp
@@ -25,7 +25,7 @@
 #include "subversion_part.h"
 #include "subversion_widget.h"
 #include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtoolbutton.h>
 #include <tqpushbutton.h>
 
diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp
index b4095389..87647525 100644
--- a/vcs/subversion/svn_blamewidget.cpp
+++ b/vcs/subversion/svn_blamewidget.cpp
@@ -21,8 +21,8 @@
 #include <tqstringlist.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f )
 	:TQWidget( parent )
diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp
index a37577bd..e042df84 100644
--- a/vcs/subversion/svn_fileselectdlg_commit.cpp
+++ b/vcs/subversion/svn_fileselectdlg_commit.cpp
@@ -28,9 +28,9 @@
 #include <tqfileinfo.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include "kdevmainwindow.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdevproject.h>
 
diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp
index eaed9c12..10e55a9f 100644
--- a/vcs/subversion/svn_logviewwidget.cpp
+++ b/vcs/subversion/svn_logviewwidget.cpp
@@ -24,9 +24,9 @@
 #include "subversion_global.h"
 #include <kdevproject.h>
 #include <ktextedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 #include <tqcombobox.h>
 #include <knuminput.h>
diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp
index ce6b08be..23f1d2ff 100644
--- a/vcs/subversion/svn_tdeio.cpp
+++ b/vcs/subversion/svn_tdeio.cpp
@@ -31,11 +31,11 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <ksock.h>
 #include <dcopclient.h>
-- 
cgit v1.2.1