3 files changed, 32 insertions, 31 deletions

diff --git a/languages/cpp/app_templates/opieapplet/app.pro b/languages/cpp/app_templates/opieapplet/app.pro
index e1cc1e3b..696082d0 100644
--- a/languages/cpp/app_templates/opieapplet/app.pro
+++ b/languages/cpp/app_templates/opieapplet/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/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
index 3264314c..cc2a6a17 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp
@@ -2,14 +2,14 @@
 #include <tqpainter.h>
 #include <tqmessagebox.h>
 
-#include <qpe/applnk.h> // for AppLnk
-#include <qpe/resource.h> // for Resource loading
+#include <tqpe/applnk.h> // for AppLnk
+#include <tqpe/resource.h> // for Resource loading
 
 #include "%{APPNAMELC}.h"
 
 
-%{APPNAME}::%{APPNAME}(TQWidget *parent)
-    : TQWidget( parent,  "%{APPNAME} Applet" ) {
+%{APPNAME}::%{APPNAME}(TQWidget *tqparent)
+    : TQWidget( tqparent,  "%{APPNAME} Applet" ) {
 /*
  * we will load an Image, scale it for the right usage
  * remember your applet might be used by different
@@ -79,7 +79,7 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) {
 %{APPNAME}Impl::~%{APPNAME}Impl() {
     /*
      * we will delete our applets as well
-     * setAUtoDelete makes the QList free
+     * setAUtoDelete makes the TQList free
      * the objects behind the pointers
      */
     m_applets.setAutoDelete( true );
@@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) {
 /*
  * For the taskbar interface return a Widget
  */
-TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) {
+TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) {
     /*
      * There are problems with ownership. So we add
      * our ownlist and clear this;
      */
-    %{APPNAME}* ap = new %{APPNAME}( parent );
+    %{APPNAME}* ap = new %{APPNAME}( tqparent );
     m_applets.append( ap );
 
     return ap;
@@ -109,12 +109,12 @@ int %{APPNAME}Impl::position()const {
 
 
 /*
- * Now the important QUnkownInterface method without
+ * Now the important TQUnkownInterface method without
  * this one your applet won't load
  * @param uuid The uuid of the interface
  * @param iface The pointer to the interface ptr
  */
-QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** iface) {
+TQRESULT %{APPNAME}Impl::queryInterface( const TQUuid& uuid, TQUnknownInterface** iface) {
     /* set the pointer to the interface to 0 */
     *iface = 0;
 
@@ -128,24 +128,24 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i
      * Now the caller knows that the Interface Pointer
      * is valid and the interface supported
      */
-    if ( uuid == IID_QUnknown )
+    if ( uuid == IID_TQUnknown )
         *iface = this;
     else if ( uuid == IID_TaskbarApplet )
         *iface = this;
     else
-        return QS_FALSE;
+        return TQS_FALSE;
 
     if ( *iface )
         (*iface)->addRef();
 
-    return QS_OK;
+    return TQS_OK;
 }
 
 
 /*
  * Finally we need to export the Interface.
  * CREATE_INSTANCE creates a interface and calls
- * queryInterface for the QUnknownInterface once
+ * queryInterface for the TQUnknownInterface once
  * With out this function the applet can't be loaded.
  *
  * NOTE: If your applet does not load it's likely you've an
@@ -156,7 +156,7 @@ QRESULT %{APPNAME}Impl::queryInterface( const QUuid& uuid, QUnknownInterface** i
  * The main(int argc, char* argv[] ) does not need to be
  * included in a library so it's ok that the linker complains
  */
-Q_EXPORT_INTERFACE() {
-    Q_CREATE_INSTANCE( %{APPNAME}Impl )
+TQ_EXPORT_INTERFACE() {
+    TQ_CREATE_INSTANCE( %{APPNAME}Impl )
 }
 
diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h
index 7cca8ee7..855aed57 100644
--- a/languages/cpp/app_templates/opieapplet/simpleimpl.h
+++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h
@@ -3,18 +3,18 @@
 
 
 /**
- * Opie and Qtopia uses a component system called QCOM
- * which was first part of the Qt 3.0 API but was made
- * prviate during the betas. Opie and Qtopia still use it
+ * Opie and TQtopia uses a component system called TQCOM
+ * which was first part of the TQt 3.0 API but was made
+ * prviate during the betas. Opie and TQtopia still use it
  * and we're happy with it.
- * Every starts with the QUnknownInterface. It supports functions
+ * Every starts with the TQUnknownInterface. It supports functions
  * for reference counting and the most important one
- * is for a query. Every QCOM interface got a global unique id ( GUID,UUID )
+ * is for a query. Every TQCOM interface got a global unique id ( GUID,UUID )
  * query is used to see if a interface is supported by
  * a dynamic shared object ( dso / plugin )
  * For tasks like loading Applications, InputMethods, Today, MenuButton,
  * Taskbar, Style, Email Client there are specefic Interfaces you
- * need to implement. The interfaces inherits from QUnknownInterface and
+ * need to implement. The interfaces inherits from TQUnknownInterface and
  * you'll need inherit from the interface.
  * As example we will use the Taskbar interface
  */
@@ -22,26 +22,27 @@
 
 /*
  * The taskbar applet interfaces wants us to implement position() and applet()
- * additionally we need to implement add(), release() and queryInterface for QUnknownInterface
+ * additionally we need to implement add(), release() and queryInterface for TQUnknownInterface
  * luckiy there is a macro for the reference counting
  * We provide an Implementation of the interface.
  */
 #include <tqwidget.h>
 #include <tqptrlist.h>
 
-#include <qpe/taskbarappletinterface.h>
+#include <tqpe/taskbarappletinterface.h>
 
 
 /*
  * Because we only draw an Icon in a fixed width and height
- * we declare and define  %{APPNAME} here and you could use QLabel
+ * we declare and define  %{APPNAME} here and you could use TQLabel
  * setPixmap or use TQWidget and draw yourself.
  * You might also want to reimplement mouse*Event to use some simple actions
  */
 class  %{APPNAME} : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
-     %{APPNAME}(TQWidget *parent);
+     %{APPNAME}(TQWidget *tqparent);
     ~%{APPNAME}();
 private:
     void mousePressEvent( TQMouseEvent* );
@@ -55,9 +56,9 @@ public:
     %{APPNAME}Impl();
     virtual ~%{APPNAME}Impl();
 
-    QRESULT queryInterface( const QUuid&, QUnknownInterface** );
+    TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** );
 
-    TQWidget *applet( TQWidget* parent );
+    TQWidget *applet( TQWidget* tqparent );
     int position()const;
 
     /*
@@ -65,10 +66,10 @@ public:
      * if reference drops to zero
      * delete this is called
      */
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
 private:
-    QList<%{APPNAME}> m_applets;
+    TQList<%{APPNAME}> m_applets;
 };