summaryrefslogtreecommitdiffstats
path: root/libk3b/tools
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 /libk3b/tools
parente8585949197fd7b5423328b0aeb8cceffa18f0db (diff)
downloadk3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz
k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/tools')
-rw-r--r--libk3b/tools/k3bbusywidget.cpp2
-rw-r--r--libk3b/tools/k3bdevicecombobox.cpp2
-rw-r--r--libk3b/tools/k3bdeviceselectiondialog.cpp2
-rw-r--r--libk3b/tools/k3bdirsizejob.cpp2
-rw-r--r--libk3b/tools/k3bintvalidator.cpp4
-rw-r--r--libk3b/tools/k3bmd5job.cpp2
-rw-r--r--libk3b/tools/k3bmultichoicedialog.cpp2
-rw-r--r--libk3b/tools/k3bprogressdialog.cpp2
-rw-r--r--libk3b/tools/k3bpushbutton.cpp2
-rw-r--r--libk3b/tools/k3brichtextlabel.cpp2
-rw-r--r--libk3b/tools/k3bstdguiitems.cpp2
-rw-r--r--libk3b/tools/k3btempfile.cpp2
-rw-r--r--libk3b/tools/k3btempfile.h2
-rw-r--r--libk3b/tools/k3btoolbutton.cpp2
14 files changed, 15 insertions, 15 deletions
diff --git a/libk3b/tools/k3bbusywidget.cpp b/libk3b/tools/k3bbusywidget.cpp
index 929e1f1..f9e7bc3 100644
--- a/libk3b/tools/k3bbusywidget.cpp
+++ b/libk3b/tools/k3bbusywidget.cpp
@@ -18,7 +18,7 @@
#include <tqtimer.h>
#include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
K3bBusyWidget::K3bBusyWidget( TQWidget* parent, const char* name )
diff --git a/libk3b/tools/k3bdevicecombobox.cpp b/libk3b/tools/k3bdevicecombobox.cpp
index 8d2870c..0ca6075 100644
--- a/libk3b/tools/k3bdevicecombobox.cpp
+++ b/libk3b/tools/k3bdevicecombobox.cpp
@@ -18,7 +18,7 @@
#include <k3bdevicemanager.h>
#include <k3bcore.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqmap.h>
#include <tqptrvector.h>
diff --git a/libk3b/tools/k3bdeviceselectiondialog.cpp b/libk3b/tools/k3bdeviceselectiondialog.cpp
index 0c6c3f4..f457adb 100644
--- a/libk3b/tools/k3bdeviceselectiondialog.cpp
+++ b/libk3b/tools/k3bdeviceselectiondialog.cpp
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
class K3bDeviceSelectionDialog::Private
diff --git a/libk3b/tools/k3bdirsizejob.cpp b/libk3b/tools/k3bdirsizejob.cpp
index 131e0ff..646e38a 100644
--- a/libk3b/tools/k3bdirsizejob.cpp
+++ b/libk3b/tools/k3bdirsizejob.cpp
@@ -21,7 +21,7 @@
#include <k3bglobals.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqfileinfo.h>
#include <tqdir.h>
diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp
index 725de5a..a4d20d4 100644
--- a/libk3b/tools/k3bintvalidator.cpp
+++ b/libk3b/tools/k3bintvalidator.cpp
@@ -19,8 +19,8 @@
#include "k3bintvalidator.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp
index 394f94d..39eff96 100644
--- a/libk3b/tools/k3bmd5job.cpp
+++ b/libk3b/tools/k3bmd5job.cpp
@@ -21,7 +21,7 @@
#include <k3bfilesplitter.h>
#include <kmdcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp
index 9c7dcc5..c502d95 100644
--- a/libk3b/tools/k3bmultichoicedialog.cpp
+++ b/libk3b/tools/k3bmultichoicedialog.cpp
@@ -45,7 +45,7 @@ public:
};
-// from kmessagebox.cpp
+// from tdemessagebox.cpp
static TQPixmap themedMessageBoxIcon(TQMessageBox::Icon icon)
{
TQString icon_name;
diff --git a/libk3b/tools/k3bprogressdialog.cpp b/libk3b/tools/k3bprogressdialog.cpp
index fe7b2af..f510622 100644
--- a/libk3b/tools/k3bprogressdialog.cpp
+++ b/libk3b/tools/k3bprogressdialog.cpp
@@ -23,7 +23,7 @@
#include <tqframe.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp
index a80374d..780a338 100644
--- a/libk3b/tools/k3bpushbutton.cpp
+++ b/libk3b/tools/k3bpushbutton.cpp
@@ -19,7 +19,7 @@
#include <tqpopupmenu.h>
#include <tqevent.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeapplication.h>
diff --git a/libk3b/tools/k3brichtextlabel.cpp b/libk3b/tools/k3brichtextlabel.cpp
index 36c0a63..70edeae 100644
--- a/libk3b/tools/k3brichtextlabel.cpp
+++ b/libk3b/tools/k3brichtextlabel.cpp
@@ -19,7 +19,7 @@
#include <tqstylesheet.h>
#include <tqsimplerichtext.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
static TQString qrichtextify( const TQString& text )
{
diff --git a/libk3b/tools/k3bstdguiitems.cpp b/libk3b/tools/k3bstdguiitems.cpp
index c8fee1b..87f3542 100644
--- a/libk3b/tools/k3bstdguiitems.cpp
+++ b/libk3b/tools/k3bstdguiitems.cpp
@@ -22,7 +22,7 @@
#include <tqframe.h>
#include <tqpalette.h>
-#include <klocale.h>
+#include <tdelocale.h>
TQCheckBox* K3bStdGuiItems::simulateCheckbox( TQWidget* parent, const char* name )
diff --git a/libk3b/tools/k3btempfile.cpp b/libk3b/tools/k3btempfile.cpp
index 0136f91..55d8491 100644
--- a/libk3b/tools/k3btempfile.cpp
+++ b/libk3b/tools/k3btempfile.cpp
@@ -15,7 +15,7 @@
#include "k3btempfile.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
diff --git a/libk3b/tools/k3btempfile.h b/libk3b/tools/k3btempfile.h
index 4b18164..03dc75f 100644
--- a/libk3b/tools/k3btempfile.h
+++ b/libk3b/tools/k3btempfile.h
@@ -16,7 +16,7 @@
#ifndef _K3B_TEMP_FILE_H_
#define _K3B_TEMP_FILE_H_
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <k3b_export.h>
diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp
index f9b72ff..cdc26b9 100644
--- a/libk3b/tools/k3btoolbutton.cpp
+++ b/libk3b/tools/k3btoolbutton.cpp
@@ -19,7 +19,7 @@
#include <tqpainter.h>
#include <tqevent.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeapplication.h>