qtbindings 4.6.3.0 → 4.6.3.1

data/examples/itemviews/simpledommodel/dommodel.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
         
-require 'domitem.rb'
+require './domitem.rb'
     
 class DomModel < Qt::AbstractItemModel
 
@@ -52,16 +52,16 @@ class DomModel < Qt::AbstractItemModel
         attributeMap = node.attributes
     
         case index.column
-        when 0:
+        when 0
             return Qt::Variant.new(node.nodeName)
-        when 1:
+        when 1
             for i in 0...attributeMap.length
                 attribute = attributeMap.item(i)
                 attributes << attribute.nodeName() + '="' + 
                                 attribute.nodeValue() + '"'
             end
             return Qt::Variant.new(attributes.join(" "))
-        when 2:
+        when 2
             if node.nodeValue.nil?
                 return Qt::Variant.new
             else
@@ -83,11 +83,11 @@ class DomModel < Qt::AbstractItemModel
     def headerData(section, orientation, role = Qt::DisplayRole)
         if orientation == Qt::Horizontal && role == Qt::DisplayRole
             case section
-            when 0:
+            when 0
                 return Qt::Variant.new(tr("Name"))
-            when 1:
+            when 1
                 return Qt::Variant.new(tr("Attributes"))
-            when 2:
+            when 2
                 return Qt::Variant.new(tr("Value"))
             else
                 return Qt::Variant.new

data/examples/itemviews/simpledommodel/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 window = MainWindow.new

data/examples/itemviews/simpledommodel/mainwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'dommodel.rb'
+require './dommodel.rb'
 
 class MainWindow < Qt::MainWindow
     slots 'openFile()'

data/examples/itemviews/simpletreemodel/main.rb

@@ -24,8 +24,8 @@
 =end
 
 require 'Qt'
-require 'qrc_simpletreemodel.rb'
-require 'treemodel.rb'
+require './qrc_simpletreemodel.rb'
+require './treemodel.rb'
 
 app = Qt::Application.new(ARGV)
 file = Qt::File.new(":/default.txt")

data/examples/itemviews/simpletreemodel/treemodel.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'treeitem.rb'
+require './treeitem.rb'
 
 class TreeModel < Qt::AbstractItemModel
 	

data/examples/itemviews/sortingmodel/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'treemodel.rb'
+require './treemodel.rb'
 
 app = Qt::Application.new(ARGV)
 

data/examples/itemviews/sortingmodel/treemodel.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 	
-require 'treeitem.rb'
+require './treeitem.rb'
 	
 #	Provides a simple tree model to show how to create and use hierarchical
 #	models.

data/examples/itemviews/spinboxdelegate/main.rb

@@ -24,7 +24,7 @@
 =end
 	
 require 'Qt'
-require 'spinboxdelegate.rb'
+require './spinboxdelegate.rb'
 
 app = Qt::Application.new(ARGV)
 	

data/examples/itemviews/spinboxdelegate/spinboxdelegate.rb

@@ -52,8 +52,8 @@ class SpinBoxDelegate < Qt::ItemDelegate
 	    @spinBox = editor
 	    @spinBox.interpretText
 	    value = @spinBox.value
-	
-	    model.setData(index, value)
+
+	    model.setData(index, Qt::Variant.new(value))
 	end
 	
 	def updateEditorGeometry(editor, option, index)

data/examples/layouts/basiclayouts/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'dialog.rb'
+require './dialog.rb'
 
 app = Qt::Application.new(ARGV)
 dialog = Dialog.new

data/examples/layouts/borderlayout/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/layouts/borderlayout/window.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'borderlayout.rb'
+require './borderlayout.rb'
 	
 class Window < Qt::Widget
 	

data/examples/layouts/flowlayouts/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/layouts/flowlayouts/window.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'flowlayout.rb'
+require './flowlayout.rb'
 
 class Window < Qt::Widget
 	

data/examples/mainwindows/application/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/mainwindows/dockwidgets/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/mainwindows/dockwidgets/mainwindow.rb

@@ -117,7 +117,7 @@ class MainWindow < Qt::MainWindow
 	    fileName = Qt::FileDialog.getSaveFileName(self,
 	                        tr("Choose a file name"), ".",
 	                        tr("HTML (*.html *.htm)"))
-	    if fileName.empty?
+	    if not fileName or fileName.empty?
 	        return
 		end
 	    file = Qt::File.new(fileName)

data/examples/mainwindows/mdi/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/mainwindows/mdi/mainwindow.rb

@@ -24,7 +24,7 @@
 =end
     
     
-require 'mdichild.rb'
+require './mdichild.rb'
     
 class MainWindow < Qt::MainWindow
     

data/examples/mainwindows/mdi/mdichild.rb

@@ -80,7 +80,7 @@ class MdiChild < Qt::TextEdit
 	def saveAs()
 	    fileName = Qt::FileDialog.getSaveFileName(self, tr("Save As"),
 	                                                    @currentFile)
-	    if fileName.empty?
+	    if not fileName or fileName.empty?
 	        return false
 		end
 	

data/examples/mainwindows/menus/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/mainwindows/recentfiles/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/mainwindows/sdi/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/network/broadcastreceiver/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'receiver.rb'
+require './receiver.rb'
 
 app = Qt::Application.new(ARGV)
 receiver = Receiver.new

data/examples/network/broadcastsender/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'sender.rb'
+require './sender.rb'
 
 app = Qt::Application.new(ARGV)
 sender = Sender.new

data/examples/network/fortuneclient/client.rb

@@ -122,13 +122,12 @@ class Client < Qt::Dialog
     
     def displayError(socketError)
         case socketError
-        when Qt::AbstractSocket::RemoteHostClosedError:
-            ;
-        when Qt::AbstractSocket::HostNotFoundError:
+        when Qt::AbstractSocket::RemoteHostClosedError
+        when Qt::AbstractSocket::HostNotFoundError
             Qt::MessageBox.information(self, tr("Fortune Client"),
                                      tr("The host was not found. Please check the " +
                                         "host name and port settings."))
-        when Qt::AbstractSocket::ConnectionRefusedError:
+        when Qt::AbstractSocket::ConnectionRefusedError
             Qt::MessageBox.information(self, tr("Fortune Client"),
                                      tr("The connection was refused by the peer. " +
                                         "Make sure the fortune server is running, " +

data/examples/network/fortuneclient/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'client.rb'
+require './client.rb'
 
 app = Qt::Application.new(ARGV)
 client = Client.new

data/examples/network/fortuneserver/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'server.rb'
+require './server.rb'
 
 app = Qt::Application.new(ARGV)
 server = Server.new

data/examples/network/ftp/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'ftpwindow.rb'
+require './ftpwindow.rb'
 
 app = Qt::Application.new(ARGV)
 ftpWin = FtpWindow.new

data/examples/network/http/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'httpwindow.rb'
+require './httpwindow.rb'
 
 app = Qt::Application.new(ARGV)
 httpWin = HttpWindow.new

data/examples/network/loopback/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'dialog.rb'
+require './dialog.rb'
 
 app = Qt::Application.new(ARGV)
 dialog = Dialog.new

data/examples/opengl/grabber/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'mainwindow.rb'
+require './mainwindow.rb'
 
 app = Qt::Application.new(ARGV)
 mainWin = MainWindow.new

data/examples/opengl/grabber/mainwindow.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
     
-require 'glwidget.rb'
+require './glwidget.rb'
 
 class MainWindow < Qt::MainWindow
         

data/examples/opengl/hellogl/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/opengl/hellogl/window.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
     
-require 'glwidget.rb'
+require './glwidget.rb'
 
 class Window < Qt::Widget
     

data/examples/opengl/textures/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/opengl/textures/window.rb

@@ -23,7 +23,7 @@
 ** Translated to QtRuby by Richard Dale
 =end
 
-require 'glwidget.rb'
+require './glwidget.rb'
 
 class Window < Qt::Widget
 	

data/examples/painting/basicdrawing/main.rb

@@ -24,7 +24,7 @@
 =end
 
 require 'Qt'
-require 'window.rb'
+require './window.rb'
 
 app = Qt::Application.new(ARGV)
 window = Window.new

data/examples/painting/basicdrawing/renderarea.rb

@@ -129,31 +129,31 @@ class RenderArea < Qt::Widget
 	            end
 	
 	            case @shape
-	            when Line:
+	            when Line
 	                painter.drawLine(rect.bottomLeft(), rect.topRight())
-	            when Points:
+	            when Points
 	                painter.drawPoints(points)
-	            when Polyline:
+	            when Polyline
 	                painter.drawPolyline(points)
-	            when Polygon:
+	            when Polygon
 	                painter.drawPolygon(points)
-	            when Rect:
+	            when Rect
 	                painter.drawRect(rect)
-	            when RoundRect:
+	            when RoundRect
 	                painter.drawRoundRect(rect)
-	            when Ellipse:
+	            when Ellipse
 	                painter.drawEllipse(rect)
-	            when Arc:
+	            when Arc
 	                painter.drawArc(rect, startAngle, arcLength)
-	            when Chord:
+	            when Chord
 	                painter.drawChord(rect, startAngle, arcLength)
-	            when Pie:
+	            when Pie
 	                painter.drawPie(rect, startAngle, arcLength)
-	            when Path:
+	            when Path
 	                painter.drawPath(path)
-	            when Text:
+	            when Text
 	                painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nTrolltech"))
-	            when Pixmap:
+	            when Pixmap
 	                painter.drawPixmap(10, 10, @pixmap)
 	            end
 	            painter.restore()