3 files changed, 19 insertions, 18 deletions
diff --git a/languages/cpp/app_templates/opieinput/app.pro b/languages/cpp/app_templates/opieinput/app.pro
index 1711c78f..5a3a7a40 100644
--- a/languages/cpp/app_templates/opieinput/app.pro
+++ b/languages/cpp/app_templates/opieinput/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/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
index db2e4285..ea178e59 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp
@@ -3,7 +3,7 @@
 #include <tqlabel.h>
 #include <tqsignalmapper.h>
 #include <tqpushbutton.h>
-#include <qpe/resource.h>
+#include <tqpe/resource.h>
 
 #include "%{APPNAMELC}.h"
 
@@ -58,7 +58,7 @@ void %{APPNAME}::slotKey(int _ke){
 	
 	/*
 	 *  Send the key
-	 * ke is the unicode
+	 * ke is the tqunicode
 	 * _ke + 0x41 is the keycode
 	 *  m_state Normally the state 
 	 * down/up
@@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){
     delete m_icn;
 }
 
-TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, Qt::WFlags f )
+TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f )
 {
     if ( !m_pickboard )
-	m_pickboard = new %{APPNAME}( parent, f );
+	m_pickboard = new %{APPNAME}( tqparent, f );
     return m_pickboard;
 }
 
@@ -133,25 +133,25 @@ void %{APPNAME}Impl::onKeyPress( TQObject *receiver, const char *slot )
 	TQObject::connect( m_pickboard, TQT_SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
-#ifndef QT_NO_COMPONENT
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
+#ifndef TQT_NO_COMPONENT
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid &uuid, TQUnknownInterface **iface )
 {
     *iface = 0;
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
 	*iface = this;
     else if ( uuid == IID_InputMethod )
 	*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}Impl )
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl )
 }
 #endif
 
diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h
index 6d7033f0..76af8138 100644
--- a/languages/cpp/app_templates/opieinput/simpleimpl.h
+++ b/languages/cpp/app_templates/opieinput/simpleimpl.h
@@ -3,12 +3,13 @@
 
 #include <tqhbox.h>
 
-#include <qpe/inputmethodinterface.h>
+#include <tqpe/inputmethodinterface.h>
 
 class TQPixmap;
 class TQCheckBox;
 class %{APPNAME} : public TQHBox {
 	Q_OBJECT
+  TQ_OBJECT
 public:
 	%{APPNAME}( TQWidget *par, WFlags f );
 	~%{APPNAME}();
@@ -31,12 +32,12 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-#ifndef QT_NO_COMPONENT
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
-    Q_REFCOUNT
+#ifndef TQT_NO_COMPONENT
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
+    TQ_REFCOUNT
 #endif
 
-    virtual TQWidget *inputMethod( TQWidget *parent, Qt::WFlags f );
+    virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f );
     virtual void resetState();
     virtual TQPixmap *icon();
     virtual TQString name();