4 files changed, 11 insertions, 10 deletions
diff --git a/languages/cpp/app_templates/opieapp/app.pro b/languages/cpp/app_templates/opieapp/app.pro
index f4111696..74323c7c 100644
--- a/languages/cpp/app_templates/opieapp/app.pro
+++ b/languages/cpp/app_templates/opieapp/app.pro
@@ -9,8 +9,8 @@ QMAKE_LIBDIR = $(OPIEDIR)/lib
 OPIE-SPEC=6
 
 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/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp
index ebb4233c..6636116e 100644
--- a/languages/cpp/app_templates/opieapp/example.cpp
+++ b/languages/cpp/app_templates/opieapp/example.cpp
@@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory;
 OPIE_EXPORT_APP( %{APPNAME}Factory )
 
 /*
- *  Constructs a %{APPNAME} which is a child of 'parent', with the
+ *  Constructs a %{APPNAME} which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  */
-%{APPNAME}::%{APPNAME}( TQWidget* parent,  const char* name, WFlags fl )
-    : %{APPNAME}Base( parent, name, fl )
+%{APPNAME}::%{APPNAME}( TQWidget* tqparent,  const char* name, WFlags fl )
+    : %{APPNAME}Base( tqparent, name, fl )
 {
     connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye()));
 }
@@ -20,7 +20,7 @@ OPIE_EXPORT_APP( %{APPNAME}Factory )
  */
 %{APPNAME}::~%{APPNAME}()
 {
-    // no need to delete child widgets, Qt does it all for us
+    // no need to delete child widgets, TQt does it all for us
 }
 
 /*
diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h
index 2a9c9efa..0a8320c9 100644
--- a/languages/cpp/app_templates/opieapp/example.h
+++ b/languages/cpp/app_templates/opieapp/example.h
@@ -5,12 +5,13 @@
 class %{APPNAME} : public %{APPNAME}Base
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     static TQString appName() {
-        return TQString::fromLatin1("%{APPNAMELC}" );
+        return TQString::tqfromLatin1("%{APPNAMELC}" );
     }
-    %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     ~%{APPNAME}();
 
 private slots:
diff --git a/languages/cpp/app_templates/opieapp/examplebase.ui b/languages/cpp/app_templates/opieapp/examplebase.ui
index b6b81b11..1243c341 100644
--- a/languages/cpp/app_templates/opieapp/examplebase.ui
+++ b/languages/cpp/app_templates/opieapp/examplebase.ui
@@ -7,7 +7,7 @@
         <cstring>%{APPNAME}Base</cstring>
     </property>
     <property stdset="1">
-        <name>geometry</name>
+        <name>tqgeometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
@@ -45,5 +45,5 @@
         </widget>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>