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/cvsservice/annotatedialog.cpp           | 4 ++--
 vcs/cvsservice/annotatepage.cpp             | 6 +++---
 vcs/cvsservice/annotateview.cpp             | 6 +++---
 vcs/cvsservice/changelog.cpp                | 2 +-
 vcs/cvsservice/checkoutdialog.cpp           | 4 ++--
 vcs/cvsservice/commitdlg.cpp                | 4 ++--
 vcs/cvsservice/cvsdiffpage.cpp              | 4 ++--
 vcs/cvsservice/cvslogdialog.cpp             | 4 ++--
 vcs/cvsservice/cvslogpage.cpp               | 4 ++--
 vcs/cvsservice/cvsoptions.cpp               | 2 +-
 vcs/cvsservice/cvspart.cpp                  | 4 ++--
 vcs/cvsservice/cvspartimpl.cpp              | 4 ++--
 vcs/cvsservice/cvsprocesswidget.cpp         | 4 ++--
 vcs/cvsservice/diffdialog.cpp               | 2 +-
 vcs/cvsservice/diffwidget.cpp               | 6 +++---
 vcs/cvsservice/editorsdialog.cpp            | 4 ++--
 vcs/cvsservice/integrator/integratordlg.cpp | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'vcs/cvsservice')

diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp
index 2937b2bb..ac9f293d 100644
--- a/vcs/cvsservice/annotatedialog.cpp
+++ b/vcs/cvsservice/annotatedialog.cpp
@@ -13,8 +13,8 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp
index 11c9c835..e044db54 100644
--- a/vcs/cvsservice/annotatepage.cpp
+++ b/vcs/cvsservice/annotatepage.cpp
@@ -15,15 +15,15 @@
 #include <tqdatetime.h>
 #include <tqlabel.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <krfcdate.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <dcopref.h>
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index 32a1ef40..89aa7f01 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -18,9 +18,9 @@
 #include <tqheader.h>
 #include <tqdatetime.h>
 #include <tqpainter.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "annotatepage.h"
diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp
index 1e676f43..78528307 100644
--- a/vcs/cvsservice/changelog.cpp
+++ b/vcs/cvsservice/changelog.cpp
@@ -13,7 +13,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include "changelog.h"
 
diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp
index c34c5083..e6bcbd05 100644
--- a/vcs/cvsservice/checkoutdialog.cpp
+++ b/vcs/cvsservice/checkoutdialog.cpp
@@ -17,8 +17,8 @@
 
 #include <tdelistview.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kcursor.h>
 #include <kdebug.h>
diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp
index 575396b5..d5ccd014 100644
--- a/vcs/cvsservice/commitdlg.cpp
+++ b/vcs/cvsservice/commitdlg.cpp
@@ -19,8 +19,8 @@
 
 #include <tdeapplication.h>
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
 
 #include "commitdlg.h"
diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp
index 7777760a..e58e7497 100644
--- a/vcs/cvsservice/cvsdiffpage.cpp
+++ b/vcs/cvsservice/cvsdiffpage.cpp
@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp
index ff36c19d..21169346 100644
--- a/vcs/cvsservice/cvslogdialog.cpp
+++ b/vcs/cvsservice/cvslogdialog.cpp
@@ -14,9 +14,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <cvsjob_stub.h>
diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp
index c0ade68e..4b2d7fb4 100644
--- a/vcs/cvsservice/cvslogpage.cpp
+++ b/vcs/cvsservice/cvslogpage.cpp
@@ -15,9 +15,9 @@
 #include <tqdir.h>
 #include <tqstringlist.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp
index f1b45c30..2cdf5c92 100644
--- a/vcs/cvsservice/cvsoptions.cpp
+++ b/vcs/cvsservice/cvsoptions.cpp
@@ -14,7 +14,7 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "domutil.h"
 #include "kdevproject.h"
diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp
index 75fda6f6..88cd870d 100644
--- a/vcs/cvsservice/cvspart.cpp
+++ b/vcs/cvsservice/cvspart.cpp
@@ -19,8 +19,8 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 #include <kstandarddirs.h>
 #include <tdeaction.h>
diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp
index 05de2c19..01c85df3 100644
--- a/vcs/cvsservice/cvspartimpl.cpp
+++ b/vcs/cvsservice/cvspartimpl.cpp
@@ -15,10 +15,10 @@
 #include<tqcheckbox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index d4de15c1..bb8fb459 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -15,8 +15,8 @@
 #include <dcopref.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "kdevpartcontroller.h"
 #include "kdevmainwindow.h"
diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp
index c86ae0ce..ebcb354b 100644
--- a/vcs/cvsservice/diffdialog.cpp
+++ b/vcs/cvsservice/diffdialog.cpp
@@ -13,7 +13,7 @@
 #include <tqradiobutton.h>
 
 #include "diffdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbuttongroup.h>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp
index bb9aa69c..56bb5b2c 100644
--- a/vcs/cvsservice/diffwidget.cpp
+++ b/vcs/cvsservice/diffwidget.cpp
@@ -17,13 +17,13 @@
 
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/part.h>
diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp
index 47e1b0ac..199ffdc6 100644
--- a/vcs/cvsservice/editorsdialog.cpp
+++ b/vcs/cvsservice/editorsdialog.cpp
@@ -9,9 +9,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp
index 6f741bf4..5b0b593f 100644
--- a/vcs/cvsservice/integrator/integratordlg.cpp
+++ b/vcs/cvsservice/integrator/integratordlg.cpp
@@ -31,8 +31,8 @@
 #include <kdialogbase.h>
 #include <kurlrequester.h>
 #include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <klineedit.h>
 
-- 
cgit v1.2.3