9 files changed, 12 insertions, 25 deletions
diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui b/qtruby/rubylib/designer/examples/colortool/mainform.ui
index f4081882..340b6c31 100644
--- a/qtruby/rubylib/designer/examples/colortool/mainform.ui
+++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui
@@ -215,9 +215,6 @@
         <property name="menuText">
             <string>Save &amp;As...</string>
         </property>
-        <property name="accel">
-            <string></string>
-        </property>
     </action>
     <action>
         <property name="name">
@@ -229,9 +226,6 @@
         <property name="menuText">
             <string>E&amp;xit</string>
         </property>
-        <property name="accel">
-            <string></string>
-        </property>
     </action>
     <action>
         <property name="name">
@@ -294,9 +288,6 @@
         <property name="menuText">
             <string>&amp;Contents...</string>
         </property>
-        <property name="accel">
-            <string></string>
-        </property>
     </action>
     <action>
         <property name="name">
@@ -308,9 +299,6 @@
         <property name="menuText">
             <string>&amp;Index...</string>
         </property>
-        <property name="accel">
-            <string></string>
-        </property>
     </action>
     <action>
         <property name="name">
@@ -322,9 +310,6 @@
         <property name="menuText">
             <string>&amp;About</string>
         </property>
-        <property name="accel">
-            <string></string>
-        </property>
     </action>
     <action>
         <property name="name">
diff --git a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb
index 3f4f5945..e83207d9 100644
--- a/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb
+++ b/qtruby/rubylib/designer/examples/colortool/mainform.ui.rb
@@ -321,8 +321,8 @@ end
 def editFind()
     if ! @findForm
         @findForm = FindForm.new( self )
-        connect( @findForm, SIGNAL( 'lookfor(const TQString&)' ),
-                 self, SLOT( 'lookfor(const TQString&)' ) )
+        connect( @findForm, TQ_SIGNAL( 'lookfor(const TQString&)' ),
+                 self, TQ_SLOT( 'lookfor(const TQString&)' ) )
     end
     @findForm.show()
 end
diff --git a/qtruby/rubylib/designer/rbuic/domtool.h b/qtruby/rubylib/designer/rbuic/domtool.h
index 8f3aa67c..1e7d4b77 100644
--- a/qtruby/rubylib/designer/rbuic/domtool.h
+++ b/qtruby/rubylib/designer/rbuic/domtool.h
@@ -33,7 +33,7 @@
 class TQDomElement;
 class TQDomDocument;
 
-class DomTool : public Qt
+class DomTool : public TQt
 {
 public:
     static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue );
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index 8d30b0d7..2eb8e45a 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 
     // children
     if( !objectNames.isEmpty() )
-    	tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__);
+      tqWarning("WARNING : objectNames should be empty at %s line %d", __FILE__, __LINE__);
     nl = e.parentNode().toElement().elementsByTagName( "widget" );
     for ( i = 1; i < (int) nl.length(); i++ )
     { // start at 1, 0 is the toplevel widget
@@ -751,7 +751,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 		    receiver = "self";
 
 		out << indent << "TQt::Object.connect(" << sender
-		    << ", TQT_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQT_SLOT(\"" << slot << "\") )" << endl;
+		    << ", TQ_SIGNAL(\"" << signal << "\"), "<< receiver << ", TQ_SLOT(\"" << slot << "\") )" << endl;
 	    }
 	} else if ( n.tagName()  == "tabstops" ) {
 	    // setup tab order
diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/qtruby/rubylib/designer/rbuic/uic.h
index ddfcc1be..11bdd82a 100644
--- a/qtruby/rubylib/designer/rbuic/uic.h
+++ b/qtruby/rubylib/designer/rbuic/uic.h
@@ -48,7 +48,7 @@ private:
 };
 
 
-class Uic : public Qt
+class Uic : public TQt
 {
 public:
     Uic( const TQString &fn, TQTextStream& out, TQDomDocument doc, bool subcl,
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.h b/qtruby/rubylib/designer/rbuic/widgetdatabase.h
index 63ccd829..9f88141b 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.h
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.h
@@ -24,7 +24,7 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include "widgetinterface.h" // up here for GCC 2.7.* compatibility
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 
 
 extern TQPluginManager<WidgetInterface> *widgetManager();
@@ -40,7 +40,7 @@ struct WidgetDatabaseRecord
     int nameCounter;
 };
 
-class WidgetDatabase : public Qt
+class WidgetDatabase : public TQt
 {
 public:
     WidgetDatabase();
diff --git a/qtruby/rubylib/designer/rbuic/widgetinterface.h b/qtruby/rubylib/designer/rbuic/widgetinterface.h
index 1296f162..d8e3d208 100644
--- a/qtruby/rubylib/designer/rbuic/widgetinterface.h
+++ b/qtruby/rubylib/designer/rbuic/widgetinterface.h
@@ -21,7 +21,7 @@
 #ifndef WIDGETINTERFACE_H
 #define WIDGETINTERFACE_H
 
-#include <private/qwidgetinterface_p.h>
+#include <private/tqwidgetinterface_p.h>
 
 #define WidgetInterface TQWidgetFactoryInterface
 #define IID_Widget IID_QWidgetFactory
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index 45876ed6..80363009 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -1,3 +1,5 @@
+CXXFLAGS += $(RUBY_CXXFLAGS)
+
 INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
 
 rubylibdir = $(RUBY_ARCHDIR)
diff --git a/qtruby/rubylib/designer/uilib/test/test.rb b/qtruby/rubylib/designer/uilib/test/test.rb
index ff3570cc..e089c735 100644
--- a/qtruby/rubylib/designer/uilib/test/test.rb
+++ b/qtruby/rubylib/designer/uilib/test/test.rb
@@ -15,6 +15,6 @@ if ARGV.length == 2
 		exit
 	end
     w.show()
-    a.connect( a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()') )
+    a.connect( a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()') )
     a.exec()
 end