Skip to content

Commit 27de3b9

Browse files
author
florianlink
committed
updated wrappers to build on clang
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@354 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
1 parent b190643 commit 27de3b9

38 files changed

+101
-343
lines changed

‎generated_cpp_53/com_trolltech_qt_core/com_trolltech_qt_core0.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
7272

7373
class PythonQtPublicPromoter_QAbstractAnimation : public QAbstractAnimation
7474
{ public:
75-
friend class PythonQtWrapper_QAbstractAnimation;
7675
inline bool promoted_event(QEvent* event) { return QAbstractAnimation::event(event); }
7776
inline void promoted_updateDirection(QAbstractAnimation::Direction direction) { QAbstractAnimation::updateDirection(direction); }
7877
inline void promoted_updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QAbstractAnimation::updateState(newState, oldState); }
@@ -158,7 +157,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
158157

159158
class PythonQtPublicPromoter_QAbstractItemModel : public QAbstractItemModel
160159
{ public:
161-
friend class PythonQtWrapper_QAbstractItemModel;
162160
inline void promoted_beginInsertColumns(const QModelIndex& parent, int first, int last) { QAbstractItemModel::beginInsertColumns(parent, first, last); }
163161
inline void promoted_beginInsertRows(const QModelIndex& parent, int first, int last) { QAbstractItemModel::beginInsertRows(parent, first, last); }
164162
inline bool promoted_beginMoveColumns(const QModelIndex& sourceParent, int sourceFirst, int sourceLast, const QModelIndex& destinationParent, int destinationColumn) { return QAbstractItemModel::beginMoveColumns(sourceParent, sourceFirst, sourceLast, destinationParent, destinationColumn); }
@@ -331,7 +329,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
331329

332330
class PythonQtPublicPromoter_QAbstractListModel : public QAbstractListModel
333331
{ public:
334-
friend class PythonQtWrapper_QAbstractListModel;
335332
inline bool promoted_dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) { return QAbstractListModel::dropMimeData(data, action, row, column, parent); }
336333
inline Qt::ItemFlags promoted_flags(const QModelIndex& index) const { return QAbstractListModel::flags(index); }
337334
inline QModelIndex promoted_index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const { return QAbstractListModel::index(row, column, parent); }
@@ -373,7 +370,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
373370

374371
class PythonQtPublicPromoter_QAbstractState : public QAbstractState
375372
{ public:
376-
friend class PythonQtWrapper_QAbstractState;
377373
inline bool promoted_event(QEvent* e) { return QAbstractState::event(e); }
378374
};
379375

@@ -411,7 +407,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
411407

412408
class PythonQtPublicPromoter_QAbstractTransition : public QAbstractTransition
413409
{ public:
414-
friend class PythonQtWrapper_QAbstractTransition;
415410
inline bool promoted_event(QEvent* e) { return QAbstractTransition::event(e); }
416411
};
417412

@@ -459,7 +454,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
459454

460455
class PythonQtPublicPromoter_QAnimationGroup : public QAnimationGroup
461456
{ public:
462-
friend class PythonQtWrapper_QAnimationGroup;
463457
inline bool promoted_event(QEvent* event) { return QAnimationGroup::event(event); }
464458
};
465459

@@ -567,7 +561,6 @@ virtual qint64 writeData(const char* data, qint64 len);
567561

568562
class PythonQtPublicPromoter_QBuffer : public QBuffer
569563
{ public:
570-
friend class PythonQtWrapper_QBuffer;
571564
inline bool promoted_atEnd() const { return QBuffer::atEnd(); }
572565
inline bool promoted_canReadLine() const { return QBuffer::canReadLine(); }
573566
inline void promoted_close() { QBuffer::close(); }
@@ -765,7 +758,6 @@ void delete_QCommandLineParser(QCommandLineParser* obj) { delete obj; }
765758

766759
class PythonQtPublicPromoter_QCoreApplication : public QCoreApplication
767760
{ public:
768-
friend class PythonQtWrapper_QCoreApplication;
769761
inline bool promoted_event(QEvent* arg__1) { return QCoreApplication::event(arg__1); }
770762
inline bool promoted_notify(QObject* arg__1, QEvent* arg__2) { return QCoreApplication::notify(arg__1, arg__2); }
771763
};
@@ -1190,7 +1182,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
11901182

11911183
class PythonQtPublicPromoter_QEventLoop : public QEventLoop
11921184
{ public:
1193-
friend class PythonQtWrapper_QEventLoop;
11941185
inline bool promoted_event(QEvent* event) { return QEventLoop::event(event); }
11951186
};
11961187

@@ -1239,7 +1230,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
12391230

12401231
class PythonQtPublicPromoter_QEventTransition : public QEventTransition
12411232
{ public:
1242-
friend class PythonQtWrapper_QEventTransition;
12431233
inline bool promoted_event(QEvent* e) { return QEventTransition::event(e); }
12441234
inline bool promoted_eventTest(QEvent* event) { return QEventTransition::eventTest(event); }
12451235
inline void promoted_onTransition(QEvent* event) { QEventTransition::onTransition(event); }
@@ -1330,7 +1320,6 @@ virtual qint64 writeData(const char* data, qint64 len);
13301320

13311321
class PythonQtPublicPromoter_QFile : public QFile
13321322
{ public:
1333-
friend class PythonQtWrapper_QFile;
13341323
inline QString promoted_fileName() const { return QFile::fileName(); }
13351324
inline bool promoted_open(QIODevice::OpenMode flags) { return QFile::open(flags); }
13361325
inline QFileDevice::Permissions promoted_permissions() const { return QFile::permissions(); }
@@ -1418,7 +1407,6 @@ virtual qint64 writeData(const char* data, qint64 len);
14181407

14191408
class PythonQtPublicPromoter_QFileDevice : public QFileDevice
14201409
{ public:
1421-
friend class PythonQtWrapper_QFileDevice;
14221410
inline bool promoted_atEnd() const { return QFileDevice::atEnd(); }
14231411
inline void promoted_close() { QFileDevice::close(); }
14241412
inline QString promoted_fileName() const { return QFileDevice::fileName(); }

‎generated_cpp_53/com_trolltech_qt_core/com_trolltech_qt_core1.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
138138

139139
class PythonQtPublicPromoter_QFinalState : public QFinalState
140140
{ public:
141-
friend class PythonQtWrapper_QFinalState;
142141
inline bool promoted_event(QEvent* e) { return QFinalState::event(e); }
143142
inline void promoted_onEntry(QEvent* event) { QFinalState::onEntry(event); }
144143
inline void promoted_onExit(QEvent* event) { QFinalState::onExit(event); }
@@ -180,7 +179,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
180179

181180
class PythonQtPublicPromoter_QHistoryState : public QHistoryState
182181
{ public:
183-
friend class PythonQtWrapper_QHistoryState;
184182
inline bool promoted_event(QEvent* e) { return QHistoryState::event(e); }
185183
inline void promoted_onEntry(QEvent* event) { QHistoryState::onEntry(event); }
186184
inline void promoted_onExit(QEvent* event) { QHistoryState::onExit(event); }
@@ -241,7 +239,6 @@ virtual qint64 writeData(const char* data, qint64 len);
241239

242240
class PythonQtPublicPromoter_QIODevice : public QIODevice
243241
{ public:
244-
friend class PythonQtWrapper_QIODevice;
245242
inline bool promoted_atEnd() const { return QIODevice::atEnd(); }
246243
inline qint64 promoted_bytesAvailable() const { return QIODevice::bytesAvailable(); }
247244
inline qint64 promoted_bytesToWrite() const { return QIODevice::bytesToWrite(); }
@@ -367,7 +364,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
367364

368365
class PythonQtPublicPromoter_QIdentityProxyModel : public QIdentityProxyModel
369366
{ public:
370-
friend class PythonQtWrapper_QIdentityProxyModel;
371367
inline int promoted_columnCount(const QModelIndex& parent = QModelIndex()) const { return QIdentityProxyModel::columnCount(parent); }
372368
inline bool promoted_dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) { return QIdentityProxyModel::dropMimeData(data, action, row, column, parent); }
373369
inline QVariant promoted_headerData(int section, Qt::Orientation orientation, int role) const { return QIdentityProxyModel::headerData(section, orientation, role); }
@@ -1014,7 +1010,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
10141010

10151011
class PythonQtPublicPromoter_QMimeData : public QMimeData
10161012
{ public:
1017-
friend class PythonQtWrapper_QMimeData;
10181013
inline QStringList promoted_formats() const { return QMimeData::formats(); }
10191014
inline bool promoted_hasFormat(const QString& mimetype) const { return QMimeData::hasFormat(mimetype); }
10201015
inline QVariant promoted_retrieveData(const QString& mimetype, QVariant::Type preferredType) const { return QMimeData::retrieveData(mimetype, preferredType); }
@@ -1178,7 +1173,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
11781173

11791174
class PythonQtPublicPromoter_QObject : public QObject
11801175
{ public:
1181-
friend class PythonQtWrapper_QObject;
11821176
inline void promoted_childEvent(QChildEvent* arg__1) { QObject::childEvent(arg__1); }
11831177
inline void promoted_customEvent(QEvent* arg__1) { QObject::customEvent(arg__1); }
11841178
inline bool promoted_event(QEvent* arg__1) { return QObject::event(arg__1); }
@@ -1247,7 +1241,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
12471241

12481242
class PythonQtPublicPromoter_QParallelAnimationGroup : public QParallelAnimationGroup
12491243
{ public:
1250-
friend class PythonQtWrapper_QParallelAnimationGroup;
12511244
inline int promoted_duration() const { return QParallelAnimationGroup::duration(); }
12521245
inline bool promoted_event(QEvent* event) { return QParallelAnimationGroup::event(event); }
12531246
inline void promoted_updateCurrentTime(int currentTime) { QParallelAnimationGroup::updateCurrentTime(currentTime); }

‎generated_cpp_53/com_trolltech_qt_core/com_trolltech_qt_core2.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
7171

7272
class PythonQtPublicPromoter_QPauseAnimation : public QPauseAnimation
7373
{ public:
74-
friend class PythonQtWrapper_QPauseAnimation;
7574
inline int promoted_duration() const { return QPauseAnimation::duration(); }
7675
inline bool promoted_event(QEvent* e) { return QPauseAnimation::event(e); }
7776
inline void promoted_updateCurrentTime(int arg__1) { QPauseAnimation::updateCurrentTime(arg__1); }
@@ -161,7 +160,6 @@ virtual qint64 writeData(const char* data, qint64 len);
161160

162161
class PythonQtPublicPromoter_QProcess : public QProcess
163162
{ public:
164-
friend class PythonQtWrapper_QProcess;
165163
inline bool promoted_atEnd() const { return QProcess::atEnd(); }
166164
inline qint64 promoted_bytesAvailable() const { return QProcess::bytesAvailable(); }
167165
inline qint64 promoted_bytesToWrite() const { return QProcess::bytesToWrite(); }
@@ -308,7 +306,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
308306

309307
class PythonQtPublicPromoter_QPropertyAnimation : public QPropertyAnimation
310308
{ public:
311-
friend class PythonQtWrapper_QPropertyAnimation;
312309
inline bool promoted_event(QEvent* event) { return QPropertyAnimation::event(event); }
313310
inline void promoted_updateCurrentValue(const QVariant& value) { QPropertyAnimation::updateCurrentValue(value); }
314311
inline void promoted_updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) { QPropertyAnimation::updateState(newState, oldState); }
@@ -468,7 +465,6 @@ class PythonQtShell_QResource : public QResource
468465

469466
class PythonQtPublicPromoter_QResource : public QResource
470467
{ public:
471-
friend class PythonQtWrapper_QResource;
472468
inline QStringList promoted_children() const { return QResource::children(); }
473469
inline bool promoted_isDir() const { return QResource::isDir(); }
474470
inline bool promoted_isFile() const { return QResource::isFile(); }
@@ -569,7 +565,6 @@ virtual qint64 writeData(const char* data, qint64 len);
569565

570566
class PythonQtPublicPromoter_QSaveFile : public QSaveFile
571567
{ public:
572-
friend class PythonQtWrapper_QSaveFile;
573568
inline QString promoted_fileName() const { return QSaveFile::fileName(); }
574569
inline bool promoted_open(QIODevice::OpenMode flags) { return QSaveFile::open(flags); }
575570
inline qint64 promoted_writeData(const char* data, qint64 len) { return QSaveFile::writeData(data, len); }
@@ -636,7 +631,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
636631

637632
class PythonQtPublicPromoter_QSequentialAnimationGroup : public QSequentialAnimationGroup
638633
{ public:
639-
friend class PythonQtWrapper_QSequentialAnimationGroup;
640634
inline int promoted_duration() const { return QSequentialAnimationGroup::duration(); }
641635
inline bool promoted_event(QEvent* event) { return QSequentialAnimationGroup::event(event); }
642636
inline void promoted_updateCurrentTime(int arg__1) { QSequentialAnimationGroup::updateCurrentTime(arg__1); }
@@ -686,7 +680,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
686680

687681
class PythonQtPublicPromoter_QSettings : public QSettings
688682
{ public:
689-
friend class PythonQtWrapper_QSettings;
690683
inline bool promoted_event(QEvent* event) { return QSettings::event(event); }
691684
};
692685

@@ -853,7 +846,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
853846

854847
class PythonQtPublicPromoter_QSignalTransition : public QSignalTransition
855848
{ public:
856-
friend class PythonQtWrapper_QSignalTransition;
857849
inline bool promoted_event(QEvent* e) { return QSignalTransition::event(e); }
858850
inline bool promoted_eventTest(QEvent* event) { return QSignalTransition::eventTest(event); }
859851
inline void promoted_onTransition(QEvent* event) { QSignalTransition::onTransition(event); }
@@ -881,7 +873,6 @@ void delete_QSignalTransition(QSignalTransition* obj) { delete obj; }
881873

882874
class PythonQtPublicPromoter_QSocketNotifier : public QSocketNotifier
883875
{ public:
884-
friend class PythonQtWrapper_QSocketNotifier;
885876
inline bool promoted_event(QEvent* arg__1) { return QSocketNotifier::event(arg__1); }
886877
};
887878

@@ -949,7 +940,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
949940

950941
class PythonQtPublicPromoter_QState : public QState
951942
{ public:
952-
friend class PythonQtWrapper_QState;
953943
inline bool promoted_event(QEvent* e) { return QState::event(e); }
954944
inline void promoted_onEntry(QEvent* event) { QState::onEntry(event); }
955945
inline void promoted_onExit(QEvent* event) { QState::onExit(event); }
@@ -1008,7 +998,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
1008998

1009999
class PythonQtPublicPromoter_QStateMachine : public QStateMachine
10101000
{ public:
1011-
friend class PythonQtWrapper_QStateMachine;
10121001
inline void promoted_beginMicrostep(QEvent* event) { QStateMachine::beginMicrostep(event); }
10131002
inline void promoted_beginSelectTransitions(QEvent* event) { QStateMachine::beginSelectTransitions(event); }
10141003
inline void promoted_endMicrostep(QEvent* event) { QStateMachine::endMicrostep(event); }
@@ -1217,7 +1206,6 @@ virtual qint64 writeData(const char* data, qint64 len);
12171206

12181207
class PythonQtPublicPromoter_QTemporaryFile : public QTemporaryFile
12191208
{ public:
1220-
friend class PythonQtWrapper_QTemporaryFile;
12211209
inline bool promoted_open(QIODevice::OpenMode flags) { return QTemporaryFile::open(flags); }
12221210
};
12231211

‎generated_cpp_53/com_trolltech_qt_core/com_trolltech_qt_core3.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ virtual QByteArray name() const;
5353

5454
class PythonQtPublicPromoter_QTextCodec : public QTextCodec
5555
{ public:
56-
friend class PythonQtWrapper_QTextCodec;
5756
inline QList<QByteArray > promoted_aliases() const { return QTextCodec::aliases(); }
5857
};
5958

@@ -267,7 +266,6 @@ virtual qreal valueForTime(int msec) const;
267266

268267
class PythonQtPublicPromoter_QTimeLine : public QTimeLine
269268
{ public:
270-
friend class PythonQtWrapper_QTimeLine;
271269
inline void promoted_timerEvent(QTimerEvent* event) { QTimeLine::timerEvent(event); }
272270
inline qreal promoted_valueForTime(int msec) const { return QTimeLine::valueForTime(msec); }
273271
};
@@ -384,7 +382,6 @@ virtual void timerEvent(QTimerEvent* arg__1);
384382

385383
class PythonQtPublicPromoter_QTimer : public QTimer
386384
{ public:
387-
friend class PythonQtWrapper_QTimer;
388385
inline void promoted_timerEvent(QTimerEvent* arg__1) { QTimer::timerEvent(arg__1); }
389386
};
390387

@@ -456,7 +453,6 @@ virtual QString translate(const char* context, const char* sourceText, const
456453

457454
class PythonQtPublicPromoter_QTranslator : public QTranslator
458455
{ public:
459-
friend class PythonQtWrapper_QTranslator;
460456
inline bool promoted_isEmpty() const { return QTranslator::isEmpty(); }
461457
};
462458

@@ -602,7 +598,6 @@ virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation
602598

603599
class PythonQtPublicPromoter_QVariantAnimation : public QVariantAnimation
604600
{ public:
605-
friend class PythonQtWrapper_QVariantAnimation;
606601
inline int promoted_duration() const { return QVariantAnimation::duration(); }
607602
inline bool promoted_event(QEvent* event) { return QVariantAnimation::event(event); }
608603
inline QVariant promoted_interpolated(const QVariant& from, const QVariant& to, qreal progress) const { return QVariantAnimation::interpolated(from, to, progress); }
@@ -672,7 +667,6 @@ virtual QString resolveUndeclaredEntity(const QString& name);
672667

673668
class PythonQtPublicPromoter_QXmlStreamEntityResolver : public QXmlStreamEntityResolver
674669
{ public:
675-
friend class PythonQtWrapper_QXmlStreamEntityResolver;
676670
inline QString promoted_resolveEntity(const QString& publicId, const QString& systemId) { return QXmlStreamEntityResolver::resolveEntity(publicId, systemId); }
677671
inline QString promoted_resolveUndeclaredEntity(const QString& name) { return QXmlStreamEntityResolver::resolveUndeclaredEntity(name); }
678672
};

‎generated_cpp_53/com_trolltech_qt_gui/com_trolltech_qt_gui0.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4612,7 +4612,7 @@ void PythonQtWrapper_QAbstractItemView::dropEvent(QAbstractItemView* theWrappedO
46124612
( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_dropEvent(event));
46134613
}
46144614

4615-
QAbstractItemView::DropIndicatorPosition PythonQtWrapper_QAbstractItemView::dropIndicatorPosition(QAbstractItemView* theWrappedObject) const
4615+
int PythonQtWrapper_QAbstractItemView::dropIndicatorPosition(QAbstractItemView* theWrappedObject) const
46164616
{
46174617
return ( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_dropIndicatorPosition());
46184618
}
@@ -4932,7 +4932,7 @@ void PythonQtWrapper_QAbstractItemView::setSelectionModel(QAbstractItemView* the
49324932
( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_setSelectionModel(selectionModel));
49334933
}
49344934

4935-
void PythonQtWrapper_QAbstractItemView::setState(QAbstractItemView* theWrappedObject, QAbstractItemView::State state)
4935+
void PythonQtWrapper_QAbstractItemView::setState(QAbstractItemView* theWrappedObject, int state)
49364936
{
49374937
( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_setState(state));
49384938
}
@@ -4982,7 +4982,7 @@ void PythonQtWrapper_QAbstractItemView::startDrag(QAbstractItemView* theWrappedO
49824982
( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_startDrag(supportedActions));
49834983
}
49844984

4985-
QAbstractItemView::State PythonQtWrapper_QAbstractItemView::state(QAbstractItemView* theWrappedObject) const
4985+
int PythonQtWrapper_QAbstractItemView::state(QAbstractItemView* theWrappedObject) const
49864986
{
49874987
return ( ((PythonQtPublicPromoter_QAbstractItemView*)theWrappedObject)->promoted_state());
49884988
}
@@ -19972,7 +19972,7 @@ bool PythonQtWrapper_QColumnView::isIndexHidden(QColumnView* theWrappedObject,
1997219972
return ( ((PythonQtPublicPromoter_QColumnView*)theWrappedObject)->promoted_isIndexHidden(index));
1997319973
}
1997419974

19975-
QModelIndex PythonQtWrapper_QColumnView::moveCursor(QColumnView* theWrappedObject, QAbstractItemView::CursorAction cursorAction, Qt::KeyboardModifiers modifiers)
19975+
QModelIndex PythonQtWrapper_QColumnView::moveCursor(QColumnView* theWrappedObject, int cursorAction, Qt::KeyboardModifiers modifiers)
1997619976
{
1997719977
return ( ((PythonQtPublicPromoter_QColumnView*)theWrappedObject)->promoted_moveCursor(cursorAction, modifiers));
1997819978
}

0 commit comments

Comments
 (0)