qtbindings 4.6.3.1-x86-mingw32 → 4.6.3.2-x86-mingw32

data/CHANGELOG.txt

@@ -1,5 +1,6 @@
 qtbindings Changelog:
 -----------------
+v4.6.3.0
 2010/07/27 - Apply Ryan Melton's patches to build on Windows
 2010/07/27 - Apply Ryan Melton's patch to fix ExtraSelection
 2010/07/28 - Sync with kde-bindings trunk rev 1156258
@@ -7,6 +8,19 @@ qtbindings Changelog:
 2010/07/28 - Apply Paolo Capriotti's patch for deferred objects
 2010/07/28 - Apply Paolo Capriotti's patch for marking QGraphicsEffect
 2010/07/28 - Sync with kde-bindings trunk rev 1156329
+
+v4.6.3.1
 2010/09/21 - Update examples to work with Ruby 1.9.2
 2010/09/21 - Fix 4 examples
 2010/09/21 - Sync with kde-bindings trunk rev 1178034
+
+v4.6.3.2
+2010/10/14 - Handle ambiguous results with method lookup
+2010/10/15 - Fix bug with UTF-8 support
+2010/10/17 - Sync with kde-bindings trunk rev 1186952
+2010/10/19 - Fix Http example
+2010/11/04 - Fix chart example and all methods returning QFlags&
+2010/12/03 - Add framework support on Mac OSX which also fixes the OpenGl example
+2010/12/05 - Make smokegen not parse stdio.h as a workaround for FreeBSD based systems
+2010/12/05 - Minor changes to support Qt 4.7 on various platforms including Ubuntu 10.10
+

data/KNOWN_ISSUES.txt

@@ -1,11 +1,5 @@
-1. chart example fails - can't handle QFlags as return type
-2. broadcastsender example fails - undefined method writeDatagram
-3. fortuneserver example fails - undefined method seek
-4. ftp example fails - undefined method icon=
-5. http example fails - undefined method empty? for nil
-6. textures example fails - Cannot handle Gluint
-7. fontsample example fails - undefined method checkState for nil
-8. svgviewer example fails - undefined method rx= for Qt::Point
-9. passivepopup example fails - seg fault
-10. textedit example fails - undefined method setTextFormat
-11. digitalclock example fails - unresolved constructor call DigitalClock
+1. broadcastsender example fails - undefined method writeDatagram
+2. fortuneserver example fails - undefined method seek
+3. ftp example fails - undefined method icon=
+4. fontsampler example fails - undefined method checkState for nil
+5. passivepopup example fails - seg fault

data/examples/itemviews/chart/pieview.rb

@@ -261,7 +261,7 @@ class PieView < Qt::AbstractItemView
         selections = selectionModel()
         option = viewOptions()
         state = option.state
-    
+ 
         background = option.palette.base()
         foreground = Qt::Pen.new(option.palette.color(Qt::Palette::Foreground))
         textPen = Qt::Pen.new(option.palette.color(Qt::Palette::Text))

data/examples/network/ftp/ftpwindow.rb

@@ -38,6 +38,7 @@ class FtpWindow < Qt::Dialog
         super(parent)
         @ftp = nil
         @isDirectory = {}
+        @currentPath = ""
         @ftpServerLabel = Qt::Label.new(tr("Ftp &server:"))
         @ftpServerLineEdit = Qt::LineEdit.new("ftp.trolltech.com")
         @ftpServerLabel.buddy = @ftpServerLineEdit
@@ -95,6 +96,9 @@ class FtpWindow < Qt::Dialog
     end
     
     def connectOrDisconnect()
+        @currentPath = ""
+        @isDirectory = {}
+
         if !@ftp.nil?
             @ftp.abort
             @ftp.deleteLater
@@ -134,7 +138,7 @@ class FtpWindow < Qt::Dialog
             return
         end
     
-        @file = Qt::File.new(fileName)
+        @file = Qt::File.new(@fileName)
         if !@file.open(Qt::IODevice::WriteOnly)
             Qt::MessageBox.information(self, tr("FTP"),
                                      tr("Unable to save the @file %s: %s." %
@@ -143,7 +147,7 @@ class FtpWindow < Qt::Dialog
             return
         end
     
-        @ftp.get(@fileList.currentItem.text, file)
+        @ftp.get(@fileList.currentItem.text, @file)
     
         @progressDialog.labelText = tr("Downloading %s..." % @fileName)
         @progressDialog.show()
@@ -199,7 +203,8 @@ class FtpWindow < Qt::Dialog
         item = Qt::ListWidgetItem.new
         item.text = urlInfo.name()
         pixmap = Qt::Pixmap.new(urlInfo.dir? ? "images/dir.png" : "images/file.png")
-        item.icon = pixmap
+
+        item.icon = Qt::Icon.new(pixmap)
     
         @isDirectory[urlInfo.name()] = urlInfo.isDir()
         @fileList.addItem(item)

data/examples/network/http/httpwindow.rb

@@ -106,7 +106,7 @@ class HttpWindow < Qt::Dialog
 	    end
 	
 	    @http.setHost(url.host, url.port != -1 ? url.port : 80)
-	    if !url.userName.empty?
+	    if url.userName and !url.userName.empty?
 	        @http.user = url.userName(url.password)
 		end
 	

data/examples/painting/fontsampler/mainwindow.rb

@@ -34,7 +34,7 @@ class MainWindow < Qt::MainWindow
             'on_printAction_triggered()',
             'on_printPreviewAction_triggered()',
             'on_unmarkAction_triggered()',
-            'printPage(int, QPainter &, QPrinter &)',
+            'printPage(int, QPainter*, QPrinter*)',
             'showFont(QTreeWidgetItem *)',
             'updateStyles(QTreeWidgetItem *, int)'
     
@@ -88,7 +88,7 @@ class MainWindow < Qt::MainWindow
     def on_clearAction_triggered()
         currentItem = @ui.fontTree.currentItem()
         @ui.fontTree.selectedItems.each do |item|
-            fontTree.setItemSelected(item, false)
+            @ui.fontTree.setItemSelected(item, false)
         end
         @ui.fontTree.setItemSelected(currentItem, true)
     end
@@ -169,7 +169,7 @@ class MainWindow < Qt::MainWindow
             elsif state == Qt::Unchecked &&
                        parent.checkState(0) == Qt::Checked
                 marked = false
-                for row in 0..parent.childCount
+                for row in 0..(parent.childCount - 1)
                     if parent.child(row).checkState(0) == Qt::Checked
                         marked = true
                         break
@@ -183,7 +183,7 @@ class MainWindow < Qt::MainWindow
         else
             row
             number = 0
-            for row in 0..item.childCount
+            for row in 0..(item.childCount - 1)
                 if item.child(row).checkState(0) == Qt::Checked
                     number += 1
                 end
@@ -192,13 +192,13 @@ class MainWindow < Qt::MainWindow
             # Mark/unmark all child items when marking/unmarking top-level
             # items.
             if state == Qt::Checked && number == 0
-                for row in 0..item.childCount
+                for row in 0..(item.childCount - 1)
                     if item.child(row).checkState(0) == Qt::Unchecked
                         item.child(row).setCheckState(0, Qt::Checked)
                     end
                 end
             elsif state == Qt::Unchecked && number > 0
-                for row in 0..item.childCount
+                for row in 0..(item.childCount - 1)
                     if item.child(row).checkState(0) == Qt::Checked
                         item.child(row).setCheckState(0, Qt::Unchecked)
                     end
@@ -268,18 +268,18 @@ class MainWindow < Qt::MainWindow
     
         preview = PreviewDialog.new(printer, self)
         connect(preview,
-            SIGNAL('pageRequested(int, QPainter &, QPrinter &)'),
-            self, SLOT('printPage(int, QPainter &, QPrinter &)'),
+            SIGNAL('pageRequested(int, QPainter*, QPrinter*)'),
+            self, SLOT('printPage(int, QPainter*, QPrinter*)'),
             Qt::DirectConnection)
     
-        preview.numberOfPages = @pageMap.length
+        preview.setNumberOfPages = @pageMap.length
         preview.exec()
     end
     
     def currentPageMap()
         pageMap = {}
     
-        for row in 0..@ui.fontTree.topLevelItemCount
+        for row in 0..(@ui.fontTree.topLevelItemCount - 1)
             familyItem = @ui.fontTree.topLevelItem(row)
     
             if familyItem.checkState(0) == Qt::Checked
@@ -287,10 +287,10 @@ class MainWindow < Qt::MainWindow
                 pageMap[family] = []
             end
             
-            for childRow in 0..familyItem.childCount
+            for childRow in 0..(familyItem.childCount - 1)
                 styleItem = familyItem.child(childRow)
                 if styleItem.checkState(0) == Qt::Checked
-                    pageMap[family].append(styleItem)
+                    pageMap[family] << styleItem
                 end
             end
         end
@@ -304,6 +304,7 @@ class MainWindow < Qt::MainWindow
     end
     
     def printPage(index, painter, printer)
+        pageMap = currentPageMap()
         family = pageMap.keys()[index]
         items = pageMap[family]
     
@@ -356,7 +357,7 @@ class MainWindow < Qt::MainWindow
                 rect = fontMetrics.boundingRect("%s %s" % [font.family(), style])
                 y += rect.height()
                 painter.font = font
-                painter.drawText(Qt::PointF.neew(x, y),
+                painter.drawText(Qt::PointF.new(x, y),
                                  "%s %s" % [family, style])
                 y += interLineHeight
             end

data/examples/painting/fontsampler/previewdialog.rb

@@ -31,7 +31,7 @@ class PreviewDialog < Qt::Dialog
     SmallPreviewLength = 200
     LargePreviewLength = 400
     
-    signals 'pageRequested(int, QPainter &, QPrinter &)'
+    signals 'pageRequested(int, QPainter*, QPrinter*)'
     
     slots   'accept()',
             'addPage()',
@@ -49,7 +49,7 @@ class PreviewDialog < Qt::Dialog
     
         @currentPage = 0
         @pageCount = 0
-        @ui.pageList.setIconSize(Qt::Size(SmallPreviewLength, SmallPreviewLength))
+        @ui.pageList.setIconSize(Qt::Size.new(SmallPreviewLength, SmallPreviewLength))
         @ui.pageList.header().hide()
         @previewLabel = PreviewLabel.new
         @printer = Qt::Printer.new
@@ -60,40 +60,40 @@ class PreviewDialog < Qt::Dialog
     end
     
     def setupComboBoxes()
-        @ui.paperSizeCombo.addItem(tr("A0 (841 x 1189 mm)"), Qt::Printer::A0)
-        @ui.paperSizeCombo.addItem(tr("A1 (594 x 841 mm)"), Qt::Printer::A1)
-        @ui.paperSizeCombo.addItem(tr("A2 (420 x 594 mm)"), Qt::Printer::A2)
-        @ui.paperSizeCombo.addItem(tr("A3 (297 x 420 mm)"), Qt::Printer::A3)
-        @ui.paperSizeCombo.addItem(tr("A4 (210 x 297 mm, 8.26 x 11.7 inches)"), Qt::Printer::A4)
-        @ui.paperSizeCombo.addItem(tr("A5 (148 x 210 mm)"), Qt::Printer::A5)
-        @ui.paperSizeCombo.addItem(tr("A6 (105 x 148 mm)"), Qt::Printer::A6)
-        @ui.paperSizeCombo.addItem(tr("A7 (74 x 105 mm)"), Qt::Printer::A7)
-        @ui.paperSizeCombo.addItem(tr("A8 (52 x 74 mm)"), Qt::Printer::A8)
-        @ui.paperSizeCombo.addItem(tr("A9 (37 x 52 mm)"), Qt::Printer::A9)
-        @ui.paperSizeCombo.addItem(tr("B0 (1000 x 1414 mm)"), Qt::Printer::B0)
-        @ui.paperSizeCombo.addItem(tr("B1 (707 x 1000 mm)"), Qt::Printer::B1)
-        @ui.paperSizeCombo.addItem(tr("B2 (500 x 707 mm)"), Qt::Printer::B2)
-        @ui.paperSizeCombo.addItem(tr("B3 (353 x 500 mm)"), Qt::Printer::B3)
-        @ui.paperSizeCombo.addItem(tr("B4 (250 x 353 mm)"), Qt::Printer::B4)
-        @ui.paperSizeCombo.addItem(tr("B5 (176 x 250 mm, 6.93 x 9.84 inches)"), Qt::Printer::B5)
-        @ui.paperSizeCombo.addItem(tr("B6 (125 x 176 mm)"), Qt::Printer::B6)
-        @ui.paperSizeCombo.addItem(tr("B7 (88 x 125 mm)"), Qt::Printer::B7)
-        @ui.paperSizeCombo.addItem(tr("B8 (62 x 88 mm)"), Qt::Printer::B8)
-        @ui.paperSizeCombo.addItem(tr("B9 (44 x 62 mm)"), Qt::Printer::B9)
-        @ui.paperSizeCombo.addItem(tr("B10 (31 x 44 mm)"), Qt::Printer::B10)
-        @ui.paperSizeCombo.addItem(tr("C5E (163 x 229 mm)"), Qt::Printer::C5E)
-        @ui.paperSizeCombo.addItem(tr("DLE (110 x 220 mm)"), Qt::Printer::DLE)
-        @ui.paperSizeCombo.addItem(tr("Executive (7.5 x 10 inches, 191 x 254 mm)"), Qt::Printer::Executive)
-        @ui.paperSizeCombo.addItem(tr("Folio (210 x 330 mm)"), Qt::Printer::Folio)
-        @ui.paperSizeCombo.addItem(tr("Ledger (432 x 279 mm)"), Qt::Printer::Ledger)
-        @ui.paperSizeCombo.addItem(tr("Legal (8.5 x 14 inches, 216 x 356 mm)"), Qt::Printer::Legal)
-        @ui.paperSizeCombo.addItem(tr("Letter (8.5 x 11 inches, 216 x 279 mm)"), Qt::Printer::Letter)
-        @ui.paperSizeCombo.addItem(tr("Tabloid (279 x 432 mm)"), Qt::Printer::Tabloid)
-        @ui.paperSizeCombo.addItem(tr("US Common #10 Envelope (105 x 241 mm)"), Qt::Printer::Comm10E)
-        @ui.paperSizeCombo.currentIndex = @ui.paperSizeCombo.findData(Qt::Printer::A4)
-    
-        @ui.paperOrientationCombo.addItem(tr("Portrait"), Qt::Printer::Portrait)
-        @ui.paperOrientationCombo.addItem(tr("Landscape"), Qt::Printer::Landscape)
+        @ui.paperSizeCombo.addItem(tr("A0 (841 x 1189 mm)"), Qt::Variant.new(Qt::Printer::A0))
+        @ui.paperSizeCombo.addItem(tr("A1 (594 x 841 mm)"), Qt::Variant.new(Qt::Printer::A1))
+        @ui.paperSizeCombo.addItem(tr("A2 (420 x 594 mm)"), Qt::Variant.new(Qt::Printer::A2))
+        @ui.paperSizeCombo.addItem(tr("A3 (297 x 420 mm)"), Qt::Variant.new(Qt::Printer::A3))
+        @ui.paperSizeCombo.addItem(tr("A4 (210 x 297 mm, 8.26 x 11.7 inches)"), Qt::Variant.new(Qt::Printer::A4))
+        @ui.paperSizeCombo.addItem(tr("A5 (148 x 210 mm)"), Qt::Variant.new(Qt::Printer::A5))
+        @ui.paperSizeCombo.addItem(tr("A6 (105 x 148 mm)"), Qt::Variant.new(Qt::Printer::A6))
+        @ui.paperSizeCombo.addItem(tr("A7 (74 x 105 mm)"), Qt::Variant.new(Qt::Printer::A7))
+        @ui.paperSizeCombo.addItem(tr("A8 (52 x 74 mm)"), Qt::Variant.new(Qt::Printer::A8))
+        @ui.paperSizeCombo.addItem(tr("A9 (37 x 52 mm)"), Qt::Variant.new(Qt::Printer::A9))
+        @ui.paperSizeCombo.addItem(tr("B0 (1000 x 1414 mm)"), Qt::Variant.new(Qt::Printer::B0))
+        @ui.paperSizeCombo.addItem(tr("B1 (707 x 1000 mm)"), Qt::Variant.new(Qt::Printer::B1))
+        @ui.paperSizeCombo.addItem(tr("B2 (500 x 707 mm)"), Qt::Variant.new(Qt::Printer::B2))
+        @ui.paperSizeCombo.addItem(tr("B3 (353 x 500 mm)"), Qt::Variant.new(Qt::Printer::B3))
+        @ui.paperSizeCombo.addItem(tr("B4 (250 x 353 mm)"), Qt::Variant.new(Qt::Printer::B4))
+        @ui.paperSizeCombo.addItem(tr("B5 (176 x 250 mm, 6.93 x 9.84 inches)"), Qt::Variant.new(Qt::Printer::B5))
+        @ui.paperSizeCombo.addItem(tr("B6 (125 x 176 mm)"), Qt::Variant.new(Qt::Printer::B6))
+        @ui.paperSizeCombo.addItem(tr("B7 (88 x 125 mm)"), Qt::Variant.new(Qt::Printer::B7))
+        @ui.paperSizeCombo.addItem(tr("B8 (62 x 88 mm)"), Qt::Variant.new(Qt::Printer::B8))
+        @ui.paperSizeCombo.addItem(tr("B9 (44 x 62 mm)"), Qt::Variant.new(Qt::Printer::B9))
+        @ui.paperSizeCombo.addItem(tr("B10 (31 x 44 mm)"), Qt::Variant.new(Qt::Printer::B10))
+        @ui.paperSizeCombo.addItem(tr("C5E (163 x 229 mm)"), Qt::Variant.new(Qt::Printer::C5E))
+        @ui.paperSizeCombo.addItem(tr("DLE (110 x 220 mm)"), Qt::Variant.new(Qt::Printer::DLE))
+        @ui.paperSizeCombo.addItem(tr("Executive (7.5 x 10 inches, 191 x 254 mm)"), Qt::Variant.new(Qt::Printer::Executive))
+        @ui.paperSizeCombo.addItem(tr("Folio (210 x 330 mm)"), Qt::Variant.new(Qt::Printer::Folio))
+        @ui.paperSizeCombo.addItem(tr("Ledger (432 x 279 mm)"), Qt::Variant.new(Qt::Printer::Ledger))
+        @ui.paperSizeCombo.addItem(tr("Legal (8.5 x 14 inches, 216 x 356 mm)"), Qt::Variant.new(Qt::Printer::Legal))
+        @ui.paperSizeCombo.addItem(tr("Letter (8.5 x 11 inches, 216 x 279 mm)"), Qt::Variant.new(Qt::Printer::Letter))
+        @ui.paperSizeCombo.addItem(tr("Tabloid (279 x 432 mm)"), Qt::Variant.new(Qt::Printer::Tabloid))
+        @ui.paperSizeCombo.addItem(tr("US Common #10 Envelope (105 x 241 mm)"), Qt::Variant.new(Qt::Printer::Comm10E))
+        @ui.paperSizeCombo.currentIndex = @ui.paperSizeCombo.findData(Qt::Variant.new(Qt::Printer::A4))
+    
+        @ui.paperOrientationCombo.addItem(tr("Portrait"), Qt::Variant.new(Qt::Printer::Portrait))
+        @ui.paperOrientationCombo.addItem(tr("Landscape"), Qt::Variant.new(Qt::Printer::Landscape))
     end
     
     def addPage()
@@ -131,8 +131,8 @@ class PreviewDialog < Qt::Dialog
                                   @printer.paperRect().height()].max
         width = pixmap.width() * @printer.paperRect().width() / longestSide
         height = pixmap.height() * @printer.paperRect().height() / longestSide
-    
-        pixmap.fill(qRgb(224,224,224))
+   
+        pixmap.fill(Qt::Color.new(qRgb(224,224,224)))
         painter = Qt::Painter.new
         painter.begin(pixmap)
         painter.renderHint = Qt::Painter::Antialiasing
@@ -235,7 +235,8 @@ class PreviewDialog < Qt::Dialog
     end
     
     def on_paperSizeCombo_activated(index)
-        @printer.pageSize = @ui.paperSizeCombo.itemData(index.to_i)
+        Qt.debug_level = 100
+        @printer.paperSize = @ui.paperSizeCombo.itemData(index.to_i).value
     
         for index in 0..@ui.pageList.topLevelItemCount
             paintItem(@ui.pageList.topLevelItem(index), index)

data/examples/painting/fontsampler/previewlabel.rb

@@ -25,7 +25,7 @@
 	
 class PreviewLabel < Qt::Widget
 	
-	def initialize(parent)
+	def initialize(parent = nil)
 	    super(parent)
 	end
 	
@@ -33,7 +33,7 @@ class PreviewLabel < Qt::Widget
 	    painter = Qt::Painter.new
 	    painter.begin(self)
 	    painter.fillRect(event.rect(), Qt::Color.new(224,224,224))
-	    painter.drawPixmap(0, 0, @pixmap)
+	    painter.drawPixmap(0, 0, @pixmap) if @pixmap
 	    painter.end()
 	end
 	

data/examples/painting/svgviewer/svgwindow.rb

@@ -62,8 +62,8 @@ class SvgWindow < Qt::ScrollArea
 	
 	def mousePressEvent(event)
 	    @mousePressPos = event.pos
-	    @scrollBarValuesOnMousePress.rx = horizontalScrollBar.value
-	    @scrollBarValuesOnMousePress.ry = verticalScrollBar.value
+	    @scrollBarValuesOnMousePress.x = horizontalScrollBar.value
+	    @scrollBarValuesOnMousePress.y = verticalScrollBar.value
 	    event.accept
 	end
 	

data/ext/cmake/modules/FindQt4.cmake

@@ -785,6 +785,7 @@ IF (QT4_QMAKE_FOUND)
   FIND_PATH(QT_QT_INCLUDE_DIR qglobal.h
     PATHS
     ${QT_HEADERS_DIR}/Qt
+    ${QT_HEADERS_DIR}/QtCore
     ${QT_LIBRARY_DIR}/QtCore.framework/Headers
     NO_DEFAULT_PATH
     )

data/ext/generator/generatorpreprocessor.cpp

@@ -201,16 +201,58 @@ rpp::Stream* Preprocessor::sourceNeeded(QString& fileName, rpp::Preprocessor::In
     }
     if (path.isEmpty()) {
         foreach (QDir dir, m_includeDirs) {
+#if 0
+            if (dir.absolutePath().endsWith(".framework"))
+            {
+                dir.setPath(dir.absolutePath() + "/Headers");
+            }
+#endif
+            // qWarning("Searching in %s", qPrintable(dir.absolutePath()));
             info.setFile(dir, fileName);
             if (info.isFile()) {
                 path = info.absoluteFilePath();
+                // qWarning("Found #include<%s>", qPrintable(fileName));
                 break;
             }
         }
     }
-    
+ 
+#if defined(Q_OS_DARWIN)
+    /* Try searching for frameworks in default locations */
+    if (path.isEmpty()) {
+        QStringList splitString = fileName.split("/");
+        if (splitString.size() >= 2) {
+            QString frameworkName = splitString.takeFirst();
+            QString remainingFileName = splitString.join("/");
+            QDir dir1 = QDir(("/System/Library/Frameworks/" + frameworkName) + ".framework/Headers");
+            QDir dir2 = QDir(("/Library/Frameworks/" + frameworkName) + ".framework/Headers");
+            info.setFile(dir1, remainingFileName);
+            if (info.isFile()) {
+                path = info.absoluteFilePath();
+                // qWarning("Found #include<%s>", qPrintable(fileName));
+            }
+            else {
+                info.setFile(dir2, remainingFileName);
+                if (info.isFile()) {
+                    path = info.absoluteFilePath();
+                    // qWarning("Found #include<%s>", qPrintable(fileName));
+                }
+            }
+        }
+    }
+#endif
+
+    if (fileName == "stdio.h")
+    {
+        qWarning("Not parsing stdio.h because it is not handled correctly by smokegen on FreeBSD based systems");
+        return 0;
+    }
+ 
     if (path.isEmpty())
+    {
+        qWarning("Couldn't find file for #include<%s>", qPrintable(fileName));
         return 0;
+    }
     
     QFile file(path);
     file.open(QFile::ReadOnly);

data/ext/generator/generators/smoke/generator_smoke.cpp

@@ -213,13 +213,20 @@ int generate()
     Options::qtMode = ParserOptions::qtMode;
 
     Options::voidpTypes << "long long" << "long long int" << "unsigned long long" << "unsigned long long int";
+    Options::scalarTypes << "long long" << "long long int" << "unsigned long long" << "unsigned long long int";
     
     // Fill the type map. It maps some long integral types to shorter forms as used in SMOKE.
     Util::typeMap["long int"] = "long";
     Util::typeMap["short int"] = "short";
     Util::typeMap["long double"] = "double";
     Util::typeMap["wchar_t"] = "int";   // correct?
-    
+
+    if (sizeof(unsigned int) == sizeof(size_t)) {
+        Util::typeMap["size_t"] = "uint";
+    } else if (sizeof(unsigned long) == sizeof(size_t)) {
+        Util::typeMap["size_t"] = "ulong";
+    }
+
     qDebug() << "Generating SMOKE sources...";
     
     SmokeDataFile smokeData;

data/ext/generator/generators/smoke/helpers.cpp

@@ -244,7 +244,7 @@ bool Util::canClassBeInstanciated(const Class* klass)
         if (meth.isConstructor()) {
             ctorFound = true;
             if (meth.access() != Access_private) {
-                // this class can be instanciated
+                // this class can be instanstiated
                 publicCtorFound = true;
             }
         } else if ((meth.flags() & Method::PureVirtual) && meth.access() == Access_private) {
@@ -252,9 +252,9 @@ bool Util::canClassBeInstanciated(const Class* klass)
         }
     }
     
-    // The class can be instanciated if it has a public constructor or no constructor at all
+    // The class can be instanstiated if it has a public constructor or no constructor at all
     // because then it has a default one generated by the compiler.
-    // If it has private pure virtuals, then it can't be instanciated either.
+    // If it has private pure virtuals, then it can't be instanstiated either.
     bool ret = ((publicCtorFound || !ctorFound) && !privatePureVirtualsFound);
     cache[klass] = ret;
     return ret;
@@ -375,7 +375,7 @@ void Util::checkForAbstractClass(Class* klass)
             list << &meth;
     }
     
-    // abstract classes can't be instanciated - remove the constructors
+    // abstract classes can't be instanstiated - remove the constructors
     if (hasPrivatePureVirtuals) {
         foreach (const Method* ctor, list) {
             klass->methodsRef().removeOne(*ctor);
@@ -714,7 +714,7 @@ QList<const Method*> Util::virtualMethodsForClass(const Class* klass)
 {
     static QHash<const Class*, QList<const Method*> > cache;
     
-    // virtual method callbacks for classes that can't be instanciated aren't useful
+    // virtual method callbacks for classes that can't be instanstiated aren't useful
     if (!Util::canClassBeInstanciated(klass))
         return QList<const Method*>();
     

data/ext/generator/generators/smoke/writeClasses.cpp

@@ -469,7 +469,7 @@ void SmokeClassFiles::writeClass(QTextStream& out, const Class* klass, const QSt
     }
     
     // destructor
-    // if the class can't be instanciated, a callback when it's deleted is unnecessary
+    // if the class can't be instanstiated, a callback when it's deleted is unnecessary
     if (Util::canClassBeInstanciated(klass)) {
         out << "    ~" << smokeClassName << "() ";
         if (destructor && destructor->hasExceptionSpec()) {

data/ext/generator/parser/lexer.cpp

@@ -205,6 +205,7 @@ KDevVarLengthArray<KDevVarLengthArray<QPair<uint, TOKEN_KIND>, 10 >, index_size
   ADD_TOKEN(virtual);
   ADD_TOKEN(void);
   ADD_TOKEN(volatile);
+  ADD_TOKEN(size_t);
   ADD_TOKEN(wchar_t);
   ADD_TOKEN(while);
   ADD_TOKEN(xor);

data/ext/generator/parser/parser.cpp

@@ -369,9 +369,8 @@ void Parser::reportError(const QString& msg)
       Problem *p = new Problem;
       p->file = session->url().str();
       p->position = position;
-      p->description = msg;
+      p->description = msg + " : " + QString::fromUtf8(lineFromContents(session->contents(), p->position.line));
       p->source = Problem::Source_Parser;
-
       control->reportProblem(p);
     }
   else if (_M_hold_errors)
@@ -411,6 +410,7 @@ bool Parser::skipUntilDeclaration()
         case Token_identifier:
         case Token_operator:
         case Token_char:
+        case Token_size_t:
         case Token_wchar_t:
         case Token_bool:
         case Token_short:
@@ -476,6 +476,7 @@ bool Parser::skipUntilStatement()
         case Token_catch:
         case Token_throw:
         case Token_char:
+        case Token_size_t:
         case Token_wchar_t:
         case Token_bool:
         case Token_short:
@@ -1199,6 +1200,7 @@ bool Parser::parseSimpleTypeSpecifier(TypeSpecifierAST *&node,
       switch(session->token_stream->lookAhead())
         {
         case Token_char:
+        case Token_size_t:
         case Token_wchar_t:
         case Token_bool:
         case Token_short:

data/ext/generator/parser/rpp/chartools.cpp

@@ -36,6 +36,26 @@ QByteArray stringFromContents(const PreprocessedContents& contents, int offset,
   return ret;
 }
 
+#include <stdio.h>
+
+QByteArray lineFromContents(const uint* contents, int lineNumber) {
+  int a1 = 0;
+  int lineCount = 0;
+  while (lineCount < lineNumber) {
+    if (isNewline(contents[a1])) {
+        lineCount++;
+    }
+    a1++;
+  }
+
+  int a2 = a1;
+  while (!isNewline(contents[a2])) {
+    a2++;
+  }
+
+  return stringFromContents(contents + a1, a2 - a1);
+}
+
 QByteArray stringFromContents(const uint* contents, int count) {
   QByteArray ret;
   for(int a = 0; a < count; ++a) {

data/ext/generator/parser/rpp/chartools.h

@@ -72,12 +72,19 @@ inline bool isNumber(unsigned int c) {
   return isCharacter(c) && QChar(characterFromIndex(c)).isNumber();
 }
 
+inline bool isNewline(unsigned int c) {
+  return isCharacter(c) && characterFromIndex(c) == '\n';
+}
+
 ///Opposite of convertFromByteArray
 CPPPARSER_EXPORT QByteArray stringFromContents(const PreprocessedContents& contents, int offset = 0, int count = 0);
 
 ///Opposite of convertFromByteArray
 CPPPARSER_EXPORT QByteArray stringFromContents(const uint* contents, int count);
 
+///Return the line at the given line number from the contents
+CPPPARSER_EXPORT QByteArray lineFromContents(const uint* contents, int lineNumber);
+
 ///Returns a string that has a gap inserted between the tokens(for debugging)
 CPPPARSER_EXPORT QByteArray stringFromContentsWithGaps(const PreprocessedContents& contents, int offset = 0, int count = 0);
 

data/ext/generator/parser/rpp/pp-macro-expander.cpp

@@ -268,10 +268,10 @@ void pp_macro_expander::operator()(Stream& input, Stream& output)
         output << '\"';
 
         while (!is.atEnd()) {
-          if (input == '"') {
+          if (is == '"') {
             output << '\\' << is;
 
-          } else if (input == '\n') {
+          } else if (is == '\n') {
             output << '"' << is << '"';
 
           } else {
@@ -338,7 +338,7 @@ void pp_macro_expander::operator()(Stream& input, Stream& output)
             
             skip_blanks(input, devnull());
             //Omit paste tokens behind empty used actuals, else we will merge with the previous text
-            if(input == '#' && (++input) == '#') {
+            if(!input.atEnd() && input == '#' && !(++input).atEnd() && input == '#') {
               ++input;
               //We have skipped a paste token
             }else{