diff options
| author | Mailson Menezes <mailson.menezes@openbossa.org> | 2012-03-06 16:48:17 -0300 |
|---|---|---|
| committer | Anselmo L. S. Melo <anselmo.melo@openbossa.org> | 2012-03-15 02:08:02 +0100 |
| commit | 6eb3f5af9c109bf1ea115c082a0fb3e9983cb1ae (patch) | |
| tree | e8427157c7cf45d806bb0d31d8ff3ac390c0eaf6 | |
| parent | d08d2ce7dde692e30160ab6552922e7925eb8cb4 (diff) | |
UiHelpers namespace for QAction
Change-Id: I65e77d3486a71ee3ca5396c28dc98fb0512a6806
Reviewed-by: Anselmo L. S. Melo <anselmo.melo@openbossa.org>
| -rw-r--r-- | src/action/qaction.cpp | 4 | ||||
| -rw-r--r-- | src/action/qaction.h | 11 | ||||
| -rw-r--r-- | src/action/qaction_p.h | 7 | ||||
| -rw-r--r-- | src/uihelpersglobal.h | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/src/action/qaction.cpp b/src/action/qaction.cpp index 72f3313..646c076 100644 --- a/src/action/qaction.cpp +++ b/src/action/qaction.cpp @@ -58,7 +58,7 @@ return; \ } -QT_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_UIHELPERS /* internal: guesses a descriptive text from a text suited for a menu entry @@ -1356,7 +1356,7 @@ QAction::SoftKeyRole QAction::softKeyRole() const // return d->iconVisibleInMenu; // } -QT_END_NAMESPACE +QT_END_NAMESPACE_UIHELPERS #include "moc_qaction.cpp" diff --git a/src/action/qaction.h b/src/action/qaction.h index 1f26b3f..e9fb511 100644 --- a/src/action/qaction.h +++ b/src/action/qaction.h @@ -42,6 +42,7 @@ #ifndef QACTION_H #define QACTION_H +#include "uihelpersglobal.h" #include <QtGui/qkeysequence.h> #include <QtCore/qstring.h> #include <QtWidgets/qwidget.h> @@ -50,7 +51,7 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_UIHELPERS #ifndef QT_NO_ACTION @@ -60,7 +61,7 @@ class QActionGroup; class QActionPrivate; class QGraphicsWidget; -class Q_WIDGETS_EXPORT QAction : public QObject +class UIHELPERS_EXPORT QAction : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAction) @@ -219,13 +220,13 @@ private: #endif }; -QT_BEGIN_INCLUDE_NAMESPACE +QT_BEGIN_INCLUDE_NAMESPACE_UIHELPERS #include <QtWidgets/qactiongroup.h> -QT_END_INCLUDE_NAMESPACE +QT_END_INCLUDE_NAMESPACE_UIHELPERS #endif // QT_NO_ACTION -QT_END_NAMESPACE +QT_END_NAMESPACE_UIHELPERS QT_END_HEADER diff --git a/src/action/qaction_p.h b/src/action/qaction_p.h index f8523da..2f81a4a 100644 --- a/src/action/qaction_p.h +++ b/src/action/qaction_p.h @@ -57,15 +57,16 @@ #include "QtWidgets/qmenu.h" #include "private/qgraphicswidget_p.h" #include "private/qobject_p.h" +#include "uihelpersglobal.h" -QT_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_UIHELPERS #ifndef QT_NO_ACTION class QShortcutMap; -class Q_WIDGETS_EXPORT QActionPrivate : public QObjectPrivate +class UIHELPERS_EXPORT QActionPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QAction) public: @@ -132,6 +133,6 @@ public: #endif // QT_NO_ACTION -QT_END_NAMESPACE +QT_END_NAMESPACE_UIHELPERS #endif // QACTION_P_H diff --git a/src/uihelpersglobal.h b/src/uihelpersglobal.h index 3e9fa47..db7a203 100644 --- a/src/uihelpersglobal.h +++ b/src/uihelpersglobal.h @@ -72,11 +72,15 @@ # define QT_END_NAMESPACE_UIHELPERS } } # define QT_USE_NAMESPACE_UIHELPERS using namespace QT_NAMESPACE::UiHelpers; # define QT_PREPEND_NAMESPACE_UIHELPERS(name) ::QT_NAMESPACE::UiHelpers::name +# define QT_BEGIN_INCLUDE_NAMESPACE_UIHELPERS } } +# define QT_END_INCLUDE_NAMESPACE_UIHELPERS namespace QT_NAMESPACE { namespace UiHelpers { #else # define QT_BEGIN_NAMESPACE_UIHELPERS namespace UiHelpers { # define QT_END_NAMESPACE_UIHELPERS } # define QT_USE_NAMESPACE_UIHELPERS using namespace UiHelpers; # define QT_PREPEND_NAMESPACE_UIHELPERS(name) ::UiHelpers::name +# define QT_BEGIN_INCLUDE_NAMESPACE_UIHELPERS } +# define QT_END_INCLUDE_NAMESPACE_UIHELPERS namespace UiHelpers { #endif #endif // UIHELPERS_GLOBAL_H |