summaryrefslogtreecommitdiffstats
path: root/src/option
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:44:58 -0600
commit281d226f744d70a826a3bffff1ee964ef5915d4f (patch)
treec42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /src/option
parente8585949197fd7b5423328b0aeb8cceffa18f0db (diff)
downloadk3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz
k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/option')
-rw-r--r--src/option/k3bburningoptiontab.cpp2
-rw-r--r--src/option/k3bcddboptiontab.cpp2
-rw-r--r--src/option/k3bdeviceoptiontab.cpp2
-rw-r--r--src/option/k3bdevicewidget.cpp4
-rw-r--r--src/option/k3bexternalbinoptiontab.cpp4
-rw-r--r--src/option/k3bexternalbinwidget.cpp4
-rw-r--r--src/option/k3bmiscoptiontab.cpp4
-rw-r--r--src/option/k3boptiondialog.cpp2
-rw-r--r--src/option/k3bpluginoptiontab.cpp6
-rw-r--r--src/option/k3bthemeoptiontab.cpp4
10 files changed, 17 insertions, 17 deletions
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 02d680c..6c4079e 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -35,7 +35,7 @@
#include <knuminput.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index fa8f73d..e527481 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -34,7 +34,7 @@
#include <krun.h>
#include <tdelistview.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp
index 6bbb4b0..6fe722b 100644
--- a/src/option/k3bdeviceoptiontab.cpp
+++ b/src/option/k3bdeviceoptiontab.cpp
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index acaf3f2..d4d3cd7 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -21,10 +21,10 @@
#include <k3blistview.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kiconloader.h>
diff --git a/src/option/k3bexternalbinoptiontab.cpp b/src/option/k3bexternalbinoptiontab.cpp
index d34b3a0..3cf5607 100644
--- a/src/option/k3bexternalbinoptiontab.cpp
+++ b/src/option/k3bexternalbinoptiontab.cpp
@@ -18,9 +18,9 @@
#include <k3bexternalbinmanager.h>
#include "k3bexternalbinwidget.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdelistview.h>
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp
index 200de08..e79ac32 100644
--- a/src/option/k3bexternalbinwidget.cpp
+++ b/src/option/k3bexternalbinwidget.cpp
@@ -35,10 +35,10 @@
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <keditlistbox.h>
#include <tdelistview.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeversion.h>
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 49c1f6c..7176364 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -29,11 +29,11 @@
#include <tqradiobutton.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdialog.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
#include <kcombobox.h>
diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp
index 54e3f45..de0f57b 100644
--- a/src/option/k3boptiondialog.cpp
+++ b/src/option/k3boptiondialog.cpp
@@ -31,7 +31,7 @@
#include <tqwhatsthis.h>
#include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeconfig.h>
#include <tdeversion.h>
diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp
index d367584..8f214ee 100644
--- a/src/option/k3bpluginoptiontab.cpp
+++ b/src/option/k3bpluginoptiontab.cpp
@@ -22,12 +22,12 @@
#include <k3blistview.h>
#include <k3bcore.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeversion.h>
#include <tqstringlist.h>
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index 515c4f0..adb27f4 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -19,9 +19,9 @@
#include "k3bthememanager.h"
#include <k3bapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
#include <tdelistview.h>
#include <tdeio/global.h>