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

---
 cervisia/addremovedlg.cpp           | 2 +-
 cervisia/addrepositorydlg.cpp       | 2 +-
 cervisia/annotatectl.cpp            | 2 +-
 cervisia/annotateview.cpp           | 2 +-
 cervisia/cervisiapart.cpp           | 6 +++---
 cervisia/cervisiashell.cpp          | 4 ++--
 cervisia/changelogdlg.cpp           | 6 +++---
 cervisia/checkoutdlg.cpp            | 4 ++--
 cervisia/commitdlg.cpp              | 2 +-
 cervisia/cvsinitdlg.cpp             | 2 +-
 cervisia/cvsservice/cvsaskpass.cpp  | 2 +-
 cervisia/cvsservice/cvsloginjob.cpp | 2 +-
 cervisia/cvsservice/cvsservice.cpp  | 4 ++--
 cervisia/cvsservice/main.cpp        | 2 +-
 cervisia/diffdlg.cpp                | 6 +++---
 cervisia/diffview.cpp               | 4 ++--
 cervisia/entry_status.cpp           | 2 +-
 cervisia/globalignorelist.cpp       | 2 +-
 cervisia/historydlg.cpp             | 2 +-
 cervisia/logdlg.cpp                 | 6 +++---
 cervisia/loginfo.cpp                | 4 ++--
 cervisia/loglist.cpp                | 2 +-
 cervisia/logplainview.cpp           | 2 +-
 cervisia/logtree.cpp                | 4 ++--
 cervisia/main.cpp                   | 2 +-
 cervisia/mergedlg.cpp               | 2 +-
 cervisia/misc.cpp                   | 8 ++++----
 cervisia/patchoptiondlg.cpp         | 2 +-
 cervisia/protocolview.cpp           | 4 ++--
 cervisia/repositorydlg.cpp          | 4 ++--
 cervisia/resolvedlg.cpp             | 4 ++--
 cervisia/settingsdlg.cpp            | 4 ++--
 cervisia/tagdlg.cpp                 | 4 ++--
 cervisia/tooltip.cpp                | 4 ++--
 cervisia/updatedlg.cpp              | 2 +-
 cervisia/updateview.cpp             | 2 +-
 cervisia/updateview_items.cpp       | 4 ++--
 cervisia/watchdlg.cpp               | 2 +-
 cervisia/watchersdlg.cpp            | 2 +-
 39 files changed, 63 insertions(+), 63 deletions(-)

(limited to 'cervisia')

diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp
index d3f38640..f4803d1e 100644
--- a/cervisia/addremovedlg.cpp
+++ b/cervisia/addremovedlg.cpp
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name)
diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp
index 32a38c77..7784f1d5 100644
--- a/cervisia/addrepositorydlg.cpp
+++ b/cervisia/addrepositorydlg.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 
diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp
index 1f220342..d374eaed 100644
--- a/cervisia/annotatectl.cpp
+++ b/cervisia/annotatectl.cpp
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 
 #include <dcopref.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krfcdate.h>
 
 #include "annotatedlg.h"
diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp
index a46e52b1..567c6616 100644
--- a/cervisia/annotateview.cpp
+++ b/cervisia/annotateview.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqpainter.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "loginfo.h"
 #include "tooltip.h"
diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp
index b67225df..ef6f42ee 100644
--- a/cervisia/cervisiapart.cpp
+++ b/cervisia/cervisiapart.cpp
@@ -30,7 +30,7 @@
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>
@@ -39,8 +39,8 @@
 #include <kxmlguifactory.h>
 #include <krun.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
 
 #include "progressdlg.h"
diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp
index ff4cec23..ec59499b 100644
--- a/cervisia/cervisiashell.cpp
+++ b/cervisia/cervisiashell.cpp
@@ -27,8 +27,8 @@
 #include <khelpmenu.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <kurl.h>
diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp
index 80a3c729..94c06423 100644
--- a/cervisia/changelogdlg.cpp
+++ b/cervisia/changelogdlg.cpp
@@ -24,9 +24,9 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktextedit.h>
 #include "misc.h"
 
diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp
index 2f63dcd5..9519c0a9 100644
--- a/cervisia/checkoutdlg.cpp
+++ b/cervisia/checkoutdlg.cpp
@@ -30,8 +30,8 @@
 #include <kprocess.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlcompletion.h>
 
 #include "progressdlg.h"
diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp
index dd62a770..792a4195 100644
--- a/cervisia/commitdlg.cpp
+++ b/cervisia/commitdlg.cpp
@@ -29,7 +29,7 @@
 #include <tqheader.h>
 #include <tdelistview.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "cvsservice_stub.h"
 #include "logmessageedit.h"
diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp
index e29f0615..db39be24 100644
--- a/cervisia/cvsinitdlg.cpp
+++ b/cervisia/cvsinitdlg.cpp
@@ -25,7 +25,7 @@
 
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 
 
diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp
index 9196b9c6..810c906c 100644
--- a/cervisia/cvsservice/cvsaskpass.cpp
+++ b/cervisia/cvsservice/cvsaskpass.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <iostream>
diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp
index ad6f9176..5eb1d9fc 100644
--- a/cervisia/cvsservice/cvsloginjob.cpp
+++ b/cervisia/cvsservice/cvsloginjob.cpp
@@ -21,7 +21,7 @@
 #include "cvsloginjob.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 
 #include <sys/types.h>
diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp
index 9efbd86e..9eabda4c 100644
--- a/cervisia/cvsservice/cvsservice.cpp
+++ b/cervisia/cvsservice/cvsservice.cpp
@@ -27,8 +27,8 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 
 #include "cvsjob.h"
diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp
index d0180b6f..6e11f605 100644
--- a/cervisia/cvsservice/main.cpp
+++ b/cervisia/cvsservice/main.cpp
@@ -21,7 +21,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "cvsservice.h"
 
 
diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp
index 35615507..8a932cb7 100644
--- a/cervisia/diffdlg.cpp
+++ b/cervisia/diffdlg.cpp
@@ -29,9 +29,9 @@
 #include <tqregexp.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 
 #include "cvsservice_stub.h"
diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 83f5a1cf..481edf19 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -29,8 +29,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 
 class DiffViewItem
diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp
index 00ff3b32..d3ba4638 100644
--- a/cervisia/entry_status.cpp
+++ b/cervisia/entry_status.cpp
@@ -21,7 +21,7 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Cervisia
diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp
index b3834a42..d3633ee1 100644
--- a/cervisia/globalignorelist.cpp
+++ b/cervisia/globalignorelist.cpp
@@ -21,7 +21,7 @@ using namespace Cervisia;
 
 #include <tqdir.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <stdlib.h> // for getenv()
 
 #include "cvsservice_stub.h"
diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp
index 1913153c..0b21e8d7 100644
--- a/cervisia/historydlg.cpp
+++ b/cervisia/historydlg.cpp
@@ -28,7 +28,7 @@
 #include <tdeconfig.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krfcdate.h>
 
 #include "misc.h"
diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp
index a2571197..e924672b 100644
--- a/cervisia/logdlg.cpp
+++ b/cervisia/logdlg.cpp
@@ -34,11 +34,11 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kfinddialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krfcdate.h>
 #include <krun.h>
diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp
index 07468ae7..a7daa7a5 100644
--- a/cervisia/loginfo.cpp
+++ b/cervisia/loginfo.cpp
@@ -21,8 +21,8 @@
 
 #include <tqstylesheet.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 
 namespace Cervisia
diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp
index 68d07d9a..4bc4ff1e 100644
--- a/cervisia/loglist.cpp
+++ b/cervisia/loglist.cpp
@@ -22,7 +22,7 @@
 
 #include <tqapplication.h>
 #include <tqkeycode.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "loginfo.h"
 #include "misc.h"
diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp
index 413180af..4cf78061 100644
--- a/cervisia/logplainview.cpp
+++ b/cervisia/logplainview.cpp
@@ -24,7 +24,7 @@
 #include <tqstylesheet.h>
 #include <kfind.h>
 #include <kfinddialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "loginfo.h"
 
diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp
index 57d635ca..ede6d30d 100644
--- a/cervisia/logtree.cpp
+++ b/cervisia/logtree.cpp
@@ -22,8 +22,8 @@
 
 #include <tqpainter.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include "loginfo.h"
 #include "tooltip.h"
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 6c13ba95..5fe4028c 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "misc.h"
diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp
index e2b770c6..1cbecfd7 100644
--- a/cervisia/mergedlg.cpp
+++ b/cervisia/mergedlg.cpp
@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqstyle.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "misc.h"
 #include "cvsservice_stub.h"
diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp
index 11e60e5e..090861ca 100644
--- a/cervisia/misc.cpp
+++ b/cervisia/misc.cpp
@@ -30,11 +30,11 @@
 #include <tqregexp.h>
 #include <tqstringlist.h>
 #include <tdeconfig.h>
-#include <kemailsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kuser.h>
 #include <kdebug.h>
 
diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp
index 6516528f..43ba7fdf 100644
--- a/cervisia/patchoptiondlg.cpp
+++ b/cervisia/patchoptiondlg.cpp
@@ -25,7 +25,7 @@ using Cervisia::PatchOptionDialog;
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name)
diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp
index a94be9f5..7e2cb3a3 100644
--- a/cervisia/protocolview.cpp
+++ b/cervisia/protocolview.cpp
@@ -25,8 +25,8 @@
 #include <tqpopupmenu.h>
 #include <dcopref.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "cervisiapart.h"
 #include "cvsjob_stub.h"
diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp
index 24fcf608..5b348303 100644
--- a/cervisia/repositorydlg.cpp
+++ b/cervisia/repositorydlg.cpp
@@ -26,8 +26,8 @@
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "addrepositorydlg.h"
diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index 93c915fc..cd12c757 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -30,8 +30,8 @@
 #include <tqtextstream.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqregexp.h>
 #include "misc.h"
 #include "resolvedlg_p.h"
diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp
index 98a3e012..b55d310c 100644
--- a/cervisia/settingsdlg.cpp
+++ b/cervisia/settingsdlg.cpp
@@ -34,10 +34,10 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 
diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp
index b2bd1506..0ad161d9 100644
--- a/cervisia/tagdlg.cpp
+++ b/cervisia/tagdlg.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "misc.h"
 #include "cvsservice_stub.h"
diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp
index 5cd34b89..2f92823e 100644
--- a/cervisia/tooltip.cpp
+++ b/cervisia/tooltip.cpp
@@ -19,8 +19,8 @@
 
 #include "tooltip.h"
 
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <tqsimplerichtext.h>
 
diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp
index 4cd4367c..d48d625c 100644
--- a/cervisia/updatedlg.cpp
+++ b/cervisia/updatedlg.cpp
@@ -27,7 +27,7 @@
 #include <tqradiobutton.h>
 #include <tqstyle.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "misc.h"
 #include "cvsservice_stub.h"
diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp
index 4aa5a44e..ef3f1703 100644
--- a/cervisia/updateview.cpp
+++ b/cervisia/updateview.cpp
@@ -26,7 +26,7 @@
 #include <tqfileinfo.h>
 #include <tqptrstack.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "cervisiasettings.h"
 #include "entry.h"
diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp
index 34204ca8..ce74fd2a 100644
--- a/cervisia/updateview_items.cpp
+++ b/cervisia/updateview_items.cpp
@@ -27,9 +27,9 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include "cvsdir.h"
diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp
index 7be45e32..e4579d78 100644
--- a/cervisia/watchdlg.cpp
+++ b/cervisia/watchdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name)
diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp
index a3ca17ed..f3c18238 100644
--- a/cervisia/watchersdlg.cpp
+++ b/cervisia/watchersdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqtable.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "misc.h"
 #include "cvsservice_stub.h"
-- 
cgit v1.2.3