diff options
| author | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2010-10-25 14:20:57 +0200 |
|---|---|---|
| committer | Holger Schröder <holger.schroeder.ext@basyskom.de> | 2010-10-27 11:40:15 +0200 |
| commit | 0cd9ec473aa3a98f5b53815bf3b269b9412d682d (patch) | |
| tree | eafee8faaa33aeff446f4ed4f39cfa46f052aea7 | |
| parent | 8153f16fdcf2d08f614d9b841d6a69e9a6a960bc (diff) | |
Changes: change M_EXPORT to M_{CORE,VIEWS,EXTENSIONS,SETTINGS}_EXPORT
RevBy: Armin, Mirek
Details: Unter windows the M_*_EXPORT macros are mandatory.
and so they needed to be adapted after the split of libmeegotouch
to libmeegotouchcore, *views, *settings, and *extensions.
Initial patch by Thierry Bastian
329 files changed, 429 insertions, 414 deletions
diff --git a/examples/testwidget/testwidgetmodel.h b/examples/testwidget/testwidgetmodel.h index 52ba9f60..058c54ff 100644 --- a/examples/testwidget/testwidgetmodel.h +++ b/examples/testwidget/testwidgetmodel.h @@ -32,7 +32,7 @@ #include <MWidgetController> #include <mwidgetmodel.h> -class M_EXPORT TestWidgetModel : public MWidgetModel +class TestWidgetModel : public MWidgetModel { Q_OBJECT M_MODEL(TestWidgetModel) diff --git a/src/corelib/animation/core/manimation.h b/src/corelib/animation/core/manimation.h index 89c69170..8796ed81 100644 --- a/src/corelib/animation/core/manimation.h +++ b/src/corelib/animation/core/manimation.h @@ -88,7 +88,7 @@ class MAnimationPrivate; * \endcode * */ -class M_EXPORT MAnimation : public QAbstractAnimation +class M_CORE_EXPORT MAnimation : public QAbstractAnimation { Q_OBJECT Q_DECLARE_PRIVATE(MAnimation) diff --git a/src/corelib/animation/core/manimationcreator.h b/src/corelib/animation/core/manimationcreator.h index e164e1c9..0fabfd30 100644 --- a/src/corelib/animation/core/manimationcreator.h +++ b/src/corelib/animation/core/manimationcreator.h @@ -33,7 +33,7 @@ class QAbstractAnimation; you can implement your own creator or use MAnimationCreator template class with M_REGISTER_ANIMATION-macro. */ -class M_EXPORT MAnimationCreatorBase +class M_CORE_EXPORT MAnimationCreatorBase { public: /*! @@ -56,7 +56,7 @@ public: }; template<class ANIMATION> -class M_EXPORT MAnimationCreator : public MAnimationCreatorBase +class M_CORE_EXPORT MAnimationCreator : public MAnimationCreatorBase { public: MAnimationCreator(const char *animationClassName) : diff --git a/src/corelib/animation/core/mgroupanimation.h b/src/corelib/animation/core/mgroupanimation.h index 219f1106..3025c7da 100644 --- a/src/corelib/animation/core/mgroupanimation.h +++ b/src/corelib/animation/core/mgroupanimation.h @@ -28,7 +28,7 @@ class MGroupAnimationPrivate; /*! \brief MGroupAnimation provides an base class for groups of animations. */ -class M_EXPORT MGroupAnimation : public MAnimation +class M_CORE_EXPORT MGroupAnimation : public MAnimation { Q_OBJECT Q_DECLARE_PRIVATE(MGroupAnimation) diff --git a/src/corelib/animation/core/mparallelanimationgroup.h b/src/corelib/animation/core/mparallelanimationgroup.h index afa2e975..aae6fe75 100644 --- a/src/corelib/animation/core/mparallelanimationgroup.h +++ b/src/corelib/animation/core/mparallelanimationgroup.h @@ -83,7 +83,7 @@ class MParallelAnimationGroupPrivate; \endcode */ -class M_EXPORT MParallelAnimationGroup : public QParallelAnimationGroup +class M_CORE_EXPORT MParallelAnimationGroup : public QParallelAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(MParallelAnimationGroup) diff --git a/src/corelib/animation/widget/core/mabstractwidgetanimation.h b/src/corelib/animation/widget/core/mabstractwidgetanimation.h index b3b1c33a..2f20afda 100644 --- a/src/corelib/animation/widget/core/mabstractwidgetanimation.h +++ b/src/corelib/animation/widget/core/mabstractwidgetanimation.h @@ -30,7 +30,7 @@ class MAbstractWidgetAnimationPrivate; \brief MAbstractWidgetAnimation class is a base class for all widget animations. */ -class M_EXPORT MAbstractWidgetAnimation : public MParallelAnimationGroup +class M_CORE_EXPORT MAbstractWidgetAnimation : public MParallelAnimationGroup { Q_OBJECT Q_DECLARE_PRIVATE(MAbstractWidgetAnimation) diff --git a/src/corelib/core/maction.h b/src/corelib/core/maction.h index d4f036f2..b3a2ced5 100644 --- a/src/corelib/core/maction.h +++ b/src/corelib/core/maction.h @@ -30,7 +30,7 @@ class MActionPrivate; \class MAction \brief MAction implements an extension of the QAction for libmeegotouch */ -class M_EXPORT MAction : public QAction +class M_CORE_EXPORT MAction : public QAction { Q_OBJECT diff --git a/src/corelib/core/mapplication.h b/src/corelib/core/mapplication.h index e7f16a15..87f887a0 100644 --- a/src/corelib/core/mapplication.h +++ b/src/corelib/core/mapplication.h @@ -76,7 +76,7 @@ class MSceneWindow; * MApplicationService and override its methods. */ -class M_EXPORT MApplication : public QApplication +class M_CORE_EXPORT MApplication : public QApplication { Q_OBJECT diff --git a/src/corelib/core/mapplicationifadaptor.h b/src/corelib/core/mapplicationifadaptor.h index 39450654..00f3224d 100644 --- a/src/corelib/core/mapplicationifadaptor.h +++ b/src/corelib/core/mapplicationifadaptor.h @@ -42,7 +42,7 @@ class QVariant; * This is the adaptor for the MApplication QDBus service. * Do not use this class directly. */ -class M_EXPORT MApplicationIfAdaptor: public QDBusAbstractAdaptor +class M_CORE_EXPORT MApplicationIfAdaptor: public QDBusAbstractAdaptor { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "com.nokia.MApplicationIf") diff --git a/src/corelib/core/mapplicationifproxy.h b/src/corelib/core/mapplicationifproxy.h index 28a4ce36..a04e7e70 100644 --- a/src/corelib/core/mapplicationifproxy.h +++ b/src/corelib/core/mapplicationifproxy.h @@ -41,7 +41,7 @@ * * This is the proxy for the MApplication QDBus service. */ -class M_EXPORT MApplicationIfProxy: public QDBusAbstractInterface +class M_CORE_EXPORT MApplicationIfProxy: public QDBusAbstractInterface { Q_OBJECT diff --git a/src/corelib/core/mapplicationservice.h b/src/corelib/core/mapplicationservice.h index 5c8eeee0..138a6797 100644 --- a/src/corelib/core/mapplicationservice.h +++ b/src/corelib/core/mapplicationservice.h @@ -54,7 +54,7 @@ class MApplicationServicePrivate; * services appearing and disappearing when you run/kill multiple instances. * */ -class M_EXPORT MApplicationService : public QObject +class M_CORE_EXPORT MApplicationService : public QObject { Q_OBJECT diff --git a/src/corelib/core/massembly.h b/src/corelib/core/massembly.h index d31235c7..aa00e7b6 100644 --- a/src/corelib/core/massembly.h +++ b/src/corelib/core/massembly.h @@ -33,7 +33,7 @@ class MLogicalValues; \class MAssembly \brief This class provides the assembly information to MTheme which uses it to load the correct .css & .conf files. */ -class M_EXPORT MAssembly +class M_CORE_EXPORT MAssembly { MAssemblyPrivate *const d_ptr; public: diff --git a/src/corelib/core/mclassfactory.h b/src/corelib/core/mclassfactory.h index 0cad7f7a..3251ddd8 100644 --- a/src/corelib/core/mclassfactory.h +++ b/src/corelib/core/mclassfactory.h @@ -37,7 +37,7 @@ class QMetaObject; class MWidgetController; // MClassFactory -class M_EXPORT MClassFactory +class M_CORE_EXPORT MClassFactory { public: static MClassFactory *instance(); diff --git a/src/corelib/core/mcomponentcache.h b/src/corelib/core/mcomponentcache.h index adf0d073..84b22a0d 100644 --- a/src/corelib/core/mcomponentcache.h +++ b/src/corelib/core/mcomponentcache.h @@ -61,7 +61,7 @@ class MComponentCachePrivate; * The ownership of the objects returned from the cache is passed to * the caller. */ -class M_EXPORT MComponentCache +class M_CORE_EXPORT MComponentCache { public: //! Returns MApplication instance from the cache or creates a new one. diff --git a/src/corelib/core/mcomponentdata.h b/src/corelib/core/mcomponentdata.h index b5df67d4..8441698c 100644 --- a/src/corelib/core/mcomponentdata.h +++ b/src/corelib/core/mcomponentdata.h @@ -69,7 +69,7 @@ class MFeedbackPlayer; * */ -class M_EXPORT MComponentData : public QObject +class M_CORE_EXPORT MComponentData : public QObject { Q_OBJECT diff --git a/src/corelib/core/mdataaccess.h b/src/corelib/core/mdataaccess.h index 71c623f4..24f59919 100644 --- a/src/corelib/core/mdataaccess.h +++ b/src/corelib/core/mdataaccess.h @@ -32,7 +32,7 @@ * Users can read and write key values using this interface. The user * also get notified when changes happen in the key values. */ -class M_EXPORT MDataAccess : public QObject +class M_CORE_EXPORT MDataAccess : public QObject { Q_OBJECT diff --git a/src/corelib/core/mdatastore.h b/src/corelib/core/mdatastore.h index 6a89efdf..05ac8737 100644 --- a/src/corelib/core/mdatastore.h +++ b/src/corelib/core/mdatastore.h @@ -29,7 +29,7 @@ * The difference between this class and \c MDataAccess is that this interface * can also be used to create and remove keys. */ -class M_EXPORT MDataStore : public MDataAccess +class M_CORE_EXPORT MDataStore : public MDataAccess { Q_OBJECT diff --git a/src/corelib/core/mdesktopentry.h b/src/corelib/core/mdesktopentry.h index 1e4c0532..0921cfa7 100644 --- a/src/corelib/core/mdesktopentry.h +++ b/src/corelib/core/mdesktopentry.h @@ -40,7 +40,7 @@ class MDesktopEntryPrivate; * http://standards.freedesktop.org/desktop-entry-spec/latest/index.html * */ -class M_EXPORT MDesktopEntry +class M_CORE_EXPORT MDesktopEntry { public: /*! diff --git a/src/corelib/core/mexport.h b/src/corelib/core/mexport.h index 84db57d4..1343d0bd 100644 --- a/src/corelib/core/mexport.h +++ b/src/corelib/core/mexport.h @@ -22,14 +22,28 @@ #include <QtCore/QtGlobal> -#if defined(M_EXPORTS) -# define M_EXPORT Q_DECL_EXPORT +#ifdef M_BUILD_CORE +# define M_CORE_EXPORT Q_DECL_EXPORT #else -# if defined (Q_OS_WIN) -# define M_EXPORT Q_DECL_IMPORT -# else -# define M_EXPORT Q_DECL_EXPORT -# endif +# define M_CORE_EXPORT Q_DECL_IMPORT +#endif + +#ifdef M_BUILD_VIEWS +# define M_VIEWS_EXPORT Q_DECL_EXPORT +#else +# define M_VIEWS_EXPORT Q_DECL_IMPORT +#endif + +#ifdef M_BUILD_SETTINGS +# define M_SETTINGS_EXPORT Q_DECL_EXPORT +#else +# define M_SETTINGS_EXPORT Q_DECL_IMPORT +#endif + +#ifdef M_BUILD_EXTENSIONS +# define M_EXTENSIONS_EXPORT Q_DECL_EXPORT +#else +# define M_EXTENSIONS_EXPORT Q_DECL_IMPORT #endif #if defined(Q_OS_WIN) && defined (Q_CC_MSVC) diff --git a/src/corelib/core/mfiledatastore.h b/src/corelib/core/mfiledatastore.h index 4d6ee158..c722c2ce 100644 --- a/src/corelib/core/mfiledatastore.h +++ b/src/corelib/core/mfiledatastore.h @@ -28,7 +28,7 @@ class MFileDataStorePrivate; * Concrete implementation of \c MDataStore interface. This class stores the data to the * filesystem. The file name is given as a constructor parameter. */ -class M_EXPORT MFileDataStore : public MDataStore +class M_CORE_EXPORT MFileDataStore : public MDataStore { Q_OBJECT public: diff --git a/src/corelib/core/mgconfitem.h b/src/corelib/core/mgconfitem.h index 8d44087d..83962e4f 100644 --- a/src/corelib/core/mgconfitem.h +++ b/src/corelib/core/mgconfitem.h @@ -62,7 +62,7 @@ */ -class M_EXPORT MGConfItem : public QObject +class M_CORE_EXPORT MGConfItem : public QObject { Q_OBJECT diff --git a/src/corelib/core/minputmethodstate.h b/src/corelib/core/minputmethodstate.h index 26f98489..4a3bab47 100644 --- a/src/corelib/core/minputmethodstate.h +++ b/src/corelib/core/minputmethodstate.h @@ -40,7 +40,7 @@ class MInputMethodStatePrivate; * to link against libmeegotouch to get access to this class). The input method area * can be used by the application to avoid obstructing the input method. */ -class M_EXPORT MInputMethodState : public QObject +class M_CORE_EXPORT MInputMethodState : public QObject { Q_OBJECT diff --git a/src/corelib/core/mlibrary.h b/src/corelib/core/mlibrary.h index cf4a0b6b..473bff54 100644 --- a/src/corelib/core/mlibrary.h +++ b/src/corelib/core/mlibrary.h @@ -50,7 +50,7 @@ class MLibraryPrivate; MLibrary object. This object will be instantiated while the library gets loaded, and destroyed when the library gets unloaded. */ -class M_EXPORT MLibrary : public MAssembly +class M_CORE_EXPORT MLibrary : public MAssembly { public: diff --git a/src/corelib/core/mnamespace.cpp b/src/corelib/core/mnamespace.cpp index 3fbb7bc1..eb74344a 100644 --- a/src/corelib/core/mnamespace.cpp +++ b/src/corelib/core/mnamespace.cpp @@ -21,8 +21,8 @@ namespace M { - M_EXPORT const char* NoMStyle = "NoMStyle"; - M_EXPORT const char* NoMNavigationBar = "NoMNavigationBar"; - M_EXPORT const char* NoMStatusBar = "NoMStatusBar"; + M_CORE_EXPORT const char* NoMStyle = "NoMStyle"; + M_CORE_EXPORT const char* NoMNavigationBar = "NoMNavigationBar"; + M_CORE_EXPORT const char* NoMStatusBar = "NoMStatusBar"; } diff --git a/src/corelib/core/mnamespace.h b/src/corelib/core/mnamespace.h index 102a2ce7..6d14f0cf 100644 --- a/src/corelib/core/mnamespace.h +++ b/src/corelib/core/mnamespace.h @@ -37,19 +37,19 @@ namespace M * setting a dynamic porperty to any QWidget or QApplication will cause the object * not to be styled like M does. */ - M_EXPORT extern const char* NoMStyle; + M_CORE_EXPORT extern const char* NoMStyle; /*! * setting a dynamic property to QApplication named NoMNavigationBar will hide the * navigationbar from qt maemo 6 style */ - M_EXPORT extern const char* NoMNavigationBar; + M_CORE_EXPORT extern const char* NoMNavigationBar; /*! * setting a dynamic property to QApplication named NoMStatusBar will hide the * statusbar from qt maemo 6 style */ - M_EXPORT extern const char* NoMStatusBar; + M_CORE_EXPORT extern const char* NoMStatusBar; /*! * This enum contains values of the orientation angle of windows in the application. diff --git a/src/corelib/core/mremoteaction.h b/src/corelib/core/mremoteaction.h index 9ac03e8a..7ac8ac00 100644 --- a/src/corelib/core/mremoteaction.h +++ b/src/corelib/core/mremoteaction.h @@ -31,7 +31,7 @@ class MRemoteActionPrivate; * \brief MRemoteAction implements a MAction that executes a D-Bus call when triggered. * The D-Bus related parameters can be serialized and unserialized into a string. */ -class M_EXPORT MRemoteAction : public MAction +class M_CORE_EXPORT MRemoteAction : public MAction { Q_OBJECT diff --git a/src/corelib/core/mshareddata.h b/src/corelib/core/mshareddata.h index f6bd6629..2935b380 100644 --- a/src/corelib/core/mshareddata.h +++ b/src/corelib/core/mshareddata.h @@ -77,7 +77,7 @@ class MSharedDataPrivate; -class M_EXPORT MSharedData : public QObject +class M_CORE_EXPORT MSharedData : public QObject { Q_OBJECT diff --git a/src/corelib/core/mtimestamp.cpp b/src/corelib/core/mtimestamp.cpp index f3b85f78..b2055f5c 100644 --- a/src/corelib/core/mtimestamp.cpp +++ b/src/corelib/core/mtimestamp.cpp @@ -26,7 +26,7 @@ #include <sys/stat.h> #include <fcntl.h> -void M_EXPORT mTimestampStream(const QString &module, const QString &file, const QString &scope, const QString &msg) +void M_CORE_EXPORT mTimestampStream(const QString &module, const QString &file, const QString &scope, const QString &msg) { static const QString format("%1.%2 MARK|%3|%4|%5"); static const QChar fill('0'); diff --git a/src/corelib/core/mtimestamp.h b/src/corelib/core/mtimestamp.h index 907306c5..a3da8d81 100644 --- a/src/corelib/core/mtimestamp.h +++ b/src/corelib/core/mtimestamp.h @@ -23,7 +23,7 @@ #include <QString> #include "mexport.h" -void M_EXPORT mTimestampStream(const QString &module, const QString &file, const QString &scope, const QString &msg); +void M_CORE_EXPORT mTimestampStream(const QString &module, const QString &file, const QString &scope, const QString &msg); #if defined(QT_NO_WARNING_OUTPUT) || !defined(M_TIMESTAMP) #define mTimestamp(x, msg) diff --git a/src/corelib/core/mwidgetaction.h b/src/corelib/core/mwidgetaction.h index 1dea74f9..b85946ed 100644 --- a/src/corelib/core/mwidgetaction.h +++ b/src/corelib/core/mwidgetaction.h @@ -42,7 +42,7 @@ class MWidgetActionPrivate; \sa MAction */ -class M_EXPORT MWidgetAction : public MAction +class M_CORE_EXPORT MWidgetAction : public MAction { Q_OBJECT diff --git a/src/corelib/effects/core/meffectcreator.h b/src/corelib/effects/core/meffectcreator.h index 15176e92..5c3cf269 100644 --- a/src/corelib/effects/core/meffectcreator.h +++ b/src/corelib/effects/core/meffectcreator.h @@ -33,7 +33,7 @@ class QGraphicsEffect; you can implement your own creator or use MEffectCreator template class with M_REGISTER_EFFECT-macro. */ -class M_EXPORT MEffectCreatorBase +class M_CORE_EXPORT MEffectCreatorBase { public: /*! @@ -56,7 +56,7 @@ public: }; template<class EFFECT> -class M_EXPORT MEffectCreator : public MEffectCreatorBase +class MEffectCreator : public MEffectCreatorBase { public: MEffectCreator(const char *effectClassName) : diff --git a/src/corelib/effects/core/mgraphicseffect.h b/src/corelib/effects/core/mgraphicseffect.h index d92fc3d7..bb66ef8a 100644 --- a/src/corelib/effects/core/mgraphicseffect.h +++ b/src/corelib/effects/core/mgraphicseffect.h @@ -51,7 +51,7 @@ class MGraphicsEffectPrivate; */ -class M_EXPORT MGraphicsEffect : public QGraphicsEffect +class M_CORE_EXPORT MGraphicsEffect : public QGraphicsEffect { public: MGraphicsEffect(QObject *parent=0); diff --git a/src/corelib/events/mcancelevent.h b/src/corelib/events/mcancelevent.h index c47e8ab5..b259bbf2 100644 --- a/src/corelib/events/mcancelevent.h +++ b/src/corelib/events/mcancelevent.h @@ -34,7 +34,7 @@ class MCancelEventPrivate; * to the widgets below pannable viewport, but it needs to be * "cancelled" if the user wanted to pan the viewport. */ -class M_EXPORT MCancelEvent : public QGraphicsSceneEvent +class M_CORE_EXPORT MCancelEvent : public QGraphicsSceneEvent { public: diff --git a/src/corelib/events/mdismissevent.h b/src/corelib/events/mdismissevent.h index 5ad0bf04..2ec97a46 100644 --- a/src/corelib/events/mdismissevent.h +++ b/src/corelib/events/mdismissevent.h @@ -60,7 +60,7 @@ class MDismissEventPrivate; * * \sa MSceneWindow::dismiss() */ -class M_EXPORT MDismissEvent : public QEvent +class M_CORE_EXPORT MDismissEvent : public QEvent { public: /*! diff --git a/src/corelib/events/mkeyboardstatetracker.h b/src/corelib/events/mkeyboardstatetracker.h index 9d26dea8..4abf8d9c 100644 --- a/src/corelib/events/mkeyboardstatetracker.h +++ b/src/corelib/events/mkeyboardstatetracker.h @@ -31,7 +31,7 @@ class MKeyboardStateTrackerPrivate; * hardware keyboard or not. If hardware keyboard is supported, using isOpen() to query * its current state. Signal stateChanged will be emitted when hardware keyboard state is changed. */ -class M_EXPORT MKeyboardStateTracker : public QObject +class M_CORE_EXPORT MKeyboardStateTracker : public QObject { Q_OBJECT public: diff --git a/src/corelib/events/mondisplaychangeevent.h b/src/corelib/events/mondisplaychangeevent.h index 11e4f39f..522acf2f 100644 --- a/src/corelib/events/mondisplaychangeevent.h +++ b/src/corelib/events/mondisplaychangeevent.h @@ -32,7 +32,7 @@ class MOnDisplayChangeEventPrivate; * with another window. Note that this differs from Qt's explicit hide()/show() * semantics. MWidget forwards this event to its children. */ -class M_EXPORT MOnDisplayChangeEvent : public QGraphicsSceneEvent +class M_CORE_EXPORT MOnDisplayChangeEvent : public QGraphicsSceneEvent { public: diff --git a/src/corelib/events/morientationchangeevent.h b/src/corelib/events/morientationchangeevent.h index 0573495a..4d1fae15 100644 --- a/src/corelib/events/morientationchangeevent.h +++ b/src/corelib/events/morientationchangeevent.h @@ -41,7 +41,7 @@ class MOrientationChangeEventPrivate; * * \sa MWidget::orientationChangeEvent() */ -class M_EXPORT MOrientationChangeEvent : public QGraphicsSceneEvent +class M_CORE_EXPORT MOrientationChangeEvent : public QGraphicsSceneEvent { public: diff --git a/src/corelib/events/morientationtracker.h b/src/corelib/events/morientationtracker.h index 7348d936..975c6949 100644 --- a/src/corelib/events/morientationtracker.h +++ b/src/corelib/events/morientationtracker.h @@ -36,7 +36,7 @@ class MOrientationTrackerPrivate; * Initially designed as singleton as MDeviceProfile might need to access some more information about * the concrete phone position, that is not available from fired events. */ -class M_EXPORT MOrientationTracker: public QObject +class M_CORE_EXPORT MOrientationTracker: public QObject { Q_OBJECT public: diff --git a/src/corelib/events/mpreeditinjectionevent.h b/src/corelib/events/mpreeditinjectionevent.h index 6f25b5f7..d0fb1945 100644 --- a/src/corelib/events/mpreeditinjectionevent.h +++ b/src/corelib/events/mpreeditinjectionevent.h @@ -26,7 +26,7 @@ class MPreeditInjectionEventPrivate; -class M_EXPORT MPreeditInjectionEvent : public QEvent +class M_CORE_EXPORT MPreeditInjectionEvent : public QEvent { public: MPreeditInjectionEvent(const QString &preedit); diff --git a/src/corelib/feedback/mfeedback.h b/src/corelib/feedback/mfeedback.h index f24c1b9b..d94ca3d5 100644 --- a/src/corelib/feedback/mfeedback.h +++ b/src/corelib/feedback/mfeedback.h @@ -37,7 +37,7 @@ class MFeedbackPrivate; * * \sa MFeedbackPlayer */ -class M_EXPORT MFeedback : public QObject +class M_CORE_EXPORT MFeedback : public QObject { Q_OBJECT diff --git a/src/corelib/feedback/mfeedbackplayer.h b/src/corelib/feedback/mfeedbackplayer.h index d4171ad3..5048ed2c 100644 --- a/src/corelib/feedback/mfeedbackplayer.h +++ b/src/corelib/feedback/mfeedbackplayer.h @@ -45,7 +45,7 @@ class MFeedbackPlayerPrivate; * * \deprecated Please use class MFeedback to play input feedbacks. Since 0.20.43 */ -class M_EXPORT MFeedbackPlayer : public QObject +class M_CORE_EXPORT MFeedbackPlayer : public QObject { Q_OBJECT diff --git a/src/corelib/i18n/mbreakiterator.h b/src/corelib/i18n/mbreakiterator.h index b00e7984..4ae53b0f 100644 --- a/src/corelib/i18n/mbreakiterator.h +++ b/src/corelib/i18n/mbreakiterator.h @@ -27,7 +27,7 @@ class MBreakIteratorPrivate; -class M_EXPORT MBreakIterator +class M_CORE_EXPORT MBreakIterator { public: enum Type {LineIterator, WordIterator}; // would also be supported: character, sentence, title diff --git a/src/corelib/i18n/mbreakiteratorif.h b/src/corelib/i18n/mbreakiteratorif.h index b10781d0..d79327de 100644 --- a/src/corelib/i18n/mbreakiteratorif.h +++ b/src/corelib/i18n/mbreakiteratorif.h @@ -31,7 +31,7 @@ * to choose one of both backend implementations at compile time * and to keep the number of needed "#ifdef" small. */ -class M_EXPORT MBreakIteratorIf +class M_CORE_EXPORT MBreakIteratorIf { public: virtual ~MBreakIteratorIf() {}; diff --git a/src/corelib/i18n/mcalendar.h b/src/corelib/i18n/mcalendar.h index e29cbe34..df31a68d 100644 --- a/src/corelib/i18n/mcalendar.h +++ b/src/corelib/i18n/mcalendar.h @@ -29,7 +29,7 @@ class MCalendarPrivate; class QDateTime; class QDate; -class M_EXPORT MCalendar +class M_CORE_EXPORT MCalendar { public: explicit MCalendar(MLocale::CalendarType calendarType = MLocale::DefaultCalendar, diff --git a/src/corelib/i18n/mcity.h b/src/corelib/i18n/mcity.h index 7463c1f4..20fdd904 100644 --- a/src/corelib/i18n/mcity.h +++ b/src/corelib/i18n/mcity.h @@ -34,7 +34,7 @@ class MCityPrivate; -class M_EXPORT MCity +class M_CORE_EXPORT MCity { public: MCity(); diff --git a/src/corelib/i18n/mcollator.h b/src/corelib/i18n/mcollator.h index b5cf89bf..67e65e00 100644 --- a/src/corelib/i18n/mcollator.h +++ b/src/corelib/i18n/mcollator.h @@ -26,7 +26,7 @@ class QString; class MCollatorPrivate; -class M_EXPORT MCollator +class M_CORE_EXPORT MCollator { public: MCollator(); diff --git a/src/corelib/i18n/mcountry.h b/src/corelib/i18n/mcountry.h index 076285b5..b62553b9 100644 --- a/src/corelib/i18n/mcountry.h +++ b/src/corelib/i18n/mcountry.h @@ -26,7 +26,7 @@ class MCountryPrivate; -class M_EXPORT MCountry +class M_CORE_EXPORT MCountry { public: MCountry(); diff --git a/src/corelib/i18n/mlocale.h b/src/corelib/i18n/mlocale.h index ece562f7..43bf8635 100644 --- a/src/corelib/i18n/mlocale.h +++ b/src/corelib/i18n/mlocale.h @@ -89,7 +89,7 @@ class MStaticLocaleDestroyer; */ -class M_EXPORT MLocale : public QObject +class M_CORE_EXPORT MLocale : public QObject { Q_OBJECT public: diff --git a/src/corelib/i18n/mlocationdatabase.h b/src/corelib/i18n/mlocationdatabase.h index f447dda3..fd809883 100644 --- a/src/corelib/i18n/mlocationdatabase.h +++ b/src/corelib/i18n/mlocationdatabase.h @@ -29,7 +29,7 @@ class MLocationDatabasePrivate; -class M_EXPORT MLocationDatabase +class M_CORE_EXPORT MLocationDatabase { public: MLocationDatabase(); diff --git a/src/corelib/i18n/mnullbreakiterator.h b/src/corelib/i18n/mnullbreakiterator.h index 5eeda39f..c9f57d57 100644 --- a/src/corelib/i18n/mnullbreakiterator.h +++ b/src/corelib/i18n/mnullbreakiterator.h @@ -29,7 +29,7 @@ class MNullBreakIteratorPrivate; //! \internal Used by MBreakIterator -class M_EXPORT MNullBreakIterator : public MBreakIteratorIf +class M_CORE_EXPORT MNullBreakIterator : public MBreakIteratorIf { public: MNullBreakIterator(const MLocale &locale, diff --git a/src/corelib/layout/mabstractlayoutpolicy.h b/src/corelib/layout/mabstractlayoutpolicy.h index 13b5e3a2..b27a7048 100644 --- a/src/corelib/layout/mabstractlayoutpolicy.h +++ b/src/corelib/layout/mabstractlayoutpolicy.h @@ -152,7 +152,7 @@ class QGraphicsLayoutItem; * */ -class M_EXPORT MAbstractLayoutPolicy +class M_CORE_EXPORT MAbstractLayoutPolicy { public: /** \brief Create a policy and associate it with the given layout diff --git a/src/corelib/layout/mbasiclayoutanimation.h b/src/corelib/layout/mbasiclayoutanimation.h index 651766b6..997e3fd2 100644 --- a/src/corelib/layout/mbasiclayoutanimation.h +++ b/src/corelib/layout/mbasiclayoutanimation.h @@ -31,7 +31,7 @@ class MBasicLayoutAnimationPrivate; * It animates the items geometry and opacity in a linear way, with every animation * taking the same amount of time. */ -class M_EXPORT MBasicLayoutAnimation : public MLayoutAnimation +class M_CORE_EXPORT MBasicLayoutAnimation : public MLayoutAnimation { M_ANIMATION(MBasicLayoutAnimationStyle) public: diff --git a/src/corelib/layout/mflowlayoutpolicy.h b/src/corelib/layout/mflowlayoutpolicy.h index ff83307c..7af0d4bf 100644 --- a/src/corelib/layout/mflowlayoutpolicy.h +++ b/src/corelib/layout/mflowlayoutpolicy.h @@ -56,7 +56,7 @@ class MFlowLayoutPolicyPrivate; * Every MButton in a MFlowLayoutPolicy will have the same width. * */ -class M_EXPORT MFlowLayoutPolicy : public MAbstractLayoutPolicy +class M_CORE_EXPORT MFlowLayoutPolicy : public MAbstractLayoutPolicy { public: /*! diff --git a/src/corelib/layout/mfreestylelayoutpolicy.h b/src/corelib/layout/mfreestylelayoutpolicy.h index ef7fee24..eb2b7d50 100644 --- a/src/corelib/layout/mfreestylelayoutpolicy.h +++ b/src/corelib/layout/mfreestylelayoutpolicy.h @@ -43,7 +43,7 @@ class MFreestyleLayoutPolicyPrivate; * * \sa \link layout-mfreestylelayoutpolicy MFreestyleLayoutPolicy Example \endlink */ -class M_EXPORT MFreestyleLayoutPolicy : public MAbstractLayoutPolicy +class M_CORE_EXPORT MFreestyleLayoutPolicy : public MAbstractLayoutPolicy { public: /*! diff --git a/src/corelib/layout/mgridlayoutpolicy.h b/src/corelib/layout/mgridlayoutpolicy.h index 9d0da00d..0fb75821 100644 --- a/src/corelib/layout/mgridlayoutpolicy.h +++ b/src/corelib/layout/mgridlayoutpolicy.h @@ -70,7 +70,7 @@ class QWidget; * * \sa \ref layout-qgraphicsgridlayout */ -class M_EXPORT MGridLayoutPolicy : public MAbstractLayoutPolicy +class M_CORE_EXPORT MGridLayoutPolicy : public MAbstractLayoutPolicy { public: /*! diff --git a/src/corelib/layout/mlayout.h b/src/corelib/layout/mlayout.h index 702ab317..e2f0dac8 100644 --- a/src/corelib/layout/mlayout.h +++ b/src/corelib/layout/mlayout.h @@ -145,7 +145,7 @@ class MLayoutAnimation; * * \sa \ref layouts, \ref layout-inside-layout, \ref example-calculator */ -class M_EXPORT MLayout : public QGraphicsLayout +class M_CORE_EXPORT MLayout : public QGraphicsLayout { public: diff --git a/src/corelib/layout/mlayoutanimation.h b/src/corelib/layout/mlayoutanimation.h index dacb2eeb..8d876f75 100644 --- a/src/corelib/layout/mlayoutanimation.h +++ b/src/corelib/layout/mlayoutanimation.h @@ -34,7 +34,7 @@ class MLayoutAnimationPrivate; * * \section custom_animation How to write a custom animation */ -class M_EXPORT MLayoutAnimation : public MAnimation +class M_CORE_EXPORT MLayoutAnimation : public MAnimation { public: /*! diff --git a/src/corelib/layout/mlinearlayoutpolicy.h b/src/corelib/layout/mlinearlayoutpolicy.h index 0076ddfd..17a5f1b9 100644 --- a/src/corelib/layout/mlinearlayoutpolicy.h +++ b/src/corelib/layout/mlinearlayoutpolicy.h @@ -55,7 +55,7 @@ class QGraphicsLayoutItem; * \until } * \sa \ref layout-qgraphicslinearlayout, \ref layout-qgraphicslayout */ -class M_EXPORT MLinearLayoutPolicy : public MAbstractLayoutPolicy +class M_CORE_EXPORT MLinearLayoutPolicy : public MAbstractLayoutPolicy { public: /*! diff --git a/src/corelib/notification/mnotification.h b/src/corelib/notification/mnotification.h index 29ba0271..56f5cc81 100644 --- a/src/corelib/notification/mnotification.h +++ b/src/corelib/notification/mnotification.h @@ -89,7 +89,7 @@ class QString; \note A QCoreApplication instance must be created before creating any persistent notifications. */ -class M_EXPORT MNotification : public QObject +class M_CORE_EXPORT MNotification : public QObject { Q_OBJECT diff --git a/src/corelib/notification/mnotificationgroup.h b/src/corelib/notification/mnotificationgroup.h index e05c5d9e..7aa9d400 100644 --- a/src/corelib/notification/mnotificationgroup.h +++ b/src/corelib/notification/mnotificationgroup.h @@ -47,7 +47,7 @@ class MNotificationGroupPrivate; \sa \ref MNotification \sa \ref notifications */ -class M_EXPORT MNotificationGroup : public MNotification +class M_CORE_EXPORT MNotificationGroup : public MNotification { public: /*! diff --git a/src/corelib/painting/mbackgroundtiles.h b/src/corelib/painting/mbackgroundtiles.h index 8dceb42c..aa03fd93 100644 --- a/src/corelib/painting/mbackgroundtiles.h +++ b/src/corelib/painting/mbackgroundtiles.h @@ -33,7 +33,7 @@ class MBackgroundTilesPrivate; M::Position documents all the variations. \sa M::Position */ -class M_EXPORT MBackgroundTiles +class M_CORE_EXPORT MBackgroundTiles { public: MBackgroundTiles(); diff --git a/src/corelib/painting/mgles2renderer.h b/src/corelib/painting/mgles2renderer.h index e2901812..eab5a480 100644 --- a/src/corelib/painting/mgles2renderer.h +++ b/src/corelib/painting/mgles2renderer.h @@ -67,7 +67,7 @@ class QRect; uniform sampler2D textureX; //textures for each texture unit (eg. texture0, texture1 ...) \endcode */ -class M_EXPORT MGLES2Renderer +class M_CORE_EXPORT MGLES2Renderer { public: diff --git a/src/corelib/painting/mscalableimage.h b/src/corelib/painting/mscalableimage.h index 971d1ef9..0d27b7bf 100644 --- a/src/corelib/painting/mscalableimage.h +++ b/src/corelib/painting/mscalableimage.h @@ -51,7 +51,7 @@ class QRect; center block is scaled vertically and horizontally if needed. The size inputted into one the draw() methods cannot be smaller than the defined borders. */ -class M_EXPORT MScalableImage : public QObject +class M_CORE_EXPORT MScalableImage : public QObject { Q_OBJECT diff --git a/src/corelib/scene/mscene.h b/src/corelib/scene/mscene.h index a43906cb..fd911e50 100644 --- a/src/corelib/scene/mscene.h +++ b/src/corelib/scene/mscene.h @@ -55,7 +55,7 @@ class MWindowPrivate; \sa MWindow, MApplicationWindow */ -class M_EXPORT MScene : public QGraphicsScene +class M_CORE_EXPORT MScene : public QGraphicsScene { Q_OBJECT diff --git a/src/corelib/scene/mscenemanager.h b/src/corelib/scene/mscenemanager.h index e3e874d0..5d3f07de 100644 --- a/src/corelib/scene/mscenemanager.h +++ b/src/corelib/scene/mscenemanager.h @@ -50,7 +50,7 @@ class QGraphicsWidget; * * \sa MSceneWindow */ -class M_EXPORT MSceneManager : public QObject +class M_CORE_EXPORT MSceneManager : public QObject { Q_OBJECT friend class MSceneWindow; diff --git a/src/corelib/service/mserviceaction.h b/src/corelib/service/mserviceaction.h index e8045244..1f25995f 100644 --- a/src/corelib/service/mserviceaction.h +++ b/src/corelib/service/mserviceaction.h @@ -29,7 +29,7 @@ class MServiceActionPrivate; /*! * Base class for actions that can be used to launch services. */ -class M_EXPORT MServiceAction : public MAction +class M_CORE_EXPORT MServiceAction : public MAction { Q_OBJECT diff --git a/src/corelib/service/mserviceinvoker.h b/src/corelib/service/mserviceinvoker.h index 57e259cd..7bc5c9ea 100644 --- a/src/corelib/service/mserviceinvoker.h +++ b/src/corelib/service/mserviceinvoker.h @@ -26,7 +26,7 @@ /*! * A helper service that invokes service actions. */ -class M_EXPORT MServiceInvoker : public QObject +class M_CORE_EXPORT MServiceInvoker : public QObject { Q_OBJECT diff --git a/src/corelib/servicefwif/mservicefwbaseif.h b/src/corelib/servicefwif/mservicefwbaseif.h index afaa344a..0b506e3f 100644 --- a/src/corelib/servicefwif/mservicefwbaseif.h +++ b/src/corelib/servicefwif/mservicefwbaseif.h @@ -43,7 +43,7 @@ class MServiceFwBaseIfPrivate; * including service discovery and underlying IPC methods. */ -class M_EXPORT MServiceFwBaseIf : public QObject +class M_CORE_EXPORT MServiceFwBaseIf : public QObject { Q_OBJECT public: diff --git a/src/corelib/style/mabstractlayoutpolicystyle.h b/src/corelib/style/mabstractlayoutpolicystyle.h index 3d7422ef..f2b2c822 100644 --- a/src/corelib/style/mabstractlayoutpolicystyle.h +++ b/src/corelib/style/mabstractlayoutpolicystyle.h @@ -25,7 +25,7 @@ /** \brief Defines a style for a MAbstractLayoutPolicy class and the policies that inherit from this * This defines the attributes that are common to all MLayout policies */ -class M_EXPORT MAbstractLayoutPolicyStyle : public MStyle +class M_CORE_EXPORT MAbstractLayoutPolicyStyle : public MStyle { Q_OBJECT M_STYLE_INTERNAL(MAbstractLayoutPolicyStyle) @@ -46,7 +46,7 @@ class M_EXPORT MAbstractLayoutPolicyStyle : public MStyle }; -class M_EXPORT MAbstractLayoutPolicyStyleContainer : public MStyleContainer +class M_CORE_EXPORT MAbstractLayoutPolicyStyleContainer : public MStyleContainer { M_STYLE_CONTAINER_INTERNAL(MAbstractLayoutPolicyStyle) }; diff --git a/src/corelib/style/mabstractwidgetanimationstyle.h b/src/corelib/style/mabstractwidgetanimationstyle.h index 56632238..787712c7 100644 --- a/src/corelib/style/mabstractwidgetanimationstyle.h +++ b/src/corelib/style/mabstractwidgetanimationstyle.h @@ -23,7 +23,7 @@ #include <manimationstyle.h> #include <mexport.h> -class M_EXPORT MAbstractWidgetAnimationStyle : public MAnimationStyle +class M_CORE_EXPORT MAbstractWidgetAnimationStyle : public MAnimationStyle { Q_OBJECT M_STYLE_INTERNAL(MAbstractWidgetAnimationStyle) @@ -31,7 +31,7 @@ class M_EXPORT MAbstractWidgetAnimationStyle : public MAnimationStyle M_STYLE_ATTRIBUTE(int, duration, Duration) }; -class M_EXPORT MAbstractWidgetAnimationStyleContainer : public MAnimationStyleContainer +class M_CORE_EXPORT MAbstractWidgetAnimationStyleContainer : public MAnimationStyleContainer { M_STYLE_CONTAINER_INTERNAL(MAbstractWidgetAnimationStyle) }; diff --git a/src/corelib/style/manimationstyle.h b/src/corelib/style/manimationstyle.h index a488c291..8a2afee4 100644 --- a/src/corelib/style/manimationstyle.h +++ b/src/corelib/style/manimationstyle.h @@ -22,13 +22,13 @@ #include <mstyle.h> -class M_EXPORT MAnimationStyle : public MStyle +class M_CORE_EXPORT MAnimationStyle : public MStyle { Q_OBJECT M_STYLE_INTERNAL(MAnimationStyle) }; -class M_EXPORT MAnimationStyleContainer : public MStyleContainer +class M_CORE_EXPORT MAnimationStyleContainer : public MStyleContainer { M_STYLE_CONTAINER_INTERNAL(MAnimationStyle) }; diff --git a/src/corelib/style/mbasiclayoutanimationstyle.h b/src/corelib/style/mbasiclayoutanimationstyle.h index 12bb2ec1..f7f08a4a 100644 --- a/src/corelib/style/mbasiclayoutanimationstyle.h +++ b/src/corelib/style/mbasiclayoutanimationstyle.h @@ -39,7 +39,7 @@ class MBasicLayoutAnimationStyle : public MLayoutAnimationStyle }; // TODO: get rid of this container -class M_EXPORT MBasicLayoutAnimationStyleContainer : public MLayoutAnimationStyleContainer +class M_CORE_EXPORT MBasicLayoutAnimationStyleContainer : public MLayoutAnimationStyleContainer { M_STYLE_CONTAINER_INTERNAL(MBasicLayoutAnimationStyle) }; diff --git a/src/corelib/style/mgraphicseffectstyle.h b/src/corelib/style/mgraphicseffectstyle.h index 5d2d1414..d69b3aa9 100644 --- a/src/corelib/style/mgraphicseffectstyle.h +++ b/src/corelib/style/mgraphicseffectstyle.h @@ -22,13 +22,13 @@ #include "mstyle.h" -class M_EXPORT MGraphicsEffectStyle : public MStyle +class M_CORE_EXPORT MGraphicsEffectStyle : public MStyle { Q_OBJECT M_STYLE(MGraphicsEffectStyle) }; -class M_EXPORT MGraphicsEffectStyleContainer : public MStyleContainer +class M_CORE_EXPORT MGraphicsEffectStyleContainer : public MStyleContainer { M_STYLE_CONTAINER(MGraphicsEffectStyle) }; diff --git a/src/corelib/style/mgroupanimationstyle.h b/src/corelib/style/mgroupanimationstyle.h index c4151618..1767b1b2 100644 --- a/src/corelib/style/mgroupanimationstyle.h +++ b/src/corelib/style/mgroupanimationstyle.h @@ -22,13 +22,13 @@ #include <manimationstyle.h> -class M_EXPORT MGroupAnimationStyle : public MAnimationStyle +class M_CORE_EXPORT MGroupAnimationStyle : public MAnimationStyle { Q_OBJECT M_STYLE_INTERNAL(MGroupAnimationStyle) }; -class M_EXPORT MGroupAnimationStyleContainer : public MAnimationStyleContainer +class M_CORE_EXPORT MGroupAnimationStyleContainer : public MAnimationStyleContainer { M_STYLE_CONTAINER_INTERNAL(MGroupAnimationStyle) }; diff --git a/src/corelib/style/mlayoutanimationstyle.h b/src/corelib/style/mlayoutanimationstyle.h index 24ddc070..a1ace5d4 100644 --- a/src/corelib/style/mlayoutanimationstyle.h +++ b/src/corelib/style/mlayoutanimationstyle.h @@ -22,14 +22,14 @@ #include <manimationstyle.h> -class M_EXPORT MLayoutAnimationStyle : public MAnimationStyle +class M_CORE_EXPORT MLayoutAnimationStyle : public MAnimationStyle { Q_OBJECT M_STYLE_INTERNAL(MLayoutAnimationStyle) }; // TODO: get rid of this container -class M_EXPORT MLayoutAnimationStyleContainer : public MAnimationStyleContainer +class M_CORE_EXPORT MLayoutAnimationStyleContainer : public MAnimationStyleContainer { M_STYLE_CONTAINER_INTERNAL(MLayoutAnimationStyle) }; diff --git a/src/corelib/style/mscenewindowanimationstyle.h b/src/corelib/style/mscenewindowanimationstyle.h index dae6bebe..1f72d6d7 100644 --- a/src/corelib/style/mscenewindowanimationstyle.h +++ b/src/corelib/style/mscenewindowanimationstyle.h @@ -23,7 +23,7 @@ #include <manimationstyle.h> //#include <QEasingCurve> -class M_EXPORT MSceneWindowAnimationStyle : public MAnimationStyle +class M_CORE_EXPORT MSceneWindowAnimationStyle : public MAnimationStyle { Q_OBJECT M_STYLE_INTERNAL(MSceneWindowAnimationStyle) diff --git a/src/corelib/style/mstyle.h b/src/corelib/style/mstyle.h index 0c197c19..75afe55f 100644 --- a/src/corelib/style/mstyle.h +++ b/src/corelib/style/mstyle.h @@ -101,7 +101,7 @@ class MWidgetController; class MWidgetViewPrivate; -class M_EXPORT MStyle : public QObject +class M_CORE_EXPORT MStyle : public QObject { Q_OBJECT M_STYLE(MStyle) @@ -116,7 +116,7 @@ protected: friend class MThemePrivate; }; -class M_EXPORT MStyleContainer +class M_CORE_EXPORT MStyleContainer { M_STYLE_CONTAINER(MStyle) M_STYLE_MODE(Default) diff --git a/src/corelib/style/mstylecreator.h b/src/corelib/style/mstylecreator.h index cb927aa3..6dd9f4cf 100644 --- a/src/corelib/style/mstylecreator.h +++ b/src/corelib/style/mstylecreator.h @@ -42,7 +42,7 @@ class MStyleCreatorBasePrivate; // interface for MStyleGenerators // you can implement your own creator or use MStyleCreator template class with // M_REGISTER_STYLE-macro. -class M_EXPORT MStyleCreatorBase +class M_CORE_EXPORT MStyleCreatorBase { public: /*! @@ -88,7 +88,7 @@ private: }; template<class STYLE> -class M_EXPORT MStyleCreator : public MStyleCreatorBase +class MStyleCreator : public MStyleCreatorBase { public: MStyleCreator(const char *styleClassName, diff --git a/src/corelib/style/mstylesheet.h b/src/corelib/style/mstylesheet.h index e58a58b5..f839fbd6 100644 --- a/src/corelib/style/mstylesheet.h +++ b/src/corelib/style/mstylesheet.h @@ -38,7 +38,7 @@ class MStyleSheetPrivate; * This class reads style definitions from .css file, manages them * and provides easy interface to create a style data object from them. */ -class M_EXPORT MStyleSheet : public MStyleSheetParser +class M_CORE_EXPORT MStyleSheet : public MStyleSheetParser { public: /*! diff --git a/src/corelib/style/mstylesheetparser.h b/src/corelib/style/mstylesheetparser.h index 2185b631..77bdd8ec 100644 --- a/src/corelib/style/mstylesheetparser.h +++ b/src/corelib/style/mstylesheetparser.h @@ -40,7 +40,7 @@ class MLogicalValues; * This class extracts all the selectors from style sheet * and creates attributes into them. */ -class M_EXPORT MStyleSheetParser +class M_CORE_EXPORT MStyleSheetParser { //! \brief Set the parser mode Q_PROPERTY(SyntaxMode syntaxMode READ syntaxMode WRITE setSyntaxMode) diff --git a/src/corelib/style/mstylesheetselector.h b/src/corelib/style/mstylesheetselector.h index cb6ba695..c90e3dd2 100644 --- a/src/corelib/style/mstylesheetselector.h +++ b/src/corelib/style/mstylesheetselector.h @@ -36,7 +36,7 @@ class MStyleSheetSelectorPrivate; * Later, when the style for the target object is requested, all known selectors are compared to * target object and the matching settings are stored to target object's style object. */ -class M_EXPORT MStyleSheetSelector +class M_CORE_EXPORT MStyleSheetSelector { //friend class MStyleSheetParser; diff --git a/src/corelib/style/mwidgetfadeanimationstyle.h b/src/corelib/style/mwidgetfadeanimationstyle.h index 205a364a..af728da5 100644 --- a/src/corelib/style/mwidgetfadeanimationstyle.h +++ b/src/corelib/style/mwidgetfadeanimationstyle.h @@ -24,7 +24,7 @@ #include <QEasingCurve> //! \internal -class M_EXPORT MWidgetFadeAnimationStyle : public MAbstractWidgetAnimationStyle +class M_CORE_EXPORT MWidgetFadeAnimationStyle : public MAbstractWidgetAnimationStyle { Q_OBJECT M_STYLE_INTERNAL(MWidgetFadeAnimationStyle) diff --git a/src/corelib/style/mwidgetstyle.h b/src/corelib/style/mwidgetstyle.h index 06d20a8c..7157c65b 100644 --- a/src/corelib/style/mwidgetstyle.h +++ b/src/corelib/style/mwidgetstyle.h @@ -36,7 +36,7 @@ class MScalableImage; \brief MWidgetStyle implements a base for style objects for MVC views */ -class M_EXPORT MWidgetStyle : public MStyle +class M_CORE_EXPORT MWidgetStyle : public MStyle { Q_OBJECT M_STYLE_INTERNAL(MWidgetStyle) @@ -70,7 +70,7 @@ class M_EXPORT MWidgetStyle : public MStyle M_STYLE_ATTRIBUTE(MFeedback, cancelFeedback, CancelFeedback) }; -class M_EXPORT MWidgetStyleContainer : public MStyleContainer +class M_CORE_EXPORT MWidgetStyleContainer : public MStyleContainer { M_STYLE_CONTAINER_INTERNAL(MWidgetStyle) M_STYLE_MODE(Disabled) diff --git a/src/corelib/theme/mdefaultfonts.h b/src/corelib/theme/mdefaultfonts.h index 3c353ea6..b47a154c 100644 --- a/src/corelib/theme/mdefaultfonts.h +++ b/src/corelib/theme/mdefaultfonts.h @@ -26,7 +26,7 @@ class MDefaultFontsPrivate; class MLogicalValues; -class M_EXPORT MDefaultFonts +class M_CORE_EXPORT MDefaultFonts { public: MDefaultFonts(const MLogicalValues &); diff --git a/src/corelib/theme/mlocalthemedaemon.cpp b/src/corelib/theme/mlocalthemedaemon.cpp index 22c769c7..6156540b 100644 --- a/src/corelib/theme/mlocalthemedaemon.cpp +++ b/src/corelib/theme/mlocalthemedaemon.cpp @@ -31,7 +31,7 @@ using namespace M::MThemeDaemonProtocol; QString M_themeName; MLocalThemeDaemon *M_localDaemon; -void M_EXPORT M_changeTheme(const QString &theme) +void M_CORE_EXPORT M_changeTheme(const QString &theme) { M_themeName = theme; QTimer::singleShot(0, M_localDaemon, SLOT(themeChangedSlot())); diff --git a/src/corelib/theme/mpalette.h b/src/corelib/theme/mpalette.h index 592f9946..549e3250 100644 --- a/src/corelib/theme/mpalette.h +++ b/src/corelib/theme/mpalette.h @@ -26,7 +26,7 @@ class MPalettePrivate; class MLogicalValues; -class M_EXPORT MPalette +class M_CORE_EXPORT MPalette { public: MPalette(const MLogicalValues &); diff --git a/src/corelib/theme/mtheme.h b/src/corelib/theme/mtheme.h index 1711b329..2639341e 100644 --- a/src/corelib/theme/mtheme.h +++ b/src/corelib/theme/mtheme.h @@ -59,7 +59,7 @@ class QAbstractAnimation; server called \a mthemedaemon that shares assets using the X11 system. In case a theme server is not available, no sharing occurs and each graphical asset is duplicated for each application. */ -class M_EXPORT MTheme : public QObject +class M_CORE_EXPORT MTheme : public QObject { Q_OBJECT diff --git a/src/corelib/video/mvideo.h b/src/corelib/video/mvideo.h index 2928658a..e5c58fdf 100644 --- a/src/corelib/video/mvideo.h +++ b/src/corelib/video/mvideo.h @@ -20,7 +20,7 @@ #include <QSize> #include <MExport> -class M_EXPORT MVideo : public QObject +class M_CORE_EXPORT MVideo : public QObject { Q_OBJECT diff --git a/src/corelib/video/mvideowidget.h b/src/corelib/video/mvideowidget.h index c5f43355..7c6c7f63 100644 --- a/src/corelib/video/mvideowidget.h +++ b/src/corelib/video/mvideowidget.h @@ -54,7 +54,7 @@ class MVideoWidgetPrivate; \sa MVideoWidgetModel */ -class M_EXPORT MVideoWidget : public MWidgetController +class M_CORE_EXPORT MVideoWidget : public MWidgetController { Q_OBJECT M_CONTROLLER(MVideoWidget) diff --git a/src/corelib/video/mvideowidgetmodel.h b/src/corelib/video/mvideowidgetmodel.h index 34d4d16f..d61d2aae 100644 --- a/src/corelib/video/mvideowidgetmodel.h +++ b/src/corelib/video/mvideowidgetmodel.h @@ -25,7 +25,7 @@ \ingroup models \sa MVideoWidget */ -class M_EXPORT MVideoWidgetModel : public MWidgetModel +class M_CORE_EXPORT MVideoWidgetModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MVideoWidgetModel) diff --git a/src/corelib/widgets/core/mwidget.h b/src/corelib/widgets/core/mwidget.h index 7fee207a..837eefed 100644 --- a/src/corelib/widgets/core/mwidget.h +++ b/src/corelib/widgets/core/mwidget.h @@ -40,7 +40,7 @@ class MOrientationChangeEvent; class MSceneManager; class MApplicationPage; -class M_EXPORT MWidget : public QGraphicsWidget +class M_CORE_EXPORT MWidget : public QGraphicsWidget { Q_OBJECT diff --git a/src/corelib/widgets/core/mwidget_p.h b/src/corelib/widgets/core/mwidget_p.h index 0e43a108..69fd34ca 100644 --- a/src/corelib/widgets/core/mwidget_p.h +++ b/src/corelib/widgets/core/mwidget_p.h @@ -22,7 +22,7 @@ #include <mwidget.h> -class MWidgetPrivate +class M_CORE_EXPORT MWidgetPrivate { Q_DECLARE_PUBLIC(MWidget) public: diff --git a/src/corelib/widgets/core/mwidgetcontroller.h b/src/corelib/widgets/core/mwidgetcontroller.h index 42921efa..e4ce9c14 100644 --- a/src/corelib/widgets/core/mwidgetcontroller.h +++ b/src/corelib/widgets/core/mwidgetcontroller.h @@ -48,7 +48,7 @@ class MAbstractWidgetAnimation; */ -class M_EXPORT MWidgetController : public MWidget +class M_CORE_EXPORT MWidgetController : public MWidget { Q_OBJECT diff --git a/src/corelib/widgets/core/mwidgetcreator.h b/src/corelib/widgets/core/mwidgetcreator.h index 54f678fc..8a64177e 100644 --- a/src/corelib/widgets/core/mwidgetcreator.h +++ b/src/corelib/widgets/core/mwidgetcreator.h @@ -46,7 +46,7 @@ class MWidgetCreatorBasePrivate; \brief Interface for MWidgetGenerators, you can implement your own creator or use MWidgetCreator template class with M_REGISTER_WIDGET-macro. */ -class M_EXPORT MWidgetCreatorBase +class M_CORE_EXPORT MWidgetCreatorBase { public: @@ -88,7 +88,7 @@ private: }; template<class WIDGET> -class M_EXPORT MWidgetCreator : public MWidgetCreatorBase +class MWidgetCreator : public MWidgetCreatorBase { public: @@ -111,7 +111,7 @@ public: }; template<class WIDGET> -class M_EXPORT MWidgetNullCreator : public MWidgetCreatorBase +class MWidgetNullCreator : public MWidgetCreatorBase { public: diff --git a/src/corelib/widgets/core/mwidgetview.h b/src/corelib/widgets/core/mwidgetview.h index cc0c7bc7..7d2fca8d 100644 --- a/src/corelib/widgets/core/mwidgetview.h +++ b/src/corelib/widgets/core/mwidgetview.h @@ -71,7 +71,7 @@ class QGraphicsSceneResizeEvent; * using MVC pattern can inherit their views */ -class M_EXPORT MWidgetView : public QObject +class M_CORE_EXPORT MWidgetView : public QObject { Q_OBJECT diff --git a/src/corelib/widgets/core/mwidgetview_p.h b/src/corelib/widgets/core/mwidgetview_p.h index b4b829ed..ec620df4 100644 --- a/src/corelib/widgets/core/mwidgetview_p.h +++ b/src/corelib/widgets/core/mwidgetview_p.h @@ -27,7 +27,7 @@ class QPixmap; class MScalableImage; class MAbstractWidgetAnimation; -class M_EXPORT MWidgetViewPrivate +class M_CORE_EXPORT MWidgetViewPrivate { Q_DECLARE_PUBLIC(MWidgetView) diff --git a/src/corelib/widgets/mabstractcellcreator.h b/src/corelib/widgets/mabstractcellcreator.h index 3a97e8d0..ed4da8bb 100644 --- a/src/corelib/widgets/mabstractcellcreator.h +++ b/src/corelib/widgets/mabstractcellcreator.h @@ -36,7 +36,7 @@ Main purpose of this interface is to create and update data of widgets which has to be inserted into MList. Also MCellCreator returns size of a list item widget. */ -class M_EXPORT MCellCreator +class M_CORE_EXPORT MCellCreator { public: /*! diff --git a/src/corelib/widgets/mabstractitemmodel.h b/src/corelib/widgets/mabstractitemmodel.h index b3928f6b..169179d4 100644 --- a/src/corelib/widgets/mabstractitemmodel.h +++ b/src/corelib/widgets/mabstractitemmodel.h @@ -29,7 +29,7 @@ class MAbstractItemModelPrivate; \class MAbstractItemModel \brief MAbstractItemModel implementation of a simple list data model. */ -class M_EXPORT MAbstractItemModel : public QAbstractItemModel +class M_CORE_EXPORT MAbstractItemModel : public QAbstractItemModel { Q_OBJECT /*! diff --git a/src/corelib/widgets/madvancedlistitem.h b/src/corelib/widgets/madvancedlistitem.h index edf645bb..d46f0e8c 100644 --- a/src/corelib/widgets/madvancedlistitem.h +++ b/src/corelib/widgets/madvancedlistitem.h @@ -29,7 +29,7 @@ class MProgressIndicator; class QGraphicsGridLayout; -class M_EXPORT MAdvancedListItem : public MListItem +class M_CORE_EXPORT MAdvancedListItem : public MListItem { Q_OBJECT diff --git a/src/corelib/widgets/mapplicationmenu.h b/src/corelib/widgets/mapplicationmenu.h index 99886898..25491b9d 100644 --- a/src/corelib/widgets/mapplicationmenu.h +++ b/src/corelib/widgets/mapplicationmenu.h @@ -112,7 +112,7 @@ class MApplicationMenuPrivate; */ -class M_EXPORT MApplicationMenu : public MSceneWindow +class M_CORE_EXPORT MApplicationMenu : public MSceneWindow { Q_OBJECT M_CONTROLLER(MApplicationMenu) diff --git a/src/corelib/widgets/mapplicationmenumodel.h b/src/corelib/widgets/mapplicationmenumodel.h index 28772c88..eb437d02 100644 --- a/src/corelib/widgets/mapplicationmenumodel.h +++ b/src/corelib/widgets/mapplicationmenumodel.h @@ -30,7 +30,7 @@ \sa MApplicationMenu */ -class M_EXPORT MApplicationMenuModel : public MSceneWindowModel +class M_CORE_EXPORT MApplicationMenuModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MApplicationMenuModel) diff --git a/src/corelib/widgets/mapplicationpage.h b/src/corelib/widgets/mapplicationpage.h index 500d8ebb..b0d6a774 100644 --- a/src/corelib/widgets/mapplicationpage.h +++ b/src/corelib/widgets/mapplicationpage.h @@ -116,7 +116,7 @@ class MPannableViewport; For information on this and other navigational patterns see \subpage pagenavigation. */ -class M_EXPORT MApplicationPage : public MSceneWindow +class M_CORE_EXPORT MApplicationPage : public MSceneWindow { Q_OBJECT M_CONTROLLER(MApplicationPage) diff --git a/src/corelib/widgets/mapplicationpagemodel.h b/src/corelib/widgets/mapplicationpagemodel.h index 11ba97bf..9d6afbda 100644 --- a/src/corelib/widgets/mapplicationpagemodel.h +++ b/src/corelib/widgets/mapplicationpagemodel.h @@ -22,7 +22,7 @@ #include <mscenewindowmodel.h> -class M_EXPORT MApplicationPageModel : public MSceneWindowModel +class M_CORE_EXPORT MApplicationPageModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MApplicationPageModel) diff --git a/src/corelib/widgets/mapplicationwindow.h b/src/corelib/widgets/mapplicationwindow.h index d4bc1b8c..3ec25687 100644 --- a/src/corelib/widgets/mapplicationwindow.h +++ b/src/corelib/widgets/mapplicationwindow.h @@ -73,7 +73,7 @@ class MOnDisplayChangeEvent; presence of the navigation bar and navigation controls (home button and escape button). The presence of those is set via MApplicationPage::setComponentsDisplayMode(). */ -class M_EXPORT MApplicationWindow : public MWindow +class M_CORE_EXPORT MApplicationWindow : public MWindow { Q_OBJECT Q_PROPERTY(MTheme::ViewType toolbarViewType READ toolbarViewType WRITE setToolbarViewType) diff --git a/src/corelib/widgets/mbanner.h b/src/corelib/widgets/mbanner.h index 9d273f2b..17f2abef 100644 --- a/src/corelib/widgets/mbanner.h +++ b/src/corelib/widgets/mbanner.h @@ -97,7 +97,7 @@ \sa MNotification */ -class M_EXPORT MBanner : public MSceneWindow +class M_CORE_EXPORT MBanner : public MSceneWindow { Q_OBJECT M_CONTROLLER(MBanner) diff --git a/src/corelib/widgets/mbannermodel.h b/src/corelib/widgets/mbannermodel.h index 3aadee18..9250c8ca 100644 --- a/src/corelib/widgets/mbannermodel.h +++ b/src/corelib/widgets/mbannermodel.h @@ -23,7 +23,7 @@ #include "mscenewindowmodel.h" #include <QDateTime> -class M_EXPORT MBannerModel : public MSceneWindowModel +class M_CORE_EXPORT MBannerModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MBannerModel) diff --git a/src/corelib/widgets/mbasiclistitem.h b/src/corelib/widgets/mbasiclistitem.h index 41e4451e..8fd9983e 100644 --- a/src/corelib/widgets/mbasiclistitem.h +++ b/src/corelib/widgets/mbasiclistitem.h @@ -62,7 +62,7 @@ class MBasicListItemPrivate; \li createLayout() \li clearLayout() */ -class M_EXPORT MBasicListItem : public MListItem +class M_CORE_EXPORT MBasicListItem : public MListItem { Q_OBJECT diff --git a/src/corelib/widgets/mbubbleitem.h b/src/corelib/widgets/mbubbleitem.h index b0b68802..086bced9 100644 --- a/src/corelib/widgets/mbubbleitem.h +++ b/src/corelib/widgets/mbubbleitem.h @@ -38,7 +38,7 @@ class MImageWidget; The speech bubble supports avatar images, separate styling for incoming and outgoing messages, as well as an area for application specific widgets. */ -class M_EXPORT MBubbleItem : public MWidgetController +class M_CORE_EXPORT MBubbleItem : public MWidgetController { Q_OBJECT M_CONTROLLER(MBubbleItem) diff --git a/src/corelib/widgets/mbubbleitemmodel.h b/src/corelib/widgets/mbubbleitemmodel.h index b6854e13..65ac7e53 100644 --- a/src/corelib/widgets/mbubbleitemmodel.h +++ b/src/corelib/widgets/mbubbleitemmodel.h @@ -27,7 +27,7 @@ class QPixmap; class QGraphicsWidget; class MImageWidget; -class M_EXPORT MBubbleItemModel : public MWidgetModel +class M_CORE_EXPORT MBubbleItemModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MBubbleItemModel) diff --git a/src/corelib/widgets/mbutton.h b/src/corelib/widgets/mbutton.h index 18940d98..8f9e64e0 100644 --- a/src/corelib/widgets/mbutton.h +++ b/src/corelib/widgets/mbutton.h @@ -139,7 +139,7 @@ class MWidget; \sa MButtonModel MButtonStyle MButtonGroup */ -class M_EXPORT MButton : public MWidgetController +class M_CORE_EXPORT MButton : public MWidgetController { Q_OBJECT M_CONTROLLER(MButton) diff --git a/src/corelib/widgets/mbutton_p.h b/src/corelib/widgets/mbutton_p.h index 7fdd590e..32bcdc01 100644 --- a/src/corelib/widgets/mbutton_p.h +++ b/src/corelib/widgets/mbutton_p.h @@ -27,7 +27,7 @@ class MButtonGroup; #include <QPointer> -class M_EXPORT MButtonPrivate : protected MWidgetControllerPrivate +class M_CORE_EXPORT MButtonPrivate : protected MWidgetControllerPrivate { public: Q_DECLARE_PUBLIC(MButton) diff --git a/src/corelib/widgets/mbuttongroup.h b/src/corelib/widgets/mbuttongroup.h index ada670cc..134e1e96 100644 --- a/src/corelib/widgets/mbuttongroup.h +++ b/src/corelib/widgets/mbuttongroup.h @@ -192,7 +192,7 @@ class MButton; \endcode */ -class M_EXPORT MButtonGroup : public QObject +class M_CORE_EXPORT MButtonGroup : public QObject { Q_OBJECT diff --git a/src/corelib/widgets/mbuttonmodel.h b/src/corelib/widgets/mbuttonmodel.h index 5068a511..4ffcb809 100644 --- a/src/corelib/widgets/mbuttonmodel.h +++ b/src/corelib/widgets/mbuttonmodel.h @@ -34,7 +34,7 @@ //We need this to due to MOC generator limitations: using M::ButtonRole; -class M_EXPORT MButtonModel : public MWidgetModel +class M_CORE_EXPORT MButtonModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MButtonModel) diff --git a/src/corelib/widgets/mcombobox.h b/src/corelib/widgets/mcombobox.h index e27c8553..118b4ec8 100644 --- a/src/corelib/widgets/mcombobox.h +++ b/src/corelib/widgets/mcombobox.h @@ -69,7 +69,7 @@ class MComboBoxPrivate; \endcode */ -class M_EXPORT MComboBox : public MWidgetController +class M_CORE_EXPORT MComboBox : public MWidgetController { Q_OBJECT diff --git a/src/corelib/widgets/mcomboboxmodel.h b/src/corelib/widgets/mcomboboxmodel.h index a057cda5..7bc780c6 100644 --- a/src/corelib/widgets/mcomboboxmodel.h +++ b/src/corelib/widgets/mcomboboxmodel.h @@ -33,7 +33,7 @@ class QAbstractItemModel; \ingroup models \sa MComboBox */ -class M_EXPORT MComboBoxModel : public MWidgetModel +class M_CORE_EXPORT MComboBoxModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MComboBoxModel) diff --git a/src/corelib/widgets/mcompleter.h b/src/corelib/widgets/mcompleter.h index 18b62cfc..964c2a24 100644 --- a/src/corelib/widgets/mcompleter.h +++ b/src/corelib/widgets/mcompleter.h @@ -109,7 +109,7 @@ class MApplicationWindow; class QAbstractItemModel; class QModelIndex; -class M_EXPORT MCompleter : public MSceneWindow +class M_CORE_EXPORT MCompleter : public MSceneWindow { Q_OBJECT M_CONTROLLER(MCompleter) diff --git a/src/corelib/widgets/mcompletermodel.h b/src/corelib/widgets/mcompletermodel.h index e88f6033..08d75bd0 100644 --- a/src/corelib/widgets/mcompletermodel.h +++ b/src/corelib/widgets/mcompletermodel.h @@ -25,7 +25,7 @@ class QAbstractItemModel; class MWidget; -class M_EXPORT MCompleterModel : public MSceneWindowModel +class M_CORE_EXPORT MCompleterModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MCompleterModel) diff --git a/src/corelib/widgets/mcontainer.h b/src/corelib/widgets/mcontainer.h index 70416946..9b891e96 100644 --- a/src/corelib/widgets/mcontainer.h +++ b/src/corelib/widgets/mcontainer.h @@ -86,7 +86,7 @@ class MContainerPrivate; * \sa MContainerModel, MContainerView, \see \ref appletdevelopment */ -class M_EXPORT MContainer : public MWidgetController +class M_CORE_EXPORT MContainer : public MWidgetController { Q_OBJECT M_CONTROLLER(MContainer) diff --git a/src/corelib/widgets/mcontainermodel.h b/src/corelib/widgets/mcontainermodel.h index 174e8635..5f443b42 100644 --- a/src/corelib/widgets/mcontainermodel.h +++ b/src/corelib/widgets/mcontainermodel.h @@ -31,7 +31,7 @@ class QGraphicsWidget; * \sa MContainer, MContainerView */ -class M_EXPORT MContainerModel : public MWidgetModel +class M_CORE_EXPORT MContainerModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MContainerModel) diff --git a/src/corelib/widgets/mcontentitem.h b/src/corelib/widgets/mcontentitem.h index 5212b02f..ddde4818 100644 --- a/src/corelib/widgets/mcontentitem.h +++ b/src/corelib/widgets/mcontentitem.h @@ -54,7 +54,7 @@ class MContentItemPrivate; \sa MContentItemView */ -class M_EXPORT MContentItem : public MWidgetController +class M_CORE_EXPORT MContentItem : public MWidgetController { Q_OBJECT M_CONTROLLER(MContentItem) diff --git a/src/corelib/widgets/mcontentitemmodel.h b/src/corelib/widgets/mcontentitemmodel.h index 4e852bd6..92357f32 100644 --- a/src/corelib/widgets/mcontentitemmodel.h +++ b/src/corelib/widgets/mcontentitemmodel.h @@ -25,7 +25,7 @@ class QPixmap; class QImage; -class M_EXPORT MContentItemModel : public MWidgetModel +class M_CORE_EXPORT MContentItemModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MContentItemModel) diff --git a/src/corelib/widgets/mdetailedlistitem.h b/src/corelib/widgets/mdetailedlistitem.h index ea858306..5bfdc60e 100644 --- a/src/corelib/widgets/mdetailedlistitem.h +++ b/src/corelib/widgets/mdetailedlistitem.h @@ -29,7 +29,7 @@ class MStylableWidget; class QGraphicsGridLayout; -class M_EXPORT MDetailedListItem : public MListItem +class M_CORE_EXPORT MDetailedListItem : public MListItem { public: Q_OBJECT diff --git a/src/corelib/widgets/mdialog.h b/src/corelib/widgets/mdialog.h index 336410ac..2237ad92 100644 --- a/src/corelib/widgets/mdialog.h +++ b/src/corelib/widgets/mdialog.h @@ -163,7 +163,7 @@ class MDismissEvent; \sa MDialogView, MDialogStyle */ -class M_EXPORT MDialog : public MSceneWindow +class M_CORE_EXPORT MDialog : public MSceneWindow { Q_OBJECT M_CONTROLLER(MDialog) diff --git a/src/corelib/widgets/mdialogmodel.h b/src/corelib/widgets/mdialogmodel.h index 95821293..98ea295c 100644 --- a/src/corelib/widgets/mdialogmodel.h +++ b/src/corelib/widgets/mdialogmodel.h @@ -28,7 +28,7 @@ class MButtonModel; typedef QList<MButtonModel *> MDialogButtonsList; -class M_EXPORT MDialogModel : public MSceneWindowModel +class M_CORE_EXPORT MDialogModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MDialogModel) diff --git a/src/corelib/widgets/mescapebuttonpanel.h b/src/corelib/widgets/mescapebuttonpanel.h index abf766a2..4f58c468 100644 --- a/src/corelib/widgets/mescapebuttonpanel.h +++ b/src/corelib/widgets/mescapebuttonpanel.h @@ -34,7 +34,7 @@ * * \sa MHomeButtonPanel */ -class M_EXPORT MEscapeButtonPanel : public MSceneWindow +class M_CORE_EXPORT MEscapeButtonPanel : public MSceneWindow { Q_OBJECT M_CONTROLLER(MEscapeButtonPanel) diff --git a/src/corelib/widgets/mescapebuttonpanelmodel.h b/src/corelib/widgets/mescapebuttonpanelmodel.h index 8f53b066..018302ba 100644 --- a/src/corelib/widgets/mescapebuttonpanelmodel.h +++ b/src/corelib/widgets/mescapebuttonpanelmodel.h @@ -22,7 +22,7 @@ #include <mscenewindowmodel.h> -class M_EXPORT MEscapeButtonPanelModel : public MSceneWindowModel +class M_CORE_EXPORT MEscapeButtonPanelModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MEscapeButtonPanelModel) diff --git a/src/corelib/widgets/mgriditem.h b/src/corelib/widgets/mgriditem.h index 93b68a3d..0c63b902 100644 --- a/src/corelib/widgets/mgriditem.h +++ b/src/corelib/widgets/mgriditem.h @@ -48,7 +48,7 @@ class MGridItemPrivate; \deprecated Please use MContentItem, MBasicListItem, MAdvancedListItem, MDetailedListItem */ -class M_EXPORT MGridItem: public MWidgetController +class M_CORE_EXPORT MGridItem: public MWidgetController { Q_OBJECT M_CONTROLLER(MGridItem) diff --git a/src/corelib/widgets/mgriditemmodel.h b/src/corelib/widgets/mgriditemmodel.h index 4ca3fa3f..e1aed24e 100644 --- a/src/corelib/widgets/mgriditemmodel.h +++ b/src/corelib/widgets/mgriditemmodel.h @@ -29,7 +29,7 @@ \ingroup models \sa MGridItem */ -class M_EXPORT MGridItemModel : public MWidgetModel +class M_CORE_EXPORT MGridItemModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MGridItemModel) diff --git a/src/corelib/widgets/mgridmodel.h b/src/corelib/widgets/mgridmodel.h index 1a9bb975..8ba7b603 100644 --- a/src/corelib/widgets/mgridmodel.h +++ b/src/corelib/widgets/mgridmodel.h @@ -29,7 +29,7 @@ class QAbstractItemModel; class QGraphicsItem; -class M_EXPORT MGridModel : public MWidgetModel +class M_CORE_EXPORT MGridModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MGridModel) diff --git a/src/corelib/widgets/mhomebuttonpanel.h b/src/corelib/widgets/mhomebuttonpanel.h index 3bde283f..1e849db9 100644 --- a/src/corelib/widgets/mhomebuttonpanel.h +++ b/src/corelib/widgets/mhomebuttonpanel.h @@ -30,7 +30,7 @@ * The home button is always visible and accessible, standing on top of all * application GUI, including MOverlay instances and modal dialogs. */ -class M_EXPORT MHomeButtonPanel : public MSceneWindow +class M_CORE_EXPORT MHomeButtonPanel : public MSceneWindow { Q_OBJECT M_CONTROLLER(MSceneWindow) diff --git a/src/corelib/widgets/mimagewidget.h b/src/corelib/widgets/mimagewidget.h index 5199c8b2..68c49f0d 100644 --- a/src/corelib/widgets/mimagewidget.h +++ b/src/corelib/widgets/mimagewidget.h @@ -85,7 +85,7 @@ class MImageWidgetPrivate; */ -class M_EXPORT MImageWidget : public MWidgetController +class M_CORE_EXPORT MImageWidget : public MWidgetController { Q_OBJECT M_CONTROLLER(MImageWidget) diff --git a/src/corelib/widgets/mimagewidget_p.h b/src/corelib/widgets/mimagewidget_p.h index 929fb08f..8afd9624 100644 --- a/src/corelib/widgets/mimagewidget_p.h +++ b/src/corelib/widgets/mimagewidget_p.h @@ -24,7 +24,7 @@ class MImageWidget; -class M_EXPORT MImageWidgetPrivate : public MWidgetControllerPrivate +class M_CORE_EXPORT MImageWidgetPrivate : public MWidgetControllerPrivate { Q_DECLARE_PUBLIC(MImageWidget) diff --git a/src/corelib/widgets/mimagewidgetmodel.h b/src/corelib/widgets/mimagewidgetmodel.h index 817e5b40..8c7ccdfd 100644 --- a/src/corelib/widgets/mimagewidgetmodel.h +++ b/src/corelib/widgets/mimagewidgetmodel.h @@ -30,7 +30,7 @@ \sa MImageWidget */ -class M_EXPORT MImageWidgetModel : public MWidgetModel +class M_CORE_EXPORT MImageWidgetModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MImageWidgetModel) diff --git a/src/corelib/widgets/minfobanner.h b/src/corelib/widgets/minfobanner.h index 77433fc8..09e5b271 100644 --- a/src/corelib/widgets/minfobanner.h +++ b/src/corelib/widgets/minfobanner.h @@ -84,7 +84,7 @@ class MInfoBannerPrivate; \deprecated MInfoBanner is deprecated, use MBanner for any component with banner requirements */ -class M_EXPORT MInfoBanner : public MSceneWindow +class M_CORE_EXPORT MInfoBanner : public MSceneWindow { Q_OBJECT M_CONTROLLER(MInfoBanner) diff --git a/src/corelib/widgets/minfobannermodel.h b/src/corelib/widgets/minfobannermodel.h index c5613bdf..dc5ce216 100644 --- a/src/corelib/widgets/minfobannermodel.h +++ b/src/corelib/widgets/minfobannermodel.h @@ -22,7 +22,7 @@ #include "mscenewindowmodel.h" -class M_EXPORT MInfoBannerModel : public MSceneWindowModel +class M_CORE_EXPORT MInfoBannerModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MInfoBannerModel) diff --git a/src/corelib/widgets/mlabel.h b/src/corelib/widgets/mlabel.h index 1d86e2cc..cad0791b 100644 --- a/src/corelib/widgets/mlabel.h +++ b/src/corelib/widgets/mlabel.h @@ -119,7 +119,7 @@ class QString; \endcode \sa MLabelModel MLabelStyle <a href="http://doc.trolltech.com/richtext-html-subset.html"> Supported HTML Subset</a> */ -class M_EXPORT MLabel : public MWidgetController +class M_CORE_EXPORT MLabel : public MWidgetController { Q_OBJECT M_CONTROLLER(MLabel) diff --git a/src/corelib/widgets/mlabelhighlighter.h b/src/corelib/widgets/mlabelhighlighter.h index 392df8df..90f5526a 100644 --- a/src/corelib/widgets/mlabelhighlighter.h +++ b/src/corelib/widgets/mlabelhighlighter.h @@ -37,7 +37,7 @@ \sa MLabelStyle::highlightColor \sa MLabelStyle::activeHighlightColor */ -class M_EXPORT MLabelHighlighter +class M_CORE_EXPORT MLabelHighlighter { public: @@ -81,7 +81,7 @@ public: \ingroup widgets */ class MCommonLabelHighlighterPrivate; -class M_EXPORT MCommonLabelHighlighter : public QObject, public MLabelHighlighter +class M_CORE_EXPORT MCommonLabelHighlighter : public QObject, public MLabelHighlighter { Q_OBJECT diff --git a/src/corelib/widgets/mlabelmodel.h b/src/corelib/widgets/mlabelmodel.h index 49a14e38..6574050e 100644 --- a/src/corelib/widgets/mlabelmodel.h +++ b/src/corelib/widgets/mlabelmodel.h @@ -35,7 +35,7 @@ Q_DECLARE_METATYPE(QTextOption::WrapMode) \ingroup models \sa MLabel */ -class M_EXPORT MLabelModel : public MWidgetModel +class M_CORE_EXPORT MLabelModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MLabelModel) diff --git a/src/corelib/widgets/mlist.h b/src/corelib/widgets/mlist.h index 06e914e0..26d2db2f 100644 --- a/src/corelib/widgets/mlist.h +++ b/src/corelib/widgets/mlist.h @@ -124,7 +124,7 @@ class MListFilter; See also MListView, MWidgetFactory. */ -class M_EXPORT MList : public MWidgetController +class M_CORE_EXPORT MList : public MWidgetController { Q_OBJECT M_CONTROLLER(MList) diff --git a/src/corelib/widgets/mlistfilter.h b/src/corelib/widgets/mlistfilter.h index 95d23a1f..003bc64e 100644 --- a/src/corelib/widgets/mlistfilter.h +++ b/src/corelib/widgets/mlistfilter.h @@ -58,7 +58,7 @@ class QKeyEvent; * \endcode * */ -class M_EXPORT MListFilter : public QObject +class M_CORE_EXPORT MListFilter : public QObject { Q_OBJECT diff --git a/src/corelib/widgets/mlistitem.h b/src/corelib/widgets/mlistitem.h index 7c612936..6429db96 100644 --- a/src/corelib/widgets/mlistitem.h +++ b/src/corelib/widgets/mlistitem.h @@ -36,7 +36,7 @@ class MListItemPrivate; \sa MListItemView */ -class M_EXPORT MListItem : public MWidgetController +class M_CORE_EXPORT MListItem : public MWidgetController { Q_OBJECT M_CONTROLLER(MListItem) diff --git a/src/corelib/widgets/mlistitemmodel.h b/src/corelib/widgets/mlistitemmodel.h index 22bc3237..eb5f728f 100644 --- a/src/corelib/widgets/mlistitemmodel.h +++ b/src/corelib/widgets/mlistitemmodel.h @@ -22,7 +22,7 @@ #include <MWidgetModel> -class M_EXPORT MListItemModel : public MWidgetModel +class M_CORE_EXPORT MListItemModel : public MWidgetModel { M_MODEL(MListItemModel) }; diff --git a/src/corelib/widgets/mlistmodel.h b/src/corelib/widgets/mlistmodel.h index cb217efb..2c766d8b 100644 --- a/src/corelib/widgets/mlistmodel.h +++ b/src/corelib/widgets/mlistmodel.h @@ -36,7 +36,7 @@ \ingroup models \sa MList */ -class M_EXPORT MListModel : public MWidgetModel +class M_CORE_EXPORT MListModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MListModel) diff --git a/src/corelib/widgets/mmessagebox.h b/src/corelib/widgets/mmessagebox.h index 9f16303f..44805e2f 100644 --- a/src/corelib/widgets/mmessagebox.h +++ b/src/corelib/widgets/mmessagebox.h @@ -35,7 +35,7 @@ class MMessageBoxPrivate; You can still add a central widget to it though, by calling setCentralWidget(). It will then be placed between the title bar and the message text. */ -class M_EXPORT MMessageBox : public MDialog +class M_CORE_EXPORT MMessageBox : public MDialog { Q_OBJECT M_CONTROLLER(MMessageBox) diff --git a/src/corelib/widgets/mmessageboxmodel.h b/src/corelib/widgets/mmessageboxmodel.h index 33900656..2340ef4f 100644 --- a/src/corelib/widgets/mmessageboxmodel.h +++ b/src/corelib/widgets/mmessageboxmodel.h @@ -24,7 +24,7 @@ #include <QMessageBox> -class M_EXPORT MMessageBoxModel : public MDialogModel +class M_CORE_EXPORT MMessageBoxModel : public MDialogModel { Q_OBJECT M_MODEL_INTERNAL(MMessageBoxModel) diff --git a/src/corelib/widgets/mmodalscenewindow.h b/src/corelib/widgets/mmodalscenewindow.h index 0783720f..53328b3d 100644 --- a/src/corelib/widgets/mmodalscenewindow.h +++ b/src/corelib/widgets/mmodalscenewindow.h @@ -39,7 +39,7 @@ class MModalSceneWindowPrivate; * alignment and offset, instantiate it, set a layout to it and * populate the layout with any components the use case requires. */ -class M_EXPORT MModalSceneWindow : public MSceneWindow +class M_CORE_EXPORT MModalSceneWindow : public MSceneWindow { Q_OBJECT M_CONTROLLER(MModalSceneWindow) diff --git a/src/corelib/widgets/mmodalscenewindowmodel.h b/src/corelib/widgets/mmodalscenewindowmodel.h index b5fef024..07d9223c 100644 --- a/src/corelib/widgets/mmodalscenewindowmodel.h +++ b/src/corelib/widgets/mmodalscenewindowmodel.h @@ -22,7 +22,7 @@ #include "mscenewindowmodel.h" -class M_EXPORT MModalSceneWindowModel : public MSceneWindowModel +class M_CORE_EXPORT MModalSceneWindowModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MModalSceneWindowModel) diff --git a/src/corelib/widgets/mnavigationbar.h b/src/corelib/widgets/mnavigationbar.h index 24e51c8f..05c361b6 100644 --- a/src/corelib/widgets/mnavigationbar.h +++ b/src/corelib/widgets/mnavigationbar.h @@ -35,7 +35,7 @@ class MToolBar; * navigation bar. */ -class M_EXPORT MNavigationBar : public MSceneWindow +class M_CORE_EXPORT MNavigationBar : public MSceneWindow { Q_OBJECT M_CONTROLLER(MNavigationBar) diff --git a/src/corelib/widgets/mnavigationbarmodel.h b/src/corelib/widgets/mnavigationbarmodel.h index a8e878c5..7716c738 100644 --- a/src/corelib/widgets/mnavigationbarmodel.h +++ b/src/corelib/widgets/mnavigationbarmodel.h @@ -24,7 +24,7 @@ class MToolBar; -class M_EXPORT MNavigationBarModel : public MSceneWindowModel +class M_CORE_EXPORT MNavigationBarModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MNavigationBarModel) diff --git a/src/corelib/widgets/mobjectmenu.h b/src/corelib/widgets/mobjectmenu.h index 32a5b7f9..58196ffc 100644 --- a/src/corelib/widgets/mobjectmenu.h +++ b/src/corelib/widgets/mobjectmenu.h @@ -114,7 +114,7 @@ class QGraphicsSceneContextMenuEvent; \sa MObjectMenuModel MObjectMenuStyle */ -class M_EXPORT MObjectMenu : public MSceneWindow +class M_CORE_EXPORT MObjectMenu : public MSceneWindow { Q_OBJECT Q_DISABLE_COPY(MObjectMenu) diff --git a/src/corelib/widgets/mobjectmenumodel.h b/src/corelib/widgets/mobjectmenumodel.h index 521a806d..088e5942 100644 --- a/src/corelib/widgets/mobjectmenumodel.h +++ b/src/corelib/widgets/mobjectmenumodel.h @@ -34,7 +34,7 @@ typedef QList<MAction *> MActionList; \sa MObjectMenu */ -class M_EXPORT MObjectMenuModel : public MSceneWindowModel +class M_CORE_EXPORT MObjectMenuModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MObjectMenuModel) diff --git a/src/corelib/widgets/moverlay.h b/src/corelib/widgets/moverlay.h index e1cb3faf..38ad2d7e 100644 --- a/src/corelib/widgets/moverlay.h +++ b/src/corelib/widgets/moverlay.h @@ -38,7 +38,7 @@ class MOverlayPrivate; * * \sa MApplicationPage */ -class M_EXPORT MOverlay : public MSceneWindow +class M_CORE_EXPORT MOverlay : public MSceneWindow { Q_OBJECT M_CONTROLLER(MSceneWindow) diff --git a/src/corelib/widgets/mpannableviewport.h b/src/corelib/widgets/mpannableviewport.h index d217cd45..2fdf04bf 100644 --- a/src/corelib/widgets/mpannableviewport.h +++ b/src/corelib/widgets/mpannableviewport.h @@ -69,7 +69,7 @@ class MPositionIndicator; * \sa MPannableWidget MPannableWidgetStyle * */ -class M_EXPORT MPannableViewport : public MPannableWidget +class M_CORE_EXPORT MPannableViewport : public MPannableWidget { Q_OBJECT M_CONTROLLER(MPannableViewport) diff --git a/src/corelib/widgets/mpannableviewportmodel.h b/src/corelib/widgets/mpannableviewportmodel.h index 8e35ae9b..13c1f7f8 100644 --- a/src/corelib/widgets/mpannableviewportmodel.h +++ b/src/corelib/widgets/mpannableviewportmodel.h @@ -22,7 +22,7 @@ #include <mpannablewidgetmodel.h> -class M_EXPORT MPannableViewportModel : public MPannableWidgetModel +class M_CORE_EXPORT MPannableViewportModel : public MPannableWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MPannableViewportModel) diff --git a/src/corelib/widgets/mpannablewidget.h b/src/corelib/widgets/mpannablewidget.h index 3f1f9433..22ec7e0c 100644 --- a/src/corelib/widgets/mpannablewidget.h +++ b/src/corelib/widgets/mpannablewidget.h @@ -52,7 +52,7 @@ class MOnDisplayChangeEvent; * * \sa MPhysics2DPanning, MPannableViewport */ -class M_EXPORT MPannableWidget : public MWidgetController +class M_CORE_EXPORT MPannableWidget : public MWidgetController { Q_OBJECT M_CONTROLLER(MPannableWidget) diff --git a/src/corelib/widgets/mpannablewidgetmodel.h b/src/corelib/widgets/mpannablewidgetmodel.h index fc7cb91f..a821c22b 100644 --- a/src/corelib/widgets/mpannablewidgetmodel.h +++ b/src/corelib/widgets/mpannablewidgetmodel.h @@ -22,7 +22,7 @@ #include <mwidgetmodel.h> -class M_EXPORT MPannableWidgetModel : public MWidgetModel +class M_CORE_EXPORT MPannableWidgetModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MPannableWidgetModel) diff --git a/src/corelib/widgets/mphysics2dpanning.h b/src/corelib/widgets/mphysics2dpanning.h index 65e4af3f..5f6116a1 100644 --- a/src/corelib/widgets/mphysics2dpanning.h +++ b/src/corelib/widgets/mphysics2dpanning.h @@ -53,7 +53,7 @@ class MPhysics2DPanningPrivate; * * By default, the kinetic action of the springs is enabled. */ -class M_EXPORT MPhysics2DPanning : public QObject +class M_CORE_EXPORT MPhysics2DPanning : public QObject { Q_OBJECT diff --git a/src/corelib/widgets/mpopuplist.h b/src/corelib/widgets/mpopuplist.h index 36ae4381..279f72d9 100644 --- a/src/corelib/widgets/mpopuplist.h +++ b/src/corelib/widgets/mpopuplist.h @@ -89,7 +89,7 @@ class QModelIndex; \sa MPopupListModel MPopupListStyle */ -class M_EXPORT MPopupList : public MDialog +class M_CORE_EXPORT MPopupList : public MDialog { Q_OBJECT diff --git a/src/corelib/widgets/mpopuplistmodel.h b/src/corelib/widgets/mpopuplistmodel.h index faa9a60d..414b7d41 100644 --- a/src/corelib/widgets/mpopuplistmodel.h +++ b/src/corelib/widgets/mpopuplistmodel.h @@ -33,7 +33,7 @@ class QAbstractItemModel; \sa MPopupListModel */ -class M_EXPORT MPopupListModel : public MDialogModel +class M_CORE_EXPORT MPopupListModel : public MDialogModel { Q_OBJECT M_MODEL_INTERNAL(MPopupListModel) diff --git a/src/corelib/widgets/mpositionindicator.h b/src/corelib/widgets/mpositionindicator.h index dca8b28f..8d093d7c 100644 --- a/src/corelib/widgets/mpositionindicator.h +++ b/src/corelib/widgets/mpositionindicator.h @@ -45,7 +45,7 @@ class MPositionIndicatorPrivate; */ -class M_EXPORT MPositionIndicator : public MWidgetController +class M_CORE_EXPORT MPositionIndicator : public MWidgetController { Q_OBJECT diff --git a/src/corelib/widgets/mpositionindicatormodel.h b/src/corelib/widgets/mpositionindicatormodel.h index 3f9cbe78..fd9abf4e 100644 --- a/src/corelib/widgets/mpositionindicatormodel.h +++ b/src/corelib/widgets/mpositionindicatormodel.h @@ -27,7 +27,7 @@ #include <QRectF> #include <QPointF> -class M_EXPORT MPositionIndicatorModel : public MWidgetModel +class M_CORE_EXPORT MPositionIndicatorModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MPositionIndicatorModel) diff --git a/src/corelib/widgets/mprogressindicator.h b/src/corelib/widgets/mprogressindicator.h index 8498c7f0..2d9679f9 100644 --- a/src/corelib/widgets/mprogressindicator.h +++ b/src/corelib/widgets/mprogressindicator.h @@ -78,7 +78,7 @@ class MProgressIndicatorPrivate; \sa MProgressIndicatorModel MProgressIndicatorStyle */ -class M_EXPORT MProgressIndicator : public MWidgetController +class M_CORE_EXPORT MProgressIndicator : public MWidgetController { Q_OBJECT M_CONTROLLER(MProgressIndicator) diff --git a/src/corelib/widgets/mprogressindicatormodel.h b/src/corelib/widgets/mprogressindicatormodel.h index afbe393e..4c6bd819 100644 --- a/src/corelib/widgets/mprogressindicatormodel.h +++ b/src/corelib/widgets/mprogressindicatormodel.h @@ -30,7 +30,7 @@ \sa MProgressIndicator */ -class M_EXPORT MProgressIndicatorModel : public MWidgetModel +class M_CORE_EXPORT MProgressIndicatorModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MProgressIndicatorModel) diff --git a/src/corelib/widgets/mrichtextedit.h b/src/corelib/widgets/mrichtextedit.h index 2d4506b0..4f37ebfa 100644 --- a/src/corelib/widgets/mrichtextedit.h +++ b/src/corelib/widgets/mrichtextedit.h @@ -25,7 +25,7 @@ class MRichTextEditPrivate; -class M_EXPORT MRichTextEdit : public MTextEdit +class M_CORE_EXPORT MRichTextEdit : public MTextEdit { Q_OBJECT diff --git a/src/corelib/widgets/mscenelayereffectmodel.h b/src/corelib/widgets/mscenelayereffectmodel.h index 81a7c92d..9abff371 100644 --- a/src/corelib/widgets/mscenelayereffectmodel.h +++ b/src/corelib/widgets/mscenelayereffectmodel.h @@ -22,7 +22,7 @@ #include <mscenewindowmodel.h> -class M_EXPORT MSceneLayerEffectModel : public MSceneWindowModel +class M_CORE_EXPORT MSceneLayerEffectModel : public MSceneWindowModel { Q_OBJECT M_MODEL_INTERNAL(MSceneLayerEffectModel) diff --git a/src/corelib/widgets/mscenewindow.h b/src/corelib/widgets/mscenewindow.h index 80789455..1cc5b4d4 100644 --- a/src/corelib/widgets/mscenewindow.h +++ b/src/corelib/widgets/mscenewindow.h @@ -83,7 +83,7 @@ class MSceneWindowPrivate; * * \sa MSceneManager */ -class M_EXPORT MSceneWindow : public MWidgetController +class M_CORE_EXPORT MSceneWindow : public MWidgetController { Q_OBJECT M_CONTROLLER(MSceneWindow) diff --git a/src/corelib/widgets/mscenewindowmodel.h b/src/corelib/widgets/mscenewindowmodel.h index 1321515d..1ef09389 100644 --- a/src/corelib/widgets/mscenewindowmodel.h +++ b/src/corelib/widgets/mscenewindowmodel.h @@ -22,7 +22,7 @@ #include <mwidgetmodel.h> -class M_EXPORT MSceneWindowModel : public MWidgetModel +class M_CORE_EXPORT MSceneWindowModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MSceneWindowModel) diff --git a/src/corelib/widgets/mseekbar.h b/src/corelib/widgets/mseekbar.h index eff6cba0..8e5c0381 100644 --- a/src/corelib/widgets/mseekbar.h +++ b/src/corelib/widgets/mseekbar.h @@ -50,7 +50,7 @@ \sa MSeekBarModel MSliderStyle */ -class M_EXPORT MSeekBar : public MSlider +class M_CORE_EXPORT MSeekBar : public MSlider { Q_OBJECT M_CONTROLLER(MSeekBar) diff --git a/src/corelib/widgets/mseekbarmodel.h b/src/corelib/widgets/mseekbarmodel.h index 080dd72c..0fe2bf31 100644 --- a/src/corelib/widgets/mseekbarmodel.h +++ b/src/corelib/widgets/mseekbarmodel.h @@ -29,7 +29,7 @@ \ingroup models \sa MSlider */ -class M_EXPORT MSeekBarModel : public MSliderModel +class M_CORE_EXPORT MSeekBarModel : public MSliderModel { Q_OBJECT M_MODEL_INTERNAL(MSeekBarModel) diff --git a/src/corelib/widgets/mseparator.h b/src/corelib/widgets/mseparator.h index 42630661..11c7af4c 100644 --- a/src/corelib/widgets/mseparator.h +++ b/src/corelib/widgets/mseparator.h @@ -30,7 +30,7 @@ class MSeparatorPrivate; * \class MSeparator * \brief MSeparator is a generic separator widget. */ -class M_EXPORT MSeparator : public MWidgetController +class M_CORE_EXPORT MSeparator : public MWidgetController { Q_OBJECT M_CONTROLLER(MSeparator) diff --git a/src/corelib/widgets/mseparatormodel.h b/src/corelib/widgets/mseparatormodel.h index 9f850b7f..5a5535f8 100644 --- a/src/corelib/widgets/mseparatormodel.h +++ b/src/corelib/widgets/mseparatormodel.h @@ -30,7 +30,7 @@ \sa MSeparator */ -class M_EXPORT MSeparatorModel : public MWidgetModel +class M_CORE_EXPORT MSeparatorModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MSeparatorModel) diff --git a/src/corelib/widgets/mslider.h b/src/corelib/widgets/mslider.h index 0ba87d83..67fa1958 100644 --- a/src/corelib/widgets/mslider.h +++ b/src/corelib/widgets/mslider.h @@ -65,7 +65,7 @@ class MSliderPrivate; \sa MSliderModel MSliderStyle */ -class M_EXPORT MSlider : public MWidgetController +class M_CORE_EXPORT MSlider : public MWidgetController { Q_OBJECT M_CONTROLLER(MSlider) diff --git a/src/corelib/widgets/mslidermodel.h b/src/corelib/widgets/mslidermodel.h index 530ade23..40e4fead 100644 --- a/src/corelib/widgets/mslidermodel.h +++ b/src/corelib/widgets/mslidermodel.h @@ -29,7 +29,7 @@ \ingroup models \sa MSlider */ -class M_EXPORT MSliderModel : public MWidgetModel +class M_CORE_EXPORT MSliderModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MSliderModel) diff --git a/src/corelib/widgets/msortfilterproxymodel.h b/src/corelib/widgets/msortfilterproxymodel.h index be2b512d..e809a103 100644 --- a/src/corelib/widgets/msortfilterproxymodel.h +++ b/src/corelib/widgets/msortfilterproxymodel.h @@ -29,7 +29,7 @@ In case of filtering does not filter out the group headers (oposite to default QSortFilterProxyModel behavior). */ -class M_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel +class M_CORE_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel { Q_OBJECT diff --git a/src/corelib/widgets/mstatusbar.h b/src/corelib/widgets/mstatusbar.h index d42cdcc5..4356aa92 100644 --- a/src/corelib/widgets/mstatusbar.h +++ b/src/corelib/widgets/mstatusbar.h @@ -34,7 +34,7 @@ class MStatusBarPrivate; * * MSceneManager does not accept more than one MStatusBar instance. */ -class M_EXPORT MStatusBar : public MSceneWindow +class M_CORE_EXPORT MStatusBar : public MSceneWindow { Q_OBJECT M_CONTROLLER(MSceneWindow) diff --git a/src/corelib/widgets/mstylablewidget.h b/src/corelib/widgets/mstylablewidget.h index 7853ed3d..fe3baa8d 100644 --- a/src/corelib/widgets/mstylablewidget.h +++ b/src/corelib/widgets/mstylablewidget.h @@ -90,7 +90,7 @@ \code #include <MWidgetStyle> - class M_EXPORT MyStyle : public MWidgetStyle + class M_CORE_EXPORT MyStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MyStyle) @@ -100,7 +100,7 @@ M_STYLE_ATTRIBUTE(QString, imageVertical, ImageVertical) }; - class M_EXPORT MyStyleContainer : public MWidgetStyleContainer + class M_CORE_EXPORT MyStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MyStyle) }; @@ -116,7 +116,7 @@ size() - QSizeF(style()->marginRight(),style()->marginBottom())); \endcode */ -class M_EXPORT MStylableWidget : public MWidgetController +class M_CORE_EXPORT MStylableWidget : public MWidgetController { Q_OBJECT diff --git a/src/corelib/widgets/mtextedit.h b/src/corelib/widgets/mtextedit.h index bfbc4c81..ce6df05e 100644 --- a/src/corelib/widgets/mtextedit.h +++ b/src/corelib/widgets/mtextedit.h @@ -55,7 +55,7 @@ class MCompleter; * MLabel instead. * */ -class M_EXPORT MTextEdit : public MWidgetController +class M_CORE_EXPORT MTextEdit : public MWidgetController { Q_OBJECT M_CONTROLLER(MTextEdit) diff --git a/src/corelib/widgets/mtexteditmodel.h b/src/corelib/widgets/mtexteditmodel.h index 2dd495b4..bb7982fd 100644 --- a/src/corelib/widgets/mtexteditmodel.h +++ b/src/corelib/widgets/mtexteditmodel.h @@ -25,7 +25,7 @@ #include <QTextDocument> #include "mnamespace.h" -class M_EXPORT MTextEditModel : public MWidgetModel +class M_CORE_EXPORT MTextEditModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MTextEditModel) diff --git a/src/corelib/widgets/mtoolbar.h b/src/corelib/widgets/mtoolbar.h index 1efa800e..0942e22e 100644 --- a/src/corelib/widgets/mtoolbar.h +++ b/src/corelib/widgets/mtoolbar.h @@ -113,7 +113,7 @@ class MToolBarPrivate; \sa MToolbarStyle */ -class M_EXPORT MToolBar : public MWidgetController +class M_CORE_EXPORT MToolBar : public MWidgetController { Q_OBJECT diff --git a/src/corelib/widgets/mviewcreator.h b/src/corelib/widgets/mviewcreator.h index 2fd73ed8..cde28498 100644 --- a/src/corelib/widgets/mviewcreator.h +++ b/src/corelib/widgets/mviewcreator.h @@ -37,7 +37,7 @@ class MWidgetController; // base class for MViewCreators // you can implement your own creator or use MViewCreator template class with // M_REGISTER_VIEW-macro. -class M_EXPORT MViewCreatorBase +class M_CORE_EXPORT MViewCreatorBase { public: MViewCreatorBase(const char *viewClassName); @@ -55,7 +55,7 @@ public: }; template<class VIEW, class CONTROLLER> -class M_EXPORT MViewCreator : public MViewCreatorBase +class MViewCreator : public MViewCreatorBase { public: MViewCreator(const char *viewClassName) : diff --git a/src/corelib/widgets/mwidgetmodel.h b/src/corelib/widgets/mwidgetmodel.h index 7a107587..a3ef809d 100644 --- a/src/corelib/widgets/mwidgetmodel.h +++ b/src/corelib/widgets/mwidgetmodel.h @@ -107,7 +107,7 @@ \brief MWidgetModel implements a base class for MVC */ -class M_EXPORT MWidgetModel : public QObject +class M_CORE_EXPORT MWidgetModel : public QObject { Q_OBJECT M_MODEL_WITH_PRIVATE(MWidgetModel) @@ -138,11 +138,11 @@ private: * increaseRefenceCount() and decreaseReferenceCount() */ void setParent ( QObject * parent ) {Q_UNUSED(parent);} - friend M_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetModel &model); - friend M_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &model); + friend M_CORE_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetModel &model); + friend M_CORE_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &model); }; -M_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetModel &model); -M_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &model); +M_CORE_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetModel &model); +M_CORE_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &model); #endif diff --git a/src/corelib/widgets/mwidgetrecycler.h b/src/corelib/widgets/mwidgetrecycler.h index edfa0a8f..0776d994 100644 --- a/src/corelib/widgets/mwidgetrecycler.h +++ b/src/corelib/widgets/mwidgetrecycler.h @@ -72,7 +72,7 @@ class MWidget; widgets in recycler check setMaxItemsPerClass(int). */ -class M_EXPORT MWidgetRecycler +class M_CORE_EXPORT MWidgetRecycler { public: static const char * RecycledObjectIdentifier; diff --git a/src/corelib/widgets/mwindow.h b/src/corelib/widgets/mwindow.h index 81bb4720..82cc357c 100644 --- a/src/corelib/widgets/mwindow.h +++ b/src/corelib/widgets/mwindow.h @@ -75,7 +75,7 @@ class MOnDisplayChangeEvent; app.exec(); \endcode */ -class M_EXPORT MWindow : public QGraphicsView +class M_CORE_EXPORT MWindow : public QGraphicsView { Q_OBJECT diff --git a/src/corelib/workspace/mdeviceprofile.h b/src/corelib/workspace/mdeviceprofile.h index fb749bdd..28ad35b5 100644 --- a/src/corelib/workspace/mdeviceprofile.h +++ b/src/corelib/workspace/mdeviceprofile.h @@ -30,7 +30,7 @@ class MDeviceProfilePrivate; /*! \brief The MDeviceProfile class holds physical and simulated properties of the target device */ -class M_EXPORT MDeviceProfile : public QObject +class M_CORE_EXPORT MDeviceProfile : public QObject { Q_OBJECT diff --git a/src/extensions/applicationextension/mapplicationextensionarea.h b/src/extensions/applicationextension/mapplicationextensionarea.h index d6b4bb21..b6f25f8a 100644 --- a/src/extensions/applicationextension/mapplicationextensionarea.h +++ b/src/extensions/applicationextension/mapplicationextensionarea.h @@ -36,7 +36,7 @@ class MApplicationExtensionInterface; * * \see \ref applicationextensions */ -class M_EXPORT MApplicationExtensionArea : public MExtensionArea +class M_EXTENSIONS_EXPORT MApplicationExtensionArea : public MExtensionArea { Q_OBJECT M_CONTROLLER(MApplicationExtensionArea) diff --git a/src/extensions/applicationextension/mapplicationextensionareamodel.h b/src/extensions/applicationextension/mapplicationextensionareamodel.h index 5fdb7443..b96adf1e 100644 --- a/src/extensions/applicationextension/mapplicationextensionareamodel.h +++ b/src/extensions/applicationextension/mapplicationextensionareamodel.h @@ -26,7 +26,7 @@ /*! * MApplicationExtensionAreaModel is the model class for MApplicationExtensionArea. */ -class M_EXPORT MApplicationExtensionAreaModel : public MExtensionAreaModel +class M_EXTENSIONS_EXPORT MApplicationExtensionAreaModel : public MExtensionAreaModel { Q_OBJECT M_MODEL_INTERNAL(MApplicationExtensionAreaModel) diff --git a/src/extensions/applicationextension/mapplicationextensionareaview.h b/src/extensions/applicationextension/mapplicationextensionareaview.h index 647d2278..e4ac6293 100644 --- a/src/extensions/applicationextension/mapplicationextensionareaview.h +++ b/src/extensions/applicationextension/mapplicationextensionareaview.h @@ -31,7 +31,7 @@ class MContainer; /*! * A view class for the MApplicationExtensionArea. */ -class M_EXPORT MApplicationExtensionAreaView : public MExtensionAreaView +class M_EXTENSIONS_EXPORT MApplicationExtensionAreaView : public MExtensionAreaView { Q_OBJECT M_VIEW(MApplicationExtensionAreaModel, MApplicationExtensionAreaStyle) diff --git a/src/extensions/applicationextension/mapplicationextensioninterface.h b/src/extensions/applicationextension/mapplicationextensioninterface.h index 7a4992e4..236a977c 100644 --- a/src/extensions/applicationextension/mapplicationextensioninterface.h +++ b/src/extensions/applicationextension/mapplicationextensioninterface.h @@ -42,7 +42,7 @@ class QGraphicsWidget; * * \see \ref applicationextensions */ -class M_EXPORT MApplicationExtensionInterface +class M_EXTENSIONS_EXPORT MApplicationExtensionInterface { public: /*! diff --git a/src/extensions/applicationextension/mapplicationextensionmetadata.h b/src/extensions/applicationextension/mapplicationextensionmetadata.h index f3651182..80d89ce5 100644 --- a/src/extensions/applicationextension/mapplicationextensionmetadata.h +++ b/src/extensions/applicationextension/mapplicationextensionmetadata.h @@ -47,7 +47,7 @@ * } * \endcode */ -class M_EXPORT MApplicationExtensionMetaData : public MDesktopEntry +class M_EXTENSIONS_EXPORT MApplicationExtensionMetaData : public MDesktopEntry { public: /*! diff --git a/src/extensions/applicationextension/mextensionarea.h b/src/extensions/applicationextension/mextensionarea.h index 73101be1..b0aa61b1 100644 --- a/src/extensions/applicationextension/mextensionarea.h +++ b/src/extensions/applicationextension/mextensionarea.h @@ -29,7 +29,7 @@ class MExtensionAreaPrivate; /*! * MExtensionArea is a baseclass for widgets that can load application extensions */ -class M_EXPORT MExtensionArea : public MWidgetController +class M_EXTENSIONS_EXPORT MExtensionArea : public MWidgetController { Q_OBJECT M_CONTROLLER(MExtensionArea) diff --git a/src/extensions/applicationextension/mextensionareamodel.h b/src/extensions/applicationextension/mextensionareamodel.h index 0e54ac0a..812aafc3 100644 --- a/src/extensions/applicationextension/mextensionareamodel.h +++ b/src/extensions/applicationextension/mextensionareamodel.h @@ -29,7 +29,7 @@ typedef QMap<QGraphicsWidget *, MDataStore *> DataStoreMap; /*! * MExtensionAreaModel is the model class for MExtensionArea. */ -class M_EXPORT MExtensionAreaModel : public MWidgetModel +class M_EXTENSIONS_EXPORT MExtensionAreaModel : public MWidgetModel { Q_OBJECT M_MODEL_INTERNAL(MExtensionAreaModel) diff --git a/src/extensions/applicationextension/mextensionareaview.h b/src/extensions/applicationextension/mextensionareaview.h index 131c9e82..68c48861 100644 --- a/src/extensions/applicationextension/mextensionareaview.h +++ b/src/extensions/applicationextension/mextensionareaview.h @@ -30,7 +30,7 @@ class MExtensionArea; /*! * A view class for the MExtensionArea. */ -class M_EXPORT MExtensionAreaView : public MWidgetView +class M_EXTENSIONS_EXPORT MExtensionAreaView : public MWidgetView { Q_OBJECT M_VIEW(MExtensionAreaModel, MExtensionAreaStyle) diff --git a/src/extensions/applicationextension/mextensionrunner.h b/src/extensions/applicationextension/mextensionrunner.h index 2f21da89..bf7dac21 100644 --- a/src/extensions/applicationextension/mextensionrunner.h +++ b/src/extensions/applicationextension/mextensionrunner.h @@ -52,7 +52,7 @@ class QGLContext; * ------------- * This file is not part of the libmeegotouch API. It should only be used by applet runner developers. */ -class M_EXPORT MExtensionRunner : public QObject +class M_EXTENSIONS_EXPORT MExtensionRunner : public QObject { Q_OBJECT diff --git a/src/extensions/mashup/appletcommunication/mappletalivemessagerequest.h b/src/extensions/mashup/appletcommunication/mappletalivemessagerequest.h index cbf5145f..0e6146a7 100644 --- a/src/extensions/mashup/appletcommunication/mappletalivemessagerequest.h +++ b/src/extensions/mashup/appletcommunication/mappletalivemessagerequest.h @@ -25,7 +25,7 @@ /*! * Applet alive message. */ -class M_EXPORT MAppletAliveMessageRequest : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletAliveMessageRequest : public MAppletMessage { public: /*! diff --git a/src/extensions/mashup/appletcommunication/mappletalivemessageresponse.h b/src/extensions/mashup/appletcommunication/mappletalivemessageresponse.h index d904f87e..dbe8e860 100644 --- a/src/extensions/mashup/appletcommunication/mappletalivemessageresponse.h +++ b/src/extensions/mashup/appletcommunication/mappletalivemessageresponse.h @@ -25,7 +25,7 @@ /*! * Applet alive message. */ -class M_EXPORT MAppletAliveMessageResponse : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletAliveMessageResponse : public MAppletMessage { public: /*! diff --git a/src/extensions/mashup/appletcommunication/mappletcancelmessage.h b/src/extensions/mashup/appletcommunication/mappletcancelmessage.h index 3195fc42..f051a953 100644 --- a/src/extensions/mashup/appletcommunication/mappletcancelmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletcancelmessage.h @@ -26,7 +26,7 @@ * Cancel message sent to the applet when the previously * sent mouse press message needs to be cancelled. */ -class M_EXPORT MAppletCancelMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletCancelMessage : public MAppletMessage { public: diff --git a/src/extensions/mashup/appletcommunication/mappletclient.h b/src/extensions/mashup/appletcommunication/mappletclient.h index cf7405c5..7fe73250 100644 --- a/src/extensions/mashup/appletcommunication/mappletclient.h +++ b/src/extensions/mashup/appletcommunication/mappletclient.h @@ -28,7 +28,7 @@ * The MAppletClient implements a client for interprocess communication * between two processes (a host application and an applet). */ -class M_EXPORT MAppletClient : public MAppletCommunicator +class M_EXTENSIONS_EXPORT MAppletClient : public MAppletCommunicator { Q_OBJECT diff --git a/src/extensions/mashup/appletcommunication/mappletcommunicator.h b/src/extensions/mashup/appletcommunication/mappletcommunicator.h index 63341d9e..8229d4bd 100644 --- a/src/extensions/mashup/appletcommunication/mappletcommunicator.h +++ b/src/extensions/mashup/appletcommunication/mappletcommunicator.h @@ -31,7 +31,7 @@ class QDataStream; * The MAppletCommunicator is a base class for implementing interprocess * communication between two processes (a host application and an applet). */ -class M_EXPORT MAppletCommunicator : public QObject +class M_EXTENSIONS_EXPORT MAppletCommunicator : public QObject { Q_OBJECT diff --git a/src/extensions/mashup/appletcommunication/mappleticonchangedmessage.h b/src/extensions/mashup/appletcommunication/mappleticonchangedmessage.h index 484a92d7..d7649c9e 100644 --- a/src/extensions/mashup/appletcommunication/mappleticonchangedmessage.h +++ b/src/extensions/mashup/appletcommunication/mappleticonchangedmessage.h @@ -26,7 +26,7 @@ /*! * Applet icon changed message. */ -class M_EXPORT MAppletIconChangedMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletIconChangedMessage : public MAppletMessage { private: QString _icon; diff --git a/src/extensions/mashup/appletcommunication/mappletmessage.h b/src/extensions/mashup/appletcommunication/mappletmessage.h index d4f364ac..4b87c9fb 100644 --- a/src/extensions/mashup/appletcommunication/mappletmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletmessage.h @@ -29,7 +29,7 @@ * applets and the host process. Messages can be serialized to a byte stream * so they can be communicated to another processes. */ -class M_EXPORT MAppletMessage +class M_EXTENSIONS_EXPORT MAppletMessage { public: /*! diff --git a/src/extensions/mashup/appletcommunication/mappletmessagefactory.h b/src/extensions/mashup/appletcommunication/mappletmessagefactory.h index b39cc74f..77fcda27 100644 --- a/src/extensions/mashup/appletcommunication/mappletmessagefactory.h +++ b/src/extensions/mashup/appletcommunication/mappletmessagefactory.h @@ -36,7 +36,7 @@ * factory. Actually you can't even create instances of it since the constructor is * hidden. */ -class M_EXPORT MAppletMessageFactory +class M_EXTENSIONS_EXPORT MAppletMessageFactory { private: /// Hidden constructor to prevent instantiating. diff --git a/src/extensions/mashup/appletcommunication/mappletmousemessage.h b/src/extensions/mashup/appletcommunication/mappletmousemessage.h index d6d1ca8b..cfc99024 100644 --- a/src/extensions/mashup/appletcommunication/mappletmousemessage.h +++ b/src/extensions/mashup/appletcommunication/mappletmousemessage.h @@ -29,7 +29,7 @@ * * A mouse event contains the position of the mouse pointer when the event occurred. */ -class M_EXPORT MAppletMouseMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletMouseMessage : public MAppletMessage { private: /// Location of the mouse pointer in the event. diff --git a/src/extensions/mashup/appletcommunication/mappletobjectmenuactionselectedmessage.h b/src/extensions/mashup/appletcommunication/mappletobjectmenuactionselectedmessage.h index c17f6b75..9fcd2e47 100644 --- a/src/extensions/mashup/appletcommunication/mappletobjectmenuactionselectedmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletobjectmenuactionselectedmessage.h @@ -26,7 +26,7 @@ /*! * Send Response to applet with index of action selected from context menu actions displayed in host process */ -class M_EXPORT MAppletObjectMenuActionSelectedMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletObjectMenuActionSelectedMessage : public MAppletMessage { private: diff --git a/src/extensions/mashup/appletcommunication/mappletobjectmenumessage.h b/src/extensions/mashup/appletcommunication/mappletobjectmenumessage.h index 32e61c61..ab3b8552 100644 --- a/src/extensions/mashup/appletcommunication/mappletobjectmenumessage.h +++ b/src/extensions/mashup/appletcommunication/mappletobjectmenumessage.h @@ -28,7 +28,7 @@ class QAction; /*! * Object menu message which provides list of actions from applet. */ -class M_EXPORT MAppletObjectMenuMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletObjectMenuMessage : public MAppletMessage { private: /// The list of action names. diff --git a/src/extensions/mashup/appletcommunication/mappletobjectmenurequestmessage.h b/src/extensions/mashup/appletcommunication/mappletobjectmenurequestmessage.h index 9ac1e11e..eeb52079 100644 --- a/src/extensions/mashup/appletcommunication/mappletobjectmenurequestmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletobjectmenurequestmessage.h @@ -26,7 +26,7 @@ /*! * Send Request to applet runner for a context menu. */ -class M_EXPORT MAppletObjectMenuRequestMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletObjectMenuRequestMessage : public MAppletMessage { private: /// position where the event occured diff --git a/src/extensions/mashup/appletcommunication/mappletorientationmessage.h b/src/extensions/mashup/appletcommunication/mappletorientationmessage.h index 0d633e75..70a43d21 100644 --- a/src/extensions/mashup/appletcommunication/mappletorientationmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletorientationmessage.h @@ -26,7 +26,7 @@ /*! * Screen orientation change applet message. */ -class M_EXPORT MAppletOrientationMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletOrientationMessage : public MAppletMessage { private: /// The new orientation. diff --git a/src/extensions/mashup/appletcommunication/mappletpixmapmodifiedmessage.h b/src/extensions/mashup/appletcommunication/mappletpixmapmodifiedmessage.h index cee141e0..76b7d357 100644 --- a/src/extensions/mashup/appletcommunication/mappletpixmapmodifiedmessage.h +++ b/src/extensions/mashup/appletcommunication/mappletpixmapmodifiedmessage.h @@ -27,7 +27,7 @@ /*! * An applet message for notifying the host that a part of the applet pixmap has been modified. */ -class M_EXPORT MAppletPixmapModifiedMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletPixmapModifiedMessage : public MAppletMessage { private: //! The geometry of the modified region. diff --git a/src/extensions/mashup/appletcommunication/mappletpixmaptakenintousemessage.h b/src/extensions/mashup/appletcommunication/mappletpixmaptakenintousemessage.h index 44d561ad..5c26d502 100644 --- a/src/extensions/mashup/appletcommunication/mappletpixmaptakenintousemessage.h +++ b/src/extensions/mashup/appletcommunication/mappletpixmaptakenintousemessage.h @@ -25,7 +25,7 @@ /*! * An applet message for notifying that the pixmap has been taken into use. */ -class M_EXPORT MAppletPixmapTakenIntoUseMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletPixmapTakenIntoUseMessage : public MAppletMessage { private: //! The X pixmap handle. diff --git a/src/extensions/mashup/appletcommunication/mappletserver.h b/src/extensions/mashup/appletcommunication/mappletserver.h index c697aab4..6ebac30b 100644 --- a/src/extensions/mashup/appletcommunication/mappletserver.h +++ b/src/extensions/mashup/appletcommunication/mappletserver.h @@ -29,7 +29,7 @@ class QLocalServer; * The MAppletServer implements a server for interprocess communication * between two processes (a host application and an applet). */ -class M_EXPORT MAppletServer : public MAppletCommunicator +class M_EXTENSIONS_EXPORT MAppletServer : public MAppletCommunicator { Q_OBJECT diff --git a/src/extensions/mashup/appletcommunication/mappletsetgeometrymessage.h b/src/extensions/mashup/appletcommunication/mappletsetgeometrymessage.h index afad1ed0..d55061b0 100644 --- a/src/extensions/mashup/appletcommunication/mappletsetgeometrymessage.h +++ b/src/extensions/mashup/appletcommunication/mappletsetgeometrymessage.h @@ -27,7 +27,7 @@ /*! * An applet message for setting the geometry of a \c QGraphicsLayoutItem. */ -class M_EXPORT MAppletSetGeometryMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletSetGeometryMessage : public MAppletMessage { private: //! The geometry property of the message. diff --git a/src/extensions/mashup/appletcommunication/mapplettextchangedmessage.h b/src/extensions/mashup/appletcommunication/mapplettextchangedmessage.h index 4aa961aa..4c646790 100644 --- a/src/extensions/mashup/appletcommunication/mapplettextchangedmessage.h +++ b/src/extensions/mashup/appletcommunication/mapplettextchangedmessage.h @@ -26,7 +26,7 @@ /*! * Applet text changed message. */ -class M_EXPORT MAppletTextChangedMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletTextChangedMessage : public MAppletMessage { private: QString _text; diff --git a/src/extensions/mashup/appletcommunication/mapplettitlechangedmessage.h b/src/extensions/mashup/appletcommunication/mapplettitlechangedmessage.h index 246a5fce..e094d31a 100644 --- a/src/extensions/mashup/appletcommunication/mapplettitlechangedmessage.h +++ b/src/extensions/mashup/appletcommunication/mapplettitlechangedmessage.h @@ -26,7 +26,7 @@ /*! * Applet title changed message. */ -class M_EXPORT MAppletTitleChangedMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletTitleChangedMessage : public MAppletMessage { private: QString _title; diff --git a/src/extensions/mashup/appletcommunication/mappletupdategeometrymessage.h b/src/extensions/mashup/appletcommunication/mappletupdategeometrymessage.h index b6cf389e..3a016b68 100644 --- a/src/extensions/mashup/appletcommunication/mappletupdategeometrymessage.h +++ b/src/extensions/mashup/appletcommunication/mappletupdategeometrymessage.h @@ -27,7 +27,7 @@ /*! * Update geometry message. */ -class M_EXPORT MAppletUpdateGeometryMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletUpdateGeometryMessage : public MAppletMessage { private: // Size hints diff --git a/src/extensions/mashup/appletcommunication/mappletvisibilitymessage.h b/src/extensions/mashup/appletcommunication/mappletvisibilitymessage.h index f22b7079..c03eb078 100644 --- a/src/extensions/mashup/appletcommunication/mappletvisibilitymessage.h +++ b/src/extensions/mashup/appletcommunication/mappletvisibilitymessage.h @@ -25,7 +25,7 @@ /*! * An applet message for telling an applet when it gets visible/invisible. */ -class M_EXPORT MAppletVisibilityMessage : public MAppletMessage +class M_EXTENSIONS_EXPORT MAppletVisibilityMessage : public MAppletMessage { private: //! Visible or invisible diff --git a/src/extensions/mashup/appletinstallation/mappletinstallationsourceinterface.h b/src/extensions/mashup/appletinstallation/mappletinstallationsourceinterface.h index 316dde85..01b50efa 100644 --- a/src/extensions/mashup/appletinstallation/mappletinstallationsourceinterface.h +++ b/src/extensions/mashup/appletinstallation/mappletinstallationsourceinterface.h @@ -51,7 +51,7 @@ virtual void instantiateAppletsInPackage(const QString &packageName) = 0; * * \see \ref appletinstallationsource */ -class M_EXPORT MAppletInstallationSourceInterface : public MApplicationExtensionInterface +class M_EXTENSIONS_EXPORT MAppletInstallationSourceInterface : public MApplicationExtensionInterface { Q_INTERFACES(MApplicationExtensionInterface) diff --git a/src/extensions/mashup/appletinterface/mappletinterface.h b/src/extensions/mashup/appletinterface/mappletinterface.h index fc4c086a..5e794e75 100644 --- a/src/extensions/mashup/appletinterface/mappletinterface.h +++ b/src/extensions/mashup/appletinterface/mappletinterface.h @@ -39,7 +39,7 @@ class MDataAccess; * * \see \ref appletdevelopment */ -class M_EXPORT MAppletInterface +class M_EXTENSIONS_EXPORT MAppletInterface { public: /*! diff --git a/src/extensions/mashup/appletinterface/mappletmetadata.h b/src/extensions/mashup/appletinterface/mappletmetadata.h index 8cf31d89..d9ff0c1f 100644 --- a/src/extensions/mashup/appletinterface/mappletmetadata.h +++ b/src/extensions/mashup/appletinterface/mappletmetadata.h @@ -49,7 +49,7 @@ * * \see \ref appletdevelopment */ -class M_EXPORT MAppletMetaData : public MDesktopEntry +class M_EXTENSIONS_EXPORT MAppletMetaData : public MDesktopEntry { public: /*! diff --git a/src/extensions/mashup/mashup/maggregatedataaccess.h b/src/extensions/mashup/mashup/maggregatedataaccess.h index 4d5591ca..03af6bf0 100644 --- a/src/extensions/mashup/mashup/maggregatedataaccess.h +++ b/src/extensions/mashup/mashup/maggregatedataaccess.h @@ -50,7 +50,7 @@ class MAggregateDataAccessPrivate; * exist whenever MAggregateDataAccess exists. For instance, MAggregateDataAccess object has to be destroyed before associated primary and secondary * data access objects are destroyed. */ -class M_EXPORT MAggregateDataAccess : public MDataAccess +class M_EXTENSIONS_EXPORT MAggregateDataAccess : public MDataAccess { Q_OBJECT diff --git a/src/extensions/mashup/mashup/mappletloader.h b/src/extensions/mashup/mashup/mappletloader.h index 4519b260..ba3a8f4e 100644 --- a/src/extensions/mashup/mashup/mappletloader.h +++ b/src/extensions/mashup/mashup/mappletloader.h @@ -31,7 +31,7 @@ class MDataAccess; /*! * \brief A class that loads MeeGo Touch applets. */ -class M_EXPORT MAppletLoader +class M_EXTENSIONS_EXPORT MAppletLoader { public: /*! diff --git a/src/extensions/mashup/mashup/mappletsettings.h b/src/extensions/mashup/mashup/mappletsettings.h index 060fc746..6e54c02f 100644 --- a/src/extensions/mashup/mashup/mappletsettings.h +++ b/src/extensions/mashup/mashup/mappletsettings.h @@ -34,7 +34,7 @@ class MAppletSettingsPrivate; * This class handles parsing of the applet instance and global settings files * and creation of settings binaries. */ -class M_EXPORT MAppletSettings +class M_EXTENSIONS_EXPORT MAppletSettings { public: /*! diff --git a/src/extensions/mashup/mashup/mappletsettingsdialog.h b/src/extensions/mashup/mashup/mappletsettingsdialog.h index c30a8370..46486cf8 100644 --- a/src/extensions/mashup/mashup/mappletsettingsdialog.h +++ b/src/extensions/mashup/mashup/mappletsettingsdialog.h @@ -28,7 +28,7 @@ * \brief MAppletSettingsDialog implements the applet settings dialog. * A dialog is constructed if an applet has any settings to show. */ -class M_EXPORT MAppletSettingsDialog +class M_EXTENSIONS_EXPORT MAppletSettingsDialog { public: /*! diff --git a/src/extensions/mashup/mashup/mappletsharedmutex.h b/src/extensions/mashup/mashup/mappletsharedmutex.h index 18ae6adc..469b0080 100644 --- a/src/extensions/mashup/mashup/mappletsharedmutex.h +++ b/src/extensions/mashup/mashup/mappletsharedmutex.h @@ -31,7 +31,7 @@ class MAppletSharedMutexPrivate; * segment is attached. Destroying the mutex will detach from the shared * memory so that when all parties have detached the segment will be freed. */ -class M_EXPORT MAppletSharedMutex +class M_EXTENSIONS_EXPORT MAppletSharedMutex { Q_DECLARE_PRIVATE(MAppletSharedMutex) diff --git a/src/extensions/mashup/mashup/mgconfdatastore.h b/src/extensions/mashup/mashup/mgconfdatastore.h index ad7e5761..c0006ff7 100644 --- a/src/extensions/mashup/mashup/mgconfdatastore.h +++ b/src/extensions/mashup/mashup/mgconfdatastore.h @@ -41,7 +41,7 @@ class MGConfDataStorePrivate; * \endcode * */ -class M_EXPORT MGConfDataStore : public MDataStore +class M_EXTENSIONS_EXPORT MGConfDataStore : public MDataStore { Q_OBJECT diff --git a/src/extensions/mashup/mashup/mmashupcanvas.h b/src/extensions/mashup/mashup/mmashupcanvas.h index 9649ac9f..a537e5a5 100644 --- a/src/extensions/mashup/mashup/mmashupcanvas.h +++ b/src/extensions/mashup/mashup/mmashupcanvas.h @@ -87,7 +87,7 @@ class MMashupCanvasPrivate; * * \see \ref appletdevelopment */ -class M_EXPORT MMashupCanvas : public MExtensionArea +class M_EXTENSIONS_EXPORT MMashupCanvas : public MExtensionArea { Q_OBJECT M_CONTROLLER(MMashupCanvas) diff --git a/src/extensions/mashup/mashup/mmashupcanvasmodel.h b/src/extensions/mashup/mashup/mmashupcanvasmodel.h index f8588756..0f64160c 100644 --- a/src/extensions/mashup/mashup/mmashupcanvasmodel.h +++ b/src/extensions/mashup/mashup/mmashupcanvasmodel.h @@ -29,7 +29,7 @@ class MDataStore; /*! * MMashupCanvasModel is the model class for MMashupCanvas. */ -class M_EXPORT MMashupCanvasModel : public MExtensionAreaModel +class M_EXTENSIONS_EXPORT MMashupCanvasModel : public MExtensionAreaModel { Q_OBJECT M_MODEL_INTERNAL(MMashupCanvasModel) diff --git a/src/extensions/mashup/mashup/mmashupcanvasview.h b/src/extensions/mashup/mashup/mmashupcanvasview.h index d2d511c8..ea0520dd 100644 --- a/src/extensions/mashup/mashup/mmashupcanvasview.h +++ b/src/extensions/mashup/mashup/mmashupcanvasview.h @@ -32,7 +32,7 @@ class MContainer; /*! * A view class for the MMashupCanvas. */ -class M_EXPORT MMashupCanvasView : public MExtensionAreaView +class M_EXTENSIONS_EXPORT MMashupCanvasView : public MExtensionAreaView { Q_OBJECT M_VIEW(MMashupCanvasModel, MMashupCanvasStyle) diff --git a/src/extensions/mashup/mashup/msubdatastore.h b/src/extensions/mashup/mashup/msubdatastore.h index 1f8e4004..63216f94 100644 --- a/src/extensions/mashup/mashup/msubdatastore.h +++ b/src/extensions/mashup/mashup/msubdatastore.h @@ -31,7 +31,7 @@ * The prefix or namespace as well as the underlying DataStore object are given at * construction time and they can't be changed after that. */ -class M_EXPORT MSubDataStore : public MDataStore +class M_EXTENSIONS_EXPORT MSubDataStore : public MDataStore { Q_OBJECT diff --git a/src/extensions/mextensionwatcher.h b/src/extensions/mextensionwatcher.h index bc0a227e..d8b10e72 100644 --- a/src/extensions/mextensionwatcher.h +++ b/src/extensions/mextensionwatcher.h @@ -23,6 +23,7 @@ #include <QFileSystemWatcher> #include <QHash> #include <QSharedPointer> +#include "mexport.h" class MDesktopEntry; @@ -38,7 +39,7 @@ class MDesktopEntry; * notification leads to undefined behaviour, because the target item of the * notification will not exist. */ -class MExtensionWatcher : public QObject +class M_EXTENSIONS_EXPORT MExtensionWatcher : public QObject { Q_OBJECT diff --git a/src/extensions/style/mapplicationextensionareastyle.h b/src/extensions/style/mapplicationextensionareastyle.h index 12974005..23b42f8f 100644 --- a/src/extensions/style/mapplicationextensionareastyle.h +++ b/src/extensions/style/mapplicationextensionareastyle.h @@ -25,7 +25,7 @@ /*! * MApplicationExtensionAreaStyle is the style class for MApplicationExtensionArea. */ -class M_EXPORT MApplicationExtensionAreaStyle : public MExtensionAreaStyle +class M_EXTENSIONS_EXPORT MApplicationExtensionAreaStyle : public MExtensionAreaStyle { Q_OBJECT M_STYLE(MApplicationExtensionAreaStyle) @@ -37,7 +37,7 @@ class M_EXPORT MApplicationExtensionAreaStyle : public MExtensionAreaStyle /*! * MApplicationExtensionAreaStyleContainer is the style container class for MApplicationExtensionArea. */ -class M_EXPORT MApplicationExtensionAreaStyleContainer : public MExtensionAreaStyleContainer +class M_EXTENSIONS_EXPORT MApplicationExtensionAreaStyleContainer : public MExtensionAreaStyleContainer { M_STYLE_CONTAINER(MApplicationExtensionAreaStyle) }; diff --git a/src/extensions/style/mextensionareastyle.h b/src/extensions/style/mextensionareastyle.h index cacd50cd..c43c8a1d 100644 --- a/src/extensions/style/mextensionareastyle.h +++ b/src/extensions/style/mextensionareastyle.h @@ -25,7 +25,7 @@ /*! * MExtensionAreaStyle is the style class for MExtensionArea. */ -class M_EXPORT MExtensionAreaStyle : public MWidgetStyle +class M_EXTENSIONS_EXPORT MExtensionAreaStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MExtensionAreaStyle) @@ -37,7 +37,7 @@ class M_EXPORT MExtensionAreaStyle : public MWidgetStyle /*! * MExtensionAreaStyleContainer is the style container class for MExtensionArea. */ -class M_EXPORT MExtensionAreaStyleContainer : public MWidgetStyleContainer +class M_EXTENSIONS_EXPORT MExtensionAreaStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MExtensionAreaStyle) }; diff --git a/src/extensions/style/mmashupcanvasstyle.h b/src/extensions/style/mmashupcanvasstyle.h index 24dddc5c..7a570237 100644 --- a/src/extensions/style/mmashupcanvasstyle.h +++ b/src/extensions/style/mmashupcanvasstyle.h @@ -25,7 +25,7 @@ /*! * MMashupCanvasStyle is the style class for MMashupCanvas. */ -class M_EXPORT MMashupCanvasStyle : public MWidgetStyle +class M_EXTENSIONS_EXPORT MMashupCanvasStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MMashupCanvasStyle) @@ -37,7 +37,7 @@ class M_EXPORT MMashupCanvasStyle : public MWidgetStyle /*! * MMashupCanvasStyleContainer is the style container class for MMashupCanvas. */ -class M_EXPORT MMashupCanvasStyleContainer : public MWidgetStyleContainer +class M_EXTENSIONS_EXPORT MMashupCanvasStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MMashupCanvasStyle) }; diff --git a/src/settings/settingslanguage/msettingslanguagebinary.h b/src/settings/settingslanguage/msettingslanguagebinary.h index d4f4ca55..5cf84584 100644 --- a/src/settings/settingslanguage/msettingslanguagebinary.h +++ b/src/settings/settingslanguage/msettingslanguagebinary.h @@ -30,7 +30,7 @@ * This is the central access point class for the settings binary * interface. */ -class M_EXPORT MSettingsLanguageBinary : public MSettingsLanguageSettings +class M_SETTINGS_EXPORT MSettingsLanguageBinary : public MSettingsLanguageSettings { public: /*! diff --git a/src/settings/settingslanguage/msettingslanguageparser.h b/src/settings/settingslanguage/msettingslanguageparser.h index da661efc..850e3f1b 100644 --- a/src/settings/settingslanguage/msettingslanguageparser.h +++ b/src/settings/settingslanguage/msettingslanguageparser.h @@ -34,7 +34,7 @@ class MSettingsLanguageParserPrivate; * This class can be used to read in a settings language description * and transfer it into a binary representation. */ -class M_EXPORT MSettingsLanguageParser +class M_SETTINGS_EXPORT MSettingsLanguageParser { public: /*! diff --git a/src/settings/settingslanguage/msettingslanguagesettingsfactorystyle.h b/src/settings/settingslanguage/msettingslanguagesettingsfactorystyle.h index fdc095f5..52a26754 100644 --- a/src/settings/settingslanguage/msettingslanguagesettingsfactorystyle.h +++ b/src/settings/settingslanguage/msettingslanguagesettingsfactorystyle.h @@ -25,7 +25,7 @@ /*! * MSettingsLanguageSettingsFactoryStyle is the style class for MSettingsLanguageSettingFactory. */ -class M_EXPORT MSettingsLanguageSettingsFactoryStyle : public MWidgetStyle +class M_SETTINGS_EXPORT MSettingsLanguageSettingsFactoryStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MSettingsLanguageSettingsFactoryStyle) @@ -56,7 +56,7 @@ class M_EXPORT MSettingsLanguageSettingsFactoryStyle : public MWidgetStyle /*! * MSettingsLanguageSettingsFactoryStyleContainer is the style container class for MSettingsLanguageSettingFactory. */ -class M_EXPORT MSettingsLanguageSettingsFactoryStyleContainer : public MWidgetStyleContainer +class M_SETTINGS_EXPORT MSettingsLanguageSettingsFactoryStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MSettingsLanguageSettingsFactoryStyle) }; diff --git a/src/settings/settingslanguage/msettingslanguagewidget.h b/src/settings/settingslanguage/msettingslanguagewidget.h index 4e7646d0..2051e613 100644 --- a/src/settings/settingslanguage/msettingslanguagewidget.h +++ b/src/settings/settingslanguage/msettingslanguagewidget.h @@ -28,7 +28,7 @@ typedef MWidgetModel MSettingsLanguageWidgetModel; /*! * MSettingsLanguageWidget is a UI component that represents a MSettingsLanguageBinary node. */ -class M_EXPORT MSettingsLanguageWidget : public MWidgetController +class M_SETTINGS_EXPORT MSettingsLanguageWidget : public MWidgetController { Q_OBJECT M_CONTROLLER(MSettingsLanguageWidget) diff --git a/src/settings/settingslanguage/msettingslanguagewidgetfactory.h b/src/settings/settingslanguage/msettingslanguagewidgetfactory.h index 200d910c..1f3faa76 100644 --- a/src/settings/settingslanguage/msettingslanguagewidgetfactory.h +++ b/src/settings/settingslanguage/msettingslanguagewidgetfactory.h @@ -31,7 +31,7 @@ class MDataStore; /*! * A factory for translating settings binaries to widgets. */ -class M_EXPORT MSettingsLanguageWidgetFactory +class M_SETTINGS_EXPORT MSettingsLanguageWidgetFactory { /*! * Private constructor to prevent construction. diff --git a/src/views/mapplicationmenuview.h b/src/views/mapplicationmenuview.h index d9d4f073..f51cb955 100644 --- a/src/views/mapplicationmenuview.h +++ b/src/views/mapplicationmenuview.h @@ -76,7 +76,7 @@ class MApplicationMenuViewPrivate; */ -class M_EXPORT MApplicationMenuView : public MSceneWindowView +class M_VIEWS_EXPORT MApplicationMenuView : public MSceneWindowView { Q_OBJECT M_VIEW(MApplicationMenuModel, MApplicationMenuStyle) diff --git a/src/views/mapplicationpageview.h b/src/views/mapplicationpageview.h index 535688f5..3b7458cb 100644 --- a/src/views/mapplicationpageview.h +++ b/src/views/mapplicationpageview.h @@ -27,7 +27,7 @@ class MApplicationPage; class MApplicationPageViewPrivate; -class M_EXPORT MApplicationPageView : public MSceneWindowView +class M_VIEWS_EXPORT MApplicationPageView : public MSceneWindowView { Q_OBJECT M_VIEW(MApplicationPageModel, MApplicationPageStyle) diff --git a/src/views/mbannerview.h b/src/views/mbannerview.h index f27c32c6..4fe5ef5c 100644 --- a/src/views/mbannerview.h +++ b/src/views/mbannerview.h @@ -27,7 +27,7 @@ class MBanner; class MBannerViewPrivate; -class M_EXPORT MBannerView : public MSceneWindowView +class M_VIEWS_EXPORT MBannerView : public MSceneWindowView { Q_OBJECT M_VIEW(MBannerModel, MBannerStyle) diff --git a/src/views/mbubbleitemview.h b/src/views/mbubbleitemview.h index 192f9bb2..b0f7e2ef 100644 --- a/src/views/mbubbleitemview.h +++ b/src/views/mbubbleitemview.h @@ -41,7 +41,7 @@ class MBubbleItemViewPrivate; \image html bubble-item.png */ -class M_EXPORT MBubbleItemView : public MWidgetView +class M_VIEWS_EXPORT MBubbleItemView : public MWidgetView { Q_OBJECT M_VIEW(MBubbleItemModel, MBubbleItemStyle) diff --git a/src/views/mbuttoniconview.h b/src/views/mbuttoniconview.h index 144d2068..cb08ce7f 100644 --- a/src/views/mbuttoniconview.h +++ b/src/views/mbuttoniconview.h @@ -66,7 +66,7 @@ class MButton; \sa MButton MButtonView MButtonIconStyle */ -class M_EXPORT MButtonIconView : public MButtonView +class M_VIEWS_EXPORT MButtonIconView : public MButtonView { Q_OBJECT M_VIEW(MButtonModel, MButtonIconStyle) diff --git a/src/views/mbuttonswitchview.h b/src/views/mbuttonswitchview.h index d20a6a2e..e0426495 100644 --- a/src/views/mbuttonswitchview.h +++ b/src/views/mbuttonswitchview.h @@ -81,7 +81,7 @@ class MButton; \sa MButton MButtonView MButtonSwitchStyle */ -class M_EXPORT MButtonSwitchView : public MButtonView +class M_VIEWS_EXPORT MButtonSwitchView : public MButtonView { Q_OBJECT M_VIEW(MButtonModel, MButtonSwitchStyle) diff --git a/src/views/mbuttonview.h b/src/views/mbuttonview.h index 69c106ee..2cc5a531 100644 --- a/src/views/mbuttonview.h +++ b/src/views/mbuttonview.h @@ -102,7 +102,7 @@ class QGraphicsSceneResizeEvent; \sa MButton MButtonView MButtonStyle */ -class M_EXPORT MButtonView : public MWidgetView +class M_VIEWS_EXPORT MButtonView : public MWidgetView { Q_OBJECT M_VIEW(MButtonModel, MButtonStyle) diff --git a/src/views/mcheckboxview.h b/src/views/mcheckboxview.h index 23170304..30032905 100644 --- a/src/views/mcheckboxview.h +++ b/src/views/mcheckboxview.h @@ -66,7 +66,7 @@ class MCheckboxViewPrivate; \sa MButton MButtonView MCheckboxStyle */ -class M_EXPORT MCheckboxView : public MButtonView +class M_VIEWS_EXPORT MCheckboxView : public MButtonView { Q_OBJECT M_VIEW(MButtonModel, MCheckboxStyle) diff --git a/src/views/mcomboboxview.h b/src/views/mcomboboxview.h index 0c00d6a7..9dd20e6e 100644 --- a/src/views/mcomboboxview.h +++ b/src/views/mcomboboxview.h @@ -38,7 +38,7 @@ class MComboBoxViewPrivate; \sa MComboBox MComboBoxStyle */ -class M_EXPORT MComboBoxView : public MWidgetView +class M_VIEWS_EXPORT MComboBoxView : public MWidgetView { Q_OBJECT M_VIEW(MComboBoxModel, MComboBoxStyle) diff --git a/src/views/mcompleterview.h b/src/views/mcompleterview.h index 1ca32e37..29f0a818 100644 --- a/src/views/mcompleterview.h +++ b/src/views/mcompleterview.h @@ -27,7 +27,7 @@ class MCompleter; class MCompleterViewPrivate; -class M_EXPORT MCompleterView : public MSceneWindowView +class M_VIEWS_EXPORT MCompleterView : public MSceneWindowView { Q_OBJECT M_VIEW(MCompleterModel, MCompleterStyle) diff --git a/src/views/mcontainerview.h b/src/views/mcontainerview.h index edf878b2..2f11daf3 100644 --- a/src/views/mcontainerview.h +++ b/src/views/mcontainerview.h @@ -45,7 +45,7 @@ class MContainer; * * \sa MContainer, MContainerModel */ -class M_EXPORT MContainerView : public MWidgetView +class M_VIEWS_EXPORT MContainerView : public MWidgetView { Q_OBJECT M_VIEW(MContainerModel, MContainerStyle) diff --git a/src/views/mcontentitemview.h b/src/views/mcontentitemview.h index da8ceae9..82493cd0 100644 --- a/src/views/mcontentitemview.h +++ b/src/views/mcontentitemview.h @@ -45,7 +45,7 @@ class MContentItemViewPrivate; \image html content-item-modes.png */ -class M_EXPORT MContentItemView : public MWidgetView +class M_VIEWS_EXPORT MContentItemView : public MWidgetView { Q_OBJECT M_VIEW(MContentItemModel, MContentItemStyle) diff --git a/src/views/mdialogview.h b/src/views/mdialogview.h index 4b4fb672..016a03c6 100644 --- a/src/views/mdialogview.h +++ b/src/views/mdialogview.h @@ -82,7 +82,7 @@ class QGraphicsLinearLayout; \sa MDialog, MDialogStyle */ -class M_EXPORT MDialogView : public MSceneWindowView +class M_VIEWS_EXPORT MDialogView : public MSceneWindowView { Q_OBJECT M_VIEW(MDialogModel, MDialogStyle) diff --git a/src/views/mescapebuttonpanelview.h b/src/views/mescapebuttonpanelview.h index 3054342f..e659724f 100644 --- a/src/views/mescapebuttonpanelview.h +++ b/src/views/mescapebuttonpanelview.h @@ -33,7 +33,7 @@ class MEscapeButtonPanel; * * It just draws an escape button on an otherwise empty scene window. */ -class M_EXPORT MEscapeButtonPanelView : public MSceneWindowView +class M_VIEWS_EXPORT MEscapeButtonPanelView : public MSceneWindowView { Q_OBJECT M_VIEW(MEscapeButtonPanelModel, MEscapeButtonPanelStyle) diff --git a/src/views/mextendingbackgroundview.h b/src/views/mextendingbackgroundview.h index 730a179b..db8d7391 100644 --- a/src/views/mextendingbackgroundview.h +++ b/src/views/mextendingbackgroundview.h @@ -30,7 +30,7 @@ class MExtendingBackgroundViewPrivate; * The extending background view draws a background that can extend beyond * the edges of the bounding rectangle. */ -class M_EXPORT MExtendingBackgroundView : public MWidgetView +class M_VIEWS_EXPORT MExtendingBackgroundView : public MWidgetView { Q_OBJECT M_VIEW(MWidgetModel, MExtendingBackgroundStyle) diff --git a/src/views/mgriditemview.h b/src/views/mgriditemview.h index 2fb8b16e..4b0f8e5c 100644 --- a/src/views/mgriditemview.h +++ b/src/views/mgriditemview.h @@ -39,7 +39,7 @@ class MGridItemViewPrivate; \deprecated */ -class M_EXPORT MGridItemView : public MWidgetView +class M_VIEWS_EXPORT MGridItemView : public MWidgetView { Q_OBJECT M_VIEW(MGridItemModel, MGridItemStyle) diff --git a/src/views/mhomebuttonpanelview.h b/src/views/mhomebuttonpanelview.h index ae28983a..96a3ff1f 100644 --- a/src/views/mhomebuttonpanelview.h +++ b/src/views/mhomebuttonpanelview.h @@ -32,7 +32,7 @@ class MHomeButtonPanelViewPrivate; * * It just draws a home button on an otherwise empty scene window. */ -class M_EXPORT MHomeButtonPanelView : public MSceneWindowView +class M_VIEWS_EXPORT MHomeButtonPanelView : public MSceneWindowView { Q_OBJECT M_VIEW(MSceneWindowModel, MHomeButtonPanelStyle) diff --git a/src/views/mimagewidgetview.h b/src/views/mimagewidgetview.h index ad722544..7e816019 100644 --- a/src/views/mimagewidgetview.h +++ b/src/views/mimagewidgetview.h @@ -47,7 +47,7 @@ class MImageWidget; */ -class M_EXPORT MImageWidgetView : public MWidgetView +class M_VIEWS_EXPORT MImageWidgetView : public MWidgetView { Q_OBJECT M_VIEW(MImageWidgetModel, MImageWidgetStyle) diff --git a/src/views/minfobannereventview.h b/src/views/minfobannereventview.h index ca76f891..c65f4480 100644 --- a/src/views/minfobannereventview.h +++ b/src/views/minfobannereventview.h @@ -80,7 +80,7 @@ class MInfoBannerEventViewPrivate; \sa MNotification */ -class M_EXPORT MInfoBannerEventView : public MSceneWindowView +class M_VIEWS_EXPORT MInfoBannerEventView : public MSceneWindowView { Q_OBJECT M_VIEW(MInfoBannerModel, MInfoBannerStyle) diff --git a/src/views/minfobannerinformationview.h b/src/views/minfobannerinformationview.h index b2a65a5b..aaf6cf4e 100644 --- a/src/views/minfobannerinformationview.h +++ b/src/views/minfobannerinformationview.h @@ -112,7 +112,7 @@ class MInfoBannerInformationViewPrivate; \sa MNotification */ -class M_EXPORT MInfoBannerInformationView : public MSceneWindowView +class M_VIEWS_EXPORT MInfoBannerInformationView : public MSceneWindowView { Q_OBJECT M_VIEW(MInfoBannerModel, MInfoBannerStyle) diff --git a/src/views/mlabelview.h b/src/views/mlabelview.h index f18aa227..99bc76c1 100644 --- a/src/views/mlabelview.h +++ b/src/views/mlabelview.h @@ -70,7 +70,7 @@ class MCancelEvent; \sa MLabelStyle MWidgetView */ -class M_EXPORT MLabelView : public MWidgetView +class M_VIEWS_EXPORT MLabelView : public MWidgetView { //FIXME //Temporary remove this when proper longPressEvents are coming to view. diff --git a/src/views/mlistitemview.h b/src/views/mlistitemview.h index 5718b20c..00a3e60a 100644 --- a/src/views/mlistitemview.h +++ b/src/views/mlistitemview.h @@ -27,7 +27,7 @@ class MListItemViewPrivate; -class M_EXPORT MListItemView : public MWidgetView +class M_VIEWS_EXPORT MListItemView : public MWidgetView { Q_OBJECT M_VIEW(MListItemModel, MListItemStyle) diff --git a/src/views/mlistview.h b/src/views/mlistview.h index 1b4b81bc..1d681f9f 100644 --- a/src/views/mlistview.h +++ b/src/views/mlistview.h @@ -34,7 +34,7 @@ class MPlainMultiColumnListViewPrivate; class MGroupHeaderListViewPrivate; class MMultiColumnListViewPrivate; -class M_EXPORT MListView : public MWidgetView +class M_VIEWS_EXPORT MListView : public MWidgetView { Q_OBJECT M_VIEW(MListModel, MListStyle) diff --git a/src/views/mmenuobjectview.h b/src/views/mmenuobjectview.h index 5c38f858..d9eaeb40 100644 --- a/src/views/mmenuobjectview.h +++ b/src/views/mmenuobjectview.h @@ -33,7 +33,7 @@ class MMenuObjectViewPrivate; * \brief MMenuObjectView implements an object view for the MMenu widget */ -class M_EXPORT MMenuObjectView : public MSceneWindowView +class M_VIEWS_EXPORT MMenuObjectView : public MSceneWindowView { Q_OBJECT M_VIEW(MApplicationMenuModel, MApplicationMenuStyle) diff --git a/src/views/mmessageboxview.h b/src/views/mmessageboxview.h index 6b681b1c..3a0f96aa 100644 --- a/src/views/mmessageboxview.h +++ b/src/views/mmessageboxview.h @@ -27,7 +27,7 @@ class MMessageBox; class MMessageBoxViewPrivate; -class M_EXPORT MMessageBoxView : public MDialogView +class M_VIEWS_EXPORT MMessageBoxView : public MDialogView { Q_OBJECT M_VIEW(MMessageBoxModel, MMessageBoxStyle) diff --git a/src/views/mmodalscenewindowview.h b/src/views/mmodalscenewindowview.h index 6b8acee0..2f43864b 100644 --- a/src/views/mmodalscenewindowview.h +++ b/src/views/mmodalscenewindowview.h @@ -27,7 +27,7 @@ class MModalSceneWindow; class MModalSceneWindowViewPrivate; -class M_EXPORT MModalSceneWindowView : public MSceneWindowView +class M_VIEWS_EXPORT MModalSceneWindowView : public MSceneWindowView { Q_OBJECT M_VIEW(MModalSceneWindowModel, MModalSceneWindowStyle) diff --git a/src/views/mnavigationbarview.h b/src/views/mnavigationbarview.h index 40c1a113..c22f8568 100644 --- a/src/views/mnavigationbarview.h +++ b/src/views/mnavigationbarview.h @@ -27,7 +27,7 @@ class MNavigationBarViewPrivate; class MNavigationBar; -class M_EXPORT MNavigationBarView : public MSceneWindowView +class M_VIEWS_EXPORT MNavigationBarView : public MSceneWindowView { Q_OBJECT M_VIEW(MNavigationBarModel, MNavigationBarStyle) diff --git a/src/views/mobjectmenuview.h b/src/views/mobjectmenuview.h index 520d8384..c7d74155 100644 --- a/src/views/mobjectmenuview.h +++ b/src/views/mobjectmenuview.h @@ -34,7 +34,7 @@ class MObjectMenuViewPrivate; * \brief MObjectMenuView implements an object view "frogfoot" for the MApplicationMenu widget */ -class M_EXPORT MObjectMenuView : public MSceneWindowView +class M_VIEWS_EXPORT MObjectMenuView : public MSceneWindowView { Q_OBJECT Q_DISABLE_COPY(MObjectMenuView) diff --git a/src/views/moverlayview.h b/src/views/moverlayview.h index af1bc1d0..29d3e486 100644 --- a/src/views/moverlayview.h +++ b/src/views/moverlayview.h @@ -25,7 +25,7 @@ class MOverlay; -class M_EXPORT MOverlayView : public MSceneWindowView +class M_VIEWS_EXPORT MOverlayView : public MSceneWindowView { Q_OBJECT M_VIEW(MSceneWindowModel, MOverlayStyle) diff --git a/src/views/mpannablewidgetview.h b/src/views/mpannablewidgetview.h index 2bb3ef9e..790baa5f 100644 --- a/src/views/mpannablewidgetview.h +++ b/src/views/mpannablewidgetview.h @@ -31,7 +31,7 @@ class MPannableWidget; * \class MPannableWidgetView * \brief MPannableWidgetView implements the view for pannable widget */ -class M_EXPORT MPannableWidgetView : public MWidgetView +class M_VIEWS_EXPORT MPannableWidgetView : public MWidgetView { Q_OBJECT M_VIEW(MPannableWidgetModel, MPannableWidgetStyle) diff --git a/src/views/mpopuplistview.h b/src/views/mpopuplistview.h index be60c829..35f78606 100644 --- a/src/views/mpopuplistview.h +++ b/src/views/mpopuplistview.h @@ -40,7 +40,7 @@ class QAbstractItemModel; MPopupListView is used to visualize popupList. */ -class M_EXPORT MPopupListView : public MDialogView +class M_VIEWS_EXPORT MPopupListView : public MDialogView { Q_OBJECT M_VIEW(MPopupListModel, MPopupListStyle) diff --git a/src/views/mpositionindicatorview.h b/src/views/mpositionindicatorview.h index 350434f0..f5a9bf02 100644 --- a/src/views/mpositionindicatorview.h +++ b/src/views/mpositionindicatorview.h @@ -41,7 +41,7 @@ class MPositionIndicatorViewPrivate; */ -class M_EXPORT MPositionIndicatorView : public MWidgetView +class M_VIEWS_EXPORT MPositionIndicatorView : public MWidgetView { Q_OBJECT M_VIEW(MPositionIndicatorModel, MPositionIndicatorStyle) diff --git a/src/views/mprogressindicatorbarview.h b/src/views/mprogressindicatorbarview.h index 1526b820..2dd9ff82 100644 --- a/src/views/mprogressindicatorbarview.h +++ b/src/views/mprogressindicatorbarview.h @@ -64,7 +64,7 @@ class QGraphicsSceneResizeEvent; \sa MProgressIndicator MProgressIndicatorModel MProgressIndicatorStyle */ -class M_EXPORT MProgressIndicatorBarView : public MWidgetView +class M_VIEWS_EXPORT MProgressIndicatorBarView : public MWidgetView { Q_OBJECT M_VIEW(MProgressIndicatorModel, MProgressIndicatorStyle) diff --git a/src/views/mscenewindowview.h b/src/views/mscenewindowview.h index e154a218..b53efd6e 100644 --- a/src/views/mscenewindowview.h +++ b/src/views/mscenewindowview.h @@ -39,7 +39,7 @@ class MSceneWindowViewPrivate; * signal, which is propagated to the MSceneManager instance, * causing the window geometry and position to be recalculated. */ -class M_EXPORT MSceneWindowView : public MWidgetView +class M_VIEWS_EXPORT MSceneWindowView : public MWidgetView { Q_OBJECT M_VIEW(MSceneWindowModel, MSceneWindowStyle) diff --git a/src/views/mseparatorview.h b/src/views/mseparatorview.h index 14dc752f..cc100e9d 100644 --- a/src/views/mseparatorview.h +++ b/src/views/mseparatorview.h @@ -32,7 +32,7 @@ class MSeparator; \brief MSeparatorView implements a view for the MSeparator */ -class M_EXPORT MSeparatorView : public MWidgetView +class M_VIEWS_EXPORT MSeparatorView : public MWidgetView { Q_OBJECT M_VIEW(MSeparatorModel, MSeparatorStyle) diff --git a/src/views/msliderview.h b/src/views/msliderview.h index 953b2b12..2759dd46 100644 --- a/src/views/msliderview.h +++ b/src/views/msliderview.h @@ -55,7 +55,7 @@ class MSlider; \sa MSliderStyle MWidgetView */ -class M_EXPORT MSliderView : public MWidgetView +class M_VIEWS_EXPORT MSliderView : public MWidgetView { Q_OBJECT M_VIEW(MSliderModel, MSliderStyle) diff --git a/src/views/mspinnerview.h b/src/views/mspinnerview.h index 97572f33..1b4aecd2 100644 --- a/src/views/mspinnerview.h +++ b/src/views/mspinnerview.h @@ -59,7 +59,7 @@ class QTimerEvent; \sa MProgressIndicator MProgressIndicatorModel MSpinnerStyle */ -class M_EXPORT MSpinnerView : public MWidgetView +class M_VIEWS_EXPORT MSpinnerView : public MWidgetView { Q_OBJECT M_VIEW(MProgressIndicatorModel, MSpinnerStyle) diff --git a/src/views/mtexteditview.h b/src/views/mtexteditview.h index 88cc1578..0feec8c7 100644 --- a/src/views/mtexteditview.h +++ b/src/views/mtexteditview.h @@ -32,7 +32,7 @@ class MTextEditViewPrivate; * \class MTextEditView * \brief Standard view for MTextEdit widget */ -class M_EXPORT MTextEditView : public MWidgetView +class M_VIEWS_EXPORT MTextEditView : public MWidgetView { Q_OBJECT M_VIEW(MTextEditModel, MTextEditStyle) diff --git a/src/views/mtoolbartabview.h b/src/views/mtoolbartabview.h index 3e3e4608..cb6e8611 100644 --- a/src/views/mtoolbartabview.h +++ b/src/views/mtoolbartabview.h @@ -52,7 +52,7 @@ class MToolbarTabViewPrivate; \sa MToolBar MToolbarTabStyle */ -class M_EXPORT MToolbarTabView : public MToolBarView +class M_VIEWS_EXPORT MToolbarTabView : public MToolBarView { Q_OBJECT M_VIEW(MWidgetModel, MToolbarTabStyle) diff --git a/src/views/mtoolbarview.h b/src/views/mtoolbarview.h index a64cd5ef..b86fd4b6 100644 --- a/src/views/mtoolbarview.h +++ b/src/views/mtoolbarview.h @@ -54,7 +54,7 @@ class MToolBarViewPrivate; \sa MToolBar MToolbarStyle */ -class M_EXPORT MToolBarView : public MWidgetView +class M_VIEWS_EXPORT MToolBarView : public MWidgetView { Q_OBJECT M_VIEW(MWidgetModel, MToolbarStyle) diff --git a/src/views/style/mapplicationmenubuttonstyle.h b/src/views/style/mapplicationmenubuttonstyle.h index e9691541..730ac926 100644 --- a/src/views/style/mapplicationmenubuttonstyle.h +++ b/src/views/style/mapplicationmenubuttonstyle.h @@ -36,7 +36,7 @@ \ingroup styles \sa MApplicationMenuButtonStyleContainer MButtonStyle \ref styling MApplicationMenuButton MApplicationMenuButtonView */ -class M_EXPORT MApplicationMenuButtonStyle : public MButtonStyle +class M_VIEWS_EXPORT MApplicationMenuButtonStyle : public MButtonStyle { Q_OBJECT M_STYLE_INTERNAL(MApplicationMenuButtonStyle) @@ -61,7 +61,7 @@ class M_EXPORT MApplicationMenuButtonStyle : public MButtonStyle \ingroup styles \sa MApplicationMenuButtonStyle */ -class M_EXPORT MApplicationMenuButtonStyleContainer : public MButtonStyleContainer +class M_VIEWS_EXPORT MApplicationMenuButtonStyleContainer : public MButtonStyleContainer { M_STYLE_CONTAINER_INTERNAL(MApplicationMenuButtonStyle) }; diff --git a/src/views/style/mapplicationmenustyle.h b/src/views/style/mapplicationmenustyle.h index 93109b60..4afbd7d5 100644 --- a/src/views/style/mapplicationmenustyle.h +++ b/src/views/style/mapplicationmenustyle.h @@ -52,7 +52,7 @@ class MScalableImage; \sa MApplicationMenuStyleContainer MSceneWindowStyle \ref styling MApplicationMenu MApplicationMenuView */ -class M_EXPORT MApplicationMenuStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MApplicationMenuStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MApplicationMenuStyle) @@ -137,7 +137,7 @@ class M_EXPORT MApplicationMenuStyle : public MSceneWindowStyle \ingroup styles \sa MApplicationMenuStyle */ -class M_EXPORT MApplicationMenuStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MApplicationMenuStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MApplicationMenuStyle) }; diff --git a/src/views/style/mapplicationpagestyle.h b/src/views/style/mapplicationpagestyle.h index 88391650..544210b4 100644 --- a/src/views/style/mapplicationpagestyle.h +++ b/src/views/style/mapplicationpagestyle.h @@ -23,7 +23,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MApplicationPageStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MApplicationPageStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MApplicationPageStyle) @@ -35,7 +35,7 @@ class M_EXPORT MApplicationPageStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(bool, hasTitleLabel, HasTitleLabel) }; -class M_EXPORT MApplicationPageStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MApplicationPageStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MApplicationPageStyle) }; diff --git a/src/views/style/mbannerstyle.h b/src/views/style/mbannerstyle.h index 3fbb67c6..52f5710f 100644 --- a/src/views/style/mbannerstyle.h +++ b/src/views/style/mbannerstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MBannerStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MBannerStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE(MBannerStyle) @@ -31,7 +31,7 @@ class M_EXPORT MBannerStyle : public MSceneWindowStyle }; -class M_EXPORT MBannerStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER(MBannerStyle) }; diff --git a/src/views/style/mbubbleitembackgroundstyle.h b/src/views/style/mbubbleitembackgroundstyle.h index f0264e7d..d47217fd 100644 --- a/src/views/style/mbubbleitembackgroundstyle.h +++ b/src/views/style/mbubbleitembackgroundstyle.h @@ -26,7 +26,7 @@ * \internal */ -class M_EXPORT MBubbleItemBackgroundStyle : public MWidgetStyle +class M_VIEWS_EXPORT MBubbleItemBackgroundStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MBubbleItemBackgroundStyle) @@ -34,7 +34,7 @@ class M_EXPORT MBubbleItemBackgroundStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, mirroredObjectName, MirroredObjectName) }; -class M_EXPORT MBubbleItemBackgroundStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MBubbleItemBackgroundStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MBubbleItemBackgroundStyle) diff --git a/src/views/style/mbubbleitemstyle.h b/src/views/style/mbubbleitemstyle.h index 7bdcd205..fa0ccea6 100644 --- a/src/views/style/mbubbleitemstyle.h +++ b/src/views/style/mbubbleitemstyle.h @@ -26,7 +26,7 @@ * \internal */ -class M_EXPORT MBubbleItemStyle : public MWidgetStyle +class M_VIEWS_EXPORT MBubbleItemStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MBubbleItemStyle) @@ -41,7 +41,7 @@ class M_EXPORT MBubbleItemStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, bubbleObjectName, BubbleObjectName) }; -class M_EXPORT MBubbleItemStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MBubbleItemStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MBubbleItemStyle) diff --git a/src/views/style/mbuttoniconstyle.h b/src/views/style/mbuttoniconstyle.h index 183cc1ce..7d3a0985 100644 --- a/src/views/style/mbuttoniconstyle.h +++ b/src/views/style/mbuttoniconstyle.h @@ -41,7 +41,7 @@ \ingroup styles \sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MButton MButtonIconView */ -class M_EXPORT MButtonIconStyle : public MButtonStyle +class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle { Q_OBJECT M_STYLE_INTERNAL(MButtonIconStyle) @@ -86,7 +86,7 @@ class M_EXPORT MButtonIconStyle : public MButtonStyle \ingroup styles \sa MButtonIconStyle */ -class M_EXPORT MButtonIconStyleContainer : public MButtonStyleContainer +class M_VIEWS_EXPORT MButtonIconStyleContainer : public MButtonStyleContainer { M_STYLE_CONTAINER_INTERNAL(MButtonIconStyle) }; diff --git a/src/views/style/mbuttonstyle.h b/src/views/style/mbuttonstyle.h index f494dbdb..341c7dbe 100644 --- a/src/views/style/mbuttonstyle.h +++ b/src/views/style/mbuttonstyle.h @@ -53,7 +53,7 @@ \ingroup styles \sa MButtonStyleContainer MWidgetStyle \ref styling MButton MButtonView */ -class M_EXPORT MButtonStyle : public MWidgetStyle +class M_VIEWS_EXPORT MButtonStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MButtonStyle) @@ -163,7 +163,7 @@ class M_EXPORT MButtonStyle : public MWidgetStyle \ingroup styles \sa MButtonStyle */ -class M_EXPORT MButtonStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MButtonStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MButtonStyle) diff --git a/src/views/style/mbuttonswitchstyle.h b/src/views/style/mbuttonswitchstyle.h index 91cbf1f8..6f555fec 100644 --- a/src/views/style/mbuttonswitchstyle.h +++ b/src/views/style/mbuttonswitchstyle.h @@ -43,7 +43,7 @@ \ingroup styles \sa MButtonSwitchStyleContainer MWidgetStyle MButtonStyle \ref styling MButton MButtonSwitchView */ -class M_EXPORT MButtonSwitchStyle : public MButtonStyle +class M_VIEWS_EXPORT MButtonSwitchStyle : public MButtonStyle { Q_OBJECT M_STYLE_INTERNAL(MButtonSwitchStyle) @@ -106,7 +106,7 @@ class M_EXPORT MButtonSwitchStyle : public MButtonStyle \ingroup styles \sa MButtonSwitchStyle */ -class M_EXPORT MButtonSwitchStyleContainer : public MButtonStyleContainer +class M_VIEWS_EXPORT MButtonSwitchStyleContainer : public MButtonStyleContainer { M_STYLE_CONTAINER_INTERNAL(MButtonSwitchStyle) }; diff --git a/src/views/style/mcheckboxstyle.h b/src/views/style/mcheckboxstyle.h index be59e799..f0f32224 100644 --- a/src/views/style/mcheckboxstyle.h +++ b/src/views/style/mcheckboxstyle.h @@ -36,7 +36,7 @@ \ingroup styles \sa MCheckboxStyleContainer MWidgetStyle MButtonStyle \ref styling MButton MCheckboxView */ -class M_EXPORT MCheckboxStyle : public MButtonStyle +class M_VIEWS_EXPORT MCheckboxStyle : public MButtonStyle { Q_OBJECT M_STYLE_INTERNAL(MCheckboxStyle) @@ -79,7 +79,7 @@ class M_EXPORT MCheckboxStyle : public MButtonStyle \ingroup styles \sa MCheckboxStyle */ -class M_EXPORT MCheckboxStyleContainer : public MButtonStyleContainer +class M_VIEWS_EXPORT MCheckboxStyleContainer : public MButtonStyleContainer { M_STYLE_CONTAINER_INTERNAL(MCheckboxStyle) }; diff --git a/src/views/style/mcomboboxstyle.h b/src/views/style/mcomboboxstyle.h index c37c121e..7f6d7022 100644 --- a/src/views/style/mcomboboxstyle.h +++ b/src/views/style/mcomboboxstyle.h @@ -29,7 +29,7 @@ \ingroup styles \sa MComboBoxStyleContainer MWidgetStyle \ref styling MComboBox MComboBoxView */ -class M_EXPORT MComboBoxStyle : public MWidgetStyle +class M_VIEWS_EXPORT MComboBoxStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MComboBoxStyle) @@ -100,7 +100,7 @@ class M_EXPORT MComboBoxStyle : public MWidgetStyle \ingroup styles \sa MComboBoxStyle */ -class M_EXPORT MComboBoxStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MComboBoxStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MComboBoxStyle) diff --git a/src/views/style/mcompleterstyle.h b/src/views/style/mcompleterstyle.h index c155ab9c..a4387efd 100644 --- a/src/views/style/mcompleterstyle.h +++ b/src/views/style/mcompleterstyle.h @@ -24,7 +24,7 @@ #include <QFont> #include <mscenewindowstyle.h> -class M_EXPORT MCompleterStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MCompleterStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MCompleterStyle) @@ -38,7 +38,7 @@ class M_EXPORT MCompleterStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(int, yPositionOffset, YPositionOffset) }; -class M_EXPORT MCompleterStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MCompleterStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MCompleterStyle) }; diff --git a/src/views/style/mcontainerheaderstyle.h b/src/views/style/mcontainerheaderstyle.h index 9840acba..597edef3 100644 --- a/src/views/style/mcontainerheaderstyle.h +++ b/src/views/style/mcontainerheaderstyle.h @@ -28,13 +28,13 @@ * \internal */ -class M_EXPORT MContainerHeaderStyle : public MWidgetStyle +class M_VIEWS_EXPORT MContainerHeaderStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MContainerHeaderStyle) }; -class M_EXPORT MContainerHeaderStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MContainerHeaderStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MContainerHeaderStyle) M_STYLE_MODE(Pressed) diff --git a/src/views/style/mcontainerstyle.h b/src/views/style/mcontainerstyle.h index 036f7818..07a00f98 100644 --- a/src/views/style/mcontainerstyle.h +++ b/src/views/style/mcontainerstyle.h @@ -24,7 +24,7 @@ #include <QSize> -class M_EXPORT MContainerStyle : public MWidgetStyle +class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MContainerStyle) @@ -34,7 +34,7 @@ class M_EXPORT MContainerStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing) }; -class M_EXPORT MContainerStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MContainerStyle) }; diff --git a/src/views/style/mcontentitemstyle.h b/src/views/style/mcontentitemstyle.h index 68dda4b9..f68a03de 100644 --- a/src/views/style/mcontentitemstyle.h +++ b/src/views/style/mcontentitemstyle.h @@ -22,7 +22,7 @@ #include <mwidgetstyle.h> -class M_EXPORT MContentItemStyle : public MWidgetStyle +class M_VIEWS_EXPORT MContentItemStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MContentItemStyle) @@ -52,7 +52,7 @@ class M_EXPORT MContentItemStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, optionalImageObjectName, OptionalImageObjectName) }; -class M_EXPORT MContentItemStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MContentItemStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MContentItemStyle) }; diff --git a/src/views/style/mdevicestyle.h b/src/views/style/mdevicestyle.h index ba5dbe7b..48007197 100644 --- a/src/views/style/mdevicestyle.h +++ b/src/views/style/mdevicestyle.h @@ -25,7 +25,7 @@ #include <QObject> #include <QSize> -class M_EXPORT MDeviceStyle : public MStyle +class M_VIEWS_EXPORT MDeviceStyle : public MStyle { Q_OBJECT M_STYLE(MDeviceStyle) @@ -34,7 +34,7 @@ class M_EXPORT MDeviceStyle : public MStyle M_STYLE_ATTRIBUTE(QSize, pixelsPerInch, PixelsPerInch) }; -class M_EXPORT MDeviceStyleContainer : public MStyleContainer +class M_VIEWS_EXPORT MDeviceStyleContainer : public MStyleContainer { M_STYLE_CONTAINER(MDeviceStyle) }; diff --git a/src/views/style/mdialogstyle.h b/src/views/style/mdialogstyle.h index 02ab5b9f..bd9e3bc1 100644 --- a/src/views/style/mdialogstyle.h +++ b/src/views/style/mdialogstyle.h @@ -54,7 +54,7 @@ \ingroup styles \sa MWidgetStyle MDialog MDialogView */ -class M_EXPORT MDialogStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MDialogStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MDialogStyle) @@ -191,7 +191,7 @@ class M_EXPORT MDialogStyle : public MSceneWindowStyle \ingroup styles \sa MDialogStyle */ -class M_EXPORT MDialogStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MDialogStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MDialogStyle) }; diff --git a/src/views/style/mdockwidgetstyle.h b/src/views/style/mdockwidgetstyle.h index 60bcc1e5..f1ec59a9 100644 --- a/src/views/style/mdockwidgetstyle.h +++ b/src/views/style/mdockwidgetstyle.h @@ -23,13 +23,13 @@ #include <mscenewindowstyle.h> //! \internal -class M_EXPORT MDockWidgetStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MDockWidgetStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MDockWidgetStyle) }; -class M_EXPORT MDockWidgetStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MDockWidgetStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MDockWidgetStyle) }; diff --git a/src/views/style/mescapebuttonpanelstyle.h b/src/views/style/mescapebuttonpanelstyle.h index 1633e3df..3ea9b72e 100644 --- a/src/views/style/mescapebuttonpanelstyle.h +++ b/src/views/style/mescapebuttonpanelstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MEscapeButtonPanelStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MEscapeButtonPanelStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MEscapeButtonPanelStyle) @@ -35,7 +35,7 @@ class M_EXPORT MEscapeButtonPanelStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(QString, closeButtonIconId, CloseButtonIconId) }; -class M_EXPORT MEscapeButtonPanelStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MEscapeButtonPanelStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MEscapeButtonPanelStyle) M_STYLE_MODE(Fullscreen) diff --git a/src/views/style/mextendingbackgroundstyle.h b/src/views/style/mextendingbackgroundstyle.h index 7fdf0a72..0559c472 100644 --- a/src/views/style/mextendingbackgroundstyle.h +++ b/src/views/style/mextendingbackgroundstyle.h @@ -25,7 +25,7 @@ /*! * Style class for MExtendingBackgroundView */ -class M_EXPORT MExtendingBackgroundStyle : public MWidgetStyle +class M_VIEWS_EXPORT MExtendingBackgroundStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MExtendingBackgroundStyle) @@ -34,7 +34,7 @@ class M_EXPORT MExtendingBackgroundStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, extendDirection, ExtendDirection) }; -class M_EXPORT MExtendingBackgroundStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MExtendingBackgroundStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MExtendingBackgroundStyle) }; diff --git a/src/views/style/mgriditemstyle.h b/src/views/style/mgriditemstyle.h index 45aed0e4..3dd9ac4e 100644 --- a/src/views/style/mgriditemstyle.h +++ b/src/views/style/mgriditemstyle.h @@ -37,7 +37,7 @@ \sa MGridItemStyleContainer MWidgetStyle \ref styling MGridItem MGridItemView */ -class M_EXPORT MGridItemStyle : public MWidgetStyle +class M_VIEWS_EXPORT MGridItemStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MGridItemStyle) @@ -62,7 +62,7 @@ class M_EXPORT MGridItemStyle : public MWidgetStyle \ingroup styles \sa MGridItemStyle */ -class M_EXPORT MGridItemStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MGridItemStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MGridItemStyle) }; diff --git a/src/views/style/mhomebuttonpanelstyle.h b/src/views/style/mhomebuttonpanelstyle.h index 8a3940fa..1b82f719 100644 --- a/src/views/style/mhomebuttonpanelstyle.h +++ b/src/views/style/mhomebuttonpanelstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MHomeButtonPanelStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MHomeButtonPanelStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MHomeButtonPanelStyle) @@ -31,7 +31,7 @@ class M_EXPORT MHomeButtonPanelStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(QString, homeButtonIconId, HomeButtonIconId) }; -class M_EXPORT MHomeButtonPanelStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MHomeButtonPanelStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MHomeButtonPanelStyle) M_STYLE_MODE(Fullscreen) diff --git a/src/views/style/mimagewidgetstyle.h b/src/views/style/mimagewidgetstyle.h index 9e060f32..8239e5d1 100644 --- a/src/views/style/mimagewidgetstyle.h +++ b/src/views/style/mimagewidgetstyle.h @@ -42,7 +42,7 @@ \sa MImageWidgetStyleContainer MWidgetStyle \ref styling MImageWidget MImageWidgetView */ -class M_EXPORT MImageWidgetStyle : public MWidgetStyle +class M_VIEWS_EXPORT MImageWidgetStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MImageWidgetStyle) @@ -91,7 +91,7 @@ class M_EXPORT MImageWidgetStyle : public MWidgetStyle \ingroup styles \sa MImageWidgetStyle */ -class M_EXPORT MImageWidgetStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MImageWidgetStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MImageWidgetStyle) }; diff --git a/src/views/style/minfobannerstyle.h b/src/views/style/minfobannerstyle.h index e0827566..4af1bdca 100644 --- a/src/views/style/minfobannerstyle.h +++ b/src/views/style/minfobannerstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MInfoBannerStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MInfoBannerStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MInfoBannerStyle) @@ -31,7 +31,7 @@ class M_EXPORT MInfoBannerStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize) }; -class M_EXPORT MInfoBannerStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MInfoBannerStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MInfoBannerStyle) }; diff --git a/src/views/style/mlabelstyle.h b/src/views/style/mlabelstyle.h index 4f24aa0d..49161cb5 100644 --- a/src/views/style/mlabelstyle.h +++ b/src/views/style/mlabelstyle.h @@ -38,7 +38,7 @@ \ingroup styles \sa MLabelStyleContainer MWidgetStyle \ref styling MLabel */ -class M_EXPORT MLabelStyle : public MWidgetStyle +class M_VIEWS_EXPORT MLabelStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MLabelStyle) @@ -81,7 +81,7 @@ class M_EXPORT MLabelStyle : public MWidgetStyle \ingroup styles \sa MLabelStyle */ -class M_EXPORT MLabelStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MLabelStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MLabelStyle) }; diff --git a/src/views/style/mlistitemstyle.h b/src/views/style/mlistitemstyle.h index 6901bdd0..a43cb798 100644 --- a/src/views/style/mlistitemstyle.h +++ b/src/views/style/mlistitemstyle.h @@ -22,7 +22,7 @@ #include <mwidgetstyle.h> -class M_EXPORT MListItemStyle : public MWidgetStyle +class M_VIEWS_EXPORT MListItemStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MListItemStyle) @@ -30,7 +30,7 @@ class M_EXPORT MListItemStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, downStateEffect, DownStateEffect) }; -class M_EXPORT MListItemStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MListItemStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MListItemStyle) }; diff --git a/src/views/style/mliststyle.h b/src/views/style/mliststyle.h index c2b78a05..57d49acd 100644 --- a/src/views/style/mliststyle.h +++ b/src/views/style/mliststyle.h @@ -42,7 +42,7 @@ \ingroup styles \sa MLabelStyleContainer MWidgetStyle MLabelStyle \ref styling MList */ -class M_EXPORT MListStyle : public MWidgetStyle +class M_VIEWS_EXPORT MListStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MListStyle) @@ -83,7 +83,7 @@ class M_EXPORT MListStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(QString, groupSeparatorObjectName, GroupSeparatorObjectName) }; -class M_EXPORT MListStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MListStyle) }; diff --git a/src/views/style/mmessageboxstyle.h b/src/views/style/mmessageboxstyle.h index 09491028..e125e366 100644 --- a/src/views/style/mmessageboxstyle.h +++ b/src/views/style/mmessageboxstyle.h @@ -22,13 +22,13 @@ #include <mdialogstyle.h> -class M_EXPORT MMessageBoxStyle : public MDialogStyle +class M_VIEWS_EXPORT MMessageBoxStyle : public MDialogStyle { Q_OBJECT M_STYLE_INTERNAL(MMessageBoxStyle) }; -class M_EXPORT MMessageBoxStyleContainer : public MDialogStyleContainer +class M_VIEWS_EXPORT MMessageBoxStyleContainer : public MDialogStyleContainer { M_STYLE_CONTAINER_INTERNAL(MMessageBoxStyle) }; diff --git a/src/views/style/mmodalscenewindowstyle.h b/src/views/style/mmodalscenewindowstyle.h index 32123c29..1d2cf39c 100644 --- a/src/views/style/mmodalscenewindowstyle.h +++ b/src/views/style/mmodalscenewindowstyle.h @@ -22,13 +22,13 @@ #include <mscenewindowstyle.h> -class M_EXPORT MModalSceneWindowStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MModalSceneWindowStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MModalSceneWindowStyle) }; -class M_EXPORT MModalSceneWindowStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MModalSceneWindowStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MModalSceneWindowStyle) }; diff --git a/src/views/style/mnavigationbarstyle.h b/src/views/style/mnavigationbarstyle.h index 76addb46..9276c762 100644 --- a/src/views/style/mnavigationbarstyle.h +++ b/src/views/style/mnavigationbarstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MNavigationBarStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MNavigationBarStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MNavigationBarStyle) @@ -40,7 +40,7 @@ class M_EXPORT MNavigationBarStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(QString, closeButtonStyleName, CloseButtonStyleName) }; -class M_EXPORT MNavigationBarStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MNavigationBarStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MNavigationBarStyle) M_STYLE_MODE(Fullscreen) diff --git a/src/views/style/mobjectmenustyle.h b/src/views/style/mobjectmenustyle.h index f98cdbff..0bb171a9 100644 --- a/src/views/style/mobjectmenustyle.h +++ b/src/views/style/mobjectmenustyle.h @@ -24,13 +24,13 @@ class MScalableImage; -class M_EXPORT MObjectMenuStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MObjectMenuStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MObjectMenuStyle) }; -class M_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MObjectMenuStyle) }; diff --git a/src/views/style/moverlaystyle.h b/src/views/style/moverlaystyle.h index b9f16bfe..a82e0735 100644 --- a/src/views/style/moverlaystyle.h +++ b/src/views/style/moverlaystyle.h @@ -22,13 +22,13 @@ #include <mscenewindowstyle.h> -class M_EXPORT MOverlayStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MOverlayStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MOverlayStyle) }; -class M_EXPORT MOverlayStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MOverlayStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MOverlayStyle) }; diff --git a/src/views/style/mpannablewidgetstyle.h b/src/views/style/mpannablewidgetstyle.h index 04403690..f29473db 100644 --- a/src/views/style/mpannablewidgetstyle.h +++ b/src/views/style/mpannablewidgetstyle.h @@ -47,7 +47,7 @@ \sa MPannableWidget MWidgetStyle */ -class M_EXPORT MPannableWidgetStyle : public MWidgetStyle +class M_VIEWS_EXPORT MPannableWidgetStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MPannableWidgetStyle) @@ -63,7 +63,7 @@ class M_EXPORT MPannableWidgetStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(qreal, maximumVelocity, MaximumVelocity) }; -class M_EXPORT MPannableWidgetStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MPannableWidgetStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MPannableWidgetStyle) }; diff --git a/src/views/style/mpopupliststyle.h b/src/views/style/mpopupliststyle.h index 498645f1..7f1e17b5 100644 --- a/src/views/style/mpopupliststyle.h +++ b/src/views/style/mpopupliststyle.h @@ -32,7 +32,7 @@ \sa MPopupListStyleContainer MDialogStyle \ref styling MPopupList MPopupListView */ -class M_EXPORT MPopupListStyle : public MDialogStyle +class M_VIEWS_EXPORT MPopupListStyle : public MDialogStyle { Q_OBJECT M_STYLE_INTERNAL(MPopupListStyle) @@ -48,7 +48,7 @@ class M_EXPORT MPopupListStyle : public MDialogStyle \ingroup styles \sa MPopupListStyle */ -class M_EXPORT MPopupListStyleContainer : public MDialogStyleContainer +class M_VIEWS_EXPORT MPopupListStyleContainer : public MDialogStyleContainer { M_STYLE_CONTAINER_INTERNAL(MPopupListStyle) }; diff --git a/src/views/style/mpositionindicatorstyle.h b/src/views/style/mpositionindicatorstyle.h index d592251b..db47c7db 100644 --- a/src/views/style/mpositionindicatorstyle.h +++ b/src/views/style/mpositionindicatorstyle.h @@ -25,7 +25,7 @@ class QPixmap; -class M_EXPORT MPositionIndicatorStyle : public MWidgetStyle +class M_VIEWS_EXPORT MPositionIndicatorStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MPositionIndicatorStyle) @@ -35,7 +35,7 @@ class M_EXPORT MPositionIndicatorStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(int, hideTimeout, HideTimeout) }; -class M_EXPORT MPositionIndicatorStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MPositionIndicatorStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MPositionIndicatorStyle) }; diff --git a/src/views/style/mprogressindicatorstyle.h b/src/views/style/mprogressindicatorstyle.h index 7f5af935..4705b82c 100644 --- a/src/views/style/mprogressindicatorstyle.h +++ b/src/views/style/mprogressindicatorstyle.h @@ -29,7 +29,7 @@ \ingroup styles \sa MProgressIndicatorStyleContainer */ -class M_EXPORT MProgressIndicatorStyle : public MWidgetStyle +class M_VIEWS_EXPORT MProgressIndicatorStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MProgressIndicatorStyle) @@ -115,7 +115,7 @@ class M_EXPORT MProgressIndicatorStyle : public MWidgetStyle \ingroup styles \sa MProgressIndicatorStyle */ -class M_EXPORT MProgressIndicatorStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MProgressIndicatorStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MProgressIndicatorStyle) }; diff --git a/src/views/style/mrichtexteditstyle.h b/src/views/style/mrichtexteditstyle.h index 5da00ec4..861ddbaf 100644 --- a/src/views/style/mrichtexteditstyle.h +++ b/src/views/style/mrichtexteditstyle.h @@ -26,13 +26,13 @@ #include <mwidgetstyle.h> #include "mtexteditstyle.h" -class M_EXPORT MRichTextEditStyle : public MTextEditStyle +class M_VIEWS_EXPORT MRichTextEditStyle : public MTextEditStyle { Q_OBJECT M_STYLE(MRichTextEditStyle) }; -class M_EXPORT MRichTextEditStyleContainer : public MTextEditStyleContainer +class M_VIEWS_EXPORT MRichTextEditStyleContainer : public MTextEditStyleContainer { M_STYLE_CONTAINER(MRichTextEditStyle) }; diff --git a/src/views/style/mscenelayereffectdimstyle.h b/src/views/style/mscenelayereffectdimstyle.h index d74069f9..51e044cd 100644 --- a/src/views/style/mscenelayereffectdimstyle.h +++ b/src/views/style/mscenelayereffectdimstyle.h @@ -23,7 +23,7 @@ #include <QEasingCurve> #include <mscenelayereffectstyle.h> -class M_EXPORT MSceneLayerEffectDimStyle : public MSceneLayerEffectStyle +class M_VIEWS_EXPORT MSceneLayerEffectDimStyle : public MSceneLayerEffectStyle { Q_OBJECT M_STYLE_INTERNAL(MSceneLayerEffectDimStyle) @@ -33,7 +33,7 @@ class M_EXPORT MSceneLayerEffectDimStyle : public MSceneLayerEffectStyle M_STYLE_ATTRIBUTE(int, fadeDuration, FadeDuration) }; -class M_EXPORT MSceneLayerEffectDimStyleContainer : public MSceneLayerEffectStyleContainer +class M_VIEWS_EXPORT MSceneLayerEffectDimStyleContainer : public MSceneLayerEffectStyleContainer { M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectDimStyle) }; diff --git a/src/views/style/mscenelayereffectstyle.h b/src/views/style/mscenelayereffectstyle.h index b4256733..a2077c9e 100644 --- a/src/views/style/mscenelayereffectstyle.h +++ b/src/views/style/mscenelayereffectstyle.h @@ -22,13 +22,13 @@ #include <mscenewindowstyle.h> -class M_EXPORT MSceneLayerEffectStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MSceneLayerEffectStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE_INTERNAL(MSceneLayerEffectStyle) }; -class M_EXPORT MSceneLayerEffectStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MSceneLayerEffectStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectStyle) }; diff --git a/src/views/style/mscenewindowanimatorstyle.h b/src/views/style/mscenewindowanimatorstyle.h index 3d71645c..6210ee8e 100644 --- a/src/views/style/mscenewindowanimatorstyle.h +++ b/src/views/style/mscenewindowanimatorstyle.h @@ -23,7 +23,7 @@ #include <mstyle.h> #include <QPoint> -class M_EXPORT MSceneWindowAnimatorStyle : public MStyle +class M_VIEWS_EXPORT MSceneWindowAnimatorStyle : public MStyle { Q_OBJECT M_STYLE(MSceneWindowAnimatorStyle) @@ -38,7 +38,7 @@ class M_EXPORT MSceneWindowAnimatorStyle : public MStyle M_STYLE_ATTRIBUTE(QPoint, transitionOutDestination, TransitionOutDestination) }; -class M_EXPORT MSceneWindowAnimatorStyleContainer : public MStyleContainer +class M_VIEWS_EXPORT MSceneWindowAnimatorStyleContainer : public MStyleContainer { M_STYLE_CONTAINER(MSceneWindowAnimatorStyle) }; diff --git a/src/views/style/mscenewindowstyle.h b/src/views/style/mscenewindowstyle.h index ccc1b8f8..dabb72d4 100644 --- a/src/views/style/mscenewindowstyle.h +++ b/src/views/style/mscenewindowstyle.h @@ -23,7 +23,7 @@ #include <QPointF> #include <mwidgetstyle.h> -class M_EXPORT MSceneWindowStyle : public MWidgetStyle +class M_VIEWS_EXPORT MSceneWindowStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MSceneWindowStyle) @@ -40,7 +40,7 @@ class M_EXPORT MSceneWindowStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(MFeedback, appearFeedback, AppearFeedback) }; -class M_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MSceneWindowStyle) }; diff --git a/src/views/style/mseparatorstyle.h b/src/views/style/mseparatorstyle.h index a1a3f618..96b0736e 100644 --- a/src/views/style/mseparatorstyle.h +++ b/src/views/style/mseparatorstyle.h @@ -36,7 +36,7 @@ \sa MSeparatorStyleContainer MWidgetStyle \ref styling MSeparator */ -class M_EXPORT MSeparatorStyle : public MWidgetStyle +class M_VIEWS_EXPORT MSeparatorStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MSeparatorStyle) @@ -55,7 +55,7 @@ class M_EXPORT MSeparatorStyle : public MWidgetStyle \ingroup styles \sa MSeparatorStyle */ -class M_EXPORT MSeparatorStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MSeparatorStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MSeparatorStyle) M_STYLE_MODE(Horizontal) diff --git a/src/views/style/msliderstyle.h b/src/views/style/msliderstyle.h index e5dd983b..13a10b31 100644 --- a/src/views/style/msliderstyle.h +++ b/src/views/style/msliderstyle.h @@ -36,7 +36,7 @@ class MScalableImage; \ingroup styles \sa MSliderStyleContainer MWidgetStyle \ref styling MSliderView */ -class M_EXPORT MSliderStyle : public MWidgetStyle +class M_VIEWS_EXPORT MSliderStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MSliderStyle) @@ -148,7 +148,7 @@ class M_EXPORT MSliderStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(int, stepsPerFeedback, StepsPerFeedback) }; -class M_EXPORT MSliderStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MSliderStyle) }; diff --git a/src/views/style/mspinnerstyle.h b/src/views/style/mspinnerstyle.h index e42552ad..a21c0f8f 100644 --- a/src/views/style/mspinnerstyle.h +++ b/src/views/style/mspinnerstyle.h @@ -29,7 +29,7 @@ \ingroup styles \sa MSpinnerStyleContainer */ -class M_EXPORT MSpinnerStyle : public MWidgetStyle +class M_VIEWS_EXPORT MSpinnerStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MSpinnerStyle) @@ -66,7 +66,7 @@ class M_EXPORT MSpinnerStyle : public MWidgetStyle \ingroup styles \sa MSpinnerStyle */ -class M_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MSpinnerStyle) }; diff --git a/src/views/style/mstatusbarstyle.h b/src/views/style/mstatusbarstyle.h index 301b8915..44caad45 100644 --- a/src/views/style/mstatusbarstyle.h +++ b/src/views/style/mstatusbarstyle.h @@ -22,7 +22,7 @@ #include <mscenewindowstyle.h> -class M_EXPORT MStatusBarStyle : public MSceneWindowStyle +class M_VIEWS_EXPORT MStatusBarStyle : public MSceneWindowStyle { Q_OBJECT M_STYLE(MStatusBarStyle) @@ -31,7 +31,7 @@ class M_EXPORT MStatusBarStyle : public MSceneWindowStyle M_STYLE_ATTRIBUTE(int, swipeThreshold, SwipeThreshold) }; -class M_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleContainer +class M_VIEWS_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleContainer { M_STYLE_CONTAINER(MStatusBarStyle) }; diff --git a/src/views/style/mstylablewidgetstyle.h b/src/views/style/mstylablewidgetstyle.h index 233d56a7..c39be883 100644 --- a/src/views/style/mstylablewidgetstyle.h +++ b/src/views/style/mstylablewidgetstyle.h @@ -22,13 +22,13 @@ #include <MWidgetStyle> -class M_EXPORT MStylableWidgetStyle : public MWidgetStyle +class M_VIEWS_EXPORT MStylableWidgetStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MStylableWidgetStyle) }; -class M_EXPORT MStylableWidgetStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MStylableWidgetStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MStylableWidgetStyle) }; diff --git a/src/views/style/mtexteditstyle.h b/src/views/style/mtexteditstyle.h index f4f19bd1..f38ae944 100644 --- a/src/views/style/mtexteditstyle.h +++ b/src/views/style/mtexteditstyle.h @@ -25,7 +25,7 @@ #include <QString> #include <mwidgetstyle.h> -class M_EXPORT MTextEditStyle : public MWidgetStyle +class M_VIEWS_EXPORT MTextEditStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MTextEditStyle) @@ -73,7 +73,7 @@ class M_EXPORT MTextEditStyle : public MWidgetStyle M_STYLE_ATTRIBUTE(MFeedback, changeSelectionFeedback, ChangeSelectionFeedback) }; -class M_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MTextEditStyle) }; diff --git a/src/views/style/mtoolbarstyle.h b/src/views/style/mtoolbarstyle.h index ab7309c6..03b33748 100644 --- a/src/views/style/mtoolbarstyle.h +++ b/src/views/style/mtoolbarstyle.h @@ -30,7 +30,7 @@ \sa MToolbarStyleContainer MWidgetStyle \ref styling MToolBar MToolBarView */ -class M_EXPORT MToolbarStyle : public MWidgetStyle +class M_VIEWS_EXPORT MToolbarStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MToolbarStyle) @@ -65,7 +65,7 @@ class M_EXPORT MToolbarStyle : public MWidgetStyle \ingroup styles \sa MToolbarStyle */ -class M_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MToolbarStyle) }; diff --git a/src/views/style/mtoolbartabstyle.h b/src/views/style/mtoolbartabstyle.h index 109d4980..cb81691b 100644 --- a/src/views/style/mtoolbartabstyle.h +++ b/src/views/style/mtoolbartabstyle.h @@ -30,7 +30,7 @@ \sa MToolbarTabStyleContainer MWidgetStyle \ref styling MToolBar MToolbarTabView */ -class M_EXPORT MToolbarTabStyle : public MToolbarStyle +class M_VIEWS_EXPORT MToolbarTabStyle : public MToolbarStyle { Q_OBJECT M_STYLE_INTERNAL(MToolbarTabStyle) @@ -43,7 +43,7 @@ class M_EXPORT MToolbarTabStyle : public MToolbarStyle \ingroup styles \sa MToolbarTabStyle */ -class M_EXPORT MToolbarTabStyleContainer : public MToolbarStyleContainer +class M_VIEWS_EXPORT MToolbarTabStyleContainer : public MToolbarStyleContainer { M_STYLE_CONTAINER_INTERNAL(MToolbarTabStyle) }; diff --git a/src/views/style/mvideowidgetstyle.h b/src/views/style/mvideowidgetstyle.h index 42c4fc22..9f04a27a 100644 --- a/src/views/style/mvideowidgetstyle.h +++ b/src/views/style/mvideowidgetstyle.h @@ -35,7 +35,7 @@ \ingroup styles \sa MVideoWidgetStyleContainer MWidgetStyle \ref styling MVideoWidget MVideoWidgetView */ -class M_EXPORT MVideoWidgetStyle : public MWidgetStyle +class M_VIEWS_EXPORT MVideoWidgetStyle : public MWidgetStyle { Q_OBJECT M_STYLE(MVideoWidgetStyle) @@ -54,7 +54,7 @@ class M_EXPORT MVideoWidgetStyle : public MWidgetStyle \ingroup styles \sa MVideoWidgetStyle */ -class M_EXPORT MVideoWidgetStyleContainer : public MWidgetStyleContainer +class M_VIEWS_EXPORT MVideoWidgetStyleContainer : public MWidgetStyleContainer { M_STYLE_CONTAINER(MVideoWidgetStyle) diff --git a/src/views/video/mvideowidgetview.h b/src/views/video/mvideowidgetview.h index 4ec6a5fd..72a2eadd 100644 --- a/src/views/video/mvideowidgetview.h +++ b/src/views/video/mvideowidgetview.h @@ -40,7 +40,7 @@ class QGraphicsSceneResizeEvent; \sa MVideoWidget MVideoWidgetStyle */ -class M_EXPORT MVideoWidgetView : public MWidgetView +class M_VIEWS_EXPORT MVideoWidgetView : public MWidgetView { Q_OBJECT M_VIEW(MVideoWidgetModel, MVideoWidgetStyle) diff --git a/tests/ut_mfeedback/mexport_mock.h b/tests/ut_mfeedback/mexport_mock.h index 0c65e294..04e33bf5 100644 --- a/tests/ut_mfeedback/mexport_mock.h +++ b/tests/ut_mfeedback/mexport_mock.h @@ -20,6 +20,6 @@ #ifndef MEXPORT_H #define MEXPORT_H -#define M_EXPORT +#define M_CORE_EXPORT #endif // Header guard diff --git a/tests/ut_mfeedbackplayer/mexport_mock.h b/tests/ut_mfeedbackplayer/mexport_mock.h index 0c65e294..04e33bf5 100644 --- a/tests/ut_mfeedbackplayer/mexport_mock.h +++ b/tests/ut_mfeedbackplayer/mexport_mock.h @@ -20,6 +20,6 @@ #ifndef MEXPORT_H #define MEXPORT_H -#define M_EXPORT +#define M_CORE_EXPORT #endif // Header guard |