summaryrefslogtreecommitdiffstats
path: root/quanta/dialogs
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
commit279764bab1514a051db18e14241e9bae62be14d6 (patch)
treec587a443a0a228897e395535e2791dbde757bb3d /quanta/dialogs
parentee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff)
downloadtdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz
tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/dialogs')
-rw-r--r--quanta/dialogs/actionconfigdialog.cpp4
-rw-r--r--quanta/dialogs/dirtydlg.cpp2
-rw-r--r--quanta/dialogs/dtepeditdlg.cpp4
-rw-r--r--quanta/dialogs/filecombo.cpp2
-rw-r--r--quanta/dialogs/settings/abbreviation.cpp6
-rw-r--r--quanta/dialogs/settings/parseroptions.cpp2
-rw-r--r--quanta/dialogs/settings/previewoptions.cpp4
-rw-r--r--quanta/dialogs/specialchardialog.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/colorcombo.cpp8
-rw-r--r--quanta/dialogs/tagdialogs/listdlg.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagdialog.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagimgdlg.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagimgdlgdata.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagmaildlg.cpp6
-rw-r--r--quanta/dialogs/tagdialogs/tagmiscdlg.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp2
-rw-r--r--quanta/dialogs/tagdialogs/tagxml.cpp2
17 files changed, 27 insertions, 27 deletions
diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index b9032d6d..a1a53eab 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -32,9 +32,9 @@
#include <kiconloader.h>
#include <kkeybutton.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index 08ce2883..720c3d8a 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -21,7 +21,7 @@
//kde includes
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <tdeio/job.h>
#include <tdeio/jobclasses.h>
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index 13be01e7..c9b12ac7 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -29,8 +29,8 @@
#include <kicondialog.h>
#include <tdelistbox.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
//own includes
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 8f31f692..1293d8b4 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -21,7 +21,7 @@
#include <tqpushbutton.h>
// KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kurl.h>
diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp
index 6524beb9..85d3065b 100644
--- a/quanta/dialogs/settings/abbreviation.cpp
+++ b/quanta/dialogs/settings/abbreviation.cpp
@@ -25,12 +25,12 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
#include <tdelistbox.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
//app includes
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 1f0e8b3c..fac7207b 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -18,7 +18,7 @@
#include <tqcombobox.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
/*
diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp
index 2df03ea9..b5cb7318 100644
--- a/quanta/dialogs/settings/previewoptions.cpp
+++ b/quanta/dialogs/settings/previewoptions.cpp
@@ -20,8 +20,8 @@
#include <tqradiobutton.h>
#include <tqcheckbox.h>
// kde includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
PreviewOptions::PreviewOptions(TQWidget *parent, const char *name)
: PreviewOptionsS(parent,name)
diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp
index aff627ef..3ea29117 100644
--- a/quanta/dialogs/specialchardialog.cpp
+++ b/quanta/dialogs/specialchardialog.cpp
@@ -20,7 +20,7 @@
#include <tqtextstream.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdelistbox.h>
#include <klineedit.h>
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 188f2ca0..5b735fcf 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -46,12 +46,12 @@
#include <kcolordialog.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kpalette.h>
#include <kimageeffect.h>
diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp
index c9b20d5a..eeb6bfc2 100644
--- a/quanta/dialogs/tagdialogs/listdlg.cpp
+++ b/quanta/dialogs/tagdialogs/listdlg.cpp
@@ -17,7 +17,7 @@
//kde include
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
//qt includes
#include <tqpushbutton.h>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index fe466986..7db3c307 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -21,7 +21,7 @@
#include <tqevent.h>
// include kde headers
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdetexteditor/viewcursorinterface.h>
#include <tdeconfig.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index 9a032000..4c9531ee 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -21,7 +21,7 @@
#include <tqimage.h>
//kde includes
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <kurl.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
index a761d62c..97c82811 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp
@@ -8,7 +8,7 @@
(C) 2006 Andras Mantia
**********************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <knumvalidator.h>
#include <kiconloader.h>
diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
index bf78291d..1d2c44be 100644
--- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp
@@ -23,9 +23,9 @@
#include <tdeapplication.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kabc/stdaddressbook.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeabc/stdaddressbook.h>
//qt includes
#include <tqlineedit.h>
diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
index 9313bb08..bea9a81f 100644
--- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp
@@ -15,7 +15,7 @@
#include "tagmiscdlg.h"
#include "tagmisc.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <tqcheckbox.h>
diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
index 44d461c4..be0dff6a 100644
--- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
+++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp
@@ -8,7 +8,7 @@
**********************************************************************/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include "tagquicklistdlg.h"
#include <tqspinbox.h>
diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp
index 0292dc79..2db18a3e 100644
--- a/quanta/dialogs/tagdialogs/tagxml.cpp
+++ b/quanta/dialogs/tagdialogs/tagxml.cpp
@@ -19,7 +19,7 @@
#include "tagattr.h"
#include <klineedit.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqlayout.h>