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

---
 quanta/project/eventconfigurationdlg.cpp | 4 ++--
 quanta/project/eventeditordlg.cpp        | 2 +-
 quanta/project/membereditdlg.cpp         | 6 +++---
 quanta/project/project.cpp               | 4 ++--
 quanta/project/projectnewgeneral.cpp     | 4 ++--
 quanta/project/projectnewlocal.cpp       | 2 +-
 quanta/project/projectnewweb.cpp         | 4 ++--
 quanta/project/projectoptions.ui.h       | 4 ++--
 quanta/project/projectprivate.cpp        | 6 +++---
 quanta/project/projectupload.cpp         | 6 +++---
 quanta/project/rescanprj.cpp             | 4 ++--
 quanta/project/teammembersdlg.cpp        | 4 ++--
 quanta/project/uploadprofiles.cpp        | 2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'quanta/project')

diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp
index 0e20506c..5301bc29 100644
--- a/quanta/project/eventconfigurationdlg.cpp
+++ b/quanta/project/eventconfigurationdlg.cpp
@@ -21,8 +21,8 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "eventconfigurationdlg.h"
diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp
index 6210e1cd..14f26618 100644
--- a/quanta/project/eventeditordlg.cpp
+++ b/quanta/project/eventeditordlg.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <tdeaction.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
  //app includes
 #include "eventeditordlg.h"
diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp
index b7111b5b..540f931c 100644
--- a/quanta/project/membereditdlg.cpp
+++ b/quanta/project/membereditdlg.cpp
@@ -21,10 +21,10 @@
 #include <kdialogbase.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 //app includes
 #include "listdlg.h"
diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp
index 596ce6c8..107ba14a 100644
--- a/quanta/project/project.cpp
+++ b/quanta/project/project.cpp
@@ -33,9 +33,9 @@
 #include <kdirwatch.h>
 #include <tdeio/netaccess.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kprogress.h>
 #include <kstringhandler.h>
diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp
index c60a9ac2..ce9faf08 100644
--- a/quanta/project/projectnewgeneral.cpp
+++ b/quanta/project/projectnewgeneral.cpp
@@ -28,8 +28,8 @@
 // kde includes
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <kprotocolinfo.h>
 #include <tdeversion.h>
diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp
index b430b43b..1f4750b1 100644
--- a/quanta/project/projectnewlocal.cpp
+++ b/quanta/project/projectnewlocal.cpp
@@ -26,7 +26,7 @@
 #include <tqregexp.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp
index 7d62d276..d1692ab6 100644
--- a/quanta/project/projectnewweb.cpp
+++ b/quanta/project/projectnewweb.cpp
@@ -25,11 +25,11 @@
 #include <tqcombobox.h>
 
 // kde includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kled.h>
 
 // app includes
diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h
index ef8ab07d..54871a6c 100644
--- a/quanta/project/projectoptions.ui.h
+++ b/quanta/project/projectoptions.ui.h
@@ -18,8 +18,8 @@
 #include <kcombobox.h>
 #include <tdefiledialog.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 
 void ProjectOptions::buttonTemplate_clicked()
diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp
index defbc145..08f0f4b5 100644
--- a/quanta/project/projectprivate.cpp
+++ b/quanta/project/projectprivate.cpp
@@ -36,13 +36,13 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp
index e61f6249..481ea134 100644
--- a/quanta/project/projectupload.cpp
+++ b/quanta/project/projectupload.cpp
@@ -37,18 +37,18 @@
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprotocolinfo.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>
 #include <kpassdlg.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kuser.h>
 
 //standard includes
diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp
index e04fd444..e78eb438 100644
--- a/quanta/project/rescanprj.cpp
+++ b/quanta/project/rescanprj.cpp
@@ -24,9 +24,9 @@
 // kde includes
 #include <kdebug.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprogress.h>
 
 // app includes
diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp
index fe13a530..1d2516f5 100644
--- a/quanta/project/teammembersdlg.cpp
+++ b/quanta/project/teammembersdlg.cpp
@@ -21,8 +21,8 @@
 #include <kdialogbase.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "teammembersdlg.h"
diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp
index b0e0d489..25166e98 100644
--- a/quanta/project/uploadprofiles.cpp
+++ b/quanta/project/uploadprofiles.cpp
@@ -19,7 +19,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // app includes
 #include "servertreeview.h"
-- 
cgit v1.2.1