Use use instead of typedef in optionpage.h
This commit is contained in:
parent
9303e3f60d
commit
c1746c4302
|
@ -142,13 +142,18 @@ template <class UiClass> inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
|
||||||
}
|
}
|
||||||
} // namespace QtUtilities
|
} // namespace QtUtilities
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Declares the base class for a class inheriting from Dialogs::OptionPage.
|
||||||
|
*/
|
||||||
|
#define BEGIN_DECLARE_TYPEDEF_OPTION_PAGE(SomeClass) using SomeClass##Base = ::QtUtilities::OptionPage;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Declares a class inheriting from Dialogs::OptionPage in a convenient
|
* \brief Declares a class inheriting from Dialogs::OptionPage in a convenient
|
||||||
* way.
|
* way.
|
||||||
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
||||||
*/
|
*/
|
||||||
#define BEGIN_DECLARE_OPTION_PAGE(SomeClass) \
|
#define BEGIN_DECLARE_OPTION_PAGE(SomeClass) \
|
||||||
typedef ::QtUtilities::OptionPage SomeClass##Base; \
|
BEGIN_DECLARE_TYPEDEF_OPTION_PAGE(SomeClass) \
|
||||||
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::OptionPage { \
|
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::OptionPage { \
|
||||||
public: \
|
public: \
|
||||||
explicit SomeClass(QWidget *parentWidget = nullptr); \
|
explicit SomeClass(QWidget *parentWidget = nullptr); \
|
||||||
|
@ -164,7 +169,7 @@ template <class UiClass> inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
|
||||||
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
||||||
*/
|
*/
|
||||||
#define BEGIN_DECLARE_OPTION_PAGE_CUSTOM_CTOR(SomeClass) \
|
#define BEGIN_DECLARE_OPTION_PAGE_CUSTOM_CTOR(SomeClass) \
|
||||||
typedef ::QtUtilities::OptionPage SomeClass##Base; \
|
BEGIN_DECLARE_TYPEDEF_OPTION_PAGE(SomeClass) \
|
||||||
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::OptionPage { \
|
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::OptionPage { \
|
||||||
public: \
|
public: \
|
||||||
~SomeClass() override; \
|
~SomeClass() override; \
|
||||||
|
@ -173,16 +178,22 @@ template <class UiClass> inline UiClass *UiFileBasedOptionPage<UiClass>::ui()
|
||||||
\
|
\
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Declares the base class for a class inheriting from Dialogs::UiFileBasedOptionPage.
|
||||||
|
*/
|
||||||
|
#define BEGIN_DECLARE_TYPEDEF_UI_FILE_BASED_OPTION_PAGE(SomeClass) \
|
||||||
|
namespace Ui { \
|
||||||
|
class SomeClass; \
|
||||||
|
} \
|
||||||
|
using SomeClass##Base = ::QtUtilities::UiFileBasedOptionPage<Ui::SomeClass>;
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Declares a class inheriting from Dialogs::UiFileBasedOptionPage in a
|
* \brief Declares a class inheriting from Dialogs::UiFileBasedOptionPage in a
|
||||||
* convenient way.
|
* convenient way.
|
||||||
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
* \remarks Must be closed with END_DECLARE_OPTION_PAGE.
|
||||||
*/
|
*/
|
||||||
#define BEGIN_DECLARE_UI_FILE_BASED_OPTION_PAGE_CUSTOM_CTOR(SomeClass) \
|
#define BEGIN_DECLARE_UI_FILE_BASED_OPTION_PAGE_CUSTOM_CTOR(SomeClass) \
|
||||||
namespace Ui { \
|
BEGIN_DECLARE_TYPEDEF_UI_FILE_BASED_OPTION_PAGE(SomeClass) \
|
||||||
class SomeClass; \
|
|
||||||
} \
|
|
||||||
typedef ::QtUtilities::UiFileBasedOptionPage<Ui::SomeClass> SomeClass##Base; \
|
|
||||||
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::UiFileBasedOptionPage<Ui::SomeClass> { \
|
class QT_UTILITIES_EXPORT SomeClass : public ::QtUtilities::UiFileBasedOptionPage<Ui::SomeClass> { \
|
||||||
public: \
|
public: \
|
||||||
~SomeClass() override; \
|
~SomeClass() override; \
|
||||||
|
|
Loading…
Reference in New Issue