Commits

Anonymous committed 5e6303e

Updated the patches to apply against PyQt 4.9.1-2ubuntu1.
The qapplication.sip and qabstractsocket.sip patches are incomplete because the
graph data structures need to be modified to handle features.

  • Participants
  • Parent commits ea789bd

Comments (0)

Files changed (91)

File PyQt4-Qt-Embedded-Linux-patches/qpy/QtCore/qpycore_init.cpp.diff

 --- qpy/QtCore/qpycore_init.cpp.old	2009-10-01 01:45:46.000000000 +0200
 +++ qpy/QtCore/qpycore_init.cpp	2009-10-01 01:54:27.000000000 +0200
-@@ -30,6 +30,7 @@
+@@ -30,7 +30,8 @@
  
  #include <Python.h>
  
 +#include <qconfig.h>
+ #include "qpycore_chimera.h"
  #include "qpycore_qobject_helpers.h"
  #include "qpycore_shared.h"
  #include "qpycore_sip.h"

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/QtCoremod.sip.diff

  %Include qbasictimer.sip
  %Include qbitarray.sip
  %Include qbuffer.sip
-@@ -156,77 +297,131 @@
+@@ -156,78 +297,132 @@
  %Include qcoreapplication.sip
  %Include qcoreevent.sip
  %Include qcryptographichash.sip
 +%If (PyQt_XMLStream)
 +  %Include qxmlstream.sip
 +%End
+ %Include qpynullvariant.sip

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstracteventdispatcher.sip.diff

 +%If (PyQt_Thread)
      static QAbstractEventDispatcher *instance(QThread *thread = 0);
 +%End
-     virtual bool processEvents(QFlags<QEventLoop::ProcessEventsFlag>) = 0 /ReleaseGIL/;
+     virtual bool processEvents(QFlags<QEventLoop::ProcessEventsFlag> flags) = 0 /ReleaseGIL/;
      virtual bool hasPendingEvents() = 0;
-     virtual void registerSocketNotifier(QSocketNotifier *) = 0;
+     virtual void registerSocketNotifier(QSocketNotifier *notifier) = 0;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstractitemmodel.sip.diff

---- sip/QtCore/qabstractitemmodel.sip.old	2010-09-11 00:11:48.000000000 +0200
-+++ sip/QtCore/qabstractitemmodel.sip	2010-09-11 00:20:52.000000000 +0200
+--- sip/QtCore/qabstractitemmodel.sip.old	2012-10-04 17:32:10.952244884 +0200
++++ sip/QtCore/qabstractitemmodel.sip	2012-10-04 17:33:40.188244447 +0200
 @@ -183,8 +183,10 @@
-     virtual void revert();
+ %End
  
  protected:
 +%If (PyQt_DataStream)
-     void encodeData(const QModelIndexList &, QDataStream &) const;
-     bool decodeData(int, int, const QModelIndex &, QDataStream &);
+     void encodeData(const QModelIndexList &indexes, QDataStream &stream) const;
+     bool decodeData(int row, int column, const QModelIndex &parent, QDataStream &stream);
 +%End
-     void beginInsertRows(const QModelIndex &, int, int);
+     void beginInsertRows(const QModelIndex &parent, int first, int last);
      void endInsertRows();
-     void beginRemoveRows(const QModelIndex &, int, int);
+     void beginRemoveRows(const QModelIndex &parent, int first, int last);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstracttransition.sip.diff

 +++ sip/QtCore/qabstracttransition.sip	2010-09-12 00:52:29.000000000 +0200
 @@ -47,9 +47,11 @@
      QList<QAbstractState*> targetStates() const;
-     void setTargetStates(const QList<QAbstractState*> &);
+     void setTargetStates(const QList<QAbstractState*> &targets);
      QStateMachine *machine() const;
 +%If (PyQt_Animation)
-     void addAnimation(QAbstractAnimation *);
-     void removeAnimation(QAbstractAnimation *);
+     void addAnimation(QAbstractAnimation *animation);
+     void removeAnimation(QAbstractAnimation *animation);
      QList<QAbstractAnimation*> animations() const;
 +%End
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qbytearray.sip.diff

 --- sip/QtCore/qbytearray.sip.old	2010-09-07 02:05:18.000000000 +0200
 +++ sip/QtCore/qbytearray.sip	2010-09-07 02:05:36.000000000 +0200
 @@ -394,8 +394,10 @@
- bool operator>(const QByteArray &, const QByteArray &);
- bool operator>=(const QByteArray &, const QByteArray &);
- const QByteArray operator+(const QByteArray &, const QByteArray &);
+ bool operator>(const QByteArray &a1, const QByteArray &a2);
+ bool operator>=(const QByteArray &a1, const QByteArray &a2);
+ const QByteArray operator+(const QByteArray &a1, const QByteArray &a2);
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QByteArray & /Constrained/);
  QDataStream &operator>>(QDataStream &, QByteArray & /Constrained/);
 +%End
- QByteArray qCompress(const QByteArray &, int compressionLevel = -1);
- QByteArray qUncompress(const QByteArray &);
+ QByteArray qCompress(const QByteArray &data, int compressionLevel = -1);
+ QByteArray qUncompress(const QByteArray &data);
  %If (Qt_4_3_0 -)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qchar.sip.diff

 --- sip/QtCore/qchar.sip.old	2010-09-07 01:53:31.000000000 +0200
 +++ sip/QtCore/qchar.sip	2010-09-07 01:53:55.000000000 +0200
 @@ -407,5 +407,7 @@
- bool operator>=(QChar, QChar);
- bool operator<(QChar, QChar);
- bool operator>(QChar, QChar);
+ bool operator>=(QChar c1, QChar c2);
+ bool operator<(QChar c1, QChar c2);
+ bool operator>(QChar c1, QChar c2);
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QChar & /Constrained/);
  QDataStream &operator>>(QDataStream &, QChar & /Constrained/);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qdatetime.sip.diff

      int daysInYear() const;
      int weekNumber(int *yearNumber = 0) const;
 +%If (PyQt_TextDate)
-     static QString shortMonthName(int);
-     static QString shortDayName(int);
-     static QString longMonthName(int);
-     static QString longDayName(int);
+     static QString shortMonthName(int month);
+     static QString shortDayName(int weekday);
+     static QString longMonthName(int month);
+     static QString longDayName(int weekday);
 +%End
 +%If (PyQt_DateString)
      QString toString(Qt::DateFormat format = Qt::TextDate) const;
-     QString toString(const QString &) const;
+     QString toString(const QString &format) const;
 +%End
-     bool setYMD(int, int, int);
-     QDate addDays(int) const;
-     QDate addMonths(int) const;
+     bool setYMD(int y, int m, int d);
+     QDate addDays(int days) const;
+     QDate addMonths(int months) const;
 @@ -155,8 +161,10 @@
-     bool operator>(const QDate &) const;
-     bool operator>=(const QDate &) const;
+     bool operator>(const QDate &other) const;
+     bool operator>=(const QDate &other) const;
      static QDate currentDate();
 +%If (PyQt_DateString)
-     static QDate fromString(const QString &, Qt::DateFormat format = Qt::TextDate);
-     static QDate fromString(const QString &, const QString &);
+     static QDate fromString(const QString &string, Qt::DateFormat format = Qt::TextDate);
+     static QDate fromString(const QString &s, const QString &format);
 +%End
-     static bool isValid(int, int, int);
-     static bool isLeapYear(int);
-     static uint gregorianToJulian(int, int, int);
+     static bool isValid(int y, int m, int d);
+     static bool isLeapYear(int year);
+     static uint gregorianToJulian(int y, int m, int d);
 @@ -178,6 +186,7 @@
      };
  
      int msec() const;
 +%If (PyQt_DateString)
      QString toString(Qt::DateFormat format = Qt::TextDate) const;
-     QString toString(const QString &) const;
+     QString toString(const QString &format) const;
 +%End
-     bool setHMS(int, int, int, int msec = 0);
-     QTime addSecs(int) const;
+     bool setHMS(int h, int m, int s, int msec = 0);
+     QTime addSecs(int secs) const;
      int secsTo(const QTime &) const;
 @@ -329,8 +343,10 @@
-     bool operator>(const QTime &) const;
-     bool operator>=(const QTime &) const;
+     bool operator>(const QTime &other) const;
+     bool operator>=(const QTime &other) const;
      static QTime currentTime();
 +%If (PyQt_DateString)
-     static QTime fromString(const QString &, Qt::DateFormat format = Qt::TextDate);
-     static QTime fromString(const QString &, const QString &);
+     static QTime fromString(const QString &string, Qt::DateFormat format = Qt::TextDate);
+     static QTime fromString(const QString &s, const QString &format);
 +%End
-     static bool isValid(int, int, int, int msec = 0);
+     static bool isValid(int h, int m, int s, int msec = 0);
      void start();
      int restart();
 @@ -465,6 +481,7 @@
  %If (Py_DateTime)
      SIP_PYOBJECT toPyDateTime() const /DocType="datetime.datetime"/;
 @@ -508,8 +526,10 @@
-     void setTime(const QTime &);
-     void setTimeSpec(Qt::TimeSpec);
-     void setTime_t(uint);
+     void setTime(const QTime &time);
+     void setTimeSpec(Qt::TimeSpec spec);
+     void setTime_t(uint secsSince1Jan1970UTC);
 +%If (PyQt_DateString)
      QString toString(Qt::DateFormat format = Qt::TextDate) const;
-     QString toString(const QString &) const;
+     QString toString(const QString &format) const;
 +%End
-     QDateTime addDays(int) const;
-     QDateTime addMonths(int) const;
-     QDateTime addYears(int) const;
+     QDateTime addDays(int days) const;
+     QDateTime addMonths(int months) const;
+     QDateTime addYears(int years) const;
 @@ -527,8 +547,10 @@
-     bool operator>(const QDateTime &) const;
-     bool operator>=(const QDateTime &) const;
+     bool operator>(const QDateTime &other) const;
+     bool operator>=(const QDateTime &other) const;
      static QDateTime currentDateTime();
 +%If (PyQt_DateString)
-     static QDateTime fromString(const QString &, Qt::DateFormat format = Qt::TextDate);
-     static QDateTime fromString(const QString &, const QString &);
+     static QDateTime fromString(const QString &string, Qt::DateFormat format = Qt::TextDate);
+     static QDateTime fromString(const QString &s, const QString &format);
 +%End
  %If (Qt_4_2_0 -)
-     static QDateTime fromTime_t(uint);
+     static QDateTime fromTime_t(uint secsSince1Jan1970UTC);
  %End
 @@ -552,9 +574,11 @@
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qnamespace.sip.diff

  
      enum NavigationMode
 @@ -1790,5 +1792,7 @@
- QFlags<Qt::TouchPointState> operator|(Qt::TouchPointState, QFlags<Qt::TouchPointState>);
+ QFlags<Qt::TouchPointState> operator|(Qt::TouchPointState f1, QFlags<Qt::TouchPointState> f2);
  %End
  %If (Qt_4_6_0 -)
 +%If (PyQt_Gestures)
- QFlags<Qt::GestureFlag> operator|(Qt::GestureFlag, QFlags<Qt::GestureFlag>);
+ QFlags<Qt::GestureFlag> operator|(Qt::GestureFlag f1, QFlags<Qt::GestureFlag> f2);
  %End
 +%End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qobject.sip.diff

 @@ -472,8 +494,10 @@
      bool isWidgetType() const;
      bool signalsBlocked() const;
-     bool blockSignals(bool);
+     bool blockSignals(bool b);
 +%If (PyQt_Thread)
      QThread *thread() const;
-     void moveToThread(QThread *);
+     void moveToThread(QThread *thread);
 +%End
-     int startTimer(int);
-     void killTimer(int);
+     int startTimer(int interval);
+     void killTimer(int id);
      const QObjectList &children() const;
 @@ -507,11 +531,13 @@
  
  %If (Qt_4_2_0 -)
      QList<QByteArray> dynamicPropertyNames() const;
  %End
-     bool setProperty(const char *, const QVariant &);
-     QVariant property(const char *) const;
+     bool setProperty(const char *name, const QVariant &value);
+     QVariant property(const char *name) const;
 +%End
  
  signals:

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qpoint.sip.diff

 --- sip/QtCore/qpoint.sip.old	2010-09-07 01:49:30.000000000 +0200
 +++ sip/QtCore/qpoint.sip	2010-09-07 01:50:10.000000000 +0200
 @@ -76,8 +76,10 @@
-     QPoint &operator/=(qreal);
+     QPoint &operator/=(qreal c);
  };
  
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QPoint & /Constrained/);
  QDataStream &operator>>(QDataStream &, QPoint & /Constrained/);
 +%End
- bool operator==(const QPoint &, const QPoint &);
- bool operator!=(const QPoint &, const QPoint &);
- const QPoint operator+(const QPoint &, const QPoint &);
+ bool operator==(const QPoint &p1, const QPoint &p2);
+ bool operator!=(const QPoint &p1, const QPoint &p2);
+ const QPoint operator+(const QPoint &p1, const QPoint &p2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qreadwritelock.sip.diff

      QReadWriteLock();
  %If (Qt_4_4_0 -)
 +%If (PyQt_Thread)
-     QReadWriteLock(QReadWriteLock::RecursionMode);
+     QReadWriteLock(QReadWriteLock::RecursionMode recursionMode);
  %End
 +%End
      ~QReadWriteLock();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qrect.sip.diff

  QDataStream &operator<<(QDataStream &, const QRect & /Constrained/);
  QDataStream &operator>>(QDataStream &, QRect & /Constrained/);
 +%End
- bool operator==(const QRect &, const QRect &);
- bool operator!=(const QRect &, const QRect &);
+ bool operator==(const QRect &r1, const QRect &r2);
+ bool operator!=(const QRect &r1, const QRect &r2);
  
 @@ -289,7 +291,9 @@
  %End
  QDataStream &operator<<(QDataStream &, const QRectF & /Constrained/);
  QDataStream &operator>>(QDataStream &, QRectF & /Constrained/);
 +%End
- bool operator==(const QRectF &, const QRectF &);
- bool operator!=(const QRectF &, const QRectF &);
+ bool operator==(const QRectF &r1, const QRectF &r2);
+ bool operator!=(const QRectF &r1, const QRectF &r2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qregexp.sip.diff

  };
  
 +%If (PyQt_DataStream)
- QDataStream &operator<<(QDataStream &, const QRegExp & /Constrained/);
- QDataStream &operator>>(QDataStream &, QRegExp & /Constrained/);
+ QDataStream &operator<<(QDataStream &out, const QRegExp &regExp /Constrained/);
+ QDataStream &operator>>(QDataStream &in, QRegExp &regExp /Constrained/);
 +%End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qsize.sip.diff

 --- sip/QtCore/qsize.sip.old	2010-09-07 01:38:01.000000000 +0200
 +++ sip/QtCore/qsize.sip	2010-09-07 01:38:41.000000000 +0200
 @@ -82,8 +82,10 @@
-     QSize boundedTo(const QSize &) const;
+     QSize boundedTo(const QSize &otherSize) const;
  };
  
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QSize & /Constrained/);
  QDataStream &operator>>(QDataStream &, QSize & /Constrained/);
 +%End
- bool operator==(const QSize &, const QSize &);
- bool operator!=(const QSize &, const QSize &);
- const QSize operator+(const QSize &, const QSize &);
+ bool operator==(const QSize &s1, const QSize &s2);
+ bool operator!=(const QSize &s1, const QSize &s2);
+ const QSize operator+(const QSize &s1, const QSize &s2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstate.sip.diff

 --- sip/QtCore/qstate.sip.old	2010-09-12 01:02:25.000000000 +0200
 +++ sip/QtCore/qstate.sip	2010-09-12 00:53:42.000000000 +0200
 @@ -75,7 +75,9 @@
-     void setInitialState(QAbstractState *);
+     void setInitialState(QAbstractState *state /KeepReference/);
      QState::ChildMode childMode() const;
-     void setChildMode(QState::ChildMode);
+     void setChildMode(QState::ChildMode mode);
 +%If (PyQt_Properties)
-     void assignProperty(QObject *, const char *, const QVariant &);
+     void assignProperty(QObject *object, const char *name, const QVariant &value);
 +%End
  
  signals:

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstatemachine.sip.diff

      bool isRunning() const;
 +%If (PyQt_Animation)
      bool isAnimated() const;
-     void setAnimated(bool);
-     void addDefaultAnimation(QAbstractAnimation *);
+     void setAnimated(bool enabled);
+     void addDefaultAnimation(QAbstractAnimation *animation);
      QList<QAbstractAnimation*> defaultAnimations() const;
-     void removeDefaultAnimation(QAbstractAnimation *);
+     void removeDefaultAnimation(QAbstractAnimation *animation);
 +%End
      QStateMachine::RestorePolicy globalRestorePolicy() const;
-     void setGlobalRestorePolicy(QStateMachine::RestorePolicy);
-     void postEvent(QEvent * /Transfer/, QStateMachine::EventPriority priority = QStateMachine::NormalPriority);
+     void setGlobalRestorePolicy(QStateMachine::RestorePolicy restorePolicy);
+     void postEvent(QEvent *event /Transfer/, QStateMachine::EventPriority priority = QStateMachine::NormalPriority);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstring.sip.diff

      
          // A Python string is the most convenient method to save the encoded
 @@ -600,8 +606,10 @@
- const QString operator+(QChar, const QString &) /Numeric/;
- const QString operator+(const QByteArray &, const QString &) /Numeric/;
- const QString operator+(const QString &, const QByteArray &) /Numeric/;
+ const QString operator+(QChar s1, const QString &s2) /Numeric/;
+ const QString operator+(const QByteArray &ba, const QString &s) /Numeric/;
+ const QString operator+(const QString &s, const QByteArray &ba) /Numeric/;
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QString & /Constrained/) /API=QString: - 2/;
  QDataStream &operator>>(QDataStream &, QString & /Constrained/) /API=QString: - 2/;
 +%End
- QFlags<QString::SectionFlag> operator|(QString::SectionFlag, QFlags<QString::SectionFlag>);
+ QFlags<QString::SectionFlag> operator|(QString::SectionFlag f1, QFlags<QString::SectionFlag> f2);
  %If (Qt_4_3_0 -)
- bool operator==(const QLatin1String &, const QLatin1String &);
+ bool operator==(const QLatin1String &s1, const QLatin1String &s2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstringlist.sip.diff

  };
  
 +%If (PyQt_DataStream)
- QDataStream &operator>>(QDataStream &, QStringList & /Constrained/) /API=QString: - 2/;
- QDataStream &operator<<(QDataStream &, const QStringList & /Constrained/) /API=QString: - 2/;
+ QDataStream &operator>>(QDataStream &in, QStringList &list /Constrained/) /API=QString: - 2/;
+ QDataStream &operator<<(QDataStream &out, const QStringList &list /Constrained/) /API=QString: - 2/;
 +%End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qtextstream.sip.diff

 --- sip/QtCore/qtextstream.sip.old	2010-10-23 14:51:35.000000000 +0200
 +++ sip/QtCore/qtextstream.sip	2010-10-23 14:55:09.000000000 +0200
 @@ -78,6 +78,7 @@
-     QTextStream(QString * /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
-     QTextStream(QByteArray * /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite);
+     QTextStream(QString *string /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
+     QTextStream(QByteArray *array /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite);
      virtual ~QTextStream();
 +%If (PyQt_TextCodec)
-     void setCodec(QTextCodec * /KeepReference/);
-     void setCodec(const char *);
+     void setCodec(QTextCodec *codec /KeepReference/);
+     void setCodec(const char *codecName);
      QTextCodec *codec() const;
 @@ -85,6 +86,7 @@
      bool autoDetectUnicode() const;
-     void setGenerateByteOrderMark(bool);
+     void setGenerateByteOrderMark(bool generate);
      bool generateByteOrderMark() const;
 +%End
-     void setDevice(QIODevice *);
+     void setDevice(QIODevice *device);
      QIODevice *device() const;
-     void setString(QString * /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
+     void setString(QString *string /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
 @@ -166,7 +168,9 @@
- QTextStream &endl(QTextStream &);
- QTextStream &flush(QTextStream &);
- QTextStream &reset(QTextStream &);
+ QTextStream &endl(QTextStream &s);
+ QTextStream &flush(QTextStream &s);
+ QTextStream &reset(QTextStream &s);
 +%If (PyQt_TextCodec)
- QTextStream &bom(QTextStream &);
+ QTextStream &bom(QTextStream &s);
 +%End
- QTextStream &ws(QTextStream &);
- QTextStreamManipulator qSetFieldWidth(int);
- QTextStreamManipulator qSetPadChar(QChar);
+ QTextStream &ws(QTextStream &s);
+ QTextStreamManipulator qSetFieldWidth(int width);
+ QTextStreamManipulator qSetPadChar(QChar ch);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qurl.sip.diff

 @@ -241,8 +241,10 @@
  };
  
- QFlags<QUrl::FormattingOption> operator|(QUrl::FormattingOption, QFlags<QUrl::FormattingOption>);
+ QFlags<QUrl::FormattingOption> operator|(QUrl::FormattingOption f1, QFlags<QUrl::FormattingOption> f2);
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QUrl & /Constrained/);
  QDataStream &operator>>(QDataStream &, QUrl & /Constrained/);
 +%End
  %If (Qt_4_3_0 -)
- void qSwap(QUrl &, QUrl &);
+ void qSwap(QUrl &value1, QUrl &value2);
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/quuid.sip.diff

---- sip/QtCore/quuid.sip.old	2010-09-07 02:17:05.000000000 +0200
-+++ sip/QtCore/quuid.sip	2010-09-07 02:17:35.000000000 +0200
-@@ -60,6 +60,7 @@
+--- sip/QtCore/quuid.sip.old	2012-10-04 17:38:58.836242905 +0200
++++ sip/QtCore/quuid.sip	2012-10-04 17:42:58.880241743 +0200
+@@ -55,10 +55,13 @@
  
      QUuid();
-     QUuid(uint, ushort, ushort, uchar, uchar, uchar, uchar, uchar, uchar, uchar, uchar);
+     QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8);
 +%If (PyQt_UUIDString)
      QUuid(const QString &);
++%End
+ %If (Qt_4_8_0 -)
+     QUuid(const QByteArray &);
+ %End
++%If (PyQt_UUIDString)
      SIP_PYOBJECT __repr__() const /DocType="str"/;
  %MethodCode
-@@ -78,8 +79,11 @@
+         PyObject *uni = qpycore_PyObject_FromQString(sipCpp->toString());
+@@ -76,8 +79,11 @@
              Py_DECREF(uni);
          }
  %End
      QString toString() const;
 +%End
      bool isNull() const;
-     bool operator==(const QUuid &) const;
-     bool operator!=(const QUuid &) const;
-@@ -88,8 +92,12 @@
+     bool operator==(const QUuid &orig) const;
+     bool operator!=(const QUuid &orig) const;
+@@ -86,7 +92,9 @@
      static QUuid createUuid();
      QUuid::Variant variant() const;
      QUuid::Version version() const;
 +%If (PyQt_UUIDString)
      operator QString() const;
 +%End
+ %If (Qt_4_8_0 -)
+     QByteArray toByteArray() const;
+ %End
+@@ -98,5 +106,7 @@
+ %End
  };
  
 +%If (PyQt_DataStream)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qvariant.sip.diff

  %End
  
 +%If (PyQt_DataStream)
-     void load(QDataStream &);
-     void save(QDataStream &) const;
+     void load(QDataStream &ds);
+     void save(QDataStream &ds) const;
 +%End
-     static const char *typeToName(QVariant::Type);
-     static QVariant::Type nameToType(const char *);
+     static const char *typeToName(QVariant::Type type);
+     static QVariant::Type nameToType(const char *name);
      void *data();
-@@ -324,10 +326,12 @@
+@@ -324,11 +326,13 @@
  %If (Qt_4_5_0 -)
  typedef QHash<QString,QVariant> QVariantHash /DocType="Py_v3:dict-of-str-object"/;
  %End
 +%If (PyQt_DataStream)
- QDataStream &operator>>(QDataStream &, QVariant & /Constrained/) /API=QVariant: - 2/;
- QDataStream &operator<<(QDataStream &, const QVariant & /Constrained/) /API=QVariant: - 2/;
- QDataStream &operator>>(QDataStream &, QVariant::Type & /Constrained,In/);
- QDataStream &operator<<(QDataStream &, const QVariant::Type /Constrained/);
+ QDataStream &operator>>(QDataStream &s, QVariant &p /Constrained/) /API=QVariant: - 2/;
+ typedef QMap<QString, QVariant> QVariantMap /DocType="Py_v3:dict-of-str-object"/;
+ QDataStream &operator<<(QDataStream &s, const QVariant &p /Constrained/) /API=QVariant: - 2/;
+ QDataStream &operator>>(QDataStream &s, QVariant::Type &p /Constrained,In/);
+ QDataStream &operator<<(QDataStream &s, const QVariant::Type p /Constrained/);
 +%End
  %If (Qt_4_3_0 -)
- void qSwap(QVariant &, QVariant &) /API=QVariant: - 2/;
+ void qSwap(QVariant &value1, QVariant &value2) /API=QVariant: - 2/;
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qwaitcondition.sip.diff

 +++ sip/QtCore/qwaitcondition.sip	2010-09-07 01:58:22.000000000 +0200
 @@ -41,8 +41,10 @@
      ~QWaitCondition();
-     bool wait(QMutex *, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;
+     bool wait(QMutex *mutex, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;
  %If (Qt_4_4_0 -)
 +%If (PyQt_Thread)
-     bool wait(QReadWriteLock *, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;
+     bool wait(QReadWriteLock *readWriteLock, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;
  %End
 +%End
      void wakeOne();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qxmlstream.sip.diff

  {
 @@ -455,9 +458,11 @@
      ~QXmlStreamWriter();
-     void setDevice(QIODevice *);
+     void setDevice(QIODevice *device);
      QIODevice *device() const;
 +%If (PyQt_TextCodec)
-     void setCodec(QTextCodec * /KeepReference/);
-     void setCodec(const char *);
+     void setCodec(QTextCodec *codec /KeepReference/);
+     void setCodec(const char *codecName);
      QTextCodec *codec() const;
 +%End
      void setAutoFormatting(bool);
      bool autoFormatting() const;
-     void setAutoFormattingIndent(int);
-@@ -487,10 +492,13 @@
+     void setAutoFormattingIndent(int spaces);
+@@ -487,13 +492,16 @@
  %End
-     void writeStartElement(const QString &);
-     void writeStartElement(const QString &, const QString &);
+     void writeStartElement(const QString &qualifiedName);
+     void writeStartElement(const QString &namespaceUri, const QString &name);
 +%If (PyQt_XMLStreamReader)
-     void writeCurrentToken(const QXmlStreamReader &);
+     void writeCurrentToken(const QXmlStreamReader &reader);
 +%End
- 
+ %If (Qt_4_8_0 -)
+     bool hasError() const;
+ %End
+
  private:
      QXmlStreamWriter(const QXmlStreamWriter &);
  };

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/QtGuimod.sip.diff

 --- sip/QtGui/QtGuimod.sip.old	2010-10-10 00:37:06.000000000 +0200
 +++ sip/QtGui/QtGuimod.sip	2010-10-10 01:59:24.000000000 +0200
-@@ -68,197 +68,421 @@
+@@ -68,201 +68,425 @@
  %DefaultSupertype sip.simplewrapper
  
  %Include qabstractbutton.sip
 -%Include qcolumnview.sip
 -%Include qcolordialog.sip
 -%Include qcombobox.sip
+-%Include qcommonstyle.sip
 -%Include qcompleter.sip
 -%Include qcursor.sip
 -%Include qdatawidgetmapper.sip
 +%If (PyQt_ComboBox)
 +  %Include qcombobox.sip
 +%End
++%Include qcommonstyle.sip
 +%If (PyQt_Completer)
 +  %Include qcompleter.sip
 +%End
  %Include qgenericmatrix.sip
 -%Include qgesture.sip
 -%Include qgesturerecognizer.sip
+-%Include qglyphrun.sip
 -%Include qgraphicsanchorlayout.sip
 -%Include qgraphicseffect.sip
 -%Include qgraphicsgridlayout.sip
 +  %Include qgesture.sip
 +  %Include qgesturerecognizer.sip
 +%End
++%Include qglyphrun.sip
 +%If (PyQt_GraphicsView)
 +  %Include qgraphicsanchorlayout.sip
 +  %Include qgraphicseffect.sip
 +%End
  %Include qicon.sip
  %Include qiconengine.sip
+ %Include qidentityproxymodel.sip
  %Include qimage.sip
  %Include qimageiohandler.sip
  %Include qimagereader.sip
  %Include qpushbutton.sip
  %Include qquaternion.sip
  %Include qradiobutton.sip
+ %Include qrawfont.sip
  %Include qregion.sip
  %Include qrgb.sip
 -%Include qrubberband.sip

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractbutton.sip.diff

 --- sip/QtGui/qabstractbutton.sip.old	2010-09-08 01:00:52.000000000 +0200
 +++ sip/QtGui/qabstractbutton.sip	2010-09-08 01:01:16.000000000 +0200
 @@ -56,8 +56,10 @@
-     void setIcon(const QIcon &);
+     void setIcon(const QIcon &icon);
      QIcon icon() const;
      QSize iconSize() const;
 +%If (PyQt_Shortcut)
-     void setShortcut(const QKeySequence &);
+     void setShortcut(const QKeySequence &key);
      QKeySequence shortcut() const;
 +%End
      void setCheckable(bool);
 +%End
  
  public slots:
-     void setIconSize(const QSize &);
+     void setIconSize(const QSize &size);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractitemview.sip.diff

      {
 @@ -123,10 +125,12 @@
      bool hasAutoScroll() const;
-     void setTabKeyNavigation(bool);
+     void setTabKeyNavigation(bool enable);
      bool tabKeyNavigation() const;
 +%If (PyQt_DragAndDrop)
-     void setDropIndicatorShown(bool);
+     void setDropIndicatorShown(bool enable);
      bool showDropIndicator() const;
-     void setDragEnabled(bool);
+     void setDragEnabled(bool enable);
      bool dragEnabled() const;
 +%End
-     void setAlternatingRowColors(bool);
+     void setAlternatingRowColors(bool enable);
      bool alternatingRowColors() const;
-     void setIconSize(const QSize &);
+     void setIconSize(const QSize &size);
 @@ -233,7 +237,9 @@
      virtual QModelIndexList selectedIndexes() const;
-     virtual bool edit(const QModelIndex &, QAbstractItemView::EditTrigger, QEvent *);
-     virtual QFlags<QItemSelectionModel::SelectionFlag> selectionCommand(const QModelIndex &, const QEvent *event = 0) const;
+     virtual bool edit(const QModelIndex &index, QAbstractItemView::EditTrigger trigger, QEvent *event);
+     virtual QFlags<QItemSelectionModel::SelectionFlag> selectionCommand(const QModelIndex &index, const QEvent *event = 0) const;
 +%If (PyQt_DragAndDrop)
-     virtual void startDrag(Qt::DropActions);
+     virtual void startDrag(Qt::DropActions supportedActions);
 +%End
      virtual QStyleOptionViewItem viewOptions() const;
  
      enum State
-@@ -262,16 +268,19 @@
-     virtual void mouseMoveEvent(QMouseEvent *);
-     virtual void mouseReleaseEvent(QMouseEvent *);
-     virtual void mouseDoubleClickEvent(QMouseEvent *);
+@@ -262,10 +268,12 @@
+     virtual void mouseMoveEvent(QMouseEvent *e);
+     virtual void mouseReleaseEvent(QMouseEvent *e);
+     virtual void mouseDoubleClickEvent(QMouseEvent *e);
 +%If (PyQt_DragAndDrop)
-     virtual void dragEnterEvent(QDragEnterEvent *);
-     virtual void dragMoveEvent(QDragMoveEvent *);
-     virtual void dragLeaveEvent(QDragLeaveEvent *);
-     virtual void dropEvent(QDropEvent *);
+     virtual void dragEnterEvent(QDragEnterEvent *e);
+     virtual void dragMoveEvent(QDragMoveEvent *e);
+     virtual void dragLeaveEvent(QDragLeaveEvent *e);
+     virtual void dropEvent(QDropEvent *e);
 +%End
-     virtual void focusInEvent(QFocusEvent *);
-     virtual void focusOutEvent(QFocusEvent *);
-     virtual void keyPressEvent(QKeyEvent *);
-     virtual void resizeEvent(QResizeEvent *);
-     virtual void timerEvent(QTimerEvent *);
+     virtual void focusInEvent(QFocusEvent *e);
+     virtual void focusOutEvent(QFocusEvent *e);
+     virtual void keyPressEvent(QKeyEvent *e);
+     virtual void resizeEvent(QResizeEvent *e);
+     virtual void timerEvent(QTimerEvent *e);
  
 +%If (PyQt_DragAndDrop)
      enum DropIndicatorPosition
  public:
 +%If (PyQt_DragAndDrop)
  %If (Qt_4_6_0 -)
-     void setDefaultDropAction(Qt::DropAction);
+     void setDefaultDropAction(Qt::DropAction dropAction);
  %End
  %If (Qt_4_6_0 -)
      Qt::DropAction defaultDropAction() const;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractprintdialog.sip.diff

      typedef QFlags<QAbstractPrintDialog::PrintDialogOption> PrintDialogOptions;
  %If (PyQt_PrintDialog)
 +%If (PyQt_Printer)
-     QAbstractPrintDialog(QPrinter *, QWidget *parent /TransferThis/ = 0);
+     QAbstractPrintDialog(QPrinter *printer, QWidget *parent /TransferThis/ = 0);
 +%End
  %If (Qt_4_5_0 -)
      virtual ~QAbstractPrintDialog();
  %End
-@@ -87,7 +89,9 @@
-     void setFromTo(int, int);
-     int fromPage() const;
-     int toPage() const;
-+%If (PyQt_Printer)
-     QPrinter *printer() const;
-+%End
- %If (Qt_4_4_0 -)
-     void setOptionTabs(const QList<QWidget*> &);
- %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractslider.sip.diff

 --- sip/QtGui/qabstractslider.sip.old	2010-09-08 01:08:29.000000000 +0200
 +++ sip/QtGui/qabstractslider.sip	2010-09-08 01:09:19.000000000 +0200
 @@ -103,7 +103,9 @@
-     virtual bool event(QEvent *);
-     virtual void keyPressEvent(QKeyEvent *);
+     virtual bool event(QEvent *e);
+     virtual void keyPressEvent(QKeyEvent *ev);
      virtual void timerEvent(QTimerEvent *);
 +%If (PyQt_WheelEvent)
-     virtual void wheelEvent(QWheelEvent *);
+     virtual void wheelEvent(QWheelEvent *e);
 +%End
-     virtual void changeEvent(QEvent *);
+     virtual void changeEvent(QEvent *e);
  
  private:

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractspinbox.sip.diff

 --- sip/QtGui/qabstractspinbox.sip.old	2010-09-08 01:55:08.000000000 +0200
 +++ sip/QtGui/qabstractspinbox.sip	2010-09-08 01:55:41.000000000 +0200
 @@ -98,10 +98,14 @@
-     virtual void resizeEvent(QResizeEvent *);
-     virtual void keyPressEvent(QKeyEvent *);
-     virtual void keyReleaseEvent(QKeyEvent *);
+     virtual void resizeEvent(QResizeEvent *e);
+     virtual void keyPressEvent(QKeyEvent *e);
+     virtual void keyReleaseEvent(QKeyEvent *e);
 +%If (PyQt_WheelEvent)
-     virtual void wheelEvent(QWheelEvent *);
+     virtual void wheelEvent(QWheelEvent *e);
 +%End
-     virtual void focusInEvent(QFocusEvent *);
-     virtual void focusOutEvent(QFocusEvent *);
+     virtual void focusInEvent(QFocusEvent *e);
+     virtual void focusOutEvent(QFocusEvent *e);
 +%If (PyQt_ContextMenu)
-     virtual void contextMenuEvent(QContextMenuEvent *);
+     virtual void contextMenuEvent(QContextMenuEvent *e);
 +%End
-     virtual void changeEvent(QEvent *);
-     virtual void closeEvent(QCloseEvent *);
-     virtual void hideEvent(QHideEvent *);
+     virtual void changeEvent(QEvent *e);
+     virtual void closeEvent(QCloseEvent *e);
+     virtual void hideEvent(QHideEvent *e);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qaction.sip.diff

 +++ sip/QtGui/qaction.sip	2010-10-23 15:05:08.000000000 +0200
 @@ -49,20 +49,30 @@
      QString text() const;
-     void setIconText(const QString &);
+     void setIconText(const QString &text);
      QString iconText() const;
--    void setToolTip(const QString &);
+-    void setToolTip(const QString &tip);
 -    QString toolTip() const;
--    void setStatusTip(const QString &);
+-    void setStatusTip(const QString &statusTip);
 -    QString statusTip() const;
--    void setWhatsThis(const QString &);
+-    void setWhatsThis(const QString &what);
 -    QString whatsThis() const;
 +%If (PyQt_ToolTip)
-+      void setToolTip(const QString &);
++      void setToolTip(const QString &tip);
 +      QString toolTip() const;
 +%End
 +%If (PyQt_StatusTip)
-+      void setStatusTip(const QString &);
++      void setStatusTip(const QString &statusTip);
 +      QString statusTip() const;
 +%End
 +%If (PyQt_WhatsThis)
-+      void setWhatsThis(const QString &);
++      void setWhatsThis(const QString &what);
 +      QString whatsThis() const;
 +%End
 +%If (PyQt_Menu)
      QMenu *menu() const;
-     void setMenu(QMenu * /KeepReference/);
+     void setMenu(QMenu *menu /KeepReference/);
 +%End
-     void setSeparator(bool);
+     void setSeparator(bool b);
      bool isSeparator() const;
 +%If (PyQt_Shortcut)
-     void setShortcut(const QKeySequence &);
+     void setShortcut(const QKeySequence &shortcut);
      QKeySequence shortcut() const;
-     void setShortcutContext(Qt::ShortcutContext);
+     void setShortcutContext(Qt::ShortcutContext context);
      Qt::ShortcutContext shortcutContext() const;
 +%End
-     void setFont(const QFont &);
+     void setFont(const QFont &font);
      QFont font() const;
      void setCheckable(bool);
 @@ -116,6 +126,7 @@

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qapplication.sip.diff

 --- sip/QtGui/qapplication.sip.old	2011-02-27 02:40:55.000000000 +0100
 +++ sip/QtGui/qapplication.sip	2011-02-27 16:32:42.000000000 +0100
-@@ -128,18 +128,38 @@
-     #else
-         {0, 0, -1, 1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QItemSelectionModel, &sipType_QItemSelectionModel, -1, 2},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, -1, 2},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_UndoGroup)
-         {sipName_QUndoGroup, &sipType_QUndoGroup, -1, 3},
-     #else
-         {0, 0, -1, 3},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Clipboard)
-         {sipName_QClipboard, &sipType_QClipboard, -1, 4},
-+    #else
-+        {0, 0, -1, 4},
-+    #endif
-         {sipName_QTextObject, &sipType_QTextObject, 42, 5},
-+    #if defined(SIP_FEATURE_PyQt_IM)
-         {sipName_QInputContext, &sipType_QInputContext, -1, 6},
-+    #else
-+        {0, 0, -1, 6},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ButtonGroup)
-         {sipName_QButtonGroup, &sipType_QButtonGroup, -1, 7},
-+    #else
-+        {0, 0, -1, 7},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QAbstractItemDelegate, &sipType_QAbstractItemDelegate, 46, 8},
--    #if QT_VERSION >= 0x040600
-+    #else
-+        {0, 0, 46, 8},
-+    #endif
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsEffect, &sipType_QGraphicsEffect, 48, 9},
-     #else
-         {0, 0, 48, 9},
-@@ -151,77 +171,132 @@
-     #endif
-         {sipName_QLayout, &sipType_QLayout, 52, 11},
-         {sipName_QAbstractTextDocumentLayout, &sipType_QAbstractTextDocumentLayout, 58, 12},
--    #if QT_VERSION >= 0x040200
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_DataWidgetMapper)
-         {sipName_QDataWidgetMapper, &sipType_QDataWidgetMapper, -1, 13},
-     #else
-         {0, 0, -1, 13},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Action)
-         {sipName_QActionGroup, &sipType_QActionGroup, -1, 14},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, -1, 14},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsItemAnimation, &sipType_QGraphicsItemAnimation, -1, 15},
--        {sipName_QUndoStack, &sipType_QUndoStack, -1, 16},
-     #else
-         {0, 0, -1, 15},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_UndoStack)
-+        {sipName_QUndoStack, &sipType_QUndoStack, -1, 16},
-+    #else
-         {0, 0, -1, 16},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Sound)
-         {sipName_QSound, &sipType_QSound, -1, 17},
--    #if QT_VERSION >= 0x040600
-+    #else
-+        {0, 0, -1, 17},
-+    #endif
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_StateMachine)
-         {sipName_QMouseEventTransition, &sipType_QMouseEventTransition, -1, 18},
-     #else
-         {0, 0, -1, 18},
-     #endif
-         {sipName_QApplication, &sipType_QApplication, -1, 19},
--    #if QT_VERSION >= 0x040600
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_Gestures)
-         {sipName_QGesture, &sipType_QGesture, 59, 20},
-     #else
-         {0, 0, 59, 20},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_StandardItemModel)
-         {sipName_QStandardItemModel, &sipType_QStandardItemModel, -1, 21},
--    #if QT_VERSION >= 0x040600
-+    #else
-+        {0, 0, -1, 21},
-+    #endif
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsTransform, &sipType_QGraphicsTransform, 64, 22},
-     #else
-         {0, 0, 64, 22},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_StringListModel)
-         {sipName_QStringListModel, &sipType_QStringListModel, -1, 23},
-+    #else
-+        {0, 0, -1, 23},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_DragAndDrop)
-         {sipName_QDrag, &sipType_QDrag, -1, 24},
-+    #else
-+        {0, 0, -1, 24},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Action)
-         {sipName_QAction, &sipType_QAction, 66, 25},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, 66, 25},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_Completer)
-         {sipName_QCompleter, &sipType_QCompleter, -1, 26},
-     #else
-         {0, 0, -1, 26},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Validator)
-         {sipName_QValidator, &sipType_QValidator, 67, 27},
-+    #else
-+        {0, 0, 67, 27},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Movie)
-         {sipName_QMovie, &sipType_QMovie, -1, 28},
-+    #else
-+        {0, 0, -1, 28},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ProxyModel)
-         {sipName_QProxyModel, &sipType_QProxyModel, -1, 29},
-+    #else
-+        {0, 0, -1, 29},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ProxyModel)
-         {sipName_QAbstractProxyModel, &sipType_QAbstractProxyModel, 70, 30},
-+    #else
-+        {0, 0, 70, 30},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_DirModel)
-         {sipName_QDirModel, &sipType_QDirModel, -1, 31},
-+    #else
-+        {0, 0, -1, 31},
-+    #endif
-         {sipName_QWidget, &sipType_QWidget, 71, 32},
--    #if QT_VERSION >= 0x040600
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsObject, &sipType_QGraphicsObject, 150, 33},
-     #else
-         {0, 0, 150, 33},
-     #endif
--    #if QT_VERSION >= 0x040400
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QFileSystemModel, &sipType_QFileSystemModel, -1, 34},
-     #else
-         {0, 0, -1, 34},
-     #endif
-         {sipName_QTextDocument, &sipType_QTextDocument, -1, 35},
--    #if QT_VERSION >= 0x040600
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsAnchor, &sipType_QGraphicsAnchor, -1, 36},
-     #else
-         {0, 0, -1, 36},
-     #endif
--    #if QT_VERSION >= 0x040200
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsScene, &sipType_QGraphicsScene, -1, 37},
-     #else
-         {0, 0, -1, 37},
-     #endif
-         {sipName_QPyTextObject, &sipType_QPyTextObject, -1, 38},
-+    #if defined(SIP_FEATURE_PyQt_Shortcut)
-         {sipName_QShortcut, &sipType_QShortcut, -1, 39},
-+    #else
-+        {0, 0, -1, 39},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_TextEdit) && defined(SIP_FEATURE_PyQt_SyntaxHighlighter)
-         {sipName_QSyntaxHighlighter, &sipType_QSyntaxHighlighter, -1, 40},
-+    #else
-+        {0, 0, -1, 40},
-+    #endif
-         {sipName_QStyle, &sipType_QStyle, -1, 41},
--    #if QT_VERSION >= 0x040600
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_StateMachine)
-         {sipName_QKeyEventTransition, &sipType_QKeyEventTransition, -1, -1},
-     #else
-         {0, 0, -1, -1},
-@@ -230,13 +305,17 @@
-         {sipName_QTextBlockGroup, &sipType_QTextBlockGroup, 45, -1},
-         {sipName_QTextTable, &sipType_QTextTable, -1, -1},
-         {sipName_QTextList, &sipType_QTextList, -1, -1},
-+    #if defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QItemDelegate, &sipType_QItemDelegate, -1, 47},
--    #if QT_VERSION >= 0x040400
-+    #else
-+        {0, 0, -1, 47},
-+    #endif
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QStyledItemDelegate, &sipType_QStyledItemDelegate, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
--    #if QT_VERSION >= 0x040600
-+    #if QT_VERSION >= 0x040600 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsDropShadowEffect, &sipType_QGraphicsDropShadowEffect, -1, 49},
-         {sipName_QGraphicsOpacityEffect, &sipType_QGraphicsOpacityEffect, -1, 50},
-         {sipName_QGraphicsBlurEffect, &sipType_QGraphicsBlurEffect, -1, 51},
-@@ -257,20 +336,33 @@
-         {sipName_QStackedLayout, &sipType_QStackedLayout, -1, -1},
-         {sipName_QVBoxLayout, &sipType_QVBoxLayout, -1, 57},
-         {sipName_QHBoxLayout, &sipType_QHBoxLayout, -1, -1},
--    #if QT_VERSION >= 0x040400
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_TextEdit)
-         {sipName_QPlainTextDocumentLayout, &sipType_QPlainTextDocumentLayout, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-     #if QT_VERSION >= 0x040600
-+    #if defined(SIP_FEATURE_PyQt_Gestures)
-         {sipName_QPanGesture, &sipType_QPanGesture, -1, 60},
-         {sipName_QPinchGesture, &sipType_QPinchGesture, -1, 61},
-         {sipName_QTapAndHoldGesture, &sipType_QTapAndHoldGesture, -1, 62},
-         {sipName_QTapGesture, &sipType_QTapGesture, -1, 63},
-         {sipName_QSwipeGesture, &sipType_QSwipeGesture, -1, -1},
-+    #else
-+        {0, 0, -1, 60},
-+        {0, 0, -1, 61},
-+        {0, 0, -1, 62},
-+        {0, 0, -1, 63},
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsRotation, &sipType_QGraphicsRotation, -1, 65},
-         {sipName_QGraphicsScale, &sipType_QGraphicsScale, -1, -1},
-     #else
-+        {0, 0, -1, 65},
-+        {0, 0, -1, -1},
-+    #endif
-+    #else
-         {0, 0, -1, 60},
-         {0, 0, -1, 61},
-         {0, 0, -1, 62},
-@@ -279,33 +371,67 @@
-         {0, 0, -1, 65},
-         {0, 0, -1, -1},
-     #endif
--    #if QT_VERSION >= 0x040200
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_Action)
-         {sipName_QWidgetAction, &sipType_QWidgetAction, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Validator)
-         {sipName_QIntValidator, &sipType_QIntValidator, -1, 68},
-         {sipName_QRegExpValidator, &sipType_QRegExpValidator, -1, 69},
-         {sipName_QDoubleValidator, &sipType_QDoubleValidator, -1, -1},
-+    #else
-+        {0, 0, -1, 68},
-+        {0, 0, -1, 69},
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_SortFilterProxyModel)
-         {sipName_QSortFilterProxyModel, &sipType_QSortFilterProxyModel, -1, -1},
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Menu)
-         {sipName_QMenu, &sipType_QMenu, -1, 72},
-+    #else
-+        {0, 0, -1, 72},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ToolBar)
-         {sipName_QToolBar, &sipType_QToolBar, -1, 73},
-+    #else
-+        {0, 0, -1, 73},
-+    #endif
-     #if defined(Q_WS_X11)
-         {sipName_QX11EmbedContainer, &sipType_QX11EmbedContainer, -1, 74},
-     #else
-         {0, 0, -1, 74},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_MenuBar)
-         {sipName_QMenuBar, &sipType_QMenuBar, -1, 75},
-+    #else
-+        {0, 0, -1, 75},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_RubberBand)
-         {sipName_QRubberBand, &sipType_QRubberBand, -1, 76},
-+    #else
-+        {0, 0, -1, 76},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_TabBar)
-         {sipName_QTabBar, &sipType_QTabBar, -1, 77},
-+    #else
-+        {0, 0, -1, 77},
-+    #endif
-     #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_PrintPreviewWidget)
-         {sipName_QPrintPreviewWidget, &sipType_QPrintPreviewWidget, -1, 78},
-     #else
-         {0, 0, -1, 78},
-     #endif
-         {sipName_QDesktopWidget, &sipType_QDesktopWidget, -1, 79},
-+    #if defined(SIP_FEATURE_PyQt_ProgressBar)
-         {sipName_QProgressBar, &sipType_QProgressBar, -1, 80},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, -1, 80},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_CalendarWidget)
-         {sipName_QCalendarWidget, &sipType_QCalendarWidget, -1, 81},
-     #else
-         {0, 0, -1, 81},
-@@ -321,88 +447,224 @@
-     #else
-         {0, 0, -1, 84},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ComboBox)
-         {sipName_QComboBox, &sipType_QComboBox, 102, 85},
-+    #else
-+        {0, 0, 102, 85},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_DockWidget)
-         {sipName_QDockWidget, &sipType_QDockWidget, -1, 86},
-+    #else
-+        {0, 0, -1, 86},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Slider)
-         {sipName_QAbstractSlider, &sipType_QAbstractSlider, 103, 87},
-+    #else
-+        {0, 0, 103, 87},
-+    #endif
-         {sipName_QFrame, &sipType_QFrame, 106, 88},
-+    #if defined(SIP_FEATURE_PyQt_TabWidget)
-         {sipName_QTabWidget, &sipType_QTabWidget, -1, 89},
-+    #else
-+        {0, 0, -1, 89},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_GroupBox)
-         {sipName_QGroupBox, &sipType_QGroupBox, -1, 90},
-+    #else
-+        {0, 0, -1, 90},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_StatusBar)
-         {sipName_QStatusBar, &sipType_QStatusBar, -1, 91},
-+    #else
-+        {0, 0, -1, 91},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Splitter)
-         {sipName_QSplitterHandle, &sipType_QSplitterHandle, -1, 92},
-+    #else
-+        {0, 0, -1, 92},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_LineEdit)
-         {sipName_QLineEdit, &sipType_QLineEdit, -1, 93},
--    #if QT_VERSION >= 0x040300
-+    #else
-+        {0, 0, -1, 93},
-+    #endif
-+    #if QT_VERSION >= 0x040300 && defined(SIP_FEATURE_PyQt_MDIArea)
-         {sipName_QMdiSubWindow, &sipType_QMdiSubWindow, -1, 94},
-     #else
-         {0, 0, -1, 94},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_SplashScreen)
-         {sipName_QSplashScreen, &sipType_QSplashScreen, -1, 95},
--    #if QT_VERSION >= 0x040300
-+    #else
-+        {0, 0, -1, 95},
-+    #endif
-+    #if QT_VERSION >= 0x040300 && defined(SIP_FEATURE_PyQt_Wizard)
-         {sipName_QWizardPage, &sipType_QWizardPage, -1, 96},
-     #else
-         {0, 0, -1, 96},
-     #endif
-         {sipName_QAbstractButton, &sipType_QAbstractButton, 128, 97},
-         {sipName_QDialog, &sipType_QDialog, 133, 98},
-+    #if defined(SIP_FEATURE_PyQt_Workspace)
-         {sipName_QWorkspace, &sipType_QWorkspace, -1, 99},
-+    #else
-+        {0, 0, -1, 99},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_MainWindow)
-         {sipName_QMainWindow, &sipType_QMainWindow, -1, 100},
-+    #else
-+        {0, 0, -1, 100},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_SpinBox)
-         {sipName_QAbstractSpinBox, &sipType_QAbstractSpinBox, 145, 101},
-+    #else
-+        {0, 0, 145, 101},
-+    #endif
-     #if QT_VERSION >= 0x040200
-         {sipName_QDialogButtonBox, &sipType_QDialogButtonBox, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
--    #if QT_VERSION >= 0x040200
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_FontComboBox)
-         {sipName_QFontComboBox, &sipType_QFontComboBox, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_Slider)
-         {sipName_QSlider, &sipType_QSlider, -1, 104},
-+    #else
-+        {0, 0, -1, 104},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ScrollBar)
-         {sipName_QScrollBar, &sipType_QScrollBar, -1, 105},
-+    #else
-+        {0, 0, -1, 105},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Dial)
-         {sipName_QDial, &sipType_QDial, -1, -1},
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ToolBox)
-         {sipName_QToolBox, &sipType_QToolBox, -1, 107},
-+    #else
-+        {0, 0, -1, 107},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_StackedWidget)
-         {sipName_QStackedWidget, &sipType_QStackedWidget, -1, 108},
-+    #else
-+        {0, 0, -1, 108},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Splitter)
-         {sipName_QSplitter, &sipType_QSplitter, -1, 109},
-+    #else
-+        {0, 0, -1, 109},
-+    #endif
-         {sipName_QLabel, &sipType_QLabel, -1, 110},
-+    #if defined(SIP_FEATURE_PyQt_ScrollArea)
-         {sipName_QAbstractScrollArea, &sipType_QAbstractScrollArea, 112, 111},
-+    #else
-+        {0, 0, 112, 111},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_LCDNumber)
-         {sipName_QLCDNumber, &sipType_QLCDNumber, -1, -1},
--    #if QT_VERSION >= 0x040400
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_TextEdit)
-         {sipName_QPlainTextEdit, &sipType_QPlainTextEdit, -1, 113},
-     #else
-         {0, 0, -1, 113},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ScrollArea)
-         {sipName_QScrollArea, &sipType_QScrollArea, -1, 114},
-+    #else
-+        {0, 0, -1, 114},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_TextEdit)
-         {sipName_QTextEdit, &sipType_QTextEdit, 118, 115},
-+    #else
-+        {0, 0, 118, 115},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ItemViews)
-         {sipName_QAbstractItemView, &sipType_QAbstractItemView, 119, 116},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, 119, 116},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsView, &sipType_QGraphicsView, -1, 117},
-     #else
-         {0, 0, -1, 117},
-     #endif
--    #if QT_VERSION >= 0x040300
-+    #if QT_VERSION >= 0x040300 && defined(SIP_FEATURE_PyQt_MDIArea)
-         {sipName_QMdiArea, &sipType_QMdiArea, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_TextEdit) && defined(SIP_FEATURE_PyQt_TextBrowser)
-         {sipName_QTextBrowser, &sipType_QTextBrowser, -1, -1},
--    #if QT_VERSION >= 0x040300
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ItemViews)
-+    #if QT_VERSION >= 0x040300 && defined(SIP_FEATURE_PyQt_ColumnView)
-         {sipName_QColumnView, &sipType_QColumnView, -1, 120},
-     #else
-         {0, 0, -1, 120},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_TreeView)
-         {sipName_QTreeView, &sipType_QTreeView, 124, 121},
-+    #else
-+        {0, 0, 124, 121},
-+    #endif
-         {sipName_QHeaderView, &sipType_QHeaderView, -1, 122},
-+    #if defined(SIP_FEATURE_PyQt_ListView)
-         {sipName_QListView, &sipType_QListView, 125, 123},
-+    #else
-+        {0, 0, 125, 123},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_TableView)
-         {sipName_QTableView, &sipType_QTableView, 127, -1},
-+    #else
-+        {0, 0, 127, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_TreeWidget)
-         {sipName_QTreeWidget, &sipType_QTreeWidget, -1, -1},
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_ListView)
-         {sipName_QListWidget, &sipType_QListWidget, -1, 126},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, -1, 126},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_UndoView)
-         {sipName_QUndoView, &sipType_QUndoView, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_TableView)
-         {sipName_QTableWidget, &sipType_QTableWidget, -1, -1},
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-+    #else
-+        {0, 0, -1, 120},
-+        {0, 0, 124, 121},
-+        {0, 0, -1, 122},
-+        {0, 0, 125, 123},
-+        {0, 0, 127, -1},
-+        {0, 0, -1, -1},
-+        {0, 0, -1, 126},
-+        {0, 0, -1, -1},
-+        {0, 0, -1, -1},
-+    #endif
-         {sipName_QRadioButton, &sipType_QRadioButton, -1, 129},
-+    #if defined(SIP_FEATURE_PyQt_ToolButton)
-         {sipName_QToolButton, &sipType_QToolButton, -1, 130},
-+    #else
-+        {0, 0, -1, 130},
-+    #endif
-         {sipName_QPushButton, &sipType_QPushButton, 132, 131},
-         {sipName_QCheckBox, &sipType_QCheckBox, -1, -1},
-     #if QT_VERSION >= 0x040400
-@@ -410,49 +672,88 @@
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_MessageBox)
-         {sipName_QMessageBox, &sipType_QMessageBox, -1, 134},
-+    #else
-+        {0, 0, -1, 134},
-+    #endif
-     #if defined(SIP_FEATURE_PyQt_PrintDialog)
-         {sipName_QPageSetupDialog, &sipType_QPageSetupDialog, -1, 135},
-     #else
-         {0, 0, -1, 135},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ProgressDialog)
-         {sipName_QProgressDialog, &sipType_QProgressDialog, -1, 136},
-+    #else
-+        {0, 0, -1, 136},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_FileDialog)
-         {sipName_QFileDialog, &sipType_QFileDialog, -1, 137},
-+    #else
-+        {0, 0, -1, 137},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_InputDialog)
-         {sipName_QInputDialog, &sipType_QInputDialog, -1, 138},
-+    #else
-+        {0, 0, -1, 138},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_FontDialog)
-         {sipName_QFontDialog, &sipType_QFontDialog, -1, 139},
--    #if defined(SIP_FEATURE_PyQt_Printer)
-+    #else
-+        {0, 0, -1, 139},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_Printer) && defined(SIP_FEATURE_PyQt_PrintDialog)
-         {sipName_QAbstractPrintDialog, &sipType_QAbstractPrintDialog, 144, 140},
-     #else
-         {0, 0, 144, 140},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ColorDialog)
-         {sipName_QColorDialog, &sipType_QColorDialog, -1, 141},
--    #if QT_VERSION >= 0x040300
-+    #else
-+        {0, 0, -1, 141},
-+    #endif
-+    #if QT_VERSION >= 0x040300 && defined(SIP_FEATURE_PyQt_Wizard)
-         {sipName_QWizard, &sipType_QWizard, -1, 142},
-     #else
-         {0, 0, -1, 142},
-     #endif
--    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_PrintPreviewDialog)
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_PrintDialog) && defined(SIP_FEATURE_PyQt_PrintPreviewDialog)
-         {sipName_QPrintPreviewDialog, &sipType_QPrintPreviewDialog, -1, 143},
-     #else
-         {0, 0, -1, 143},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_ErrorMessage)
-         {sipName_QErrorMessage, &sipType_QErrorMessage, -1, -1},
-+    #else
-+        {0, 0, -1, -1},
-+    #endif
-     #if defined(SIP_FEATURE_PyQt_PrintDialog)
-         {sipName_QPrintDialog, &sipType_QPrintDialog, -1, -1},
-     #else
-         {0, 0, -1, -1},
-     #endif
-+    #if defined(SIP_FEATURE_PyQt_SpinBox)
-         {sipName_QDoubleSpinBox, &sipType_QDoubleSpinBox, -1, 146},
-         {sipName_QSpinBox, &sipType_QSpinBox, -1, 147},
-+    #else
-+        {0, 0, -1, 146},
-+        {0, 0, -1, 147},
-+    #endif
-+    #if defined(SIP_FEATURE_PyQt_DateTimeEdit)
-         {sipName_QDateTimeEdit, &sipType_QDateTimeEdit, 148, -1},
-         {sipName_QDateEdit, &sipType_QDateEdit, -1, 149},
-         {sipName_QTimeEdit, &sipType_QTimeEdit, -1, -1},
--    #if QT_VERSION >= 0x040200
-+    #else
-+        {0, 0, -1, 148},
-+        {0, 0, -1, 149},
-+        {0, 0, -1, -1},
-+    #endif
-+    #if QT_VERSION >= 0x040200 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsTextItem, &sipType_QGraphicsTextItem, -1, 151},
-     #else
-         {0, 0, -1, 151},
-     #endif
--    #if QT_VERSION >= 0x040400
-+    #if QT_VERSION >= 0x040400 && defined(SIP_FEATURE_PyQt_GraphicsView)
-         {sipName_QGraphicsWidget, &sipType_QGraphicsWidget, 152, -1},
-         {sipName_QGraphicsProxyWidget, &sipType_QGraphicsProxyWidget, -1, -1},
-     #else
 @@ -626,10 +927,12 @@
  
      static int colorSpec();
      static void closeAllWindows();
  %If (Qt_4_2_0 -)
 +%If (PyQt_Style_StyleSheet)
-     void setStyleSheet(const QString &);
+     void setStyleSheet(const QString &sheet);
  %End
 +%End
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qbrush.sip.diff

  QDataStream &operator>>(QDataStream &, QBrush & /Constrained/);
  QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/);
 +%End
- typedef QVector<QPair<qreal, QColor> > QGradientStops;
+ typedef QVector<QPair<qreal, QColor>> QGradientStops;
  
  class QGradient

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qcombobox.sip.diff

 +++ sip/QtGui/qcombobox.sip	2010-09-08 00:29:27.000000000 +0200
 @@ -44,10 +44,12 @@
      int count() const /__len__/;
-     void setMaxCount(int);
+     void setMaxCount(int max);
      int maxCount() const;
 +%If (PyQt_Completer)
      bool autoCompletion() const;
-     void setAutoCompletion(bool);
+     void setAutoCompletion(bool enable);
      Qt::CaseSensitivity autoCompletionCaseSensitivity() const;
-     void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity);
+     void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity);
 +%End
      bool duplicatesEnabled() const;
-     void setDuplicatesEnabled(bool);
+     void setDuplicatesEnabled(bool enable);
      void setFrame(bool);
 @@ -91,8 +93,10 @@
      void setEditable(bool);
      void setLineEdit(QLineEdit * /Transfer/);
      QLineEdit *lineEdit() const;
 +%If (PyQt_Validator)
-     void setValidator(const QValidator * /KeepReference/);
+     void setValidator(const QValidator *v /KeepReference/);
      const QValidator *validator() const;
 +%End
      QAbstractItemDelegate *itemDelegate() const;
-     void setItemDelegate(QAbstractItemDelegate * /KeepReference/);
+     void setItemDelegate(QAbstractItemDelegate *delegate /KeepReference/);
      QAbstractItemModel *model() const;
 @@ -124,12 +128,14 @@
      virtual void showPopup();
      virtual void hidePopup();
-     virtual bool event(QEvent *);
+     virtual bool event(QEvent *event);
 +%If (PyQt_Completer)
  %If (Qt_4_2_0 -)
-     void setCompleter(QCompleter * /KeepReference/);
+     void setCompleter(QCompleter *c /KeepReference/);
  %End
  %If (Qt_4_2_0 -)
      QCompleter *completer() const;
  %End
 +%End
  %If (Qt_4_4_0 -)
-     void insertSeparator(int);
+     void insertSeparator(int index);
  %End
 @@ -163,8 +169,12 @@
-     virtual void mouseReleaseEvent(QMouseEvent *);
-     virtual void keyPressEvent(QKeyEvent *);
-     virtual void keyReleaseEvent(QKeyEvent *);
+     virtual void mouseReleaseEvent(QMouseEvent *e);
+     virtual void keyPressEvent(QKeyEvent *e);
+     virtual void keyReleaseEvent(QKeyEvent *e);
 +%If (PyQt_WheelEvent)
-     virtual void wheelEvent(QWheelEvent *);
+     virtual void wheelEvent(QWheelEvent *e);
 +%End