Skip to content

Commit 09e8cbf

Browse files
author
florianlink
committed
update with new py_ naming and field getters/setters
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@154 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
1 parent 157d211 commit 09e8cbf

File tree

52 files changed

+18852
-18488
lines changed

Some content is hidden

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

52 files changed

+18852
-18488
lines changed

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.cpp

+476-476
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core0.h

+50-50
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.cpp

+360-367
Large diffs are not rendered by default.

‎generated_cpp/com_trolltech_qt_core/com_trolltech_qt_core1.h

+35-36
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ void delete_QModelIndex(QModelIndex* obj) { delete obj; }
6666
QModelIndex sibling(QModelIndex* theWrappedObject, int row, int column) const;
6767
int column(QModelIndex* theWrappedObject) const;
6868
int row(QModelIndex* theWrappedObject) const;
69-
QString toString(QModelIndex*);
69+
QString py_toString(QModelIndex*);
7070
};
7171

7272

@@ -134,18 +134,17 @@ void delete_QObject(QObject* obj) { delete obj; }
134134
void killTimer(QObject* theWrappedObject, int id);
135135
void setObjectName(QObject* theWrappedObject, const QString& name);
136136
QThread* thread(QObject* theWrappedObject) const;
137-
void setParent(QObject* theWrappedObject, QObject* arg__1);
138137
bool signalsBlocked(QObject* theWrappedObject) const;
138+
void setParent(QObject* theWrappedObject, QObject* arg__1);
139139
void customEvent(QObject* theWrappedObject, QEvent* arg__1);
140140
int startTimer(QObject* theWrappedObject, int interval);
141141
bool blockSignals(QObject* theWrappedObject, bool b);
142142
QVariant property(QObject* theWrappedObject, const char* name) const;
143143
bool event(QObject* theWrappedObject, QEvent* arg__1);
144144
bool eventFilter(QObject* theWrappedObject, QObject* arg__1, QEvent* arg__2);
145145
QList<QByteArray > dynamicPropertyNames(QObject* theWrappedObject) const;
146-
QString objectName(QObject* theWrappedObject) const;
147146
void childEvent(QObject* theWrappedObject, QChildEvent* arg__1);
148-
QString toString(QObject*);
147+
QString objectName(QObject* theWrappedObject) const;
149148
};
150149

151150

@@ -162,8 +161,8 @@ virtual void updateCurrentTime(int currentTime);
162161
virtual bool event(QEvent* event);
163162
virtual void updateDirection(QAbstractAnimation::Direction direction);
164163
virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
165-
virtual void timerEvent(QTimerEvent* arg__1);
166164
virtual void childEvent(QChildEvent* arg__1);
165+
virtual void timerEvent(QTimerEvent* arg__1);
167166
virtual void customEvent(QEvent* arg__1);
168167
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
169168

@@ -207,8 +206,8 @@ virtual void updateCurrentTime(int arg__1);
207206
virtual bool event(QEvent* e);
208207
virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
209208
virtual void updateDirection(QAbstractAnimation::Direction direction);
210-
virtual void timerEvent(QTimerEvent* arg__1);
211209
virtual void childEvent(QChildEvent* arg__1);
210+
virtual void timerEvent(QTimerEvent* arg__1);
212211
virtual void customEvent(QEvent* arg__1);
213212
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
214213

@@ -255,16 +254,16 @@ virtual bool waitForBytesWritten(int msecs = 30000);
255254
virtual qint64 readData(char* data, qint64 maxlen);
256255
virtual qint64 writeData(const char* data, qint64 len);
257256
virtual qint64 bytesToWrite() const;
257+
virtual qint64 pos() const;
258+
virtual qint64 size() const;
258259
virtual bool reset();
259260
virtual bool open(QIODevice::OpenMode mode);
260261
virtual bool seek(qint64 pos);
261262
virtual qint64 readLineData(char* data, qint64 maxlen);
262-
virtual qint64 size() const;
263-
virtual qint64 pos() const;
264-
virtual void timerEvent(QTimerEvent* arg__1);
265263
virtual void childEvent(QChildEvent* arg__1);
266-
virtual bool event(QEvent* arg__1);
264+
virtual void timerEvent(QTimerEvent* arg__1);
267265
virtual void customEvent(QEvent* arg__1);
266+
virtual bool event(QEvent* arg__1);
268267
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
269268

270269
PythonQtInstanceWrapper* _wrapper;
@@ -364,8 +363,8 @@ void delete_QProcessEnvironment(QProcessEnvironment* obj) { delete obj; }
364363
QProcessEnvironment static_QProcessEnvironment_systemEnvironment();
365364
void clear(QProcessEnvironment* theWrappedObject);
366365
void insert(QProcessEnvironment* theWrappedObject, const QString& name, const QString& value);
367-
bool operator_equal(QProcessEnvironment* theWrappedObject, const QProcessEnvironment& other) const;
368366
bool contains(QProcessEnvironment* theWrappedObject, const QString& name) const;
367+
bool operator_equal(QProcessEnvironment* theWrappedObject, const QProcessEnvironment& other) const;
369368
QString value(QProcessEnvironment* theWrappedObject, const QString& name, const QString& defaultValue = QString()) const;
370369
bool isEmpty(QProcessEnvironment* theWrappedObject) const;
371370
};
@@ -388,8 +387,8 @@ virtual QVariant interpolated(const QVariant& from, const QVariant& to, qreal
388387
virtual void updateCurrentTime(int arg__1);
389388
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
390389
virtual void updateDirection(QAbstractAnimation::Direction direction);
391-
virtual void timerEvent(QTimerEvent* arg__1);
392390
virtual void childEvent(QChildEvent* arg__1);
391+
virtual void timerEvent(QTimerEvent* arg__1);
393392
virtual void customEvent(QEvent* arg__1);
394393

395394
PythonQtInstanceWrapper* _wrapper;
@@ -491,13 +490,13 @@ class PythonQtShell_QSequentialAnimationGroup : public QSequentialAnimationGroup
491490
public:
492491
PythonQtShell_QSequentialAnimationGroup(QObject* parent = 0):QSequentialAnimationGroup(parent),_wrapper(NULL) {};
493492

494-
virtual void updateCurrentTime(int arg__1);
495493
virtual int duration() const;
494+
virtual void updateCurrentTime(int arg__1);
496495
virtual void updateDirection(QAbstractAnimation::Direction direction);
497496
virtual bool event(QEvent* event);
498497
virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);
499-
virtual void timerEvent(QTimerEvent* arg__1);
500498
virtual void childEvent(QChildEvent* arg__1);
499+
virtual void timerEvent(QTimerEvent* arg__1);
501500
virtual void customEvent(QEvent* arg__1);
502501
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
503502

@@ -506,8 +505,8 @@ virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
506505

507506
class PythonQtPublicPromoter_QSequentialAnimationGroup : public QSequentialAnimationGroup
508507
{ public:
509-
inline void promoted_updateCurrentTime(int arg__1) { QSequentialAnimationGroup::updateCurrentTime(arg__1); }
510508
inline int promoted_duration() const { return QSequentialAnimationGroup::duration(); }
509+
inline void promoted_updateCurrentTime(int arg__1) { QSequentialAnimationGroup::updateCurrentTime(arg__1); }
511510
inline void promoted_updateDirection(QAbstractAnimation::Direction direction) { QSequentialAnimationGroup::updateDirection(direction); }
512511
inline bool promoted_event(QEvent* event) { return QSequentialAnimationGroup::event(event); }
513512
inline void promoted_updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QSequentialAnimationGroup::updateState(newState, oldState); }
@@ -519,9 +518,9 @@ class PythonQtWrapper_QSequentialAnimationGroup : public QObject
519518
public slots:
520519
QSequentialAnimationGroup* new_QSequentialAnimationGroup(QObject* parent = 0);
521520
void delete_QSequentialAnimationGroup(QSequentialAnimationGroup* obj) { delete obj; }
522-
void updateCurrentTime(QSequentialAnimationGroup* theWrappedObject, int arg__1);
523521
QAbstractAnimation* currentAnimation(QSequentialAnimationGroup* theWrappedObject) const;
524522
int duration(QSequentialAnimationGroup* theWrappedObject) const;
523+
void updateCurrentTime(QSequentialAnimationGroup* theWrappedObject, int arg__1);
525524
void updateDirection(QSequentialAnimationGroup* theWrappedObject, QAbstractAnimation::Direction direction);
526525
bool event(QSequentialAnimationGroup* theWrappedObject, QEvent* event);
527526
QPauseAnimation* insertPause(QSequentialAnimationGroup* theWrappedObject, int index, int msecs);
@@ -543,8 +542,8 @@ class PythonQtShell_QSettings : public QSettings
543542
PythonQtShell_QSettings(const QString& organization, const QString& application = QString(), QObject* parent = 0):QSettings(organization, application, parent),_wrapper(NULL) {};
544543

545544
virtual bool event(QEvent* event);
546-
virtual void timerEvent(QTimerEvent* arg__1);
547545
virtual void childEvent(QChildEvent* arg__1);
546+
virtual void timerEvent(QTimerEvent* arg__1);
548547
virtual void customEvent(QEvent* arg__1);
549548
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
550549

@@ -616,10 +615,10 @@ class PythonQtShell_QSignalMapper : public QSignalMapper
616615
public:
617616
PythonQtShell_QSignalMapper(QObject* parent = 0):QSignalMapper(parent),_wrapper(NULL) {};
618617

619-
virtual void timerEvent(QTimerEvent* arg__1);
620618
virtual void childEvent(QChildEvent* arg__1);
621-
virtual bool event(QEvent* arg__1);
619+
virtual void timerEvent(QTimerEvent* arg__1);
622620
virtual void customEvent(QEvent* arg__1);
621+
virtual bool event(QEvent* arg__1);
623622
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
624623

625624
PythonQtInstanceWrapper* _wrapper;
@@ -653,8 +652,8 @@ class PythonQtShell_QSignalTransition : public QSignalTransition
653652
virtual bool event(QEvent* e);
654653
virtual void onTransition(QEvent* event);
655654
virtual bool eventTest(QEvent* event);
656-
virtual void timerEvent(QTimerEvent* arg__1);
657655
virtual void childEvent(QChildEvent* arg__1);
656+
virtual void timerEvent(QTimerEvent* arg__1);
658657
virtual void customEvent(QEvent* arg__1);
659658
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
660659

@@ -694,8 +693,8 @@ class PythonQtShell_QSocketNotifier : public QSocketNotifier
694693
PythonQtShell_QSocketNotifier(int socket, QSocketNotifier::Type arg__2, QObject* parent = 0):QSocketNotifier(socket, arg__2, parent),_wrapper(NULL) {};
695694

696695
virtual bool event(QEvent* arg__1);
697-
virtual void timerEvent(QTimerEvent* arg__1);
698696
virtual void childEvent(QChildEvent* arg__1);
697+
virtual void timerEvent(QTimerEvent* arg__1);
699698
virtual void customEvent(QEvent* arg__1);
700699
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
701700

@@ -735,8 +734,8 @@ class PythonQtShell_QState : public QState
735734
virtual bool event(QEvent* e);
736735
virtual void onExit(QEvent* event);
737736
virtual void onEntry(QEvent* event);
738-
virtual void timerEvent(QTimerEvent* arg__1);
739737
virtual void childEvent(QChildEvent* arg__1);
738+
virtual void timerEvent(QTimerEvent* arg__1);
740739
virtual void customEvent(QEvent* arg__1);
741740
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
742741

@@ -790,9 +789,9 @@ virtual void endSelectTransitions(QEvent* event);
790789
virtual void beginSelectTransitions(QEvent* event);
791790
virtual bool eventFilter(QObject* watched, QEvent* event);
792791
virtual void endMicrostep(QEvent* event);
793-
virtual void customEvent(QEvent* arg__1);
794-
virtual void timerEvent(QTimerEvent* arg__1);
795792
virtual void childEvent(QChildEvent* arg__1);
793+
virtual void timerEvent(QTimerEvent* arg__1);
794+
virtual void customEvent(QEvent* arg__1);
796795

797796
PythonQtInstanceWrapper* _wrapper;
798797
};
@@ -872,8 +871,8 @@ class PythonQtWrapper_QStateMachine_WrappedEvent : public QObject
872871
public slots:
873872
QStateMachine::WrappedEvent* new_QStateMachine_WrappedEvent(QObject* object, QEvent* event);
874873
void delete_QStateMachine_WrappedEvent(QStateMachine::WrappedEvent* obj) { delete obj; }
875-
QEvent* event(QStateMachine::WrappedEvent* theWrappedObject) const;
876874
QObject* object(QStateMachine::WrappedEvent* theWrappedObject) const;
875+
QEvent* event(QStateMachine::WrappedEvent* theWrappedObject) const;
877876
};
878877

879878

@@ -932,25 +931,25 @@ class PythonQtShell_QTemporaryFile : public QTemporaryFile
932931

933932
virtual QAbstractFileEngine* fileEngine() const;
934933
virtual bool open(QIODevice::OpenMode flags);
934+
virtual bool isSequential() const;
935+
virtual qint64 writeData(const char* data, qint64 len);
935936
virtual qint64 size() const;
937+
virtual qint64 readData(char* data, qint64 maxlen);
936938
virtual bool seek(qint64 offset);
939+
virtual bool waitForBytesWritten(int msecs);
937940
virtual qint64 pos() const;
938-
virtual qint64 writeData(const char* data, qint64 len);
939941
virtual bool atEnd() const;
940942
virtual void close();
941943
virtual qint64 readLineData(char* data, qint64 maxlen);
942-
virtual bool isSequential() const;
943-
virtual qint64 readData(char* data, qint64 maxlen);
944+
virtual qint64 bytesToWrite() const;
945+
virtual qint64 bytesAvailable() const;
944946
virtual bool reset();
945947
virtual bool waitForReadyRead(int msecs);
946948
virtual bool canReadLine() const;
947-
virtual qint64 bytesToWrite() const;
948-
virtual qint64 bytesAvailable() const;
949-
virtual bool waitForBytesWritten(int msecs);
950-
virtual void timerEvent(QTimerEvent* arg__1);
951949
virtual void childEvent(QChildEvent* arg__1);
952-
virtual bool event(QEvent* arg__1);
950+
virtual void timerEvent(QTimerEvent* arg__1);
953951
virtual void customEvent(QEvent* arg__1);
952+
virtual bool event(QEvent* arg__1);
954953
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
955954

956955
PythonQtInstanceWrapper* _wrapper;
@@ -1193,10 +1192,10 @@ class PythonQtShell_QThreadPool : public QThreadPool
11931192
public:
11941193
PythonQtShell_QThreadPool(QObject* parent = 0):QThreadPool(parent),_wrapper(NULL) {};
11951194

1196-
virtual void timerEvent(QTimerEvent* arg__1);
11971195
virtual void childEvent(QChildEvent* arg__1);
1198-
virtual bool event(QEvent* arg__1);
1196+
virtual void timerEvent(QTimerEvent* arg__1);
11991197
virtual void customEvent(QEvent* arg__1);
1198+
virtual bool event(QEvent* arg__1);
12001199
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
12011200

12021201
PythonQtInstanceWrapper* _wrapper;
@@ -1233,8 +1232,8 @@ class PythonQtShell_QTimeLine : public QTimeLine
12331232
virtual void timerEvent(QTimerEvent* event);
12341233
virtual qreal valueForTime(int msec) const;
12351234
virtual void childEvent(QChildEvent* arg__1);
1236-
virtual bool event(QEvent* arg__1);
12371235
virtual void customEvent(QEvent* arg__1);
1236+
virtual bool event(QEvent* arg__1);
12381237
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
12391238

12401239
PythonQtInstanceWrapper* _wrapper;

0 commit comments

Comments
 (0)