From 281d226f744d70a826a3bffff1ee964ef5915d4f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:44:58 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 src/projects/k3baudioburndialog.cpp                 | 4 ++--
 src/projects/k3baudiocdtextwidget.cpp               | 2 +-
 src/projects/k3baudiodatasourceeditwidget.cpp       | 2 +-
 src/projects/k3baudiotrackaddingdialog.cpp          | 4 ++--
 src/projects/k3baudiotrackdialog.cpp                | 2 +-
 src/projects/k3baudiotrackplayer.cpp                | 2 +-
 src/projects/k3baudiotracksplitdialog.cpp           | 2 +-
 src/projects/k3baudiotracktrmlookupdialog.cpp       | 6 +++---
 src/projects/k3baudiotrackview.cpp                  | 4 ++--
 src/projects/k3baudiotrackwidget.cpp                | 2 +-
 src/projects/k3baudioview.cpp                       | 4 ++--
 src/projects/k3bbootimagedialog.cpp                 | 2 +-
 src/projects/k3bbootimageview.cpp                   | 4 ++--
 src/projects/k3bdataadvancedimagesettingswidget.cpp | 2 +-
 src/projects/k3bdataburndialog.cpp                  | 4 ++--
 src/projects/k3bdatadirtreeview.cpp                 | 2 +-
 src/projects/k3bdatafileview.cpp                    | 2 +-
 src/projects/k3bdataimagesettingswidget.cpp         | 4 ++--
 src/projects/k3bdatamultisessioncombobox.cpp        | 2 +-
 src/projects/k3bdatapropertiesdialog.cpp            | 2 +-
 src/projects/k3bdatasessionimportdialog.cpp         | 4 ++--
 src/projects/k3bdataurladdingdialog.cpp             | 6 +++---
 src/projects/k3bdataview.cpp                        | 4 ++--
 src/projects/k3bdataviewitem.cpp                    | 2 +-
 src/projects/k3bdvdburndialog.cpp                   | 4 ++--
 src/projects/k3bdvdview.cpp                         | 2 +-
 src/projects/k3bfillstatusdisplay.cpp               | 6 +++---
 src/projects/k3bmixedburndialog.cpp                 | 4 ++--
 src/projects/k3bmixeddirtreeview.cpp                | 2 +-
 src/projects/k3bmixedview.cpp                       | 4 ++--
 src/projects/k3bmovixburndialog.cpp                 | 4 ++--
 src/projects/k3bmovixdvdburndialog.cpp              | 4 ++--
 src/projects/k3bmovixdvdview.cpp                    | 2 +-
 src/projects/k3bmovixlistview.cpp                   | 2 +-
 src/projects/k3bmovixoptionswidget.cpp              | 4 ++--
 src/projects/k3bmovixview.cpp                       | 4 ++--
 src/projects/k3bmusicbrainzjob.cpp                  | 4 ++--
 src/projects/k3bprojectburndialog.cpp               | 6 +++---
 src/projects/k3bvcdburndialog.cpp                   | 4 ++--
 src/projects/k3bvcdlistview.cpp                     | 2 +-
 src/projects/k3bvcdtrackdialog.cpp                  | 2 +-
 src/projects/k3bvcdview.cpp                         | 4 ++--
 src/projects/k3bvideodvdburndialog.cpp              | 4 ++--
 src/projects/k3bvideodvdview.cpp                    | 4 ++--
 src/projects/k3bview.cpp                            | 4 ++--
 src/projects/kostore/koStore.cc                     | 4 ++--
 46 files changed, 77 insertions(+), 77 deletions(-)

(limited to 'src/projects')

diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 8274f3b..8e4fff8 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -49,10 +49,10 @@
 #include <tqhbox.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 K3bAudioBurnDialog::K3bAudioBurnDialog(K3bAudioDoc* _doc, TQWidget *parent, const char *name, bool modal )
diff --git a/src/projects/k3baudiocdtextwidget.cpp b/src/projects/k3baudiocdtextwidget.cpp
index a1dff26..6b8dda6 100644
--- a/src/projects/k3baudiocdtextwidget.cpp
+++ b/src/projects/k3baudiocdtextwidget.cpp
@@ -28,7 +28,7 @@
 #include <tqgroupbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 
diff --git a/src/projects/k3baudiodatasourceeditwidget.cpp b/src/projects/k3baudiodatasourceeditwidget.cpp
index 438cd83..84b943b 100644
--- a/src/projects/k3baudiodatasourceeditwidget.cpp
+++ b/src/projects/k3baudiodatasourceeditwidget.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 
diff --git a/src/projects/k3baudiotrackaddingdialog.cpp b/src/projects/k3baudiotrackaddingdialog.cpp
index 42fe2ce..30ff9df 100644
--- a/src/projects/k3baudiotrackaddingdialog.cpp
+++ b/src/projects/k3baudiotrackaddingdialog.cpp
@@ -25,9 +25,9 @@
 #include <k3bthreadjob.h>
 #include <k3bcuefileparser.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index 8e20636..7871b1e 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqwhatsthis.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kmimetype.h>
 #include <kurl.h>
diff --git a/src/projects/k3baudiotrackplayer.cpp b/src/projects/k3baudiotrackplayer.cpp
index 57e7ebb..8cb7633 100644
--- a/src/projects/k3baudiotrackplayer.cpp
+++ b/src/projects/k3baudiotrackplayer.cpp
@@ -19,7 +19,7 @@
 #include <k3baudioserver.h>
 
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqslider.h>
 #include <tqtimer.h>
diff --git a/src/projects/k3baudiotracksplitdialog.cpp b/src/projects/k3baudiotracksplitdialog.cpp
index f0c7fcb..3ba799b 100644
--- a/src/projects/k3baudiotracksplitdialog.cpp
+++ b/src/projects/k3baudiotracksplitdialog.cpp
@@ -20,7 +20,7 @@
 #include <k3bmsf.h>
 #include <k3bmsfedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeactioncollection.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 3e21a54..07c6027 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -25,11 +25,11 @@
 #include <k3baudiofile.h>
 #include <k3bpassivepopup.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp
index b24c5f3..0786f70 100644
--- a/src/projects/k3baudiotrackview.cpp
+++ b/src/projects/k3baudiotrackview.cpp
@@ -52,12 +52,12 @@
 
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 
 
diff --git a/src/projects/k3baudiotrackwidget.cpp b/src/projects/k3baudiotrackwidget.cpp
index 76f0c97..9c9860e 100644
--- a/src/projects/k3baudiotrackwidget.cpp
+++ b/src/projects/k3baudiotrackwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqtabwidget.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp
index de903e3..1c226a3 100644
--- a/src/projects/k3baudioview.cpp
+++ b/src/projects/k3baudioview.cpp
@@ -42,10 +42,10 @@
 #include <tqstring.h>
 
 // KDE-includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 
diff --git a/src/projects/k3bbootimagedialog.cpp b/src/projects/k3bbootimagedialog.cpp
index a722736..88c40af 100644
--- a/src/projects/k3bbootimagedialog.cpp
+++ b/src/projects/k3bbootimagedialog.cpp
@@ -17,7 +17,7 @@
 #include "k3bbootimagedialog.h"
 #include "k3bbootimageview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bBootImageDialog::K3bBootImageDialog( K3bDataDoc* doc, 
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index 7b3e2f4..85c00bd 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -19,11 +19,11 @@
 #include "k3bbootitem.h"
 #include <k3bintvalidator.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tdefiledialog.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 #include <tqstring.h>
diff --git a/src/projects/k3bdataadvancedimagesettingswidget.cpp b/src/projects/k3bdataadvancedimagesettingswidget.cpp
index be1cb17..cd8af5e 100644
--- a/src/projects/k3bdataadvancedimagesettingswidget.cpp
+++ b/src/projects/k3bdataadvancedimagesettingswidget.cpp
@@ -30,7 +30,7 @@
 
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index 3df6c2a..6b0abdd 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -51,9 +51,9 @@
 #include <tqspinbox.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/src/projects/k3bdatadirtreeview.cpp b/src/projects/k3bdatadirtreeview.cpp
index cb35a18..1aa154c 100644
--- a/src/projects/k3bdatadirtreeview.cpp
+++ b/src/projects/k3bdatadirtreeview.cpp
@@ -30,7 +30,7 @@
 #include <tqheader.h>
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
diff --git a/src/projects/k3bdatafileview.cpp b/src/projects/k3bdatafileview.cpp
index d703d2f..b928256 100644
--- a/src/projects/k3bdatafileview.cpp
+++ b/src/projects/k3bdatafileview.cpp
@@ -37,7 +37,7 @@
 #include <tqheader.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
diff --git a/src/projects/k3bdataimagesettingswidget.cpp b/src/projects/k3bdataimagesettingswidget.cpp
index ced699c..08cda53 100644
--- a/src/projects/k3bdataimagesettingswidget.cpp
+++ b/src/projects/k3bdataimagesettingswidget.cpp
@@ -28,8 +28,8 @@
 #include <tqwhatsthis.h>
 #include <tqlayout.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 
diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp
index aa038eb..1c5f3d7 100644
--- a/src/projects/k3bdatamultisessioncombobox.cpp
+++ b/src/projects/k3bdatamultisessioncombobox.cpp
@@ -15,7 +15,7 @@
 
 #include "k3bdatamultisessioncombobox.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqwhatsthis.h>
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 183f47c..970d607 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -33,7 +33,7 @@
 
 #include <klineedit.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <tdeio/global.h>
diff --git a/src/projects/k3bdatasessionimportdialog.cpp b/src/projects/k3bdatasessionimportdialog.cpp
index bf5d263..6ccaec2 100644
--- a/src/projects/k3bdatasessionimportdialog.cpp
+++ b/src/projects/k3bdatasessionimportdialog.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 #include <tqapplication.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 K3bDataSessionImportDialog::K3bDataSessionImportDialog( TQWidget* parent )
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 9bf28db..b110a6d 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -41,12 +41,12 @@
 #include <k3bsignalwaiter.h>
 #include <k3bexternalbinmanager.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdguiitem.h>
 #include <tdeconfig.h>
 #include <ksqueezedtextlabel.h>
diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp
index 63584f2..89653be 100644
--- a/src/projects/k3bdataview.cpp
+++ b/src/projects/k3bdataview.cpp
@@ -31,12 +31,12 @@
 #include <k3btoolbox.h>
 #include <k3bvalidators.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeio/job.h>
 #include <kdialogbase.h>
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index 1534363..fb42b67 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeio/global.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kurl.h>
 #include <kpixmapeffect.h>
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index decfca8..3fccbed 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -29,9 +29,9 @@
 #include <k3bglobalsettings.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bdvdview.cpp b/src/projects/k3bdvdview.cpp
index c245e04..7119a0e 100644
--- a/src/projects/k3bdvdview.cpp
+++ b/src/projects/k3bdvdview.cpp
@@ -19,7 +19,7 @@
 #include <k3bfillstatusdisplay.h>
 #include <k3bdatafileview.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name )
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index b2d2e2a..fca7f89 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -41,14 +41,14 @@
 
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kpixmapeffect.h>
 
 
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index b956e67..43b798d 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -52,11 +52,11 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 K3bMixedBurnDialog::K3bMixedBurnDialog( K3bMixedDoc* doc, TQWidget *parent, const char *name, bool modal )
diff --git a/src/projects/k3bmixeddirtreeview.cpp b/src/projects/k3bmixeddirtreeview.cpp
index dd644b5..f279054 100644
--- a/src/projects/k3bmixeddirtreeview.cpp
+++ b/src/projects/k3bmixeddirtreeview.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class K3bMixedDirTreeView::PrivateAudioRootViewItem : public K3bListViewItem
diff --git a/src/projects/k3bmixedview.cpp b/src/projects/k3bmixedview.cpp
index 1647ef6..ee1b4f4 100644
--- a/src/projects/k3bmixedview.cpp
+++ b/src/projects/k3bmixedview.cpp
@@ -37,10 +37,10 @@
 #include <tqvaluelist.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeactionclasses.h>
 
 
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index 189ee4f..a5ae170 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -30,9 +30,9 @@
 #include <k3bwritingmodewidget.h>
 #include <k3bcore.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 0dddd81..c17bc7d 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -32,8 +32,8 @@
 #include <k3bcore.h>
 #include <k3bglobalsettings.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/src/projects/k3bmovixdvdview.cpp b/src/projects/k3bmovixdvdview.cpp
index ae1e5a7..7c8d7d3 100644
--- a/src/projects/k3bmovixdvdview.cpp
+++ b/src/projects/k3bmovixdvdview.cpp
@@ -19,7 +19,7 @@
 #include <k3bmovixlistview.h>
 #include <k3bfillstatusdisplay.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 K3bMovixDvdView::K3bMovixDvdView( K3bMovixDvdDoc* doc, TQWidget *parent, const char *name )
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index 299b415..2c9deda 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -19,7 +19,7 @@
 #include "k3bmovixfileitem.h"
 #include <k3bdiritem.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/global.h>
 #include <kurldrag.h>
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 9ede404..dfa7882 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -19,9 +19,9 @@
 #include "k3bmovixprogram.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bmovixview.cpp b/src/projects/k3bmovixview.cpp
index 85d8312..0780c08 100644
--- a/src/projects/k3bmovixview.cpp
+++ b/src/projects/k3bmovixview.cpp
@@ -25,12 +25,12 @@
 #include <k3bprojectplugin.h>
 #include <k3btoolbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 #include <tqlayout.h>
diff --git a/src/projects/k3bmusicbrainzjob.cpp b/src/projects/k3bmusicbrainzjob.cpp
index d39b88c..0a6ca8d 100644
--- a/src/projects/k3bmusicbrainzjob.cpp
+++ b/src/projects/k3bmusicbrainzjob.cpp
@@ -27,9 +27,9 @@
 #include <k3baudiodatasource.h>
 #include <k3bsimplejobhandler.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 // determine one trm
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index 52a9707..e03b175 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -39,13 +39,13 @@
 #include <tqspinbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kguiitem.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index fa5a262..4290f4f 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -27,9 +27,9 @@
 #include <tqtoolbutton.h>
 #include <tqfileinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>
 #include <tdeapplication.h>
diff --git a/src/projects/k3bvcdlistview.cpp b/src/projects/k3bvcdlistview.cpp
index 8035cd7..dd06d68 100644
--- a/src/projects/k3bvcdlistview.cpp
+++ b/src/projects/k3bvcdlistview.cpp
@@ -26,7 +26,7 @@
 #include <kiconloader.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kdialog.h>
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index 58c7d5e..4b4c72a 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -33,7 +33,7 @@
 // Kde Includes
 #include <kiconloader.h>
 #include <tdeio/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <knuminput.h>
 #include <kurl.h>
diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp
index 5c8a2ed..2df5c70 100644
--- a/src/projects/k3bvcdview.cpp
+++ b/src/projects/k3bvcdview.cpp
@@ -19,10 +19,10 @@
 
 
 // KDE-includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // K3b Includes
 #include "k3bvcdview.h"
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index 1479ffc..15ffcc3 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -28,9 +28,9 @@
 #include <k3bglobalsettings.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>
diff --git a/src/projects/k3bvideodvdview.cpp b/src/projects/k3bvideodvdview.cpp
index 3bcc328..ae70fa0 100644
--- a/src/projects/k3bvideodvdview.cpp
+++ b/src/projects/k3bvideodvdview.cpp
@@ -24,8 +24,8 @@
 #include <k3btoolbox.h>
 #include <k3bprojectplugin.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeactioncollection.h>
 
 #include <tqsplitter.h>
diff --git a/src/projects/k3bview.cpp b/src/projects/k3bview.cpp
index 66b05a4..df3384d 100644
--- a/src/projects/k3bview.cpp
+++ b/src/projects/k3bview.cpp
@@ -24,8 +24,8 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 // application specific includes
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index dcaf5d0..655263f 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -35,8 +35,8 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 //#define DefaultFormat KoStore::Tar
-- 
cgit v1.2.1