3 files changed, 15 insertions, 14 deletions
diff --git a/languages/cpp/app_templates/opiemenu/app.pro b/languages/cpp/app_templates/opiemenu/app.pro
index 71bc208c..f9600bf4 100644
--- a/languages/cpp/app_templates/opiemenu/app.pro
+++ b/languages/cpp/app_templates/opiemenu/app.pro
@@ -6,8 +6,8 @@ TARGET		= %{APPNAMELC}
 
 
 QUICK_SPEC_FOO = $$(OPIE_BUILD_QUICK_APP)
-contains( TEMPLATE, quick-template ){
-        contains( QUICK_SPEC_FOO, quick-app-lib ){
+tqcontains( TEMPLATE, quick-template ){
+        tqcontains( QUICK_SPEC_FOO, quick-app-lib ){
                 message( "foo" )
                 system( rm $$TARGET )
                 system( ln -s $$(OPIEDIR)/bin/quicklauncher $$TARGET)
diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
index 17b59a3e..9d953663 100644
--- a/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opiemenu/simpleimpl.cpp
@@ -1,7 +1,7 @@
 #include "%{APPNAMELC}.h"
 
-#include <qpe/applnk.h>
-#include <qpe/resource.h>
+#include <tqpe/applnk.h>
+#include <tqpe/resource.h>
 
 /* QT */
 #include <tqiconset.h>
@@ -57,22 +57,22 @@ void %{APPNAME}::activated()
 }
 
 
-QRESULT %{APPNAME}::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+TQRESULT %{APPNAME}::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface )
 {
     *iface = 0;
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
         *iface = this;
     else if ( uuid == IID_MenuApplet )
         *iface = this;
     else
-	return QS_FALSE;
+	return TQS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
-Q_EXPORT_INTERFACE()
+TQ_EXPORT_INTERFACE()
 {
-    Q_CREATE_INSTANCE( %{APPNAME} )
+    TQ_CREATE_INSTANCE( %{APPNAME} )
 }
diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h
index b384ee2d..61c3cc5b 100644
--- a/languages/cpp/app_templates/opiemenu/simpleimpl.h
+++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h
@@ -1,7 +1,7 @@
 #ifndef %{APPNAME}_MENU_APPLET_H
 #define %{APPNAME}_MENU_APPLET_H
 
-#include <qpe/menuappletinterface.h>
+#include <tqpe/menuappletinterface.h>
 
 #include <tqobject.h>
 
@@ -9,13 +9,14 @@ class %{APPNAME} : public TQObject, public MenuAppletInterface
 {
 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     %{APPNAME} ( );
     virtual ~%{APPNAME} ( );
 
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
+    TQ_REFCOUNT
 
     virtual int position() const;
     
@@ -25,7 +26,7 @@ public:
     /* virtual TQString tr( const char* ) const;
     virtual TQString tr( const char*, const char* ) const;
     */
-    virtual TQPopupMenu *popup ( TQWidget *parent ) const;
+    virtual TQPopupMenu *popup ( TQWidget *tqparent ) const;
     virtual void activated ( );
 };