diff options
| author | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-14 10:21:41 +0300 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@nokia.com> | 2010-09-14 10:28:40 +0300 |
| commit | 52225066a1b07ac3e0c2603f7214756abf3c4743 (patch) | |
| tree | 0ecd427ad7bd8cc9093dd1b46d806c7fc76fe576 /src | |
| parent | 0eafb62c4d803ea6df63781b46efb02b61f8eadb (diff) | |
Changes: MAbstractLayoutPolicy - removed Q_DECL_DEPRECATED from methods
RevBy: TrustMe
Details: Removed Q_DECL_DEPRECATED from setObjectName() and objectName().
Replaced it with mWarning() messages and "\deprecated" documentation.
Q_DECL_DEPRECATED caused apps that are built with -Werror to not compile.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/layout/mabstractlayoutpolicy.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/layout/mabstractlayoutpolicy.h | 18 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/corelib/layout/mabstractlayoutpolicy.cpp b/src/corelib/layout/mabstractlayoutpolicy.cpp index c5246df6..91cebe58 100644 --- a/src/corelib/layout/mabstractlayoutpolicy.cpp +++ b/src/corelib/layout/mabstractlayoutpolicy.cpp @@ -190,6 +190,7 @@ void MAbstractLayoutPolicy::applyStyle() void MAbstractLayoutPolicy::setObjectName(const QString &name) { + mWarning("MAbstractLayoutPolicy") << Q_FUNC_INFO << "is deprecated. Use setStyleName() instead."; setStyleName(name); } void MAbstractLayoutPolicy::setStyleName(const QString &name) @@ -202,6 +203,7 @@ void MAbstractLayoutPolicy::setStyleName(const QString &name) } QString MAbstractLayoutPolicy::objectName() const { + mWarning("MAbstractLayoutPolicy") << Q_FUNC_INFO << "is deprecated. Use styleName() instead."; return styleName(); } QString MAbstractLayoutPolicy::styleName() const diff --git a/src/corelib/layout/mabstractlayoutpolicy.h b/src/corelib/layout/mabstractlayoutpolicy.h index 1fccd3eb..13b5e3a2 100644 --- a/src/corelib/layout/mabstractlayoutpolicy.h +++ b/src/corelib/layout/mabstractlayoutpolicy.h @@ -288,11 +288,19 @@ public: */ QString styleName() const; - /*! \internal - * For backwards compatibility - these just call setStyleName and styleName */ - void Q_DECL_DEPRECATED setObjectName(const QString &name); - QString Q_DECL_DEPRECATED objectName() const; - /*! \internal_end */ + /*! + * \brief Sets the style name + * \deprecated Use setStyleName() instead. + * It simply calls setStyleName(). + */ + void setObjectName(const QString &name); + + /*! + * \brief returns the style name. + * \deprecated Use styleName() instead. + * It simply calls styleName(). + */ + QString objectName() const; /*! * \brief Set the horizontal spacing. |