From b59d8a0d7ea3e9d963898d2cc7437fb3fd821176 Mon Sep 17 00:00:00 2001
From: Darrell Anderson <humanreadable@yahoo.com>
Date: Sun, 21 Oct 2012 14:57:17 -0500
Subject: [PATCH] Fix inadvertent tq changes. (cherry picked from commit
 cf33cddcf8873297c569421effe4a128d70e1b06)

---
 amarok/src/amarok_play_audiocd.desktop |  4 ++--
 amarok/src/engine/helix/Makefile.test  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/amarok/src/amarok_play_audiocd.desktop b/amarok/src/amarok_play_audiocd.desktop
index b363be0e..6ccd96ec 100644
--- a/amarok/src/amarok_play_audiocd.desktop
+++ b/amarok/src/amarok_play_audiocd.desktop
@@ -35,11 +35,11 @@ Name[ne]=अमारोकसँग अडियो सीडी बजाउ
 Name[nl]=Audio-cd met Amarok afspelen
 Name[nn]=Spel lyd-CD med Amarok
 Name[pa]=ਅਮਰੋਕ ਨਾਲ ਆਡੀਓ CD ਚਲਾਓ
-Name[pl]=Odtwórz Audio CD za potqmocą Amarok
+Name[pl]=Odtwórz Audio CD za pomocą Amarok
 Name[pt]=Tocar o CD de Áudio com o Amarok
 Name[pt_BR]=Reproduzir CD de Áudio com o Amarok
 Name[se]=Čuojat jietna-CD:a Amarokain
-Name[sk]=Zahrať Audio CD potqmocou Amarok
+Name[sk]=Zahrať Audio CD pomocou Amarok
 Name[sr]=Пусти аудио CD помоћу Amarok-а
 Name[sr@Latn]=Pusti audio CD pomoću Amarok-a
 Name[sv]=Spela ljud-cd med Amarok
diff --git a/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test
index fae7489a..64c8d27e 100644
--- a/amarok/src/engine/helix/Makefile.test
+++ b/amarok/src/engine/helix/Makefile.test
@@ -1,14 +1,14 @@
 DEFINES=-DTEST_APP -D_REENTRANT_ -DQT_THREAD_SUPPORT
 
 CXX=g++
-TQMOC=/usr/lib/qt-3.3/bin/tqmoc
+TQMOC=/usr/lib/qt-3.3/bin/moc
 
 CXXFLAGS=-g -fpic -pipe -Wall -Wreturn-type -fno-exceptions --permissive -fno-rtti -Wno-ctor-dtor-privacy -march=pentium -mcpu=pentium  -O2  $(INCLUDES) $(DEFINES)
 
 SRCS=main.cpp hxsplay.cpp
 LIBSRCS=helix-engine.cpp helix-config.cpp hxsplay.cpp
-TQMOCSRCS=helix-engine.tqmoc helix-config.tqmoc
-TQMOCHDRS=$(TQMOCSRCS:.tqmoc=.h)
+TQMOCSRCS=helix-engine.moc helix-config.moc
+TQMOCHDRS=$(TQMOCSRCS:.moc=.h)
 
 OBJS=$(SRCS:.cpp=.o)
 LIBOBJS=$(LIBSRCS:.cpp=.o)
@@ -30,7 +30,7 @@ INCLUDES=\
 
 LIBRARIES=-Lhelix-sp -lhelix-sp --lstdc++ -ldl -lm -L/usr/lib/qt-3.3/lib -lqt-mt
 
-.SUFFIXES: .cpp .so .h .tqmoc
+.SUFFIXES: .cpp .so .h .moc
 
 .c.o: 
 	$(CC) $(CCFLAGS) -o  $@ -c $<
@@ -38,7 +38,7 @@ LIBRARIES=-Lhelix-sp -lhelix-sp --lstdc++ -ldl -lm -L/usr/lib/qt-3.3/lib -lqt-mt
 .cpp.o: 
 	$(CXX) $(CXXFLAGS) -o  $@ -c $<
 
-.h.tqmoc:
+.h.moc:
 	$(TQMOC) $< -o $@
 
 
@@ -69,7 +69,7 @@ uninstall:
 	rm -f /usr/share/services/amarok_helixengine_plugin.desktop
 
 clean: 
-	rm -f $(PROGRAM) $(SLIBRARY) $(LIBOBJS) $(OBJS) helix-engine.tqmoc *~
+	rm -f $(PROGRAM) $(SLIBRARY) $(LIBOBJS) $(OBJS) helix-engine.moc *~
 
 depend: 
 	makedepend $(DEFINES) $(INCLUDES) -o.o -- $(SRCS)
@@ -116,4 +116,4 @@ hxsplay.o: /usr/lib/qt-3.3/include/qwinexport.h /usr/include/string.h
 hxsplay.o: /usr/lib/qt-3.3/include/qnamespace.h
 hxsplay.o: /usr/lib/qt-3.3/include/qmutex.h
 hxsplay.o: /usr/lib/qt-3.3/include/qsemaphore.h
-hxsplay.o: /usr/lib/qt-3.3/include/qwaitcondition.h hxsplay.h hxsplay.tqmoc
+hxsplay.o: /usr/lib/qt-3.3/include/qwaitcondition.h hxsplay.h hxsplay.moc