TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 13 insertions, 12 deletions

diff --git a/languages/cpp/app_templates/qtopiaapp/example.control b/languages/cpp/app_templates/qtopiaapp/example.control
index d04f87ec..666968a3 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.control
+++ b/languages/cpp/app_templates/qtopiaapp/example.control
@@ -7,5 +7,5 @@ Arch: $DEVICE_ARCH
 Version: 1.0.0
 License: Public Domain
 Description: %{APPNAME} program
- An %{APPNAMELC} program for the Qtopia environment.
+ An %{APPNAMELC} program for the TQtopia environment.
  Does nothing interesting.
diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp
index a849977d..85082508 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/example.cpp
@@ -3,11 +3,11 @@
 #include <tqpushbutton.h>
 
 /*
- *  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()));
 }
@@ -17,7 +17,7 @@
  */
 %{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/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h
index 42dfc2dd..64abf97c 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.h
+++ b/languages/cpp/app_templates/qtopiaapp/example.h
@@ -6,9 +6,10 @@
 class %{APPNAME} : public %{APPNAME}Base
 { 
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    %{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/qtopiaapp/example.html b/languages/cpp/app_templates/qtopiaapp/example.html
index 279a6106..9bcae99d 100644
--- a/languages/cpp/app_templates/qtopiaapp/example.html
+++ b/languages/cpp/app_templates/qtopiaapp/example.html
@@ -6,10 +6,10 @@
 <p>To user this application:
 
 <ol>
- <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the Qtopia launcher.
+ <li>Press the <img width=12 height=12 src=%{APPNAME}.png> icon in the TQtopia launcher.
  <li>Read the label.
  <li>Press the button.
  <li>Read the source code provided.
 </ol>
 
-Now you know how to make a Qtopia application!
+Now you know how to make a TQtopia application!
diff --git a/languages/cpp/app_templates/qtopiaapp/examplebase.ui b/languages/cpp/app_templates/qtopiaapp/examplebase.ui
index b6b81b11..1243c341 100644
--- a/languages/cpp/app_templates/qtopiaapp/examplebase.ui
+++ b/languages/cpp/app_templates/qtopiaapp/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>
diff --git a/languages/cpp/app_templates/qtopiaapp/main.cpp b/languages/cpp/app_templates/qtopiaapp/main.cpp
index 0311a32e..ce7161b1 100644
--- a/languages/cpp/app_templates/qtopiaapp/main.cpp
+++ b/languages/cpp/app_templates/qtopiaapp/main.cpp
@@ -1,10 +1,10 @@
 
 #include "%{APPNAMELC}.h"
-#include <qpe/qpeapplication.h>
+#include <tqpe/tqpeapplication.h>
 
 int main( int argc, char ** argv )
 {
-    QPEApplication a( argc, argv );
+    TQPEApplication a( argc, argv );
 
     %{APPNAME} mw;
     a.showMainWidget( &mw );