summaryrefslogtreecommitdiffstats
path: root/quanta/dialogs/settings
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/settings
parentee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff)
downloadtdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz
tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'quanta/dialogs/settings')
-rw-r--r--quanta/dialogs/settings/abbreviation.cpp6
-rw-r--r--quanta/dialogs/settings/parseroptions.cpp2
-rw-r--r--quanta/dialogs/settings/previewoptions.cpp4
3 files changed, 6 insertions, 6 deletions
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)