summaryrefslogtreecommitdiffstats
path: root/kmix/mixer.cpp
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 /kmix/mixer.cpp
parent9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff)
downloadtdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz
tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kmix/mixer.cpp')
-rw-r--r--kmix/mixer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/mixer.cpp b/kmix/mixer.cpp
index fc5a06f6..ba3bfee8 100644
--- a/kmix/mixer.cpp
+++ b/kmix/mixer.cpp
@@ -22,9 +22,9 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <dcopobject.h>