Skip to content

Commit 5eceded

Browse files
author
florianlink
committed
regenerated wrappers for Qt 5.0 including ownership handling
git-svn-id: http://svn.code.sf.net/p/pythonqt/code/trunk@383 ea8d5007-eb21-0410-b261-ccb3ea6e24a9
1 parent b699027 commit 5eceded

File tree

71 files changed

+31405
-15605
lines changed

Some content is hidden

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

71 files changed

+31405
-15605
lines changed

generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core0.cpp

+525-318
Large diffs are not rendered by default.

generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core0.h

+102-17
Large diffs are not rendered by default.

generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core1.cpp

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

generated_cpp_50/com_trolltech_qt_core/com_trolltech_qt_core1.h

+13-5
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ virtual bool canFetchMore(const QModelIndex& parent) const;
5858
virtual void childEvent(QChildEvent* arg__1);
5959
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
6060
virtual void customEvent(QEvent* arg__1);
61-
virtual QVariant data(const QModelIndex& proxyIndex, int role) const;
61+
virtual QVariant data(const QModelIndex& proxyIndex, int role = Qt::DisplayRole) const;
6262
virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
6363
virtual bool event(QEvent* arg__1);
6464
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
6565
virtual void fetchMore(const QModelIndex& parent);
6666
virtual Qt::ItemFlags flags(const QModelIndex& index) const;
67-
virtual bool hasChildren(const QModelIndex& parent) const;
67+
virtual bool hasChildren(const QModelIndex& parent = QModelIndex()) const;
6868
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
6969
virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const;
7070
virtual bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex());
@@ -85,12 +85,12 @@ virtual bool removeRows(int row, int count, const QModelIndex& parent = QMod
8585
virtual void revert();
8686
virtual QHash<int , QByteArray > roleNames() const;
8787
virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
88-
virtual bool setData(const QModelIndex& index, const QVariant& value, int role);
89-
virtual bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role);
88+
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole);
89+
virtual bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole);
9090
virtual bool setItemData(const QModelIndex& index, const QMap<int , QVariant >& roles);
9191
virtual void setSourceModel(QAbstractItemModel* sourceModel);
9292
virtual QModelIndex sibling(int row, int column, const QModelIndex& idx) const;
93-
virtual void sort(int column, Qt::SortOrder order);
93+
virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
9494
virtual QSize span(const QModelIndex& index) const;
9595
virtual bool submit();
9696
virtual Qt::DropActions supportedDragActions() const;
@@ -814,6 +814,9 @@ inline void promoted_childEvent(QChildEvent* arg__1) { QObject::childEvent(arg_
814814
inline void promoted_customEvent(QEvent* arg__1) { QObject::customEvent(arg__1); }
815815
inline bool promoted_event(QEvent* arg__1) { return QObject::event(arg__1); }
816816
inline bool promoted_eventFilter(QObject* arg__1, QEvent* arg__2) { return QObject::eventFilter(arg__1, arg__2); }
817+
inline bool promoted_isSignalConnected(const QMetaMethod& signal) const { return QObject::isSignalConnected(signal); }
818+
inline QObject* promoted_sender() const { return QObject::sender(); }
819+
inline int promoted_senderSignalIndex() const { return QObject::senderSignalIndex(); }
817820
inline void promoted_timerEvent(QTimerEvent* arg__1) { QObject::timerEvent(arg__1); }
818821
};
819822

@@ -833,12 +836,15 @@ void delete_QObject(QObject* obj) { delete obj; }
833836
bool event(QObject* theWrappedObject, QEvent* arg__1);
834837
bool eventFilter(QObject* theWrappedObject, QObject* arg__1, QEvent* arg__2);
835838
void installEventFilter(QObject* theWrappedObject, QObject* arg__1);
839+
bool isSignalConnected(QObject* theWrappedObject, const QMetaMethod& signal) const;
836840
bool isWidgetType(QObject* theWrappedObject) const;
837841
bool isWindowType(QObject* theWrappedObject) const;
838842
void killTimer(QObject* theWrappedObject, int id);
839843
void moveToThread(QObject* theWrappedObject, QThread* thread);
840844
QString objectName(QObject* theWrappedObject) const;
841845
void removeEventFilter(QObject* theWrappedObject, QObject* arg__1);
846+
QObject* sender(QObject* theWrappedObject) const;
847+
int senderSignalIndex(QObject* theWrappedObject) const;
842848
void setObjectName(QObject* theWrappedObject, const QString& name);
843849
bool signalsBlocked(QObject* theWrappedObject) const;
844850
int startTimer(QObject* theWrappedObject, int interval, Qt::TimerType timerType = Qt::CoarseTimer);
@@ -1015,6 +1021,7 @@ inline bool promoted_canReadLine() const { return QProcess::canReadLine(); }
10151021
inline void promoted_close() { QProcess::close(); }
10161022
inline bool promoted_isSequential() const { return QProcess::isSequential(); }
10171023
inline qint64 promoted_readData(char* data, qint64 maxlen) { return QProcess::readData(data, maxlen); }
1024+
inline void promoted_setProcessState(QProcess::ProcessState state) { QProcess::setProcessState(state); }
10181025
inline void promoted_setupChildProcess() { QProcess::setupChildProcess(); }
10191026
inline bool promoted_waitForBytesWritten(int msecs = 30000) { return QProcess::waitForBytesWritten(msecs); }
10201027
inline bool promoted_waitForReadyRead(int msecs = 30000) { return QProcess::waitForReadyRead(msecs); }
@@ -1063,6 +1070,7 @@ void delete_QProcess(QProcess* obj) { delete obj; }
10631070
void setEnvironment(QProcess* theWrappedObject, const QStringList& environment);
10641071
void setProcessChannelMode(QProcess* theWrappedObject, QProcess::ProcessChannelMode mode);
10651072
void setProcessEnvironment(QProcess* theWrappedObject, const QProcessEnvironment& environment);
1073+
void setProcessState(QProcess* theWrappedObject, QProcess::ProcessState state);
10661074
void setReadChannel(QProcess* theWrappedObject, QProcess::ProcessChannel channel);
10671075
void setStandardErrorFile(QProcess* theWrappedObject, const QString& fileName, QIODevice::OpenMode mode = QIODevice::Truncate);
10681076
void setStandardInputFile(QProcess* theWrappedObject, const QString& fileName);

0 commit comments

Comments
 (0)