Skip to content

Commit 13401cd

Browse files
author
florianlink
committed
updated to new operators
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@157 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
1 parent ef1c51e commit 13401cd

File tree

63 files changed

+59620
-57389
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+59620
-57389
lines changed

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.cpp

+1,818-1,781
Large diffs are not rendered by default.

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.h

+297-286
Large diffs are not rendered by default.

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.cpp

+1,182-1,176
Large diffs are not rendered by default.

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.h

+182-180
Large diffs are not rendered by default.

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core2.cpp

+197-187
Large diffs are not rendered by default.

generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core2.h

+28-25
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class PythonQtShell_QTimer : public QTimer
3030
PythonQtShell_QTimer(QObject* parent = 0):QTimer(parent),_wrapper(NULL) {};
3131

3232
virtual void timerEvent(QTimerEvent* arg__1);
33-
virtual void childEvent(QChildEvent* arg__1);
34-
virtual void customEvent(QEvent* arg__1);
3533
virtual bool event(QEvent* arg__1);
3634
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
35+
virtual void childEvent(QChildEvent* arg__1);
36+
virtual void customEvent(QEvent* arg__1);
3737

3838
PythonQtInstanceWrapper* _wrapper;
3939
};
@@ -49,14 +49,14 @@ class PythonQtWrapper_QTimer : public QObject
4949
public slots:
5050
QTimer* new_QTimer(QObject* parent = 0);
5151
void delete_QTimer(QTimer* obj) { delete obj; }
52+
void timerEvent(QTimer* theWrappedObject, QTimerEvent* arg__1);
5253
int timerId(QTimer* theWrappedObject) const;
5354
void setSingleShot(QTimer* theWrappedObject, bool singleShot);
54-
void setInterval(QTimer* theWrappedObject, int msec);
5555
bool isActive(QTimer* theWrappedObject) const;
5656
bool isSingleShot(QTimer* theWrappedObject) const;
57-
int interval(QTimer* theWrappedObject) const;
58-
void timerEvent(QTimer* theWrappedObject, QTimerEvent* arg__1);
57+
void setInterval(QTimer* theWrappedObject, int msec);
5958
void static_QTimer_singleShot(int msec, QObject* receiver, const char* member);
59+
int interval(QTimer* theWrappedObject) const;
6060
};
6161

6262

@@ -92,11 +92,11 @@ class PythonQtShell_QTranslator : public QTranslator
9292

9393
virtual QString translate(const char* context, const char* sourceText, const char* disambiguation = 0) const;
9494
virtual bool isEmpty() const;
95-
virtual void childEvent(QChildEvent* arg__1);
96-
virtual void timerEvent(QTimerEvent* arg__1);
97-
virtual void customEvent(QEvent* arg__1);
9895
virtual bool event(QEvent* arg__1);
9996
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
97+
virtual void childEvent(QChildEvent* arg__1);
98+
virtual void customEvent(QEvent* arg__1);
99+
virtual void timerEvent(QTimerEvent* arg__1);
100100

101101
PythonQtInstanceWrapper* _wrapper;
102102
};
@@ -151,16 +151,19 @@ PythonQtShell_QUuid* a = new PythonQtShell_QUuid();
151151
*((QUuid*)a) = other;
152152
return a; }
153153
void delete_QUuid(QUuid* obj) { delete obj; }
154-
QUuid static_QUuid_createUuid();
155-
QUuid::Version version(QUuid* theWrappedObject) const;
156-
bool operator_less(QUuid* theWrappedObject, const QUuid& other) const;
157154
QString toString(QUuid* theWrappedObject) const;
158-
bool operator_equal(QUuid* theWrappedObject, const QUuid& orig) const;
155+
bool __gt__(QUuid* theWrappedObject, const QUuid& other) const;
156+
bool __ne__(QUuid* theWrappedObject, const QUuid& orig) const;
157+
bool __lt__(QUuid* theWrappedObject, const QUuid& other) const;
158+
QUuid::Version version(QUuid* theWrappedObject) const;
159+
QUuid static_QUuid_createUuid();
160+
bool __eq__(QUuid* theWrappedObject, const QUuid& orig) const;
159161
bool isNull(QUuid* theWrappedObject) const;
160162
QUuid::Variant variant(QUuid* theWrappedObject) const;
161163
void writeTo(QUuid* theWrappedObject, QDataStream& arg__1);
162164
void readFrom(QUuid* theWrappedObject, QDataStream& arg__1);
163165
QString py_toString(QUuid*);
166+
bool __nonzero__(QUuid* obj) { return !obj->isNull(); }
164167
void py_set_data1(QUuid* theWrappedObject, uint data1){ theWrappedObject->data1 = data1; }
165168
uint py_get_data1(QUuid* theWrappedObject){ return theWrappedObject->data1; }
166169
void py_set_data2(QUuid* theWrappedObject, ushort data2){ theWrappedObject->data2 = data2; }
@@ -179,16 +182,16 @@ class PythonQtShell_QVariantAnimation : public QVariantAnimation
179182
PythonQtShell_QVariantAnimation(QObject* parent = 0):QVariantAnimation(parent),_wrapper(NULL) {};
180183

181184
virtual bool event(QEvent* event);
185+
virtual void updateCurrentValue(const QVariant& value);
182186
virtual int duration() const;
183-
virtual QVariant interpolated(const QVariant& from, const QVariant& to, qreal progress) const;
184187
virtual void updateCurrentTime(int arg__1);
185-
virtual void updateCurrentValue(const QVariant& value);
188+
virtual QVariant interpolated(const QVariant& from, const QVariant& to, qreal progress) const;
186189
virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
187190
virtual void updateDirection(QAbstractAnimation::Direction direction);
191+
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
188192
virtual void childEvent(QChildEvent* arg__1);
189-
virtual void timerEvent(QTimerEvent* arg__1);
190193
virtual void customEvent(QEvent* arg__1);
191-
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
194+
virtual void timerEvent(QTimerEvent* arg__1);
192195

193196
PythonQtInstanceWrapper* _wrapper;
194197
};
@@ -197,8 +200,8 @@ class PythonQtPublicPromoter_QVariantAnimation : public QVariantAnimation
197200
{ public:
198201
inline bool promoted_event(QEvent* event) { return QVariantAnimation::event(event); }
199202
inline int promoted_duration() const { return QVariantAnimation::duration(); }
200-
inline QVariant promoted_interpolated(const QVariant& from, const QVariant& to, qreal progress) const { return QVariantAnimation::interpolated(from, to, progress); }
201203
inline void promoted_updateCurrentTime(int arg__1) { QVariantAnimation::updateCurrentTime(arg__1); }
204+
inline QVariant promoted_interpolated(const QVariant& from, const QVariant& to, qreal progress) const { return QVariantAnimation::interpolated(from, to, progress); }
202205
inline void promoted_updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QVariantAnimation::updateState(newState, oldState); }
203206
};
204207

@@ -211,18 +214,18 @@ void delete_QVariantAnimation(QVariantAnimation* obj) { delete obj; }
211214
QEasingCurve easingCurve(QVariantAnimation* theWrappedObject) const;
212215
QVariant keyValueAt(QVariantAnimation* theWrappedObject, qreal step) const;
213216
bool event(QVariantAnimation* theWrappedObject, QEvent* event);
214-
QVariant startValue(QVariantAnimation* theWrappedObject) const;
215217
QVariant currentValue(QVariantAnimation* theWrappedObject) const;
218+
QVariant startValue(QVariantAnimation* theWrappedObject) const;
216219
void setEndValue(QVariantAnimation* theWrappedObject, const QVariant& value);
217-
void setKeyValues(QVariantAnimation* theWrappedObject, const QVector<QPair<qreal , QVariant > >& values);
218-
void setDuration(QVariantAnimation* theWrappedObject, int msecs);
219-
void setStartValue(QVariantAnimation* theWrappedObject, const QVariant& value);
220220
int duration(QVariantAnimation* theWrappedObject) const;
221+
void setStartValue(QVariantAnimation* theWrappedObject, const QVariant& value);
222+
void updateCurrentTime(QVariantAnimation* theWrappedObject, int arg__1);
223+
void setDuration(QVariantAnimation* theWrappedObject, int msecs);
224+
QVariant endValue(QVariantAnimation* theWrappedObject) const;
221225
QVector<QPair<qreal , QVariant > > keyValues(QVariantAnimation* theWrappedObject) const;
222226
void setEasingCurve(QVariantAnimation* theWrappedObject, const QEasingCurve& easing);
227+
void setKeyValues(QVariantAnimation* theWrappedObject, const QVector<QPair<qreal , QVariant > >& values);
223228
QVariant interpolated(QVariantAnimation* theWrappedObject, const QVariant& from, const QVariant& to, qreal progress) const;
224-
QVariant endValue(QVariantAnimation* theWrappedObject) const;
225-
void updateCurrentTime(QVariantAnimation* theWrappedObject, int arg__1);
226229
void setKeyValueAt(QVariantAnimation* theWrappedObject, qreal step, const QVariant& value);
227230
void updateState(QVariantAnimation* theWrappedObject, QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
228231
};
@@ -238,8 +241,8 @@ public slots:
238241
QWaitCondition* new_QWaitCondition();
239242
void delete_QWaitCondition(QWaitCondition* obj) { delete obj; }
240243
void wakeAll(QWaitCondition* theWrappedObject);
241-
bool wait(QWaitCondition* theWrappedObject, QReadWriteLock* readWriteLock, unsigned long time = ULONG_MAX);
242-
bool wait(QWaitCondition* theWrappedObject, QMutex* mutex, unsigned long time = ULONG_MAX);
244+
bool wait(QWaitCondition* theWrappedObject, QReadWriteLock* readWriteLock, unsigned long time = 0xffffffffUL);
245+
bool wait(QWaitCondition* theWrappedObject, QMutex* mutex, unsigned long time = 0xffffffffUL);
243246
void wakeOne(QWaitCondition* theWrappedObject);
244247
};
245248

0 commit comments

Comments
 (0)