|
417 | 417 | <not-bool/>
|
418 | 418 | </arg>
|
419 | 419 | </function>
|
420 |
| - <!-- bool QObject::disconnect(const char *signal = Q_NULLPTR, const QObject *receiver = Q_NULLPTR, const char *method = Q_NULLPTR) const --> |
421 |
| - <!-- bool QObject::disconnect(const QObject *receiver, const char *method = Q_NULLPTR) const --> |
| 420 | + <!-- bool QObject::disconnect(const char *signal = nullptr, const QObject *receiver = nullptr, const char *method = nullptr) const --> |
| 421 | + <!-- bool QObject::disconnect(const QObject *receiver, const char *method = nullptr) const --> |
422 | 422 | <!-- bool QObject::disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *method) // static -->
|
423 | 423 | <!-- bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal, const QObject *receiver, const QMetaMethod &method) // static -->
|
424 | 424 | <!-- bool QObject::disconnect(const QMetaObject::Connection &connection) // static -->
|
|
467 | 467 | <not-uninit/>
|
468 | 468 | </arg>
|
469 | 469 | </function>
|
470 |
| - <!-- QString QObject::tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) //static --> |
| 470 | + <!-- QString QObject::tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1) //static --> |
471 | 471 | <function name="tr,QObject::tr">
|
472 | 472 | <noreturn>false</noreturn>
|
473 | 473 | <returnValue type="QString"/>
|
|
2041 | 2041 | <use-retval/>
|
2042 | 2042 | <const/>
|
2043 | 2043 | </function>
|
2044 |
| - <!-- int QString::toInt(bool *ok = Q_NULLPTR, int base = 10) const --> |
| 2044 | + <!-- int QString::toInt(bool *ok = nullptr, int base = 10) const --> |
2045 | 2045 | <function name="QString::toInt">
|
2046 | 2046 | <noreturn>false</noreturn>
|
2047 | 2047 | <returnValue type="int"/>
|
|
2459 | 2459 | <not-uninit/>
|
2460 | 2460 | </arg>
|
2461 | 2461 | </function>
|
2462 |
| - <!-- QString QFileDialog::getOpenFileName(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static --> |
2463 |
| - <!-- QString QFileDialog::getSaveFileName(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static --> |
2464 |
| - <!-- QString QFileDialog::getExistingDirectory(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), Options options = ShowDirsOnly) //static --> |
| 2462 | + <!-- QString QFileDialog::getOpenFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static --> |
| 2463 | + <!-- QString QFileDialog::getSaveFileName(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static --> |
| 2464 | + <!-- QString QFileDialog::getExistingDirectory(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), Options options = ShowDirsOnly) //static --> |
2465 | 2465 | <function name="QFileDialog::getOpenFileName,QFileDialog::getSaveFileName,QFileDialog::getExistingDirectory">
|
2466 | 2466 | <noreturn>false</noreturn>
|
2467 | 2467 | <returnValue type="QString"/>
|
|
2470 | 2470 | <not-uninit/>
|
2471 | 2471 | </arg>
|
2472 | 2472 | </function>
|
2473 |
| - <!-- QStringList QFileDialog::getOpenFileNames(QWidget *parent = Q_NULLPTR, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = Q_NULLPTR, Options options = Options()) //static --> |
| 2473 | + <!-- QStringList QFileDialog::getOpenFileNames(QWidget *parent = nullptr, const QString &caption = QString(), const QString &dir = QString(), const QString &filter = QString(), QString *selectedFilter = nullptr, Options options = Options()) //static --> |
2474 | 2474 | <function name="QFileDialog::getOpenFileNames">
|
2475 | 2475 | <noreturn>false</noreturn>
|
2476 | 2476 | <returnValue type="QStringList"/>
|
|
5325 | 5325 | <define name="Q_NAMESPACE_EXPORT" value=""/>
|
5326 | 5326 | <define name="Q_DECL_EXPORT" value=""/>
|
5327 | 5327 | <define name="Q_DECL_IMPORT" value=""/>
|
5328 |
| - <define name="QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)" value="static inline QString trUtf8(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }"/> |
| 5328 | + <define name="QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context)" value="static inline QString trUtf8(const char *sourceText, const char *disambiguation = nullptr, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); }"/> |
5329 | 5329 | <define name="Q_DECLARE_FLAGS(x,y)" value=""/>
|
5330 | 5330 | <define name="Q_DECLARE_SEQUENTIAL_ITERATOR(C)" value=""/>
|
5331 | 5331 | <define name="Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(C)" value=""/>
|
|
5339 | 5339 | <define name="Q_DECLARE_PRIVATE(Class)" value="inline Class##Private* d_func() { return reinterpret_cast<Class##Private*>(qGetPtrHelper(d_ptr)); } inline const Class##Private d_func() const { return reinterpret_cast<const Class##Private *>(qGetPtrHelper(d_ptr)); } friend class Class##Private;"/>
|
5340 | 5340 | <define name="Q_DECLARE_PRIVATE_D(Dptr, Class)" value="inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(qGetPtrHelper(Dptr)); } inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(qGetPtrHelper(Dptr)); } friend class Class##Private;"/>
|
5341 | 5341 | <define name="Q_DECLARE_PUBLIC(Class)" value="inline Class##Public* d_func() { return reinterpret_cast<Class##Public*>(qGetPtrHelper(d_ptr)); } inline const Class##Public d_func() const { return reinterpret_cast<const Class##Public *>(qGetPtrHelper(d_ptr)); } friend class Class##Public;"/>
|
5342 |
| - <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = Q_NULLPTR, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/> |
| 5342 | + <define name="Q_DECLARE_TR_FUNCTIONS(context)" value="public: static inline QString tr(const char *sourceText, const char *disambiguation = nullptr, int n = -1) { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) private:"/> |
5343 | 5343 | <define name="Q_DISABLE_COPY(C)" value="C(C&);C& operator=(const C&);"/>
|
5344 | 5344 | <define name="Q_EMIT" value=""/>
|
5345 | 5345 | <define name="Q_ENUM(X)" value=""/>
|
|
5352 | 5352 | <define name="Q_INTERFACES(X)" value=""/>
|
5353 | 5353 | <define name="Q_LIKELY(expr)" value="expr"/>
|
5354 | 5354 | <define name="Q_NAMESPACE" value=""/>
|
5355 |
| - <define name="Q_NULLPTR" value="NULL"/> |
| 5355 | + <define name="nullptr" value="NULL"/> |
5356 | 5356 | <define name="Q_OBJECT" value="static void qt_static_metacall(QObject*,QMetaObject::Call,int,void**);const MetaObject* metaObject() const;void* qt_metacast(const char*);int qt_metacall(QMetaObject::Call,int,void**);"/>
|
5357 | 5357 | <define name="Q_PRIVATE_SLOT(d, signature)" value=""/>
|
5358 | 5358 | <define name="Q_SLOTS" value=""/>
|
|
0 commit comments