diff options
Diffstat (limited to 'src/widgets/styles')
-rw-r--r-- | src/widgets/styles/qcdestyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qcleanlooksstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qcommonstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qdrawutil.h | 26 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle_p.h | 8 | ||||
-rw-r--r-- | src/widgets/styles/qmacstyle_mac.h | 6 | ||||
-rw-r--r-- | src/widgets/styles/qmotifstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qplastiquestyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qproxystyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qs60style.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qstyle.h | 4 | ||||
-rw-r--r-- | src/widgets/styles/qstylefactory.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qstyleoption.h | 88 | ||||
-rw-r--r-- | src/widgets/styles/qstyleplugin.h | 4 | ||||
-rw-r--r-- | src/widgets/styles/qwindowscestyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsmobilestyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsstyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsvistastyle.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsxpstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsxpstyle.h | 2 |
21 files changed, 83 insertions, 83 deletions
diff --git a/src/widgets/styles/qcdestyle.h b/src/widgets/styles/qcdestyle.h index 17ec47f938..854bfc6c69 100644 --- a/src/widgets/styles/qcdestyle.h +++ b/src/widgets/styles/qcdestyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_CDE) -class Q_GUI_EXPORT QCDEStyle : public QMotifStyle +class Q_WIDGETS_EXPORT QCDEStyle : public QMotifStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qcleanlooksstyle.h b/src/widgets/styles/qcleanlooksstyle.h index 0c82497742..1b35aa7969 100644 --- a/src/widgets/styles/qcleanlooksstyle.h +++ b/src/widgets/styles/qcleanlooksstyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_CLEANLOOKS) class QCleanlooksStylePrivate; -class Q_GUI_EXPORT QCleanlooksStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT QCleanlooksStyle : public QWindowsStyle { Q_OBJECT Q_DECLARE_PRIVATE(QCleanlooksStyle) diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index d7afea9333..a4a7ac11c5 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -51,7 +51,7 @@ QT_MODULE(Gui) class QCommonStylePrivate; -class Q_GUI_EXPORT QCommonStyle: public QStyle +class Q_WIDGETS_EXPORT QCommonStyle: public QStyle { Q_OBJECT diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index 01319c9427..2f35d236b7 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -63,52 +63,52 @@ class QRect; // Standard shade drawing // -Q_GUI_EXPORT void qDrawShadeLine(QPainter *p, int x1, int y1, int x2, int y2, +Q_WIDGETS_EXPORT void qDrawShadeLine(QPainter *p, int x1, int y1, int x2, int y2, const QPalette &pal, bool sunken = true, int lineWidth = 1, int midLineWidth = 0); -Q_GUI_EXPORT void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2, +Q_WIDGETS_EXPORT void qDrawShadeLine(QPainter *p, const QPoint &p1, const QPoint &p2, const QPalette &pal, bool sunken = true, int lineWidth = 1, int midLineWidth = 0); -Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h, +Q_WIDGETS_EXPORT void qDrawShadeRect(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, int lineWidth = 1, int midLineWidth = 0, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawShadeRect(QPainter *p, const QRect &r, +Q_WIDGETS_EXPORT void qDrawShadeRect(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, int lineWidth = 1, int midLineWidth = 0, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, +Q_WIDGETS_EXPORT void qDrawShadePanel(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, int lineWidth = 1, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawShadePanel(QPainter *p, const QRect &r, +Q_WIDGETS_EXPORT void qDrawShadePanel(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, int lineWidth = 1, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h, +Q_WIDGETS_EXPORT void qDrawWinButton(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawWinButton(QPainter *p, const QRect &r, +Q_WIDGETS_EXPORT void qDrawWinButton(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h, +Q_WIDGETS_EXPORT void qDrawWinPanel(QPainter *p, int x, int y, int w, int h, const QPalette &pal, bool sunken = false, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawWinPanel(QPainter *p, const QRect &r, +Q_WIDGETS_EXPORT void qDrawWinPanel(QPainter *p, const QRect &r, const QPalette &pal, bool sunken = false, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &, +Q_WIDGETS_EXPORT void qDrawPlainRect(QPainter *p, int x, int y, int w, int h, const QColor &, int lineWidth = 1, const QBrush *fill = 0); -Q_GUI_EXPORT void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &, +Q_WIDGETS_EXPORT void qDrawPlainRect(QPainter *p, const QRect &r, const QColor &, int lineWidth = 1, const QBrush *fill = 0); @@ -148,7 +148,7 @@ namespace QDrawBorderPixmap } #endif -Q_GUI_EXPORT void qDrawBorderPixmap(QPainter *painter, +Q_WIDGETS_EXPORT void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargins &targetMargins, const QPixmap &pixmap, diff --git a/src/widgets/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h index 56df2778e7..1ca6e3cc85 100644 --- a/src/widgets/styles/qgtkstyle.h +++ b/src/widgets/styles/qgtkstyle.h @@ -58,7 +58,7 @@ QT_MODULE(Gui) class QPainterPath; class QGtkStylePrivate; -class Q_GUI_EXPORT QGtkStyle : public QCleanlooksStyle +class Q_WIDGETS_EXPORT QGtkStyle : public QCleanlooksStyle { Q_OBJECT Q_DECLARE_PRIVATE(QGtkStyle) diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index 07d2a503de..55089268b3 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -271,10 +271,10 @@ typedef QString (*_qt_filedialog_save_filename_hook) (QWidget * parent, cons typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options); -extern Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook; -extern Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook; -extern Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook; -extern Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook; +extern Q_WIDGETS_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook; +extern Q_WIDGETS_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook; +extern Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook; +extern Q_WIDGETS_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook; class QGtkStylePrivate; diff --git a/src/widgets/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h index ec4fed76eb..44940bd2b7 100644 --- a/src/widgets/styles/qmacstyle_mac.h +++ b/src/widgets/styles/qmacstyle_mac.h @@ -55,15 +55,15 @@ QT_MODULE(Gui) class QPalette; #if defined(QT_PLUGIN) -#define Q_GUI_EXPORT_STYLE_MAC +#define Q_WIDGETS_EXPORT_STYLE_MAC #else -#define Q_GUI_EXPORT_STYLE_MAC Q_GUI_EXPORT +#define Q_WIDGETS_EXPORT_STYLE_MAC Q_WIDGETS_EXPORT #endif class QPushButton; class QStyleOptionButton; class QMacStylePrivate; -class Q_GUI_EXPORT_STYLE_MAC QMacStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT_STYLE_MAC QMacStyle : public QWindowsStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qmotifstyle.h b/src/widgets/styles/qmotifstyle.h index 3fe470d1f1..35b3448289 100644 --- a/src/widgets/styles/qmotifstyle.h +++ b/src/widgets/styles/qmotifstyle.h @@ -57,7 +57,7 @@ class QPalette; class QFocusFrame; class QMotifStylePrivate; -class Q_GUI_EXPORT QMotifStyle : public QCommonStyle +class Q_WIDGETS_EXPORT QMotifStyle : public QCommonStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qplastiquestyle.h b/src/widgets/styles/qplastiquestyle.h index 51a0139b21..d0afce6cf0 100644 --- a/src/widgets/styles/qplastiquestyle.h +++ b/src/widgets/styles/qplastiquestyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_PLASTIQUE) class QPlastiqueStylePrivate; -class Q_GUI_EXPORT QPlastiqueStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT QPlastiqueStyle : public QWindowsStyle { Q_OBJECT Q_DECLARE_PRIVATE(QPlastiqueStyle) diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 14b96ba0e4..96c5c34f18 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_PROXY) class QProxyStylePrivate; -class Q_GUI_EXPORT QProxyStyle : public QCommonStyle +class Q_WIDGETS_EXPORT QProxyStyle : public QCommonStyle { Q_OBJECT diff --git a/src/widgets/styles/qs60style.h b/src/widgets/styles/qs60style.h index 0bd22bdb36..4520d19fd3 100644 --- a/src/widgets/styles/qs60style.h +++ b/src/widgets/styles/qs60style.h @@ -62,7 +62,7 @@ enum { class QS60StylePrivate; -class Q_GUI_EXPORT QS60Style : public QCommonStyle +class Q_WIDGETS_EXPORT QS60Style : public QCommonStyle { Q_OBJECT Q_DECLARE_PRIVATE(QS60Style) diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index e87556d932..1896f129e1 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -65,7 +65,7 @@ class QStyleOption; class QStyleOptionComplex; class QStylePrivate; -class Q_GUI_EXPORT QStyle : public QObject +class Q_WIDGETS_EXPORT QStyle : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QStyle) @@ -879,7 +879,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::State) Q_DECLARE_OPERATORS_FOR_FLAGS(QStyle::SubControls) #if !defined(QT_NO_DEBUG_STREAM) -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QStyle::State state); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QStyle::State state); #endif QT_END_NAMESPACE diff --git a/src/widgets/styles/qstylefactory.h b/src/widgets/styles/qstylefactory.h index 92bd24fddb..b972c8e0e6 100644 --- a/src/widgets/styles/qstylefactory.h +++ b/src/widgets/styles/qstylefactory.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QStyle; -class Q_GUI_EXPORT QStyleFactory +class Q_WIDGETS_EXPORT QStyleFactory { public: static QStringList keys(); diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 557a297f7a..0640eef606 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -64,7 +64,7 @@ QT_MODULE(Gui) class QDebug; -class Q_GUI_EXPORT QStyleOption +class Q_WIDGETS_EXPORT QStyleOption { public: enum OptionType { @@ -100,7 +100,7 @@ public: QStyleOption &operator=(const QStyleOption &other); }; -class Q_GUI_EXPORT QStyleOptionFocusRect : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionFocusRect : public QStyleOption { public: enum StyleOptionType { Type = SO_FocusRect }; @@ -115,7 +115,7 @@ protected: QStyleOptionFocusRect(int version); }; -class Q_GUI_EXPORT QStyleOptionFrame : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionFrame : public QStyleOption { public: enum StyleOptionType { Type = SO_Frame }; @@ -131,7 +131,7 @@ protected: QStyleOptionFrame(int version); }; -class Q_GUI_EXPORT QStyleOptionFrameV2 : public QStyleOptionFrame +class Q_WIDGETS_EXPORT QStyleOptionFrameV2 : public QStyleOptionFrame { public: enum StyleOptionVersion { Version = 2 }; @@ -154,7 +154,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionFrameV2::FrameFeatures) -class Q_GUI_EXPORT QStyleOptionFrameV3 : public QStyleOptionFrameV2 +class Q_WIDGETS_EXPORT QStyleOptionFrameV3 : public QStyleOptionFrameV2 { public: enum StyleOptionVersion { Version = 3 }; @@ -172,7 +172,7 @@ protected: #ifndef QT_NO_TABWIDGET -class Q_GUI_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption { public: enum StyleOptionType { Type = SO_TabWidgetFrame }; @@ -193,7 +193,7 @@ protected: QStyleOptionTabWidgetFrame(int version); }; -class Q_GUI_EXPORT QStyleOptionTabWidgetFrameV2 : public QStyleOptionTabWidgetFrame +class Q_WIDGETS_EXPORT QStyleOptionTabWidgetFrameV2 : public QStyleOptionTabWidgetFrame { public: enum StyleOptionVersion { Version = 2 }; @@ -215,7 +215,7 @@ protected: #ifndef QT_NO_TABBAR -class Q_GUI_EXPORT QStyleOptionTabBarBase : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionTabBarBase : public QStyleOption { public: enum StyleOptionType { Type = SO_TabBarBase }; @@ -232,7 +232,7 @@ protected: QStyleOptionTabBarBase(int version); }; -class Q_GUI_EXPORT QStyleOptionTabBarBaseV2 : public QStyleOptionTabBarBase +class Q_WIDGETS_EXPORT QStyleOptionTabBarBaseV2 : public QStyleOptionTabBarBase { public: enum StyleOptionVersion { Version = 2 }; @@ -248,7 +248,7 @@ protected: #endif -class Q_GUI_EXPORT QStyleOptionHeader : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionHeader : public QStyleOption { public: enum StyleOptionType { Type = SO_Header }; @@ -276,7 +276,7 @@ protected: QStyleOptionHeader(int version); }; -class Q_GUI_EXPORT QStyleOptionButton : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionButton : public QStyleOption { public: enum StyleOptionType { Type = SO_Button }; @@ -301,7 +301,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionButton::ButtonFeatures) #ifndef QT_NO_TABBAR -class Q_GUI_EXPORT QStyleOptionTab : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionTab : public QStyleOption { public: enum StyleOptionType { Type = SO_Tab }; @@ -330,7 +330,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionTab::CornerWidgets) -class Q_GUI_EXPORT QStyleOptionTabV2 : public QStyleOptionTab +class Q_WIDGETS_EXPORT QStyleOptionTabV2 : public QStyleOptionTab { public: enum StyleOptionVersion { Version = 2 }; @@ -344,7 +344,7 @@ protected: QStyleOptionTabV2(int version); }; -class Q_GUI_EXPORT QStyleOptionTabV3 : public QStyleOptionTabV2 +class Q_WIDGETS_EXPORT QStyleOptionTabV3 : public QStyleOptionTabV2 { public: enum StyleOptionVersion { Version = 3 }; @@ -366,7 +366,7 @@ protected: #ifndef QT_NO_TOOLBAR -class Q_GUI_EXPORT QStyleOptionToolBar : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionToolBar : public QStyleOption { public: enum StyleOptionType { Type = SO_ToolBar }; @@ -393,7 +393,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionToolBar::ToolBarFeatures) -class Q_GUI_EXPORT QStyleOptionProgressBar : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionProgressBar : public QStyleOption { public: enum StyleOptionType { Type = SO_ProgressBar }; @@ -414,7 +414,7 @@ protected: }; // Adds style info for vertical progress bars -class Q_GUI_EXPORT QStyleOptionProgressBarV2 : public QStyleOptionProgressBar +class Q_WIDGETS_EXPORT QStyleOptionProgressBarV2 : public QStyleOptionProgressBar { public: enum StyleOptionType { Type = SO_ProgressBar }; @@ -432,7 +432,7 @@ protected: QStyleOptionProgressBarV2(int version); }; -class Q_GUI_EXPORT QStyleOptionMenuItem : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionMenuItem : public QStyleOption { public: enum StyleOptionType { Type = SO_MenuItem }; @@ -460,7 +460,7 @@ protected: QStyleOptionMenuItem(int version); }; -class Q_GUI_EXPORT QStyleOptionQ3ListViewItem : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionQ3ListViewItem : public QStyleOption { public: enum StyleOptionType { Type = SO_Q3ListViewItem }; @@ -485,7 +485,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionQ3ListViewItem::Q3ListViewItemFeatures) -class Q_GUI_EXPORT QStyleOptionQ3DockWindow : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionQ3DockWindow : public QStyleOption { public: enum StyleOptionType { Type = SO_Q3DockWindow }; @@ -501,7 +501,7 @@ protected: QStyleOptionQ3DockWindow(int version); }; -class Q_GUI_EXPORT QStyleOptionDockWidget : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionDockWidget : public QStyleOption { public: enum StyleOptionType { Type = SO_DockWidget }; @@ -519,7 +519,7 @@ protected: QStyleOptionDockWidget(int version); }; -class Q_GUI_EXPORT QStyleOptionDockWidgetV2 : public QStyleOptionDockWidget +class Q_WIDGETS_EXPORT QStyleOptionDockWidgetV2 : public QStyleOptionDockWidget { public: enum StyleOptionVersion { Version = 2 }; @@ -536,7 +536,7 @@ protected: QStyleOptionDockWidgetV2(int version); }; -class Q_GUI_EXPORT QStyleOptionViewItem : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionViewItem : public QStyleOption { public: enum StyleOptionType { Type = SO_ViewItem }; @@ -559,7 +559,7 @@ protected: QStyleOptionViewItem(int version); }; -class Q_GUI_EXPORT QStyleOptionViewItemV2 : public QStyleOptionViewItem +class Q_WIDGETS_EXPORT QStyleOptionViewItemV2 : public QStyleOptionViewItem { public: enum StyleOptionVersion { Version = 2 }; @@ -587,7 +587,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItemV2::ViewItemFeatures) -class Q_GUI_EXPORT QStyleOptionViewItemV3 : public QStyleOptionViewItemV2 +class Q_WIDGETS_EXPORT QStyleOptionViewItemV3 : public QStyleOptionViewItemV2 { public: enum StyleOptionVersion { Version = 3 }; @@ -606,7 +606,7 @@ protected: }; #ifndef QT_NO_ITEMVIEWS -class Q_GUI_EXPORT QStyleOptionViewItemV4 : public QStyleOptionViewItemV3 +class Q_WIDGETS_EXPORT QStyleOptionViewItemV4 : public QStyleOptionViewItemV3 { public: enum StyleOptionVersion { Version = 4 }; @@ -630,7 +630,7 @@ protected: }; #endif -class Q_GUI_EXPORT QStyleOptionToolBox : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionToolBox : public QStyleOption { public: enum StyleOptionType { Type = SO_ToolBox }; @@ -646,7 +646,7 @@ protected: QStyleOptionToolBox(int version); }; -class Q_GUI_EXPORT QStyleOptionToolBoxV2 : public QStyleOptionToolBox +class Q_WIDGETS_EXPORT QStyleOptionToolBoxV2 : public QStyleOptionToolBox { public: enum StyleOptionVersion { Version = 2 }; @@ -666,7 +666,7 @@ protected: }; #ifndef QT_NO_RUBBERBAND -class Q_GUI_EXPORT QStyleOptionRubberBand : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionRubberBand : public QStyleOption { public: enum StyleOptionType { Type = SO_RubberBand }; @@ -684,7 +684,7 @@ protected: #endif // QT_NO_RUBBERBAND // -------------------------- Complex style options ------------------------------- -class Q_GUI_EXPORT QStyleOptionComplex : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionComplex : public QStyleOption { public: enum StyleOptionType { Type = SO_Complex }; @@ -698,7 +698,7 @@ public: }; #ifndef QT_NO_SLIDER -class Q_GUI_EXPORT QStyleOptionSlider : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionSlider : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_Slider }; @@ -726,7 +726,7 @@ protected: #endif // QT_NO_SLIDER #ifndef QT_NO_SPINBOX -class Q_GUI_EXPORT QStyleOptionSpinBox : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionSpinBox : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_SpinBox }; @@ -744,7 +744,7 @@ protected: }; #endif // QT_NO_SPINBOX -class Q_GUI_EXPORT QStyleOptionQ3ListView : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionQ3ListView : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_Q3ListView }; @@ -765,7 +765,7 @@ protected: QStyleOptionQ3ListView(int version); }; -class Q_GUI_EXPORT QStyleOptionToolButton : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionToolButton : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_ToolButton }; @@ -793,7 +793,7 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionToolButton::ToolButtonFeatures) -class Q_GUI_EXPORT QStyleOptionComboBox : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionComboBox : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_ComboBox }; @@ -813,7 +813,7 @@ protected: QStyleOptionComboBox(int version); }; -class Q_GUI_EXPORT QStyleOptionTitleBar : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionTitleBar : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_TitleBar }; @@ -831,7 +831,7 @@ protected: QStyleOptionTitleBar(int version); }; -class Q_GUI_EXPORT QStyleOptionGroupBox : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionGroupBox : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_GroupBox }; @@ -850,7 +850,7 @@ protected: QStyleOptionGroupBox(int version); }; -class Q_GUI_EXPORT QStyleOptionSizeGrip : public QStyleOptionComplex +class Q_WIDGETS_EXPORT QStyleOptionSizeGrip : public QStyleOptionComplex { public: enum StyleOptionType { Type = SO_SizeGrip }; @@ -864,7 +864,7 @@ protected: QStyleOptionSizeGrip(int version); }; -class Q_GUI_EXPORT QStyleOptionGraphicsItem : public QStyleOption +class Q_WIDGETS_EXPORT QStyleOptionGraphicsItem : public QStyleOption { public: enum StyleOptionType { Type = SO_GraphicsItem }; @@ -904,7 +904,7 @@ T qstyleoption_cast(QStyleOption *opt) } // -------------------------- QStyleHintReturn ------------------------------- -class Q_GUI_EXPORT QStyleHintReturn { +class Q_WIDGETS_EXPORT QStyleHintReturn { public: enum HintReturnType { SH_Default=0xf000, SH_Mask, SH_Variant @@ -920,7 +920,7 @@ public: int type; }; -class Q_GUI_EXPORT QStyleHintReturnMask : public QStyleHintReturn { +class Q_WIDGETS_EXPORT QStyleHintReturnMask : public QStyleHintReturn { public: enum StyleOptionType { Type = SH_Mask }; enum StyleOptionVersion { Version = 1 }; @@ -930,7 +930,7 @@ public: QRegion region; }; -class Q_GUI_EXPORT QStyleHintReturnVariant : public QStyleHintReturn { +class Q_WIDGETS_EXPORT QStyleHintReturnVariant : public QStyleHintReturn { public: enum StyleOptionType { Type = SH_Variant }; enum StyleOptionVersion { Version = 1 }; @@ -959,8 +959,8 @@ T qstyleoption_cast(QStyleHintReturn *hint) } #if !defined(QT_NO_DEBUG_STREAM) -Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, const QStyleOption::OptionType &optionType); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option); #endif QT_END_NAMESPACE diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index 2dd8ccfcfd..ab55cdf54c 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QStyle; -struct Q_GUI_EXPORT QStyleFactoryInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QStyleFactoryInterface : public QFactoryInterface { virtual QStyle *create(const QString &key) = 0; }; @@ -62,7 +62,7 @@ struct Q_GUI_EXPORT QStyleFactoryInterface : public QFactoryInterface Q_DECLARE_INTERFACE(QStyleFactoryInterface, QStyleFactoryInterface_iid) -class Q_GUI_EXPORT QStylePlugin : public QObject, public QStyleFactoryInterface +class Q_WIDGETS_EXPORT QStylePlugin : public QObject, public QStyleFactoryInterface { Q_OBJECT Q_INTERFACES(QStyleFactoryInterface:QFactoryInterface) diff --git a/src/widgets/styles/qwindowscestyle.h b/src/widgets/styles/qwindowscestyle.h index c9e7ecadfb..3db9be58e2 100644 --- a/src/widgets/styles/qwindowscestyle.h +++ b/src/widgets/styles/qwindowscestyle.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSCE) -class Q_GUI_EXPORT QWindowsCEStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT QWindowsCEStyle : public QWindowsStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qwindowsmobilestyle.h b/src/widgets/styles/qwindowsmobilestyle.h index 2a2a697ca9..050f641888 100644 --- a/src/widgets/styles/qwindowsmobilestyle.h +++ b/src/widgets/styles/qwindowsmobilestyle.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QWindowsMobileStylePrivate; -class Q_GUI_EXPORT QWindowsMobileStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT QWindowsMobileStyle : public QWindowsStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qwindowsstyle.h b/src/widgets/styles/qwindowsstyle.h index 9c732132d4..acecfa9140 100644 --- a/src/widgets/styles/qwindowsstyle.h +++ b/src/widgets/styles/qwindowsstyle.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QWindowsStylePrivate; -class Q_GUI_EXPORT QWindowsStyle : public QCommonStyle +class Q_WIDGETS_EXPORT QWindowsStyle : public QCommonStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qwindowsvistastyle.h b/src/widgets/styles/qwindowsvistastyle.h index 24d673091a..68b489107e 100644 --- a/src/widgets/styles/qwindowsvistastyle.h +++ b/src/widgets/styles/qwindowsvistastyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSVISTA) class QWindowsVistaStylePrivate; -class Q_GUI_EXPORT QWindowsVistaStyle : public QWindowsXPStyle +class Q_WIDGETS_EXPORT QWindowsVistaStyle : public QWindowsXPStyle { Q_OBJECT public: diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 3c33df3d11..83d47db20f 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -132,7 +132,7 @@ static const int windowsArrowHMargin = 6; // arrow horizontal margin static const int windowsRightBorder = 12; // right border on windows // External function calls -extern Q_GUI_EXPORT HDC qt_win_display_dc(); +extern Q_WIDGETS_EXPORT HDC qt_win_display_dc(); extern QRegion qt_region_from_HRGN(HRGN rgn); diff --git a/src/widgets/styles/qwindowsxpstyle.h b/src/widgets/styles/qwindowsxpstyle.h index d0f1329c30..1cfd16479b 100644 --- a/src/widgets/styles/qwindowsxpstyle.h +++ b/src/widgets/styles/qwindowsxpstyle.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSXP) class QWindowsXPStylePrivate; -class Q_GUI_EXPORT QWindowsXPStyle : public QWindowsStyle +class Q_WIDGETS_EXPORT QWindowsXPStyle : public QWindowsStyle { Q_OBJECT public: |