diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index d80a065..c6b4208 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,10 +68,8 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index d80a065..c6b4208 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,10 +68,8 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6185d01..1e33a93 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,14 +319,12 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index d80a065..c6b4208 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,10 +68,8 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6185d01..1e33a93 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,14 +319,12 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index 4936887..d6b94cc 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,13 +49,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QDate; class QTime; class QDateTime; @@ -375,8 +368,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -404,8 +397,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -436,8 +429,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -471,8 +464,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -509,8 +502,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -541,8 +534,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -576,8 +569,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -640,8 +633,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -670,9 +663,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -703,12 +696,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -737,8 +730,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index d80a065..c6b4208 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,10 +68,8 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6185d01..1e33a93 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,14 +319,12 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index 4936887..d6b94cc 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,13 +49,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QDate; class QTime; class QDateTime; @@ -375,8 +368,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -404,8 +397,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -436,8 +429,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -471,8 +464,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -509,8 +502,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -541,8 +534,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -576,8 +569,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -640,8 +633,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -670,9 +663,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -703,12 +696,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -737,8 +730,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h index 735242c..656efb7 100644 --- a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h @@ -123,12 +123,10 @@ QtTreePropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotExpanded(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotCurrentBrowserItemChanged(QtBrowserItem *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentTreeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h index 173e12b..40950f8 100644 --- a/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtbuttonpropertybrowser.h @@ -78,11 +78,9 @@ QtButtonPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) Q_PRIVATE_SLOT(d_func(), void slotToggled(bool)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qteditorfactory.h b/3rdParty/qtpropertybrowser/src/qteditorfactory.h index d914702..cbb2077 100644 --- a/3rdParty/qtpropertybrowser/src/qteditorfactory.h +++ b/3rdParty/qtpropertybrowser/src/qteditorfactory.h @@ -48,13 +48,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QtSpinBoxFactoryPrivate; class QT_QTPROPERTYBROWSER_EXPORT QtSpinBoxFactory : public QtAbstractEditorFactory @@ -72,12 +65,12 @@ QtSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtSliderFactoryPrivate; @@ -97,11 +90,11 @@ QtSliderFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtScrollBarFactoryPrivate; @@ -121,11 +114,11 @@ QtScrollBarFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCheckBoxFactoryPrivate; @@ -145,10 +138,10 @@ QtCheckBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDoubleSpinBoxFactoryPrivate; @@ -168,13 +161,13 @@ QtDoubleSpinBoxFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) - X_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(double)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) + Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotDecimalsChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(double)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtLineEditFactoryPrivate; @@ -194,12 +187,12 @@ QtLineEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) - X_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) - X_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) + Q_PRIVATE_SLOT(d_func(), void slotEchoModeChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotReadOnlyChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QString &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateEditFactoryPrivate; @@ -219,11 +212,11 @@ QtDateEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, const QDate &, const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDate &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtTimeEditFactoryPrivate; @@ -243,9 +236,9 @@ QtTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtDateTimeEditFactoryPrivate; @@ -265,9 +258,9 @@ QtDateTimeEditFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtKeySequenceEditorFactoryPrivate; @@ -287,9 +280,9 @@ QtKeySequenceEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCharEditorFactoryPrivate; @@ -309,9 +302,9 @@ QtCharEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtEnumEditorFactoryPrivate; @@ -331,13 +324,13 @@ QtEnumEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, const QStringList &)) - X_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, + Q_PRIVATE_SLOT(d_func(), void slotEnumIconsChanged(QtProperty *, const QMap &)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtCursorEditorFactoryPrivate; @@ -357,9 +350,9 @@ QtCursorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) }; class QtColorEditorFactoryPrivate; @@ -379,9 +372,9 @@ QtColorEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QColor &)) }; class QtFontEditorFactoryPrivate; @@ -401,9 +394,9 @@ QtFontEditorFactoryPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) - X_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) - X_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) - X_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) + Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) + Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QFont &)) }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h index d80a065..c6b4208 100644 --- a/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtgroupboxpropertybrowser.h @@ -68,10 +68,8 @@ QtGroupBoxPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h index 6185d01..1e33a93 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertybrowser.h @@ -319,14 +319,12 @@ QtAbstractPropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDataChanged(QtProperty *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h index 4936887..d6b94cc 100644 --- a/3rdParty/qtpropertybrowser/src/qtpropertymanager.h +++ b/3rdParty/qtpropertybrowser/src/qtpropertymanager.h @@ -49,13 +49,6 @@ QT_BEGIN_NAMESPACE #endif -#undef X_PRIVATE_SLOT -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) -# define X_PRIVATE_SLOT(...) Q_PRIVATE_SLOT(__VA_ARGS__) -#else -# define X_PRIVATE_SLOT(...) -#endif - class QDate; class QTime; class QDateTime; @@ -375,8 +368,8 @@ QtLocalePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointPropertyManagerPrivate; @@ -404,8 +397,8 @@ QtPointPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtPointFPropertyManagerPrivate; @@ -436,8 +429,8 @@ QtPointFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePropertyManagerPrivate; @@ -471,8 +464,8 @@ QtSizePropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizeFPropertyManagerPrivate; @@ -509,8 +502,8 @@ QtSizeFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectPropertyManagerPrivate; @@ -541,8 +534,8 @@ QtRectPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtRectFPropertyManagerPrivate; @@ -576,8 +569,8 @@ QtRectFPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtEnumPropertyManagerPrivate; @@ -640,8 +633,8 @@ QtFlagPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtSizePolicyPropertyManagerPrivate; @@ -670,9 +663,9 @@ QtSizePolicyPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtFontPropertyManagerPrivate; @@ -703,12 +696,12 @@ QtFontPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) - X_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseChanged()) + Q_PRIVATE_SLOT(d_func(), void slotFontDatabaseDelayedChange()) }; class QtColorPropertyManagerPrivate; @@ -737,8 +730,8 @@ QtColorPropertyManagerPrivate *d_ptr; Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) - X_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) - X_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) + Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) + Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) }; class QtCursorPropertyManagerPrivate; diff --git a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h index 735242c..656efb7 100644 --- a/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h +++ b/3rdParty/qtpropertybrowser/src/qttreepropertybrowser.h @@ -123,12 +123,10 @@ QtTreePropertyBrowserPrivate *d_ptr; Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotExpanded(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void slotCurrentBrowserItemChanged(QtBrowserItem *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentTreeItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)) -#endif }; #if QT_VERSION >= 0x040400 diff --git a/3rdParty/qtpropertybrowser/src/qtvariantproperty.h b/3rdParty/qtpropertybrowser/src/qtvariantproperty.h index 4090292..2c09fe9 100644 --- a/3rdParty/qtpropertybrowser/src/qtvariantproperty.h +++ b/3rdParty/qtpropertybrowser/src/qtvariantproperty.h @@ -117,7 +117,6 @@ virtual QtProperty *createProperty(); private: QtVariantPropertyManagerPrivate *d_ptr; -#if QT_VERSION <= QT_VERSION_CHECK(5,0,0) Q_PRIVATE_SLOT(d_func(), void slotValueChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) Q_PRIVATE_SLOT(d_func(), void slotSingleStepChanged(QtProperty *, int)) @@ -157,7 +156,6 @@ Q_PRIVATE_SLOT(d_func(), void slotTextVisibleChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) -#endif Q_DECLARE_PRIVATE(QtVariantPropertyManager) Q_DISABLE_COPY(QtVariantPropertyManager) };