[Kde-bindings] kdebindings/qtruby

[Richard Dale]

CVS commit by rdale: 


* Applied patch from Marek Janukowicz.
* The patch fixes some perlisms, that caused errors on loading a Ruby file
  generated from .ui file for Qt::MainWindow subclass

CCMAIL: kde-bindings at kde.org


  M +6 -0      ChangeLog   1.68
  M +3 -3      rubylib/designer/rbuic/form.cpp   1.10


--- kdebindings/qtruby/ChangeLog  #1.67:1.68
@@ -1,2 +1,8 @@
+2004-04-30  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
+
+        * Applied patch from Marek Janukowicz.
+        * The patch fixes some perlisms, that caused errors on loading a Ruby file
+          generated from .ui file for Qt::MainWindow subclass
+
 2004-04-20  Richard Dale  <Richard_Dale at tipitina.demon.co.uk>
 

--- kdebindings/qtruby/rubylib/designer/rbuic/form.cpp  #1.9:1.10
@@ -481,5 +481,5 @@ void Uic::createFormImpl( const QDomElem
                     {
                         images += img;
-                        out << indent << imageDataName(img) << " = pack 'C*'," << endl;
+                        out << indent << imageDataName(img) << " = [ " << endl;
                         ++indent;
                         int a ;
@@ -491,5 +491,5 @@ void Uic::createFormImpl( const QDomElem
                                 out << " ";
                         }
-                        out << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << "" << endl;
+                        out << "0x" << QString(data[2*a]) << QString(data[2*a+1]) << " ].pack \"C*\"" << endl;
                         --indent;
                         out << endl;
@@ -552,5 +552,5 @@ void Uic::createFormImpl( const QDomElem
         for ( it = images.begin(); it != images.end(); ++it ) {
             out << indent << (*it) << " = Qt::Pixmap.new()" << endl;
-            out << indent << (*it) << ".loadFromData(" << imageDataName(*it) << ", length (" << imageDataName(*it) << "), \"PNG\")" << endl;
+            out << indent << (*it) << ".loadFromData(" << imageDataName(*it) << ", " << imageDataName(*it) << ".length, \"PNG\")" << endl;
         }
         out << endl;