summaryrefslogtreecommitdiffstats
path: root/kaudiocreator
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:58:20 -0600
commit6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch)
tree027fb6e879e17c2d65cbea9eab5c9da028618972 /kaudiocreator
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kaudiocreator')
-rw-r--r--kaudiocreator/encodefileimp.cpp2
-rw-r--r--kaudiocreator/encoder.cpp2
-rw-r--r--kaudiocreator/encoderconfigimp.cpp4
-rw-r--r--kaudiocreator/job.h2
-rw-r--r--kaudiocreator/jobqueimp.cpp4
-rw-r--r--kaudiocreator/kaudiocreator.cpp2
-rw-r--r--kaudiocreator/ripper.cpp4
-rw-r--r--kaudiocreator/tracksimp.cpp2
-rw-r--r--kaudiocreator/tracksimp.h2
-rw-r--r--kaudiocreator/wizard.ui.h2
10 files changed, 13 insertions, 13 deletions
diff --git a/kaudiocreator/encodefileimp.cpp b/kaudiocreator/encodefileimp.cpp
index 59f32405..75f79736 100644
--- a/kaudiocreator/encodefileimp.cpp
+++ b/kaudiocreator/encodefileimp.cpp
@@ -25,7 +25,7 @@
#include <tqlineedit.h>
#include <kurlrequester.h>
#include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
EncodeFileImp::EncodeFileImp(TQWidget* parent,
const char* name) : EncodeFile(parent, name), m_genres(KCDDB::Genres()) {
diff --git a/kaudiocreator/encoder.cpp b/kaudiocreator/encoder.cpp
index 9ef0f562..9cc729a6 100644
--- a/kaudiocreator/encoder.cpp
+++ b/kaudiocreator/encoder.cpp
@@ -27,7 +27,7 @@
#include <tqregexp.h>
#include <tqdir.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <kdebug.h>
#include <knotifyclient.h>
diff --git a/kaudiocreator/encoderconfigimp.cpp b/kaudiocreator/encoderconfigimp.cpp
index b02ca614..2865dce3 100644
--- a/kaudiocreator/encoderconfigimp.cpp
+++ b/kaudiocreator/encoderconfigimp.cpp
@@ -25,8 +25,8 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tdeconfigdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
/**
diff --git a/kaudiocreator/job.h b/kaudiocreator/job.h
index bb65eed9..c314976e 100644
--- a/kaudiocreator/job.h
+++ b/kaudiocreator/job.h
@@ -22,7 +22,7 @@
#define JOB_H
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
/**
* The job class is what is passed around the system. All of the data about
diff --git a/kaudiocreator/jobqueimp.cpp b/kaudiocreator/jobqueimp.cpp
index 1083f738..5ea164e3 100644
--- a/kaudiocreator/jobqueimp.cpp
+++ b/kaudiocreator/jobqueimp.cpp
@@ -25,10 +25,10 @@
#include <tqlabel.h>
#include <tqpainter.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tqfile.h>
#include <tqregexp.h>
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index b05af4b2..1c2cd02e 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -23,7 +23,7 @@
#include <tqvbox.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <tdeaction.h>
#include <kstatusbar.h>
diff --git a/kaudiocreator/ripper.cpp b/kaudiocreator/ripper.cpp
index 2060278f..89db60f1 100644
--- a/kaudiocreator/ripper.cpp
+++ b/kaudiocreator/ripper.cpp
@@ -23,8 +23,8 @@
#include <tqfile.h>
#include <tqtimer.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kstandarddirs.h>
#include <tdeio/scheduler.h>
diff --git a/kaudiocreator/tracksimp.cpp b/kaudiocreator/tracksimp.cpp
index 8885243d..0d7ab5cd 100644
--- a/kaudiocreator/tracksimp.cpp
+++ b/kaudiocreator/tracksimp.cpp
@@ -29,7 +29,7 @@
#include <kinputdialog.h>
#include <tdelistview.h>
#include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurl.h>
#include <tqfileinfo.h>
diff --git a/kaudiocreator/tracksimp.h b/kaudiocreator/tracksimp.h
index 26d3705e..72c33396 100644
--- a/kaudiocreator/tracksimp.h
+++ b/kaudiocreator/tracksimp.h
@@ -24,7 +24,7 @@
#include "tracks.h"
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
// CDDB support via libkcddb
#include <libkcddb/client.h>
diff --git a/kaudiocreator/wizard.ui.h b/kaudiocreator/wizard.ui.h
index cbd6ca68..ce69c172 100644
--- a/kaudiocreator/wizard.ui.h
+++ b/kaudiocreator/wizard.ui.h
@@ -29,7 +29,7 @@
#include <tqstring.h>
#include <tqregexp.h>
#include <tqmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "job.h"
void fileWizard::homePressed()