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

14 files changed, 48 insertions, 48 deletions

diff --git a/languages/ruby/app_templates/dcopservice/app.cpp b/languages/ruby/app_templates/dcopservice/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/dcopservice/app.cpp
+++ b/languages/ruby/app_templates/dcopservice/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/kapp/app.cpp
+++ b/languages/ruby/app_templates/kapp/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kapp/app.rb b/languages/ruby/app_templates/kapp/app.rb
index 470b0136..9bc2ba03 100644
--- a/languages/ruby/app_templates/kapp/app.rb
+++ b/languages/ruby/app_templates/kapp/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    slots 'fileNew()',
+    Q_SLOTS 'fileNew()',
           'fileOpen()',
           'fileSave()',
           'fileSaveAs()',
diff --git a/languages/ruby/app_templates/kapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb
index bc5b5140..4c914786 100644
--- a/languages/ruby/app_templates/kapp/appview.rb
+++ b/languages/ruby/app_templates/kapp/appview.rb
@@ -15,23 +15,23 @@ class %{APPNAMESC}View < Qt::Widget
     #
     # Use this signal to change the content of the statusbar
     #
-    signals 'signalChangeStatusbar(const QString&)'
+    Q_SIGNALS 'signalChangeStatusbar(const QString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    signals 'signalChangeCaption(const QString&)'
+    Q_SIGNALS 'signalChangeCaption(const QString&)'
 
-    slots 'slotOnURL(const QString&)',
+    Q_SLOTS 'slotOnURL(const QString&)',
           'slotSetTitle(const QString&)'
    
-    def initialize(parent)
-        super(parent)
+    def initialize(tqparent)
+        super(tqparent)
         
         # keep a reference to the DCOP Interface so it doesn't get gc'd
         @dcop = %{APPNAMESC}Iface.new(self)
         
-        # setup our layout manager to automatically add our widgets
+        # setup our tqlayout manager to automatically add our widgets
         top_layout = Qt::HBoxLayout.new(self)
         top_layout.setAutoAdd(true)
     
diff --git a/languages/ruby/app_templates/kapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb
index 98669ad2..fbdec495 100644
--- a/languages/ruby/app_templates/kapp/pref.rb
+++ b/languages/ruby/app_templates/kapp/pref.rb
@@ -17,10 +17,10 @@ end
 
 class %{APPNAMESC}PrefPageOne < Qt::Frame
 
-    def initialize(parent)
-        super(parent)
-        layout = Qt::HBoxLayout.new(self)
-        layout.setAutoAdd(true)
+    def initialize(tqparent)
+        super(tqparent)
+        tqlayout = Qt::HBoxLayout.new(self)
+        tqlayout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
@@ -28,10 +28,10 @@ end
 
 class %{APPNAMESC}PrefPageTwo < Qt::Frame
 
-    def initialize(parent)
-        super(parent)
-        layout = Qt::HBoxLayout.new(self)
-        layout.setAutoAdd(true)
+    def initialize(tqparent)
+        super(tqparent)
+        tqlayout = Qt::HBoxLayout.new(self)
+        tqlayout.setAutoAdd(true)
     
         Qt::Label.new(i18n("Add something here"), self)
     end
diff --git a/languages/ruby/app_templates/kapp/src-Makefile.am b/languages/ruby/app_templates/kapp/src-Makefile.am
index d27aa6b3..ad999e1c 100644
--- a/languages/ruby/app_templates/kapp/src-Makefile.am
+++ b/languages/ruby/app_templates/kapp/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/languages/ruby/app_templates/kxt/app.cpp b/languages/ruby/app_templates/kxt/app.cpp
index 46086a9e..5458ae8b 100644
--- a/languages/ruby/app_templates/kxt/app.cpp
+++ b/languages/ruby/app_templates/kxt/app.cpp
@@ -10,15 +10,15 @@ int main(int argc, char **argv) {
     TQString appdir = ::locate("data", "%{APPNAMELC}/main.rb", instance);
     delete instance;
     if (appdir.isNull()) {
-        qFatal("Error: Can't find \"%{APPNAMELC}/main.rb\"\n");
+        qFatal("Error: Can't tqfind \"%{APPNAMELC}/main.rb\"\n");
     }
     TQFileInfo program(appdir);
      
     char ** rubyargs = (char **) calloc(argc+4, sizeof(char *));
     rubyargs[0] = strdup(argv[0]);
     rubyargs[1] = strdup("-KU");
-    rubyargs[2] = strdup(TQString("-C%1").arg(program.dirPath()).latin1());
-    rubyargs[3] = strdup(TQString("-I%1").arg(program.dirPath()).latin1());
+    rubyargs[2] = strdup(TQString("-C%1").tqarg(program.dirPath()).latin1());
+    rubyargs[3] = strdup(TQString("-I%1").tqarg(program.dirPath()).latin1());
     rubyargs[4] = strdup(program.fileName().latin1());
     for (int i = 1; i < argc; i++) {
         rubyargs[i+4] = argv[i];
diff --git a/languages/ruby/app_templates/kxt/app.rb b/languages/ruby/app_templates/kxt/app.rb
index 39da5345..9ab56921 100644
--- a/languages/ruby/app_templates/kxt/app.rb
+++ b/languages/ruby/app_templates/kxt/app.rb
@@ -9,7 +9,7 @@
 
 class %{APPNAMESC} < KDE::MainWindow
 
-    slots 'fileNew()',
+    Q_SLOTS 'fileNew()',
           'optionsPreferences()',
           'newToolbarConfig()',
           'changeStatusbar(const QString&)',
diff --git a/languages/ruby/app_templates/kxt/appview.rb b/languages/ruby/app_templates/kxt/appview.rb
index 391f4c37..0b95fdf1 100644
--- a/languages/ruby/app_templates/kxt/appview.rb
+++ b/languages/ruby/app_templates/kxt/appview.rb
@@ -15,18 +15,18 @@ class %{APPNAMESC}View < %{APPNAMESC}view_base
     #
     # Use this signal to change the content of the statusbar
     #
-    signals 'signalChangeStatusbar(const QString&)'
+    Q_SIGNALS 'signalChangeStatusbar(const QString&)'
 
     #
     # Use this signal to change the content of the caption
     #
-    signals 'signalChangeCaption(const QString&)'
+    Q_SIGNALS 'signalChangeCaption(const QString&)'
 
-    slots 'switchColors()',
+    Q_SLOTS 'switchColors()',
           'settingsChanged()'
    
-    def initialize(parent)
-        super(parent)
+    def initialize(tqparent)
+        super(tqparent)
         
         settingsChanged()
     end
diff --git a/languages/ruby/app_templates/kxt/appview_base.ui b/languages/ruby/app_templates/kxt/appview_base.ui
index 78009d08..db29d6eb 100644
--- a/languages/ruby/app_templates/kxt/appview_base.ui
+++ b/languages/ruby/app_templates/kxt/appview_base.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>%{APPNAME}view_base</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>%{APPNAMESC}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/ruby/app_templates/kxt/prefs-base.ui b/languages/ruby/app_templates/kxt/prefs-base.ui
index 5c0fc860..8c8b9012 100644
--- a/languages/ruby/app_templates/kxt/prefs-base.ui
+++ b/languages/ruby/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/ruby/app_templates/kxt/src-Makefile.am b/languages/ruby/app_templates/kxt/src-Makefile.am
index a8170abc..e121d0bc 100644
--- a/languages/ruby/app_templates/kxt/src-Makefile.am
+++ b/languages/ruby/app_templates/kxt/src-Makefile.am
@@ -16,7 +16,7 @@ INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR)
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = %{APPNAMELC}.cpp
 
-# let automoc handle all of the meta source files (moc)
+# let autotqmoc handle all of the meta source files (tqmoc)
 METASOURCES = AUTO
 
 KDE_ICON = AUTO
diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb b/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
index 58dfa10a..c44e984a 100644
--- a/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
+++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.rb
@@ -1,7 +1,7 @@
 
 class %{APPNAME} < Qt::MainWindow
 
-    slots :newFile,
+    Q_SLOTS :newFile,
           :open,
           :save,
           :saveAs,
@@ -128,7 +128,7 @@ class %{APPNAME} < Qt::MainWindow
 
         @aboutQtAct = Qt::Action.new(tr("About &Qt"), self)
         @aboutQtAct.statusTip = tr("Show the Qt library's About box")
-        connect(@aboutQtAct, SIGNAL(:triggered), $qApp, SLOT(:aboutQt))
+        connect(@aboutQtAct, SIGNAL(:triggered), $tqApp, SLOT(:aboutQt))
 
         @cutAct.setEnabled(false)
         @copyAct.setEnabled(false)
diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
index 18ecdc3f..7d5f9ad3 100644
--- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
+++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.rb
@@ -1,6 +1,6 @@
 class %{APPNAMESC} < Qt::MainWindow
 
-    slots 'newDoc()',
+    Q_SLOTS 'newDoc()',
           'choose()',
           'load( const QString& )',
           'save()',
@@ -81,7 +81,7 @@ class %{APPNAMESC} < Qt::MainWindow
     
         file.insertItem( tr("&Close"), self, SLOT('close()'), Qt::KeySequence.new(CTRL+Key_W) )
     
-        file.insertItem( tr("&Quit"), $qApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) )
+        file.insertItem( tr("&Quit"), $tqApp, SLOT( 'closeAllWindows()' ), Qt::KeySequence.new(CTRL+Key_Q) )
     
         menuBar().insertSeparator()