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, 20 insertions, 18 deletions

diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index 09f031c4..6ed2ab3d 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -27,6 +27,7 @@ class KURL;
 class %{APPNAMELC} : public KMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     /**
      * Default Constructor
diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp
index 30d627fe..0c82dd25 100644
--- a/languages/cpp/app_templates/kxt/appview.cpp
+++ b/languages/cpp/app_templates/kxt/appview.cpp
@@ -6,8 +6,8 @@
 #include <klocale.h>
 #include <tqlabel.h>
 
-%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent)
-    : %{APPNAMELC}view_base(parent)
+%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent)
+    : %{APPNAMELC}view_base(tqparent)
 {
 	settingsChanged();
 }
@@ -33,7 +33,7 @@ void %{APPNAMELC}View::settingsChanged()
 	sillyLabel->setPaletteForegroundColor( Settings::col_foreground() );
 
 	// i18n : internationalization
-	sillyLabel->setText( i18n("This project is %1 days old").arg(Settings::val_time()) );
+	sillyLabel->setText( i18n("This project is %1 days old").tqarg(Settings::val_time()) );
 	emit signalChangeStatusbar( i18n("Settings changed") );
 }
 
diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h
index e0738ebe..897072a6 100644
--- a/languages/cpp/app_templates/kxt/appview.h
+++ b/languages/cpp/app_templates/kxt/appview.h
@@ -22,11 +22,12 @@ class KURL;
 class %{APPNAMELC}View : public %{APPNAMELC}view_base
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
 	/**
 	 * Default constructor
 	 */
-    %{APPNAMELC}View(TQWidget *parent);
+    %{APPNAMELC}View(TQWidget *tqparent);
 
 	/**
 	 * Destructor
diff --git a/languages/cpp/app_templates/kxt/appview_base.ui b/languages/cpp/app_templates/kxt/appview_base.ui
index 626d95df..5852f806 100644
--- a/languages/cpp/app_templates/kxt/appview_base.ui
+++ b/languages/cpp/app_templates/kxt/appview_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAMELC}view_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
 <property name="name">
 <cstring>%{APPNAMELC}view_base</cstring>
 </property>
@@ -19,7 +19,7 @@
 <property name="name">
 <cstring>unnamed</cstring>
 </property>
-<widget class="QLabel" row="0" column="0">
+<widget class="TQLabel" row="0" column="0">
 <property name="name">
 <cstring>sillyLabel</cstring>
 </property>
@@ -29,5 +29,5 @@
 </widget>
 </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/languages/cpp/app_templates/kxt/prefs-base.ui b/languages/cpp/app_templates/kxt/prefs-base.ui
index 5c0fc860..8c8b9012 100644
--- a/languages/cpp/app_templates/kxt/prefs-base.ui
+++ b/languages/cpp/app_templates/kxt/prefs-base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Prefs_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Prefs_base</cstring>
     </property>
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>textLabel2_2</cstring>
             </property>
@@ -32,7 +32,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -40,7 +40,7 @@
                 <string>Project age:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -66,7 +66,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -83,14 +83,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QSpinBox" row="2" column="1">
+        <widget class="TQSpinBox" row="2" column="1">
             <property name="name">
                 <cstring>kcfg_val_time</cstring>
             </property>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>41</width>
                     <height>20</height>
@@ -120,7 +120,7 @@
         </spacer>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 5f7936da..2a04da7e 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = %{APPNAMELC}
 # set the include path for X, qt and KDE
 INCLUDES         = $(all_includes)
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 # the library search path. 
@@ -27,7 +27,7 @@ kde_kcfg_DATA = %{APPNAMELC}.kcfg
 noinst_HEADERS = %{APPNAMELC}.h %{APPNAMELC}view.h prefs.h
 
 messages: rc.cpp
-	$(EXTRACTRC) `find . -name \*.ui -o -name \*.rc` > rc.cpp
+	$(EXTRACTRC) `tqfind . -name \*.ui -o -name \*.rc` > rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot
 
 KDE_ICON = AUTO