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

5 files changed, 19 insertions, 19 deletions

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