diff options
Diffstat (limited to 'src/widgets')
226 files changed, 450 insertions, 450 deletions
diff --git a/src/widgets/accessible/qaccessible.h b/src/widgets/accessible/qaccessible.h index 4876174b5d..517dac492b 100644 --- a/src/widgets/accessible/qaccessible.h +++ b/src/widgets/accessible/qaccessible.h @@ -61,7 +61,7 @@ QT_MODULE(Gui) class QAccessibleInterface; -class Q_GUI_EXPORT QAccessible +class Q_WIDGETS_EXPORT QAccessible { public: enum Event { @@ -357,7 +357,7 @@ class QAccessibleTableInterface; class QAccessibleActionInterface; class QAccessibleImageInterface; -class Q_GUI_EXPORT QAccessibleInterface : public QAccessible +class Q_WIDGETS_EXPORT QAccessibleInterface : public QAccessible { public: virtual ~QAccessibleInterface() {} @@ -423,7 +423,7 @@ private: QAccessible2Interface *cast_helper(QAccessible2::InterfaceType); }; -class Q_GUI_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface +class Q_WIDGETS_EXPORT QAccessibleInterfaceEx: public QAccessibleInterface { public: virtual QVariant invokeMethodEx(Method method, int child, const QVariantList ¶ms) = 0; @@ -433,7 +433,7 @@ public: }; -class Q_GUI_EXPORT QAccessibleEvent : public QEvent +class Q_WIDGETS_EXPORT QAccessibleEvent : public QEvent { public: inline QAccessibleEvent(Type type, int child); diff --git a/src/widgets/accessible/qaccessible2.h b/src/widgets/accessible/qaccessible2.h index c0432ede34..1f18ac5501 100644 --- a/src/widgets/accessible/qaccessible2.h +++ b/src/widgets/accessible/qaccessible2.h @@ -70,7 +70,7 @@ namespace QAccessible2 }; } -class Q_GUI_EXPORT QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessible2Interface { public: virtual ~QAccessible2Interface() {} @@ -106,7 +106,7 @@ inline QAccessible2Interface *qAccessibleImageCastHelper() { return 0; } } \ private: -class Q_GUI_EXPORT QAccessibleTextInterface: public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleTextInterface: public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleTextCastHelper() { return this; } @@ -134,7 +134,7 @@ public: virtual void scrollToSubstring(int startIndex, int endIndex) = 0; }; -class Q_GUI_EXPORT QAccessibleEditableTextInterface: public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleEditableTextInterface: public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleEditableTextCastHelper() { return this; } @@ -150,7 +150,7 @@ public: virtual void setAttributes(int startOffset, int endOffset, const QString &attributes) = 0; }; -class Q_GUI_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface +class Q_WIDGETS_EXPORT QAccessibleSimpleEditableTextInterface: public QAccessibleEditableTextInterface { public: QAccessibleSimpleEditableTextInterface(QAccessibleInterface *accessibleInterface); @@ -167,7 +167,7 @@ private: QAccessibleInterface *iface; }; -class Q_GUI_EXPORT QAccessibleValueInterface: public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleValueInterface: public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleValueCastHelper() { return this; } @@ -180,7 +180,7 @@ public: virtual QVariant minimumValue() = 0; }; -class Q_GUI_EXPORT QAccessibleTableInterface: public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleTableInterface: public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleTableCastHelper() { return this; } @@ -214,7 +214,7 @@ public: int *columnSpan, bool *isSelected) = 0; }; -class Q_GUI_EXPORT QAccessibleActionInterface : public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleActionInterface : public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleActionCastHelper() { return this; } @@ -227,7 +227,7 @@ public: virtual QStringList keyBindings(int actionIndex) = 0; }; -class Q_GUI_EXPORT QAccessibleImageInterface : public QAccessible2Interface +class Q_WIDGETS_EXPORT QAccessibleImageInterface : public QAccessible2Interface { public: inline QAccessible2Interface *qAccessibleImageCastHelper() { return this; } diff --git a/src/widgets/accessible/qaccessiblebridge.h b/src/widgets/accessible/qaccessiblebridge.h index 73edf51183..0ea04501d0 100644 --- a/src/widgets/accessible/qaccessiblebridge.h +++ b/src/widgets/accessible/qaccessiblebridge.h @@ -63,7 +63,7 @@ public: virtual void notifyAccessibilityUpdate(int, QAccessibleInterface*, int) = 0; }; -struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface { virtual QAccessibleBridge *create(const QString& name) = 0; }; @@ -71,7 +71,7 @@ struct Q_GUI_EXPORT QAccessibleBridgeFactoryInterface : public QFactoryInterface #define QAccessibleBridgeFactoryInterface_iid "com.trolltech.Qt.QAccessibleBridgeFactoryInterface" Q_DECLARE_INTERFACE(QAccessibleBridgeFactoryInterface, QAccessibleBridgeFactoryInterface_iid) -class Q_GUI_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface +class Q_WIDGETS_EXPORT QAccessibleBridgePlugin : public QObject, public QAccessibleBridgeFactoryInterface { Q_OBJECT Q_INTERFACES(QAccessibleBridgeFactoryInterface:QFactoryInterface) diff --git a/src/widgets/accessible/qaccessibleobject.h b/src/widgets/accessible/qaccessibleobject.h index 81ae8414cd..f2ec2ba9c9 100644 --- a/src/widgets/accessible/qaccessibleobject.h +++ b/src/widgets/accessible/qaccessibleobject.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QAccessibleObjectPrivate; class QObject; -class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface +class Q_WIDGETS_EXPORT QAccessibleObject : public QAccessibleInterface { public: explicit QAccessibleObject(QObject *object); @@ -81,7 +81,7 @@ private: Q_DISABLE_COPY(QAccessibleObject) }; -class Q_GUI_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx +class Q_WIDGETS_EXPORT QAccessibleObjectEx : public QAccessibleInterfaceEx { public: explicit QAccessibleObjectEx(QObject *object); @@ -106,7 +106,7 @@ private: Q_DISABLE_COPY(QAccessibleObjectEx) }; -class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject +class Q_WIDGETS_EXPORT QAccessibleApplication : public QAccessibleObject { public: QAccessibleApplication(); diff --git a/src/widgets/accessible/qaccessibleplugin.h b/src/widgets/accessible/qaccessibleplugin.h index 475681d1cc..a71a1433e1 100644 --- a/src/widgets/accessible/qaccessibleplugin.h +++ b/src/widgets/accessible/qaccessibleplugin.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QStringList; class QAccessibleInterface; -struct Q_GUI_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFactoryInterface +struct Q_WIDGETS_EXPORT QAccessibleFactoryInterface : public QAccessible, public QFactoryInterface { virtual QAccessibleInterface* create(const QString &key, QObject *object) = 0; }; @@ -66,7 +66,7 @@ Q_DECLARE_INTERFACE(QAccessibleFactoryInterface, QAccessibleFactoryInterface_iid class QAccessiblePluginPrivate; -class Q_GUI_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface +class Q_WIDGETS_EXPORT QAccessiblePlugin : public QObject, public QAccessibleFactoryInterface { Q_OBJECT Q_INTERFACES(QAccessibleFactoryInterface:QFactoryInterface) diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 6a10caacf0..9605e38c5a 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -100,12 +100,12 @@ static QString buddyString(const QWidget *widget) return QString(); } -QString Q_GUI_EXPORT qt_accStripAmp(const QString &text) +QString Q_WIDGETS_EXPORT qt_accStripAmp(const QString &text) { return QString(text).remove(QLatin1Char('&')); } -QString Q_GUI_EXPORT qt_accHotKey(const QString &text) +QString Q_WIDGETS_EXPORT qt_accHotKey(const QString &text) { #ifndef QT_NO_SHORTCUT if (text.isEmpty()) diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index 39398b81eb..3b68e30a63 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QAccessibleWidgetPrivate; -class Q_GUI_EXPORT QAccessibleWidget : public QAccessibleObject +class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject { public: explicit QAccessibleWidget(QWidget *o, Role r = Client, const QString& name = QString()); @@ -94,7 +94,7 @@ private: Q_DISABLE_COPY(QAccessibleWidget) }; -class Q_GUI_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx +class Q_WIDGETS_EXPORT QAccessibleWidgetEx : public QAccessibleObjectEx { public: explicit QAccessibleWidgetEx(QWidget *o, Role r = Client, const QString& name = QString()); diff --git a/src/widgets/dialogs/qabstractpagesetupdialog.h b/src/widgets/dialogs/qabstractpagesetupdialog.h index a1c56e0792..a867a8155b 100644 --- a/src/widgets/dialogs/qabstractpagesetupdialog.h +++ b/src/widgets/dialogs/qabstractpagesetupdialog.h @@ -56,7 +56,7 @@ class QAbstractPageSetupDialogPrivate; class QPrinter; // ### Qt 5: Remove this class -class Q_GUI_EXPORT QAbstractPageSetupDialog : public QDialog +class Q_WIDGETS_EXPORT QAbstractPageSetupDialog : public QDialog { Q_DECLARE_PRIVATE(QAbstractPageSetupDialog) Q_OBJECT diff --git a/src/widgets/dialogs/qabstractprintdialog.h b/src/widgets/dialogs/qabstractprintdialog.h index 99f31be958..29c05d544b 100644 --- a/src/widgets/dialogs/qabstractprintdialog.h +++ b/src/widgets/dialogs/qabstractprintdialog.h @@ -56,7 +56,7 @@ class QAbstractPrintDialogPrivate; class QPrinter; // ### Qt 5: remove this class -class Q_GUI_EXPORT QAbstractPrintDialog : public QDialog +class Q_WIDGETS_EXPORT QAbstractPrintDialog : public QDialog { Q_DECLARE_PRIVATE(QAbstractPrintDialog) Q_OBJECT diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index b9380498fc..2eb4658634 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QColorDialogPrivate; -class Q_GUI_EXPORT QColorDialog : public QDialog +class Q_WIDGETS_EXPORT QColorDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QColorDialog) diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index cc85dd557d..ce8aa91bc7 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QPushButton; class QDialogPrivate; -class Q_GUI_EXPORT QDialog : public QWidget +class Q_WIDGETS_EXPORT QDialog : public QWidget { Q_OBJECT friend class QPushButton; diff --git a/src/widgets/dialogs/qdialogsbinarycompat_win.cpp b/src/widgets/dialogs/qdialogsbinarycompat_win.cpp index 0a29422c2e..09c96eaafd 100644 --- a/src/widgets/dialogs/qdialogsbinarycompat_win.cpp +++ b/src/widgets/dialogs/qdialogsbinarycompat_win.cpp @@ -69,7 +69,7 @@ class QFontDialogPrivate; class QInputDialogPrivate; class QWidget; -class Q_GUI_EXPORT QColorDialog +class Q_WIDGETS_EXPORT QColorDialog { private: explicit QColorDialog(QWidget *, bool); @@ -92,7 +92,7 @@ bool QColorDialog::selectColor(const QColor &) { return false; } void QColorDialog::setSelectedAlpha(int) {} int QColorDialog::selectedAlpha() const { return 0; } -class Q_GUI_EXPORT QFontDialog +class Q_WIDGETS_EXPORT QFontDialog { private: explicit QFontDialog(QWidget *, bool, Qt::WindowFlags); @@ -118,7 +118,7 @@ void QFontDialog::updateStyles() {} void QFontDialog::updateSizes() {} QFont QFontDialog::getFont(bool *, const QFont *, QWidget *) { return QFont(); } -class Q_GUI_EXPORT QInputDialog +class Q_WIDGETS_EXPORT QInputDialog { private: enum Type { LineEdit, SpinBox, DoubleSpinBox, ComboBox, EditableComboBox }; diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 4142fae648..a8805a2372 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QErrorMessagePrivate; -class Q_GUI_EXPORT QErrorMessage: public QDialog +class Q_WIDGETS_EXPORT QErrorMessage: public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QErrorMessage) diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index c22af651cf..d3df5c9a2c 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -78,16 +78,16 @@ Q_GLOBAL_STATIC(QString, lastVisitedDir) Exported hooks that can be used to customize the static functions. */ typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options); -Q_GUI_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook = 0; +Q_WIDGETS_EXPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook = 0; typedef QString (*_qt_filedialog_open_filename_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options); -Q_GUI_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook = 0; +Q_WIDGETS_EXPORT _qt_filedialog_open_filename_hook qt_filedialog_open_filename_hook = 0; typedef QStringList (*_qt_filedialog_open_filenames_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options); -Q_GUI_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook = 0; +Q_WIDGETS_EXPORT _qt_filedialog_open_filenames_hook qt_filedialog_open_filenames_hook = 0; typedef QString (*_qt_filedialog_save_filename_hook)(QWidget * parent, const QString &caption, const QString &dir, const QString &filter, QString *selectedFilter, QFileDialog::Options options); -Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook = 0; +Q_WIDGETS_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook = 0; /*! \class QFileDialog @@ -293,7 +293,7 @@ Q_GUI_EXPORT _qt_filedialog_save_filename_hook qt_filedialog_save_filename_hook */ #if defined(Q_WS_WIN) || defined(Q_WS_MAC) -bool Q_GUI_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API +bool Q_WIDGETS_EXPORT qt_use_native_dialogs = true; // for the benefit of testing tools, until we have a proper API #endif QT_BEGIN_INCLUDE_NAMESPACE diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index 5f2f410ad4..1fd7c25255 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -63,7 +63,7 @@ class QAbstractItemDelegate; class QAbstractProxyModel; class QUrl; -class Q_GUI_EXPORT QFileDialog : public QDialog +class Q_WIDGETS_EXPORT QFileDialog : public QDialog { Q_OBJECT Q_ENUMS(ViewMode FileMode AcceptMode Option) diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index 2cccdadc42..ce907cd10e 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -60,7 +60,7 @@ class ExtendedInformation; class QFileSystemModelPrivate; class QFileIconProvider; -class Q_GUI_EXPORT QFileSystemModel : public QAbstractItemModel +class Q_WIDGETS_EXPORT QFileSystemModel : public QAbstractItemModel { Q_OBJECT Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks) diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 1b993a00eb..03ef2b7e81 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QFontDialogPrivate; -class Q_GUI_EXPORT QFontDialog : public QDialog +class Q_WIDGETS_EXPORT QFontDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QFontDialog) diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index fb6541e2d9..51411c7ae1 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QInputDialogPrivate; -class Q_GUI_EXPORT QInputDialog : public QDialog +class Q_WIDGETS_EXPORT QInputDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QInputDialog) diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index c9698237e9..b2c99d3881 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -56,7 +56,7 @@ class QLabel; class QMessageBoxPrivate; class QAbstractButton; -class Q_GUI_EXPORT QMessageBox : public QDialog +class Q_WIDGETS_EXPORT QMessageBox : public QDialog { Q_OBJECT Q_ENUMS(Icon) diff --git a/src/widgets/dialogs/qpagesetupdialog.h b/src/widgets/dialogs/qpagesetupdialog.h index ac624255c7..a41b46cf15 100644 --- a/src/widgets/dialogs/qpagesetupdialog.h +++ b/src/widgets/dialogs/qpagesetupdialog.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QPageSetupDialogPrivate; -class Q_GUI_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog +class Q_WIDGETS_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog { Q_OBJECT Q_DECLARE_PRIVATE(QPageSetupDialog) diff --git a/src/widgets/dialogs/qprintdialog.h b/src/widgets/dialogs/qprintdialog.h index 14ed7476c3..1bde1d1deb 100644 --- a/src/widgets/dialogs/qprintdialog.h +++ b/src/widgets/dialogs/qprintdialog.h @@ -59,7 +59,7 @@ class QPrinter; #if defined (Q_OS_UNIX) && !defined(QTOPIA_PRINTDIALOG) && !defined(Q_WS_MAC) && !defined(Q_OS_SYMBIAN) class QUnixPrintWidgetPrivate; -class Q_GUI_EXPORT QUnixPrintWidget : public QWidget +class Q_WIDGETS_EXPORT QUnixPrintWidget : public QWidget { Q_OBJECT @@ -78,7 +78,7 @@ private: }; #endif -class Q_GUI_EXPORT QPrintDialog : public QAbstractPrintDialog +class Q_WIDGETS_EXPORT QPrintDialog : public QAbstractPrintDialog { Q_OBJECT Q_DECLARE_PRIVATE(QPrintDialog) diff --git a/src/widgets/dialogs/qprintpreviewdialog.h b/src/widgets/dialogs/qprintpreviewdialog.h index a26b014713..e02393af2e 100644 --- a/src/widgets/dialogs/qprintpreviewdialog.h +++ b/src/widgets/dialogs/qprintpreviewdialog.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QGraphicsView; class QPrintPreviewDialogPrivate; -class Q_GUI_EXPORT QPrintPreviewDialog : public QDialog +class Q_WIDGETS_EXPORT QPrintPreviewDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QPrintPreviewDialog) diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index dded72e0cc..b981e5ef63 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -58,7 +58,7 @@ class QProgressBar; class QTimer; class QProgressDialogPrivate; -class Q_GUI_EXPORT QProgressDialog : public QDialog +class Q_WIDGETS_EXPORT QProgressDialog : public QDialog { Q_OBJECT Q_DECLARE_PRIVATE(QProgressDialog) diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index d7ab34a94b..77eef53037 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -56,7 +56,7 @@ class QAbstractButton; class QWizardPage; class QWizardPrivate; -class Q_GUI_EXPORT QWizard : public QDialog +class Q_WIDGETS_EXPORT QWizard : public QDialog { Q_OBJECT Q_ENUMS(WizardStyle WizardOption) @@ -211,7 +211,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWizard::WizardOptions) class QWizardPagePrivate; -class Q_GUI_EXPORT QWizardPage : public QWidget +class Q_WIDGETS_EXPORT QWizardPage : public QWidget { Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle) diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 6ddb6ae92c..0ee6b26463 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -63,7 +63,7 @@ class QPixmap; class QGraphicsEffectSource; class QGraphicsEffectPrivate; -class Q_GUI_EXPORT QGraphicsEffect : public QObject +class Q_WIDGETS_EXPORT QGraphicsEffect : public QObject { Q_OBJECT Q_FLAGS(ChangeFlags) @@ -127,7 +127,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags) class QGraphicsColorizeEffectPrivate; -class Q_GUI_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsColorizeEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) @@ -156,7 +156,7 @@ private: }; class QGraphicsBlurEffectPrivate; -class Q_GUI_EXPORT QGraphicsBlurEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsBlurEffect: public QGraphicsEffect { Q_OBJECT Q_FLAGS(BlurHint BlurHints) @@ -196,7 +196,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsBlurEffect::BlurHints) class QGraphicsDropShadowEffectPrivate; -class Q_GUI_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsDropShadowEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(QPointF offset READ offset WRITE setOffset NOTIFY offsetChanged) @@ -252,7 +252,7 @@ private: }; class QGraphicsOpacityEffectPrivate; -class Q_GUI_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect +class Q_WIDGETS_EXPORT QGraphicsOpacityEffect: public QGraphicsEffect { Q_OBJECT Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) diff --git a/src/widgets/effects/qgraphicseffect_p.h b/src/widgets/effects/qgraphicseffect_p.h index 6a94db005e..ac15f04d05 100644 --- a/src/widgets/effects/qgraphicseffect_p.h +++ b/src/widgets/effects/qgraphicseffect_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE class QGraphicsEffectSourcePrivate; -class Q_GUI_EXPORT QGraphicsEffectSource : public QObject +class Q_WIDGETS_EXPORT QGraphicsEffectSource : public QObject { Q_OBJECT public: @@ -145,7 +145,7 @@ private: mutable QPixmapCache::Key m_cacheKey; }; -class Q_GUI_EXPORT QGraphicsEffectPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QGraphicsEffectPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QGraphicsEffect) public: diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp index 0414a88bd1..922b45cb61 100644 --- a/src/widgets/effects/qpixmapfilter.cpp +++ b/src/widgets/effects/qpixmapfilter.cpp @@ -781,7 +781,7 @@ void expblur(QImage &img, qreal radius, bool improvedQuality = false, int transp #define AVG(a,b) ( ((((a)^(b)) & 0xfefefefeUL) >> 1) + ((a)&(b)) ) #define AVG16(a,b) ( ((((a)^(b)) & 0xf7deUL) >> 1) + ((a)&(b)) ) -Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source) +Q_WIDGETS_EXPORT QImage qt_halfScaled(const QImage &source) { if (source.width() < 2 || source.height() < 2) return QImage(); @@ -869,7 +869,7 @@ Q_GUI_EXPORT QImage qt_halfScaled(const QImage &source) return dest; } -Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0) +Q_WIDGETS_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, bool quality, bool alphaOnly, int transposed = 0) { if (blurImage.format() != QImage::Format_ARGB32_Premultiplied && blurImage.format() != QImage::Format_RGB32) @@ -896,7 +896,7 @@ Q_GUI_EXPORT void qt_blurImage(QPainter *p, QImage &blurImage, qreal radius, boo } } -Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0) +Q_WIDGETS_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed = 0) { if (blurImage.format() == QImage::Format_Indexed8) expblur<12, 10, true>(blurImage, radius, quality, transposed); @@ -904,7 +904,7 @@ Q_GUI_EXPORT void qt_blurImage(QImage &blurImage, qreal radius, bool quality, in expblur<12, 10, false>(blurImage, radius, quality, transposed); } -Q_GUI_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); +Q_WIDGETS_EXPORT bool qt_scaleForTransform(const QTransform &transform, qreal *scale); /*! \internal diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 67d5a07153..5b06656b17 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -69,7 +69,7 @@ class QPixmapData; class QPixmapFilterPrivate; -class Q_GUI_EXPORT QPixmapFilter : public QObject +class Q_WIDGETS_EXPORT QPixmapFilter : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapFilter) @@ -98,7 +98,7 @@ protected: class QPixmapConvolutionFilterPrivate; -class Q_GUI_EXPORT QPixmapConvolutionFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapConvolutionFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapConvolutionFilter) @@ -122,7 +122,7 @@ private: class QPixmapBlurFilterPrivate; -class Q_GUI_EXPORT QPixmapBlurFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapBlurFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapBlurFilter) @@ -146,7 +146,7 @@ private: class QPixmapColorizeFilterPrivate; -class Q_GUI_EXPORT QPixmapColorizeFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapColorizeFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapColorizeFilter) @@ -165,7 +165,7 @@ public: class QPixmapDropShadowFilterPrivate; -class Q_GUI_EXPORT QPixmapDropShadowFilter : public QPixmapFilter +class Q_WIDGETS_EXPORT QPixmapDropShadowFilter : public QPixmapFilter { Q_OBJECT Q_DECLARE_PRIVATE(QPixmapDropShadowFilter) diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index d27ee6b0b8..4e57dbccf9 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -58,7 +58,7 @@ class QGraphicsAnchorPrivate; class QGraphicsAnchorLayout; class QGraphicsAnchorLayoutPrivate; -class Q_GUI_EXPORT QGraphicsAnchor : public QObject +class Q_WIDGETS_EXPORT QGraphicsAnchor : public QObject { Q_OBJECT Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET unsetSpacing) @@ -79,7 +79,7 @@ private: friend struct AnchorData; }; -class Q_GUI_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsAnchorLayout : public QGraphicsLayout { public: QGraphicsAnchorLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index 11a3bef5ad..c6bc2229b6 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QGraphicsGridLayoutPrivate; -class Q_GUI_EXPORT QGraphicsGridLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsGridLayout : public QGraphicsLayout { public: QGraphicsGridLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index a3443826c7..1e4cbaced6 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -86,7 +86,7 @@ class QRectF; class QStyleOptionGraphicsItem; class QGraphicsItemPrivate; -class Q_GUI_EXPORT QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsItem { public: enum GraphicsItemFlag { @@ -544,7 +544,7 @@ inline QRectF QGraphicsItem::mapRectFromScene(qreal ax, qreal ay, qreal w, qreal { return mapRectFromScene(QRectF(ax, ay, w, h)); } -class Q_GUI_EXPORT QGraphicsObject : public QObject, public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsObject : public QObject, public QGraphicsItem { Q_OBJECT Q_PROPERTY(QGraphicsObject * parent READ parentObject WRITE setParentItem NOTIFY parentChanged DESIGNABLE false) @@ -607,7 +607,7 @@ private: class QAbstractGraphicsShapeItemPrivate; -class Q_GUI_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QAbstractGraphicsShapeItem : public QGraphicsItem { public: QAbstractGraphicsShapeItem(QGraphicsItem *parent = 0 @@ -637,7 +637,7 @@ private: }; class QGraphicsPathItemPrivate; -class Q_GUI_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsPathItem : public QAbstractGraphicsShapeItem { public: QGraphicsPathItem(QGraphicsItem *parent = 0 @@ -680,7 +680,7 @@ private: }; class QGraphicsRectItemPrivate; -class Q_GUI_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsRectItem : public QAbstractGraphicsShapeItem { public: QGraphicsRectItem(QGraphicsItem *parent = 0 @@ -733,7 +733,7 @@ inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h) { setRect(QRectF(ax, ay, w, h)); } class QGraphicsEllipseItemPrivate; -class Q_GUI_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsEllipseItem : public QAbstractGraphicsShapeItem { public: QGraphicsEllipseItem(QGraphicsItem *parent = 0 @@ -792,7 +792,7 @@ inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h) { setRect(QRectF(ax, ay, w, h)); } class QGraphicsPolygonItemPrivate; -class Q_GUI_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsPolygonItem : public QAbstractGraphicsShapeItem { public: QGraphicsPolygonItem(QGraphicsItem *parent = 0 @@ -839,7 +839,7 @@ private: }; class QGraphicsLineItemPrivate; -class Q_GUI_EXPORT QGraphicsLineItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsLineItem : public QGraphicsItem { public: QGraphicsLineItem(QGraphicsItem *parent = 0 @@ -893,7 +893,7 @@ private: }; class QGraphicsPixmapItemPrivate; -class Q_GUI_EXPORT QGraphicsPixmapItem : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsPixmapItem : public QGraphicsItem { public: enum ShapeMode { @@ -957,7 +957,7 @@ inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay) class QGraphicsTextItemPrivate; class QTextDocument; class QTextCursor; -class Q_GUI_EXPORT QGraphicsTextItem : public QGraphicsObject +class Q_WIDGETS_EXPORT QGraphicsTextItem : public QGraphicsObject { Q_OBJECT QDOC_PROPERTY(bool openExternalLinks READ openExternalLinks WRITE setOpenExternalLinks) @@ -1062,7 +1062,7 @@ private: }; class QGraphicsSimpleTextItemPrivate; -class Q_GUI_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem +class Q_WIDGETS_EXPORT QGraphicsSimpleTextItem : public QAbstractGraphicsShapeItem { public: QGraphicsSimpleTextItem(QGraphicsItem *parent = 0 @@ -1108,7 +1108,7 @@ private: }; class QGraphicsItemGroupPrivate; -class Q_GUI_EXPORT QGraphicsItemGroup : public QGraphicsItem +class Q_WIDGETS_EXPORT QGraphicsItemGroup : public QGraphicsItem { public: QGraphicsItemGroup(QGraphicsItem *parent = 0 @@ -1149,11 +1149,11 @@ template <class T> inline T qgraphicsitem_cast(const QGraphicsItem *item) } #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag); -Q_GUI_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem *item); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsObject *item); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemChange change); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlag flag); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags); #endif QT_END_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index afcb294442..3cd77f3cdb 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -155,7 +155,7 @@ public: void purge(); }; -class Q_GUI_EXPORT QGraphicsItemPrivate +class Q_WIDGETS_EXPORT QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QGraphicsItem) public: diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index e4296cbb7b..a6425a50e4 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -59,7 +59,7 @@ class QTimeLine; template <class T1, class T2> struct QPair; class QGraphicsItemAnimationPrivate; -class Q_GUI_EXPORT QGraphicsItemAnimation : public QObject +class Q_WIDGETS_EXPORT QGraphicsItemAnimation : public QObject { Q_OBJECT public: diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 8ddeccf126..6b19f0e622 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -56,7 +56,7 @@ class QGraphicsLayoutPrivate; class QGraphicsLayoutItem; class QGraphicsWidget; -class Q_GUI_EXPORT QGraphicsLayout : public QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsLayout : public QGraphicsLayoutItem { public: QGraphicsLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 1842bb44fc..c617959a06 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QGraphicsLayoutItemPrivate; class QGraphicsItem; -class Q_GUI_EXPORT QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsLayoutItem { public: QGraphicsLayoutItem(QGraphicsLayoutItem *parent = 0, bool isLayout = false); diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 0b07c8f073..5d2d5c309f 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QGraphicsLinearLayoutPrivate; -class Q_GUI_EXPORT QGraphicsLinearLayout : public QGraphicsLayout +class Q_WIDGETS_EXPORT QGraphicsLinearLayout : public QGraphicsLayout { public: QGraphicsLinearLayout(QGraphicsLayoutItem *parent = 0); diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index da00e9fccf..127578c7c9 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -189,7 +189,7 @@ QT_BEGIN_NAMESPACE */ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); -Q_GUI_EXPORT extern bool qt_tab_all_widgets; +Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets; /*! \internal diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 30f232e686..9f0a711c46 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QGraphicsProxyWidgetPrivate; -class Q_GUI_EXPORT QGraphicsProxyWidget : public QGraphicsWidget +class Q_WIDGETS_EXPORT QGraphicsProxyWidget : public QGraphicsWidget { Q_OBJECT public: diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 5aff805b76..7895584827 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -98,7 +98,7 @@ class QStyle; class QStyleOptionGraphicsItem; class QGraphicsScenePrivate; -class Q_GUI_EXPORT QGraphicsScene : public QObject +class Q_WIDGETS_EXPORT QGraphicsScene : public QObject { Q_OBJECT Q_PROPERTY(QBrush backgroundBrush READ backgroundBrush WRITE setBackgroundBrush) diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index cbc211c542..f3677fbef8 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.h +++ b/src/widgets/graphicsview/qgraphicssceneevent.h @@ -64,7 +64,7 @@ class QSizeF; class QWidget; class QGraphicsSceneEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneEvent : public QEvent +class Q_WIDGETS_EXPORT QGraphicsSceneEvent : public QEvent { public: QGraphicsSceneEvent(Type type); @@ -82,7 +82,7 @@ private: }; class QGraphicsSceneMouseEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent { public: QGraphicsSceneMouseEvent(Type type = None); @@ -130,7 +130,7 @@ private: }; class QGraphicsSceneWheelEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent { public: QGraphicsSceneWheelEvent(Type type = None); @@ -163,7 +163,7 @@ private: }; class QGraphicsSceneContextMenuEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneContextMenuEvent : public QGraphicsSceneEvent { public: enum Reason { Mouse, Keyboard, Other }; @@ -192,7 +192,7 @@ private: }; class QGraphicsSceneHoverEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent { public: QGraphicsSceneHoverEvent(Type type = None); @@ -225,7 +225,7 @@ private: }; class QGraphicsSceneHelpEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent { public: QGraphicsSceneHelpEvent(Type type = None); @@ -243,7 +243,7 @@ private: }; class QGraphicsSceneDragDropEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent { public: QGraphicsSceneDragDropEvent(Type type = None); @@ -286,7 +286,7 @@ private: }; class QGraphicsSceneResizeEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent { Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent) Q_DISABLE_COPY(QGraphicsSceneResizeEvent) @@ -302,7 +302,7 @@ public: }; class QGraphicsSceneMoveEventPrivate; -class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent +class Q_WIDGETS_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent { Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent) Q_DISABLE_COPY(QGraphicsSceneMoveEvent) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index a686edebc7..4bceecc47c 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QGraphicsItem; class QGraphicsTransformPrivate; -class Q_GUI_EXPORT QGraphicsTransform : public QObject +class Q_WIDGETS_EXPORT QGraphicsTransform : public QObject { Q_OBJECT public: @@ -80,7 +80,7 @@ private: class QGraphicsScalePrivate; -class Q_GUI_EXPORT QGraphicsScale : public QGraphicsTransform +class Q_WIDGETS_EXPORT QGraphicsScale : public QGraphicsTransform { Q_OBJECT @@ -119,7 +119,7 @@ private: class QGraphicsRotationPrivate; -class Q_GUI_EXPORT QGraphicsRotation : public QGraphicsTransform +class Q_WIDGETS_EXPORT QGraphicsRotation : public QGraphicsTransform { Q_OBJECT diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index 1f03199ddc..19b5753938 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -61,7 +61,7 @@ class QPolygonF; class QStyleOptionGraphicsItem; class QGraphicsViewPrivate; -class Q_GUI_EXPORT QGraphicsView : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QGraphicsView : public QAbstractScrollArea { Q_OBJECT Q_FLAGS(QPainter::RenderHints CacheMode OptimizationFlags) diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 441fc7606d..535679f1d8 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE -class Q_GUI_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate +class Q_WIDGETS_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate { Q_DECLARE_PUBLIC(QGraphicsView) public: diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 0ead1996a8..8222886411 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -66,7 +66,7 @@ class QStyleOption; class QGraphicsWidgetPrivate; -class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem +class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem { Q_OBJECT Q_INTERFACES(QGraphicsItem QGraphicsLayoutItem) diff --git a/src/widgets/inputmethod/qcoefepinputcontext_p.h b/src/widgets/inputmethod/qcoefepinputcontext_p.h index 913d19887c..148f092ac5 100644 --- a/src/widgets/inputmethod/qcoefepinputcontext_p.h +++ b/src/widgets/inputmethod/qcoefepinputcontext_p.h @@ -167,7 +167,7 @@ private: friend class tst_QInputContext; }; -Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable); +Q_WIDGETS_EXPORT void qt_s60_setPartialScreenInputMode(bool enable); QT_END_NAMESPACE diff --git a/src/widgets/inputmethod/qcoefepinputcontext_s60.cpp b/src/widgets/inputmethod/qcoefepinputcontext_s60.cpp index a00aa50bd3..8c215360d8 100644 --- a/src/widgets/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/widgets/inputmethod/qcoefepinputcontext_s60.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE -Q_GUI_EXPORT void qt_s60_setPartialScreenInputMode(bool enable) +Q_WIDGETS_EXPORT void qt_s60_setPartialScreenInputMode(bool enable) { S60->partial_keyboard = enable; diff --git a/src/widgets/inputmethod/qinputcontext.h b/src/widgets/inputmethod/qinputcontext.h index 9604cc018a..b02cde70c7 100644 --- a/src/widgets/inputmethod/qinputcontext.h +++ b/src/widgets/inputmethod/qinputcontext.h @@ -79,7 +79,7 @@ class QInputContextPrivate; class QSymbianEvent; #endif -class Q_GUI_EXPORT QInputContext : public QObject +class Q_WIDGETS_EXPORT QInputContext : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QInputContext) diff --git a/src/widgets/inputmethod/qinputcontextfactory.h b/src/widgets/inputmethod/qinputcontextfactory.h index e7513a13bc..458ae62aba 100644 --- a/src/widgets/inputmethod/qinputcontextfactory.h +++ b/src/widgets/inputmethod/qinputcontextfactory.h @@ -69,7 +69,7 @@ QT_MODULE(Gui) class QInputContext; class QWidget; -class Q_GUI_EXPORT QInputContextFactory +class Q_WIDGETS_EXPORT QInputContextFactory { public: static QStringList keys(); diff --git a/src/widgets/inputmethod/qinputcontextplugin.h b/src/widgets/inputmethod/qinputcontextplugin.h index 0bcb7453de..7a340a6745 100644 --- a/src/widgets/inputmethod/qinputcontextplugin.h +++ b/src/widgets/inputmethod/qinputcontextplugin.h @@ -71,7 +71,7 @@ QT_MODULE(Gui) class QInputContext; class QInputContextPluginPrivate; -struct Q_GUI_EXPORT QInputContextFactoryInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QInputContextFactoryInterface : public QFactoryInterface { virtual QInputContext *create( const QString &key ) = 0; virtual QStringList languages( const QString &key ) = 0; @@ -82,7 +82,7 @@ struct Q_GUI_EXPORT QInputContextFactoryInterface : public QFactoryInterface #define QInputContextFactoryInterface_iid "com.trolltech.Qt.QInputContextFactoryInterface" Q_DECLARE_INTERFACE(QInputContextFactoryInterface, QInputContextFactoryInterface_iid) -class Q_GUI_EXPORT QInputContextPlugin : public QObject, public QInputContextFactoryInterface +class Q_WIDGETS_EXPORT QInputContextPlugin : public QObject, public QInputContextFactoryInterface { Q_OBJECT Q_INTERFACES(QInputContextFactoryInterface:QFactoryInterface) diff --git a/src/widgets/inputmethod/qmacinputcontext_p.h b/src/widgets/inputmethod/qmacinputcontext_p.h index 8e8024a0ec..4fb3eb57b6 100644 --- a/src/widgets/inputmethod/qmacinputcontext_p.h +++ b/src/widgets/inputmethod/qmacinputcontext_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE -class Q_GUI_EXPORT QMacInputContext : public QInputContext +class Q_WIDGETS_EXPORT QMacInputContext : public QInputContext { Q_OBJECT //Q_DECLARE_PRIVATE(QMacInputContext) diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 66e56efa8f..f494f0b8c8 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -59,7 +59,7 @@ class QAbstractItemModel; class QAbstractItemView; class QHelpEvent; -class Q_GUI_EXPORT QAbstractItemDelegate : public QObject +class Q_WIDGETS_EXPORT QAbstractItemDelegate : public QObject { Q_OBJECT diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index f413f61b87..2ba7c8de1c 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -60,7 +60,7 @@ class QDrag; class QEvent; class QAbstractItemViewPrivate; -class Q_GUI_EXPORT QAbstractItemView : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QAbstractItemView : public QAbstractScrollArea { Q_OBJECT Q_ENUMS(SelectionMode SelectionBehavior ScrollHint ScrollMode DragDropMode) diff --git a/src/widgets/itemviews/qabstractproxymodel.h b/src/widgets/itemviews/qabstractproxymodel.h index 1c2c8ea722..a24755b556 100644 --- a/src/widgets/itemviews/qabstractproxymodel.h +++ b/src/widgets/itemviews/qabstractproxymodel.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QAbstractProxyModelPrivate; class QItemSelection; -class Q_GUI_EXPORT QAbstractProxyModel : public QAbstractItemModel +class Q_WIDGETS_EXPORT QAbstractProxyModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 7d0985c988..b6d8687808 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QColumnViewPrivate; -class Q_GUI_EXPORT QColumnView : public QAbstractItemView { +class Q_WIDGETS_EXPORT QColumnView : public QAbstractItemView { Q_OBJECT Q_PROPERTY(bool resizeGripsVisible READ resizeGripsVisible WRITE setResizeGripsVisible) diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index c1d47d3fc2..ebb180fa20 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -57,7 +57,7 @@ class QAbstractItemModel; class QModelIndex; class QDataWidgetMapperPrivate; -class Q_GUI_EXPORT QDataWidgetMapper: public QObject +class Q_WIDGETS_EXPORT QDataWidgetMapper: public QObject { Q_OBJECT diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 653455b80a..4ad89065f9 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QDirModelPrivate; -class Q_GUI_EXPORT QDirModel : public QAbstractItemModel +class Q_WIDGETS_EXPORT QDirModel : public QAbstractItemModel { Q_OBJECT Q_PROPERTY(bool resolveSymlinks READ resolveSymlinks WRITE setResolveSymlinks) diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index 2e591ccb04..fcaaa9f78e 100644 --- a/src/widgets/itemviews/qfileiconprovider.h +++ b/src/widgets/itemviews/qfileiconprovider.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QFileIconProviderPrivate; -class Q_GUI_EXPORT QFileIconProvider +class Q_WIDGETS_EXPORT QFileIconProvider { public: QFileIconProvider(); diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index 6c47a9b66f..c9793759a1 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QHeaderViewPrivate; class QStyleOptionHeader; -class Q_GUI_EXPORT QHeaderView : public QAbstractItemView +class Q_WIDGETS_EXPORT QHeaderView : public QAbstractItemView { Q_OBJECT Q_PROPERTY(bool showSortIndicator READ isSortIndicatorShown WRITE setSortIndicatorShown) diff --git a/src/widgets/itemviews/qidentityproxymodel.h b/src/widgets/itemviews/qidentityproxymodel.h index b5d6223100..8a8422244f 100644 --- a/src/widgets/itemviews/qidentityproxymodel.h +++ b/src/widgets/itemviews/qidentityproxymodel.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QIdentityProxyModelPrivate; -class Q_GUI_EXPORT QIdentityProxyModel : public QAbstractProxyModel +class Q_WIDGETS_EXPORT QIdentityProxyModel : public QAbstractProxyModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 4f1f405a11..97f3cc820e 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -58,7 +58,7 @@ QT_MODULE(Gui) class QItemDelegatePrivate; class QItemEditorFactory; -class Q_GUI_EXPORT QItemDelegate : public QAbstractItemDelegate +class Q_WIDGETS_EXPORT QItemDelegate : public QAbstractItemDelegate { Q_OBJECT Q_PROPERTY(bool clipping READ hasClipping WRITE setClipping) diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index 5b70e6ac8b..b48cac224f 100644 --- a/src/widgets/itemviews/qitemeditorfactory.h +++ b/src/widgets/itemviews/qitemeditorfactory.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QWidget; -class Q_GUI_EXPORT QItemEditorCreatorBase +class Q_WIDGETS_EXPORT QItemEditorCreatorBase { public: virtual ~QItemEditorCreatorBase() {} @@ -97,7 +97,7 @@ template <class T> Q_INLINE_TEMPLATE QItemEditorCreator<T>::QItemEditorCreator(const QByteArray &avaluePropertyName) : propertyName(avaluePropertyName) {} -class Q_GUI_EXPORT QItemEditorFactory +class Q_WIDGETS_EXPORT QItemEditorFactory { public: inline QItemEditorFactory() {} diff --git a/src/widgets/itemviews/qitemselectionmodel.h b/src/widgets/itemviews/qitemselectionmodel.h index 3f4aa72008..5a117c8a1c 100644 --- a/src/widgets/itemviews/qitemselectionmodel.h +++ b/src/widgets/itemviews/qitemselectionmodel.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS -class Q_GUI_EXPORT QItemSelectionRange +class Q_WIDGETS_EXPORT QItemSelectionRange { public: @@ -148,7 +148,7 @@ inline QItemSelectionRange::QItemSelectionRange(const QModelIndex &atopLeft, class QItemSelection; class QItemSelectionModelPrivate; -class Q_GUI_EXPORT QItemSelectionModel : public QObject +class Q_WIDGETS_EXPORT QItemSelectionModel : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QItemSelectionModel) @@ -228,7 +228,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QItemSelectionModel::SelectionFlags) // dummy implentation of qHash() necessary for instantiating QList<QItemSelectionRange>::toSet() with MSVC inline uint qHash(const QItemSelectionRange &) { return 0; } -class Q_GUI_EXPORT QItemSelection : public QList<QItemSelectionRange> +class Q_WIDGETS_EXPORT QItemSelection : public QList<QItemSelectionRange> { public: QItemSelection() {} @@ -243,7 +243,7 @@ public: }; #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); #endif #endif // QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index c90c5be2bd..49d6583244 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QListViewPrivate; -class Q_GUI_EXPORT QListView : public QAbstractItemView +class Q_WIDGETS_EXPORT QListView : public QAbstractItemView { Q_OBJECT Q_ENUMS(Movement Flow ResizeMode LayoutMode ViewMode) diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 9666fb77cf..750b85b4c1 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -60,7 +60,7 @@ class QListModel; class QWidgetItemData; class QListWidgetItemPrivate; -class Q_GUI_EXPORT QListWidgetItem +class Q_WIDGETS_EXPORT QListWidgetItem { friend class QListModel; friend class QListWidget; @@ -193,13 +193,13 @@ inline void QListWidgetItem::setFont(const QFont &afont) { setData(Qt::FontRole, afont); } #ifndef QT_NO_DATASTREAM -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QListWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QListWidgetItem &item); #endif class QListWidgetPrivate; -class Q_GUI_EXPORT QListWidget : public QListView +class Q_WIDGETS_EXPORT QListWidget : public QListView { Q_OBJECT Q_PROPERTY(int count READ count) diff --git a/src/widgets/itemviews/qproxymodel.h b/src/widgets/itemviews/qproxymodel.h index 49145bb1d7..948f9a07c9 100644 --- a/src/widgets/itemviews/qproxymodel.h +++ b/src/widgets/itemviews/qproxymodel.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QProxyModelPrivate; -class Q_GUI_EXPORT QProxyModel : public QAbstractItemModel +class Q_WIDGETS_EXPORT QProxyModel : public QAbstractItemModel { Q_OBJECT diff --git a/src/widgets/itemviews/qsortfilterproxymodel.h b/src/widgets/itemviews/qsortfilterproxymodel.h index 12f7b5970c..68d92be841 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.h +++ b/src/widgets/itemviews/qsortfilterproxymodel.h @@ -58,7 +58,7 @@ class QSortFilterProxyModelPrivate; class QSortFilterProxyModelLessThan; class QSortFilterProxyModelGreaterThan; -class Q_GUI_EXPORT QSortFilterProxyModel : public QAbstractProxyModel +class Q_WIDGETS_EXPORT QSortFilterProxyModel : public QAbstractProxyModel { friend class QSortFilterProxyModelLessThan; friend class QSortFilterProxyModelGreaterThan; diff --git a/src/widgets/itemviews/qstandarditemmodel.h b/src/widgets/itemviews/qstandarditemmodel.h index b3875f0a5c..b1e70fffad 100644 --- a/src/widgets/itemviews/qstandarditemmodel.h +++ b/src/widgets/itemviews/qstandarditemmodel.h @@ -63,7 +63,7 @@ template <class T> class QList; class QStandardItemModel; class QStandardItemPrivate; -class Q_GUI_EXPORT QStandardItem +class Q_WIDGETS_EXPORT QStandardItem { public: QStandardItem(); @@ -315,7 +315,7 @@ inline void QStandardItem::appendRow(QStandardItem *aitem) class QStandardItemModelPrivate; -class Q_GUI_EXPORT QStandardItemModel : public QAbstractItemModel +class Q_WIDGETS_EXPORT QStandardItemModel : public QAbstractItemModel { Q_OBJECT Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole) @@ -443,8 +443,8 @@ inline bool QStandardItemModel::insertColumn(int acolumn, const QModelIndex &apa { return QAbstractItemModel::insertColumn(acolumn, aparent); } #ifndef QT_NO_DATASTREAM -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item); -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item); #endif #endif // QT_NO_STANDARDITEMMODEL diff --git a/src/widgets/itemviews/qstringlistmodel.h b/src/widgets/itemviews/qstringlistmodel.h index 0818288ef1..5efed8753e 100644 --- a/src/widgets/itemviews/qstringlistmodel.h +++ b/src/widgets/itemviews/qstringlistmodel.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #ifndef QT_NO_STRINGLISTMODEL -class Q_GUI_EXPORT QStringListModel : public QAbstractListModel +class Q_WIDGETS_EXPORT QStringListModel : public QAbstractListModel { Q_OBJECT public: diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index 1721dfaee2..6dda0041c9 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -58,7 +58,7 @@ QT_MODULE(Gui) class QStyledItemDelegatePrivate; class QItemEditorFactory; -class Q_GUI_EXPORT QStyledItemDelegate : public QAbstractItemDelegate +class Q_WIDGETS_EXPORT QStyledItemDelegate : public QAbstractItemDelegate { Q_OBJECT diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 64272f0e93..29f3793836 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QHeaderView; class QTableViewPrivate; -class Q_GUI_EXPORT QTableView : public QAbstractItemView +class Q_WIDGETS_EXPORT QTableView : public QAbstractItemView { Q_OBJECT Q_PROPERTY(bool showGrid READ showGrid WRITE setShowGrid) diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index ec5194acfd..d7332542d2 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) #ifndef QT_NO_TABLEWIDGET -class Q_GUI_EXPORT QTableWidgetSelectionRange +class Q_WIDGETS_EXPORT QTableWidgetSelectionRange { public: QTableWidgetSelectionRange(); @@ -79,7 +79,7 @@ class QTableModel; class QWidgetItemData; class QTableWidgetItemPrivate; -class Q_GUI_EXPORT QTableWidgetItem +class Q_WIDGETS_EXPORT QTableWidgetItem { friend class QTableWidget; friend class QTableModel; @@ -211,13 +211,13 @@ inline void QTableWidgetItem::setFont(const QFont &afont) { setData(Qt::FontRole, afont); } #ifndef QT_NO_DATASTREAM -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item); -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item); #endif class QTableWidgetPrivate; -class Q_GUI_EXPORT QTableWidget : public QTableView +class Q_WIDGETS_EXPORT QTableWidget : public QTableView { Q_OBJECT Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount) diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 42d6a33705..a78bad341f 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QTreeViewPrivate; class QHeaderView; -class Q_GUI_EXPORT QTreeView : public QAbstractItemView +class Q_WIDGETS_EXPORT QTreeView : public QAbstractItemView { Q_OBJECT Q_PROPERTY(int autoExpandDelay READ autoExpandDelay WRITE setAutoExpandDelay) diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index b1e7c55b2d..ec4b0d8585 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -60,7 +60,7 @@ class QTreeModel; class QWidgetItemData; class QTreeWidgetItemPrivate; -class Q_GUI_EXPORT QTreeWidgetItem +class Q_WIDGETS_EXPORT QTreeWidgetItem { friend class QTreeModel; friend class QTreeWidget; @@ -251,13 +251,13 @@ inline int QTreeWidgetItem::indexOfChild(QTreeWidgetItem *achild) const { executePendingSort(); return children.indexOf(achild); } #ifndef QT_NO_DATASTREAM -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item); #endif class QTreeWidgetPrivate; -class Q_GUI_EXPORT QTreeWidget : public QTreeView +class Q_WIDGETS_EXPORT QTreeWidget : public QTreeView { Q_OBJECT Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount) diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h index 396e18abe2..8d27afe2c3 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.h +++ b/src/widgets/itemviews/qtreewidgetitemiterator.h @@ -58,7 +58,7 @@ class QTreeWidgetItem; class QTreeModel; class QTreeWidgetItemIteratorPrivate; -class Q_GUI_EXPORT QTreeWidgetItemIterator +class Q_WIDGETS_EXPORT QTreeWidgetItemIterator { friend class QTreeModel; diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index ee259e3242..db2b4bf0b3 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -61,7 +61,7 @@ class QActionGroup; class QActionPrivate; class QGraphicsWidget; -class Q_GUI_EXPORT QAction : public QObject +class Q_WIDGETS_EXPORT QAction : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QAction) diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index d59b9b64e6..deeed061cd 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QActionGroupPrivate; -class Q_GUI_EXPORT QActionGroup : public QObject +class Q_WIDGETS_EXPORT QActionGroup : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QActionGroup) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 13a4eca745..ec7c3a5712 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -465,8 +465,8 @@ int QApplicationPrivate::keyboard_input_time = 400; // keyboard input interval #ifndef QT_NO_WHEELEVENT int QApplicationPrivate::wheel_scroll_lines; // number of lines to scroll #endif -extern bool qt_is_gui_used; -bool Q_GUI_EXPORT qt_tab_all_widgets = true; +bool qt_is_gui_used; +bool Q_WIDGETS_EXPORT qt_tab_all_widgets = true; bool qt_in_tab_key_event = false; int qt_antialiasing_threshold = -1; static int drag_time = 500; @@ -2774,7 +2774,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave) { } /* exported for the benefit of testing tools */ -Q_GUI_EXPORT bool qt_tryModalHelper(QWidget *widget, QWidget **rettop) +Q_WIDGETS_EXPORT bool qt_tryModalHelper(QWidget *widget, QWidget **rettop) { return QApplicationPrivate::tryModalHelper(widget, rettop); } @@ -5643,7 +5643,7 @@ void QApplicationPrivate::translateRawTouchEvent(QWidget *window, } } -Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, +Q_WIDGETS_EXPORT void qt_translateRawTouchEvent(QWidget *window, QTouchEvent::DeviceType deviceType, const QList<QTouchEvent::TouchPoint> &touchPoints) { diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 2aa4ce776d..4c62d0b9ea 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -102,7 +102,7 @@ class QApplicationPrivate; #define QApplicationBase QCoreApplication #endif -class Q_GUI_EXPORT QApplication : public QApplicationBase +class Q_WIDGETS_EXPORT QApplication : public QApplicationBase { Q_OBJECT Q_PROPERTY(QIcon windowIcon READ windowIcon WRITE setWindowIcon) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 40308db870..75cc003a1d 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -296,7 +296,7 @@ PaletteHash *qt_app_palettes_hash(); #define QApplicationPrivateBase QCoreApplicationPrivate #endif -class Q_GUI_EXPORT QApplicationPrivate : public QApplicationPrivateBase +class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase { Q_DECLARE_PUBLIC(QApplication) public: @@ -607,7 +607,7 @@ private: static bool isAlien(QWidget *); }; -Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, +Q_WIDGETS_EXPORT void qt_translateRawTouchEvent(QWidget *window, QTouchEvent::DeviceType deviceType, const QList<QTouchEvent::TouchPoint> &touchPoints); diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index bd343729f5..7c56a32979 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QBoxLayoutPrivate; -class Q_GUI_EXPORT QBoxLayout : public QLayout +class Q_WIDGETS_EXPORT QBoxLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QBoxLayout) @@ -126,7 +126,7 @@ private: Q_DISABLE_COPY(QBoxLayout) }; -class Q_GUI_EXPORT QHBoxLayout : public QBoxLayout +class Q_WIDGETS_EXPORT QHBoxLayout : public QBoxLayout { Q_OBJECT public: @@ -146,7 +146,7 @@ private: Q_DISABLE_COPY(QHBoxLayout) }; -class Q_GUI_EXPORT QVBoxLayout : public QBoxLayout +class Q_WIDGETS_EXPORT QVBoxLayout : public QBoxLayout { Q_OBJECT public: diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index e1f99640b9..e1ed8cfa07 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QApplication; class QDesktopWidgetPrivate; -class Q_GUI_EXPORT QDesktopWidget : public QWidget +class Q_WIDGETS_EXPORT QDesktopWidget : public QWidget { Q_OBJECT Q_PROPERTY(bool virtualDesktop READ isVirtualDesktop) diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index aaada26def..05bb57d981 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QFormLayoutPrivate; -class Q_GUI_EXPORT QFormLayout : public QLayout +class Q_WIDGETS_EXPORT QFormLayout : public QLayout { Q_OBJECT Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 5197e0edb9..610ae2b9f6 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) class QGesturePrivate; -class Q_GUI_EXPORT QGesture : public QObject +class Q_WIDGETS_EXPORT QGesture : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QGesture) @@ -105,7 +105,7 @@ private: }; class QPanGesturePrivate; -class Q_GUI_EXPORT QPanGesture : public QGesture +class Q_WIDGETS_EXPORT QPanGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPanGesture) @@ -134,7 +134,7 @@ public: }; class QPinchGesturePrivate; -class Q_GUI_EXPORT QPinchGesture : public QGesture +class Q_WIDGETS_EXPORT QPinchGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QPinchGesture) @@ -205,7 +205,7 @@ Q_DECLARE_METATYPE(QPinchGesture::ChangeFlags) QT_BEGIN_NAMESPACE class QSwipeGesturePrivate; -class Q_GUI_EXPORT QSwipeGesture : public QGesture +class Q_WIDGETS_EXPORT QSwipeGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QSwipeGesture) @@ -230,7 +230,7 @@ public: }; class QTapGesturePrivate; -class Q_GUI_EXPORT QTapGesture : public QGesture +class Q_WIDGETS_EXPORT QTapGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QTapGesture) @@ -247,7 +247,7 @@ public: }; class QTapAndHoldGesturePrivate; -class Q_GUI_EXPORT QTapAndHoldGesture : public QGesture +class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QTapAndHoldGesture) @@ -268,7 +268,7 @@ public: class QGesture; class QGestureEventPrivate; -class Q_GUI_EXPORT QGestureEvent : public QEvent +class Q_WIDGETS_EXPORT QGestureEvent : public QEvent { public: QGestureEvent(const QList<QGesture *> &gestures); diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index d3574f7ad2..019f856f09 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QObject; class QEvent; class QGesture; -class Q_GUI_EXPORT QGestureRecognizer +class Q_WIDGETS_EXPORT QGestureRecognizer { public: enum ResultFlag diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 6923218d2d..3e579e3dfd 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) class QGridLayoutPrivate; -class Q_GUI_EXPORT QGridLayout : public QLayout +class Q_WIDGETS_EXPORT QGridLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QGridLayout) diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h index dff3c45c25..3fae6a5cbe 100644 --- a/src/widgets/kernel/qguiplatformplugin_p.h +++ b/src/widgets/kernel/qguiplatformplugin_p.h @@ -70,7 +70,7 @@ class QFileDialog; class QColorDialog; class QFileInfo; -struct Q_GUI_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface { }; @@ -78,7 +78,7 @@ struct Q_GUI_EXPORT QGuiPlatformPluginInterface : public QFactoryInterface Q_DECLARE_INTERFACE(QGuiPlatformPluginInterface, QGuiPlatformPluginInterface_iid) -class Q_GUI_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface +class Q_WIDGETS_EXPORT QGuiPlatformPlugin : public QObject, public QGuiPlatformPluginInterface { Q_OBJECT Q_INTERFACES(QGuiPlatformPluginInterface:QFactoryInterface) diff --git a/src/widgets/kernel/qicon.h b/src/widgets/kernel/qicon.h index 2fc2863236..3c527eb974 100644 --- a/src/widgets/kernel/qicon.h +++ b/src/widgets/kernel/qicon.h @@ -57,7 +57,7 @@ class QIconPrivate; class QIconEngine; class QIconEngineV2; -class Q_GUI_EXPORT QIcon +class Q_WIDGETS_EXPORT QIcon { public: enum Mode { Normal, Disabled, Active, Selected }; @@ -119,8 +119,8 @@ public: private: QIconPrivate *d; #if !defined(QT_NO_DATASTREAM) - friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); - friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); + friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); + friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); #endif public: @@ -132,8 +132,8 @@ Q_DECLARE_SHARED(QIcon) Q_DECLARE_TYPEINFO(QIcon, Q_MOVABLE_TYPE); #if !defined(QT_NO_DATASTREAM) -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QIcon &); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QIcon &); #endif QT_END_NAMESPACE diff --git a/src/widgets/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h index fada291c81..63cfcbff5e 100644 --- a/src/widgets/kernel/qiconengine.h +++ b/src/widgets/kernel/qiconengine.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QIconEngine +class Q_WIDGETS_EXPORT QIconEngine { public: virtual ~QIconEngine(); @@ -70,7 +70,7 @@ public: }; // ### Qt 5: move the below into QIconEngine -class Q_GUI_EXPORT QIconEngineV2 : public QIconEngine +class Q_WIDGETS_EXPORT QIconEngineV2 : public QIconEngine { public: virtual QString key() const; diff --git a/src/widgets/kernel/qiconengineplugin.h b/src/widgets/kernel/qiconengineplugin.h index 8e744b4e9c..c228e8666b 100644 --- a/src/widgets/kernel/qiconengineplugin.h +++ b/src/widgets/kernel/qiconengineplugin.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QIconEngine; class QIconEngineV2; -struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface +struct Q_WIDGETS_EXPORT QIconEngineFactoryInterface : public QFactoryInterface { virtual QIconEngine *create(const QString &filename) = 0; }; @@ -63,7 +63,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterface : public QFactoryInterface "com.trolltech.Qt.QIconEngineFactoryInterface" Q_DECLARE_INTERFACE(QIconEngineFactoryInterface, QIconEngineFactoryInterface_iid) -class Q_GUI_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface +class Q_WIDGETS_EXPORT QIconEnginePlugin : public QObject, public QIconEngineFactoryInterface { Q_OBJECT Q_INTERFACES(QIconEngineFactoryInterface:QFactoryInterface) @@ -76,7 +76,7 @@ public: }; // ### Qt 5: remove version 2 -struct Q_GUI_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface +struct Q_WIDGETS_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface { virtual QIconEngineV2 *create(const QString &filename = QString()) = 0; }; @@ -85,7 +85,7 @@ struct Q_GUI_EXPORT QIconEngineFactoryInterfaceV2 : public QFactoryInterface "com.trolltech.Qt.QIconEngineFactoryInterfaceV2" Q_DECLARE_INTERFACE(QIconEngineFactoryInterfaceV2, QIconEngineFactoryInterfaceV2_iid) -class Q_GUI_EXPORT QIconEnginePluginV2 : public QObject, public QIconEngineFactoryInterfaceV2 +class Q_WIDGETS_EXPORT QIconEnginePluginV2 : public QObject, public QIconEngineFactoryInterfaceV2 { Q_OBJECT Q_INTERFACES(QIconEngineFactoryInterfaceV2:QFactoryInterface) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index ad6df43908..d9f732bd14 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -60,7 +60,7 @@ class QLayout; class QSize; #ifdef QT3_SUPPORT -class Q_GUI_EXPORT QLayoutIterator +class Q_WIDGETS_EXPORT QLayoutIterator { public: inline QT3_SUPPORT_CONSTRUCTOR QLayoutIterator(QLayout *i) : layout(i), index(0) {} @@ -87,7 +87,7 @@ private: class QLayoutPrivate; -class Q_GUI_EXPORT QLayout : public QObject, public QLayoutItem +class Q_WIDGETS_EXPORT QLayout : public QObject, public QLayoutItem { Q_OBJECT Q_DECLARE_PRIVATE(QLayout) diff --git a/src/widgets/kernel/qlayout_p.h b/src/widgets/kernel/qlayout_p.h index 9e8d9cd355..e282360418 100644 --- a/src/widgets/kernel/qlayout_p.h +++ b/src/widgets/kernel/qlayout_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QWidgetItem; class QSpacerItem; -class Q_GUI_EXPORT QLayoutPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QLayoutPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QLayout) diff --git a/src/widgets/kernel/qlayoutengine.cpp b/src/widgets/kernel/qlayoutengine.cpp index a93661737d..a7470aabaa 100644 --- a/src/widgets/kernel/qlayoutengine.cpp +++ b/src/widgets/kernel/qlayoutengine.cpp @@ -338,7 +338,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, #endif } -Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, const QSize &minSize, const QSize &maxSize, const QSizePolicy &sizePolicy) { @@ -368,7 +368,7 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint return s.expandedTo(QSize(0,0)); } -Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i) +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i) { QWidget *w = ((QWidgetItem *)i)->widget(); return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), @@ -376,14 +376,14 @@ Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i) w->sizePolicy()); } -Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w) +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w) { return qSmartMinSize(w->sizeHint(), w->minimumSizeHint(), w->minimumSize(), w->maximumSize(), w->sizePolicy()); } -Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, const QSize &minSize, const QSize &maxSize, const QSizePolicy &sizePolicy, Qt::Alignment align) { @@ -406,7 +406,7 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, return s; } -Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align) +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align) { QWidget *w = ((QWidgetItem*)i)->widget(); @@ -414,13 +414,13 @@ Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align) w->sizePolicy(), align); } -Q_GUI_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align) +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align) { return qSmartMaxSize(w->sizeHint().expandedTo(w->minimumSizeHint()), w->minimumSize(), w->maximumSize(), w->sizePolicy(), align); } -Q_GUI_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm) +Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm) { QObject *parent = layout->parent(); if (!parent) { diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h index d46395850b..9be9ecd321 100644 --- a/src/widgets/kernel/qlayoutengine_p.h +++ b/src/widgets/kernel/qlayoutengine_p.h @@ -97,20 +97,20 @@ struct QLayoutStruct }; -Q_GUI_EXPORT void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, +Q_WIDGETS_EXPORT void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count, int pos, int space, int spacer = -1); -Q_GUI_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QSize &sizeHint, const QSize &minSizeHint, const QSize &minSize, const QSize &maxSize, const QSizePolicy &sizePolicy); -Q_GUI_EXPORT QSize qSmartMinSize(const QWidgetItem *i); -Q_GUI_EXPORT QSize qSmartMinSize(const QWidget *w); -Q_GUI_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidgetItem *i); +Q_WIDGETS_EXPORT QSize qSmartMinSize(const QWidget *w); +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QSize &sizeHint, const QSize &minSize, const QSize &maxSize, const QSizePolicy &sizePolicy, Qt::Alignment align = 0); -Q_GUI_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0); -Q_GUI_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0); +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidgetItem *i, Qt::Alignment align = 0); +Q_WIDGETS_EXPORT QSize qSmartMaxSize(const QWidget *w, Qt::Alignment align = 0); -Q_GUI_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm); +Q_WIDGETS_EXPORT int qSmartSpacing(const QLayout *layout, QStyle::PixelMetric pm); /* Modify total maximum (max), total expansion (exp), and total empty diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index 92bd1afebb..d03f77654b 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -61,7 +61,7 @@ class QSpacerItem; class QWidget; class QSize; -class Q_GUI_EXPORT QLayoutItem +class Q_WIDGETS_EXPORT QLayoutItem { public: inline explicit QLayoutItem(Qt::Alignment alignment = 0); @@ -93,7 +93,7 @@ protected: inline QLayoutItem::QLayoutItem(Qt::Alignment aalignment) : align(aalignment) { } -class Q_GUI_EXPORT QSpacerItem : public QLayoutItem +class Q_WIDGETS_EXPORT QSpacerItem : public QLayoutItem { public: QSpacerItem(int w, int h, @@ -119,7 +119,7 @@ private: QRect rect; }; -class Q_GUI_EXPORT QWidgetItem : public QLayoutItem +class Q_WIDGETS_EXPORT QWidgetItem : public QLayoutItem { Q_DISABLE_COPY(QWidgetItem) @@ -141,7 +141,7 @@ protected: QWidget *wid; }; -class Q_GUI_EXPORT QWidgetItemV2 : public QWidgetItem +class Q_WIDGETS_EXPORT QWidgetItemV2 : public QWidgetItem { public: explicit QWidgetItemV2(QWidget *widget); diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index bd92a91d58..76067604f9 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QVariant; -class Q_GUI_EXPORT QSizePolicy +class Q_WIDGETS_EXPORT QSizePolicy { Q_GADGET Q_ENUMS(Policy) @@ -196,8 +196,8 @@ public: private: #ifndef QT_NO_DATASTREAM - friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); - friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); + friend Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); + friend Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); #endif QSizePolicy(int i) : data(i) { } @@ -222,8 +222,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSizePolicy::ControlTypes) #ifndef QT_NO_DATASTREAM // implemented in qlayout.cpp -Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); -Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); +Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &, const QSizePolicy &); +Q_WIDGETS_EXPORT QDataStream &operator>>(QDataStream &, QSizePolicy &); #endif inline void QSizePolicy::transpose() { diff --git a/src/widgets/kernel/qsound.h b/src/widgets/kernel/qsound.h index 48e57201f0..79fd241948 100644 --- a/src/widgets/kernel/qsound.h +++ b/src/widgets/kernel/qsound.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QSoundPrivate; -class Q_GUI_EXPORT QSound : public QObject +class Q_WIDGETS_EXPORT QSound : public QObject { Q_OBJECT diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 441a23ef8b..d895d139ab 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QStackedLayoutPrivate; -class Q_GUI_EXPORT QStackedLayout : public QLayout +class Q_WIDGETS_EXPORT QStackedLayout : public QLayout { Q_OBJECT Q_DECLARE_PRIVATE(QStackedLayout) diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 506d084fd3..52fb962edb 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) #ifndef QT_NO_TOOLTIP -class Q_GUI_EXPORT QToolTip +class Q_WIDGETS_EXPORT QToolTip { QToolTip(); public: diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 0028a32545..b975b78e3e 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -58,7 +58,7 @@ class QAction; class QToolButton; #endif -class Q_GUI_EXPORT QWhatsThis +class Q_WIDGETS_EXPORT QWhatsThis { QWhatsThis(); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 5788805ccb..6c92e0bb94 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -142,7 +142,7 @@ static bool qt_enable_backingstore = true; #endif #ifdef Q_WS_X11 // for compatibility with Qt 4.0 -Q_GUI_EXPORT void qt_x11_set_global_double_buffer(bool enable) +Q_WIDGETS_EXPORT void qt_x11_set_global_double_buffer(bool enable) { qt_enable_backingstore = enable; } @@ -12242,12 +12242,12 @@ void QWidgetPrivate::adjustQuitOnCloseAttribute() -Q_GUI_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget) +Q_WIDGETS_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget) { return widget->data; } -Q_GUI_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget) +Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget) { return widget->d_func(); } diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index de6effef92..47007726a8 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -145,7 +145,7 @@ public: class QWidgetPrivate; -class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice +class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice { Q_OBJECT Q_DECLARE_PRIVATE(QWidget) @@ -803,8 +803,8 @@ private: friend void qt_set_winid_on_widget(QWidget*, Qt::HANDLE); #endif - friend Q_GUI_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget); - friend Q_GUI_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); + friend Q_WIDGETS_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget); + friend Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); private: Q_DISABLE_COPY(QWidget) diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index d39e318b36..cc894d514d 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -354,7 +354,7 @@ static inline bool bypassGraphicsProxyWidget(const QWidget *p) return false; } -class Q_GUI_EXPORT QWidgetPrivate : public QObjectPrivate +class Q_WIDGETS_EXPORT QWidgetPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QWidget) diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 22ed7c7d1c..31d58a819a 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QWidgetActionPrivate; -class Q_GUI_EXPORT QWidgetAction : public QAction +class Q_WIDGETS_EXPORT QWidgetAction : public QAction { Q_OBJECT Q_DECLARE_PRIVATE(QWidgetAction) diff --git a/src/widgets/kernel/qwidgetsvariant.cpp b/src/widgets/kernel/qwidgetsvariant.cpp index 680c8f9cfa..e4a9e0f067 100644 --- a/src/widgets/kernel/qwidgetsvariant.cpp +++ b/src/widgets/kernel/qwidgetsvariant.cpp @@ -191,7 +191,7 @@ static const QMetaTypeGuiHelper qVariantWidgetsHelper[] = { Q_IMPL_METATYPE_HELPER(QSizePolicy), }; -extern Q_GUI_EXPORT const QVariant::Handler *qt_widgets_variant_handler; +Q_WIDGETS_EXPORT const QVariant::Handler *qt_widgets_variant_handler; int qRegisterWidgetsVariant() { diff --git a/src/widgets/platforms/mac/qcocoaview_mac_p.h b/src/widgets/platforms/mac/qcocoaview_mac_p.h index e5e977bedd..963cbe06bf 100644 --- a/src/widgets/platforms/mac/qcocoaview_mac_p.h +++ b/src/widgets/platforms/mac/qcocoaview_mac_p.h @@ -61,7 +61,7 @@ QT_FORWARD_DECLARE_CLASS(QEvent); QT_FORWARD_DECLARE_CLASS(QString); QT_FORWARD_DECLARE_CLASS(QStringList); -Q_GUI_EXPORT +Q_WIDGETS_EXPORT @interface QT_MANGLE_NAMESPACE(QCocoaView) : NSControl <NSTextInput> { QWidget *qwidget; QWidgetPrivate *qwidgetprivate; diff --git a/src/widgets/platforms/mac/qkeymapper_mac.cpp b/src/widgets/platforms/mac/qkeymapper_mac.cpp index b5b3c4b5b9..e96caf1b9d 100644 --- a/src/widgets/platforms/mac/qkeymapper_mac.cpp +++ b/src/widgets/platforms/mac/qkeymapper_mac.cpp @@ -67,7 +67,7 @@ QT_USE_NAMESPACE bool qt_mac_eat_unicode_key = false; extern bool qt_sendSpontaneousEvent(QObject *obj, QEvent *event); //qapplication_mac.cpp -Q_GUI_EXPORT void qt_mac_secure_keyboard(bool b) +Q_WIDGETS_EXPORT void qt_mac_secure_keyboard(bool b) { static bool secure = false; if (b != secure){ diff --git a/src/widgets/platforms/mac/qmime_mac.cpp b/src/widgets/platforms/mac/qmime_mac.cpp index a1df34eb1f..0eaaaa8f2a 100644 --- a/src/widgets/platforms/mac/qmime_mac.cpp +++ b/src/widgets/platforms/mac/qmime_mac.cpp @@ -103,7 +103,7 @@ Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) \sa QMacPasteboardMime */ -Q_GUI_EXPORT void qRegisterDraggedTypes(const QStringList &types) +Q_WIDGETS_EXPORT void qRegisterDraggedTypes(const QStringList &types) { (*globalDraggedTypesList()) += types; } diff --git a/src/widgets/platforms/mac/qpaintdevice_mac.cpp b/src/widgets/platforms/mac/qpaintdevice_mac.cpp index 56cf8dc5a8..d29047bf50 100644 --- a/src/widgets/platforms/mac/qpaintdevice_mac.cpp +++ b/src/widgets/platforms/mac/qpaintdevice_mac.cpp @@ -85,7 +85,7 @@ float qt_mac_defaultDpi_y() \warning This function is only available on Mac OS X. */ -Q_GUI_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device) +Q_WIDGETS_EXPORT GrafPtr qt_mac_qd_context(const QPaintDevice *device) { if (device->devType() == QInternal::Pixmap) { return static_cast<GrafPtr>(static_cast<const QPixmap *>(device)->macQDHandle()); @@ -109,7 +109,7 @@ extern CGColorSpaceRef qt_mac_colorSpaceForDeviceType(const QPaintDevice *pdev); \warning This function is only available on Mac OS X. */ -Q_GUI_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) +Q_WIDGETS_EXPORT CGContextRef qt_mac_cg_context(const QPaintDevice *pdev) { if (pdev->devType() == QInternal::Pixmap) { const QPixmap *pm = static_cast<const QPixmap*>(pdev); diff --git a/src/widgets/platforms/mac/qpixmap_mac.cpp b/src/widgets/platforms/mac/qpixmap_mac.cpp index cb3016177d..da08878427 100644 --- a/src/widgets/platforms/mac/qpixmap_mac.cpp +++ b/src/widgets/platforms/mac/qpixmap_mac.cpp @@ -72,7 +72,7 @@ extern QRegion qt_mac_convert_mac_region(RgnHandle rgn); //qregion_mac.cpp static int qt_pixmap_serial = 0; -Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) +Q_WIDGETS_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) { if (QApplicationPrivate::graphics_system_name == QLatin1String("raster")) return reinterpret_cast<quint32 *>(static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bits()); @@ -80,7 +80,7 @@ Q_GUI_EXPORT quint32 *qt_mac_pixmap_get_base(const QPixmap *pix) return static_cast<QMacPixmapData*>(pix->data.data())->pixels; } -Q_GUI_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix) +Q_WIDGETS_EXPORT int qt_mac_pixmap_get_bytes_per_line(const QPixmap *pix) { if (QApplicationPrivate::graphics_system_name == QLatin1String("raster")) return static_cast<QRasterPixmapData*>(pix->data.data())->buffer()->bytesPerLine(); diff --git a/src/widgets/platforms/mac/qregion_mac.cpp b/src/widgets/platforms/mac/qregion_mac.cpp index 3a0346abc4..94805a7f80 100644 --- a/src/widgets/platforms/mac/qregion_mac.cpp +++ b/src/widgets/platforms/mac/qregion_mac.cpp @@ -66,7 +66,7 @@ static void qt_mac_cleanup_rgncache() } #endif -Q_GUI_EXPORT RgnHandle qt_mac_get_rgn() +Q_WIDGETS_EXPORT RgnHandle qt_mac_get_rgn() { #ifdef RGN_CACHE_SIZE if(!rgncache_init) { @@ -90,7 +90,7 @@ Q_GUI_EXPORT RgnHandle qt_mac_get_rgn() return NewRgn(); } -Q_GUI_EXPORT void qt_mac_dispose_rgn(RgnHandle r) +Q_WIDGETS_EXPORT void qt_mac_dispose_rgn(RgnHandle r) { #ifdef RGN_CACHE_SIZE if(rgncache_init && rgncache_used < RGN_CACHE_SIZE) { @@ -116,7 +116,7 @@ static OSStatus qt_mac_get_rgn_rect(UInt16 msg, RgnHandle, const Rect *rect, voi return noErr; } -Q_GUI_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn) +Q_WIDGETS_EXPORT QRegion qt_mac_convert_mac_region(RgnHandle rgn) { return QRegion::fromQDRgn(rgn); } diff --git a/src/widgets/platforms/mac/qt_mac_p.h b/src/widgets/platforms/mac/qt_mac_p.h index 4625982062..80328c3497 100644 --- a/src/widgets/platforms/mac/qt_mac_p.h +++ b/src/widgets/platforms/mac/qt_mac_p.h @@ -138,7 +138,7 @@ public: void performFade(); }; -class Q_GUI_EXPORT QMacCocoaAutoReleasePool +class Q_WIDGETS_EXPORT QMacCocoaAutoReleasePool { private: void *pool; @@ -151,7 +151,7 @@ public: QString qt_mac_removeMnemonics(const QString &original); //implemented in qmacstyle_mac.cpp -class Q_GUI_EXPORT QMacWindowChangeEvent +class Q_WIDGETS_EXPORT QMacWindowChangeEvent { private: static QList<QMacWindowChangeEvent*> *change_events; diff --git a/src/widgets/platforms/s60/qeventdispatcher_s60_p.h b/src/widgets/platforms/s60/qeventdispatcher_s60_p.h index 49ec568097..8e644a2d06 100644 --- a/src/widgets/platforms/s60/qeventdispatcher_s60_p.h +++ b/src/widgets/platforms/s60/qeventdispatcher_s60_p.h @@ -87,7 +87,7 @@ private: bool m_hasAlreadyRun; }; -class Q_GUI_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian +class Q_WIDGETS_EXPORT QEventDispatcherS60 : public QEventDispatcherSymbian { Q_OBJECT diff --git a/src/widgets/platforms/win/qapplication_win.cpp b/src/widgets/platforms/win/qapplication_win.cpp index c34e75ffcc..72b8870fe1 100644 --- a/src/widgets/platforms/win/qapplication_win.cpp +++ b/src/widgets/platforms/win/qapplication_win.cpp @@ -237,9 +237,9 @@ static void resolveAygLibs() # define FE_FONTSMOOTHINGCLEARTYPE 0x0002 #endif -Q_GUI_EXPORT qreal qt_fontsmoothing_gamma; -Q_GUI_EXPORT bool qt_cleartype_enabled; -Q_GUI_EXPORT bool qt_win_owndc_required; // CS_OWNDC is required if we use the GL graphicssystem as default +Q_WIDGETS_EXPORT qreal qt_fontsmoothing_gamma; +Q_WIDGETS_EXPORT bool qt_cleartype_enabled; +Q_WIDGETS_EXPORT bool qt_win_owndc_required; // CS_OWNDC is required if we use the GL graphicssystem as default typedef HCTX (API *PtrWTOpen)(HWND, LPLOGCONTEXT, BOOL); typedef BOOL (API *PtrWTClose)(HCTX); @@ -427,7 +427,7 @@ static bool sm_cancel; static bool replayPopupMouseEvent = false; // replay handling when popups close // ignore the next release event if return from a modal widget -Q_GUI_EXPORT bool qt_win_ignoreNextMouseReleaseEvent = false; +Q_WIDGETS_EXPORT bool qt_win_ignoreNextMouseReleaseEvent = false; #if defined(QT_DEBUG) @@ -946,7 +946,7 @@ void qt_cleanup() Platform specific global and internal functions *****************************************************************************/ -Q_GUI_EXPORT HDC qt_win_display_dc() // get display DC +Q_WIDGETS_EXPORT HDC qt_win_display_dc() // get display DC { Q_ASSERT(qApp && qApp->thread() == QThread::currentThread()); if (!displayDC) @@ -1122,7 +1122,7 @@ const QString qt_reg_winclass(QWidget *w) // register window class return cname; } -Q_GUI_EXPORT const QString qt_getRegisteredWndClass() +Q_WIDGETS_EXPORT const QString qt_getRegisteredWndClass() { return qt_reg_winclass(0); } diff --git a/src/widgets/platforms/win/qkeymapper_win.cpp b/src/widgets/platforms/win/qkeymapper_win.cpp index b981066434..78389c1160 100644 --- a/src/widgets/platforms/win/qkeymapper_win.cpp +++ b/src/widgets/platforms/win/qkeymapper_win.cpp @@ -497,7 +497,7 @@ static inline int toKeyOrUnicode(int vk, int scancode, unsigned char *kbdBuffer, return code == Qt::Key_unknown ? 0 : code; } -Q_GUI_EXPORT int qt_translateKeyCode(int vk) +Q_WIDGETS_EXPORT int qt_translateKeyCode(int vk) { int code = winceKeyBend((vk < 0 || vk > 255) ? 0 : vk); return code == Qt::Key_unknown ? 0 : code; diff --git a/src/widgets/platforms/x11/qapplication_x11.cpp b/src/widgets/platforms/x11/qapplication_x11.cpp index 8bf1c70cce..4a392d2a19 100644 --- a/src/widgets/platforms/x11/qapplication_x11.cpp +++ b/src/widgets/platforms/x11/qapplication_x11.cpp @@ -328,7 +328,7 @@ static const char * x11_atomnames = { "ERASER\0" }; -Q_GUI_EXPORT QX11Data *qt_x11Data = 0; +Q_WIDGETS_EXPORT QX11Data *qt_x11Data = 0; /***************************************************************************** Internal variables and functions @@ -387,7 +387,7 @@ static bool popupGrabOk; bool qt_sm_blockUserInput = false; // session management -Q_GUI_EXPORT int qt_xfocusout_grab_counter = 0; +Q_WIDGETS_EXPORT int qt_xfocusout_grab_counter = 0; #if !defined (QT_NO_TABLET) Q_GLOBAL_STATIC(QTabletDeviceDataList, tablet_devices) @@ -403,7 +403,7 @@ typedef bool(*QX11FilterFunction)(XEvent *event); Q_GLOBAL_STATIC(QList<QX11FilterFunction>, x11Filters) -Q_GUI_EXPORT void qt_installX11EventFilter(QX11FilterFunction func) +Q_WIDGETS_EXPORT void qt_installX11EventFilter(QX11FilterFunction func) { Q_ASSERT(func); @@ -411,7 +411,7 @@ Q_GUI_EXPORT void qt_installX11EventFilter(QX11FilterFunction func) list->append(func); } -Q_GUI_EXPORT void qt_removeX11EventFilter(QX11FilterFunction func) +Q_WIDGETS_EXPORT void qt_removeX11EventFilter(QX11FilterFunction func) { Q_ASSERT(func); @@ -447,7 +447,7 @@ extern bool qt_xfixes_clipboard_changed(Window clipboardOwner, Time timestamp); extern bool qt_xfixes_selection_changed(Window selectionOwner, Time timestamp); //def in qclipboard_x11.cpp static void qt_save_rootinfo(); -Q_GUI_EXPORT bool qt_try_modal(QWidget *, XEvent *); +Q_WIDGETS_EXPORT bool qt_try_modal(QWidget *, XEvent *); QWidget *qt_button_down = 0; // last widget to be pressed with the mouse QPointer<QWidget> qt_last_mouse_receiver = 0; @@ -844,7 +844,7 @@ static void qt_x11_create_intern_atoms() #endif } -Q_GUI_EXPORT void qt_x11_apply_settings_in_all_apps() +Q_WIDGETS_EXPORT void qt_x11_apply_settings_in_all_apps() { QByteArray stamp; QDataStream s(&stamp, QIODevice::WriteOnly); diff --git a/src/widgets/platforms/x11/qfont_x11.cpp b/src/widgets/platforms/x11/qfont_x11.cpp index e89e0d9dc2..ba69871855 100644 --- a/src/widgets/platforms/x11/qfont_x11.cpp +++ b/src/widgets/platforms/x11/qfont_x11.cpp @@ -118,7 +118,7 @@ QString qt_fallback_font_family(int script) } // Sets the fallback family for the specified script. -Q_GUI_EXPORT void qt_x11_set_fallback_font_family(int script, const QString &family) +Q_WIDGETS_EXPORT void qt_x11_set_fallback_font_family(int script, const QString &family) { FallBackHash *hash = fallBackHash(); if (!family.isEmpty()) diff --git a/src/widgets/platforms/x11/qfontengine_x11.cpp b/src/widgets/platforms/x11/qfontengine_x11.cpp index e3bfa5df46..9918f82bf7 100644 --- a/src/widgets/platforms/x11/qfontengine_x11.cpp +++ b/src/widgets/platforms/x11/qfontengine_x11.cpp @@ -966,7 +966,7 @@ void QFontEngineMultiFT::loadEngine(int at) -Q_GUI_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias) +Q_WIDGETS_EXPORT void qt_x11ft_convert_pattern(FcPattern *pattern, QByteArray *file_name, int *index, bool *antialias) { FcChar8 *fileName; FcPatternGetString(pattern, FC_FILE, 0, &fileName); diff --git a/src/widgets/platforms/x11/qfontengine_x11_p.h b/src/widgets/platforms/x11/qfontengine_x11_p.h index 1c0bcada11..b12fbc28d4 100644 --- a/src/widgets/platforms/x11/qfontengine_x11_p.h +++ b/src/widgets/platforms/x11/qfontengine_x11_p.h @@ -137,7 +137,7 @@ private: #ifndef QT_NO_FONTCONFIG -class Q_GUI_EXPORT QFontEngineMultiFT : public QFontEngineMulti +class Q_WIDGETS_EXPORT QFontEngineMultiFT : public QFontEngineMulti { public: QFontEngineMultiFT(QFontEngine *fe, FcPattern *firstEnginePattern, FcPattern *p, int s, const QFontDef &request); @@ -154,7 +154,7 @@ private: int firstFontIndex; // first font in fontset }; -class Q_GUI_EXPORT QFontEngineX11FT : public QFontEngineFT +class Q_WIDGETS_EXPORT QFontEngineX11FT : public QFontEngineFT { public: explicit QFontEngineX11FT(const QFontDef &fontDef) : QFontEngineFT(fontDef) {} diff --git a/src/widgets/platforms/x11/qpaintdevice_x11.cpp b/src/widgets/platforms/x11/qpaintdevice_x11.cpp index 4b2a01ffc4..d7ecb06885 100644 --- a/src/widgets/platforms/x11/qpaintdevice_x11.cpp +++ b/src/widgets/platforms/x11/qpaintdevice_x11.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE can't be obtained. */ -Drawable Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd) +Drawable Q_WIDGETS_EXPORT qt_x11Handle(const QPaintDevice *pd) { if (!pd) return 0; if (pd->devType() == QInternal::Widget) @@ -71,7 +71,7 @@ Drawable Q_GUI_EXPORT qt_x11Handle(const QPaintDevice *pd) Returns the QX11Info structure for the \a pd paint device. 0 is returned if it can't be obtained. */ -const Q_GUI_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd) +const Q_WIDGETS_EXPORT QX11Info *qt_x11Info(const QPaintDevice *pd) { if (!pd) return 0; if (pd->devType() == QInternal::Widget) diff --git a/src/widgets/platforms/x11/qpaintengine_x11.cpp b/src/widgets/platforms/x11/qpaintengine_x11.cpp index 44792f4918..a7ea84c918 100644 --- a/src/widgets/platforms/x11/qpaintengine_x11.cpp +++ b/src/widgets/platforms/x11/qpaintengine_x11.cpp @@ -97,7 +97,7 @@ static const qreal aliasedCoordinateDelta = 0.5 - 0.015625; QPainter::begin() must be called before this function returns a valid GC. */ -Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *p) +Q_WIDGETS_EXPORT GC qt_x11_get_pen_gc(QPainter *p) { if (p && p->paintEngine() && p->paintEngine()->isActive() @@ -112,7 +112,7 @@ Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *p) QPainter::begin() must be called before this function returns a valid GC. */ -Q_GUI_EXPORT GC qt_x11_get_brush_gc(QPainter *p) +Q_WIDGETS_EXPORT GC qt_x11_get_brush_gc(QPainter *p) { if (p && p->paintEngine() && p->paintEngine()->isActive() @@ -148,7 +148,7 @@ static inline int qpainterOpToXrender(QPainter::CompositionMode mode) // hack, so we don't have to make QRegion::clipRectangles() public or include // X11 headers in qregion.h -Q_GUI_EXPORT void *qt_getClipRects(const QRegion &r, int &num) +Q_WIDGETS_EXPORT void *qt_getClipRects(const QRegion &r, int &num) { return r.clipRectangles(num); } @@ -1819,7 +1819,7 @@ void QX11PaintEngine::drawPath(const QPainterPath &path) } } -Q_GUI_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image, +Q_WIDGETS_EXPORT void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image, Drawable hd, GC gc, Display *dpy, Visual *visual, int depth) { Q_ASSERT(image.format() == QImage::Format_RGB32); diff --git a/src/widgets/platforms/x11/qpaintengine_x11_p.h b/src/widgets/platforms/x11/qpaintengine_x11_p.h index d8d8817993..2ff339bbe1 100644 --- a/src/widgets/platforms/x11/qpaintengine_x11_p.h +++ b/src/widgets/platforms/x11/qpaintengine_x11_p.h @@ -131,8 +131,8 @@ protected: friend class QPixmap; friend class QFontEngineBox; - friend Q_GUI_EXPORT GC qt_x11_get_pen_gc(QPainter *); - friend Q_GUI_EXPORT GC qt_x11_get_brush_gc(QPainter *); + friend Q_WIDGETS_EXPORT GC qt_x11_get_pen_gc(QPainter *); + friend Q_WIDGETS_EXPORT GC qt_x11_get_brush_gc(QPainter *); private: Q_DISABLE_COPY(QX11PaintEngine) diff --git a/src/widgets/platforms/x11/qpixmap_x11.cpp b/src/widgets/platforms/x11/qpixmap_x11.cpp index 77c2a2a9d9..89f5b0926f 100644 --- a/src/widgets/platforms/x11/qpixmap_x11.cpp +++ b/src/widgets/platforms/x11/qpixmap_x11.cpp @@ -311,7 +311,7 @@ static int defaultScreen = -1; *****************************************************************************/ QBasicAtomicInt qt_pixmap_serial = Q_BASIC_ATOMIC_INITIALIZER(0); -int Q_GUI_EXPORT qt_x11_preferred_pixmap_depth = 0; +int Q_WIDGETS_EXPORT qt_x11_preferred_pixmap_depth = 0; QX11PixmapData::QX11PixmapData(PixelType type) : QPixmapData(type, X11Class), gl_surface(0), hd(0), diff --git a/src/widgets/platforms/x11/qpixmap_x11_p.h b/src/widgets/platforms/x11/qpixmap_x11_p.h index 7cd80e62f9..8c8ccd156c 100644 --- a/src/widgets/platforms/x11/qpixmap_x11_p.h +++ b/src/widgets/platforms/x11/qpixmap_x11_p.h @@ -64,7 +64,7 @@ class QX11PaintEngine; struct QXImageWrapper; -class Q_GUI_EXPORT QX11PixmapData : public QPixmapData +class Q_WIDGETS_EXPORT QX11PixmapData : public QPixmapData { public: QX11PixmapData(PixelType type); diff --git a/src/widgets/platforms/x11/qt_x11_p.h b/src/widgets/platforms/x11/qt_x11_p.h index 1a9830d42b..ea808fb8a2 100644 --- a/src/widgets/platforms/x11/qt_x11_p.h +++ b/src/widgets/platforms/x11/qt_x11_p.h @@ -332,7 +332,7 @@ struct QXdndDropTransaction class QMimeData; struct QX11Data; -extern Q_GUI_EXPORT QX11Data *qt_x11Data; +extern Q_WIDGETS_EXPORT QX11Data *qt_x11Data; enum DesktopEnvironment { DE_UNKNOWN, diff --git a/src/widgets/platforms/x11/qwidget_x11.cpp b/src/widgets/platforms/x11/qwidget_x11.cpp index b0dac5f9e8..cd4b7b4e15 100644 --- a/src/widgets/platforms/x11/qwidget_x11.cpp +++ b/src/widgets/platforms/x11/qwidget_x11.cpp @@ -341,7 +341,7 @@ void qt_x11_enforce_cursor(QWidget * w, bool force) } } -Q_GUI_EXPORT void qt_x11_enforce_cursor(QWidget * w) +Q_WIDGETS_EXPORT void qt_x11_enforce_cursor(QWidget * w) { qt_x11_enforce_cursor(w, false); } @@ -397,7 +397,7 @@ void qt_x11_wait_for_window_manager(QWidget *w, bool sendPostedEvents) } while(1); } -Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget *w) +Q_WIDGETS_EXPORT void qt_x11_wait_for_window_manager(QWidget *w) { qt_x11_wait_for_window_manager(w, true); } diff --git a/src/widgets/platforms/x11/qx11embed_x11.h b/src/widgets/platforms/x11/qx11embed_x11.h index 229cc3d34d..fcf94b60a2 100644 --- a/src/widgets/platforms/x11/qx11embed_x11.h +++ b/src/widgets/platforms/x11/qx11embed_x11.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) class QX11EmbedWidgetPrivate; -class Q_GUI_EXPORT QX11EmbedWidget : public QWidget +class Q_WIDGETS_EXPORT QX11EmbedWidget : public QWidget { Q_OBJECT public: @@ -85,7 +85,7 @@ private: }; class QX11EmbedContainerPrivate; -class Q_GUI_EXPORT QX11EmbedContainer : public QWidget +class Q_WIDGETS_EXPORT QX11EmbedContainer : public QWidget { Q_OBJECT public: diff --git a/src/widgets/platforms/x11/qx11info_x11.h b/src/widgets/platforms/x11/qx11info_x11.h index 2d81c6be76..ac2c36e175 100644 --- a/src/widgets/platforms/x11/qx11info_x11.h +++ b/src/widgets/platforms/x11/qx11info_x11.h @@ -60,7 +60,7 @@ class QX11InfoPrivate; struct QX11WindowAttributes; void qt_x11_getX11InfoForWindow(QX11Info * xinfo, const QX11WindowAttributes &a); -class Q_GUI_EXPORT QX11Info +class Q_WIDGETS_EXPORT QX11Info { public: QX11Info(); diff --git a/src/widgets/s60framework/qs60mainapplication.h b/src/widgets/s60framework/qs60mainapplication.h index 74e3706155..2e06181b86 100644 --- a/src/widgets/s60framework/qs60mainapplication.h +++ b/src/widgets/s60framework/qs60mainapplication.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QS60MainApplication : public QS60MainApplicationBase +class Q_WIDGETS_EXPORT QS60MainApplication : public QS60MainApplicationBase { public: QS60MainApplication(); diff --git a/src/widgets/s60framework/qs60mainappui.h b/src/widgets/s60framework/qs60mainappui.h index 374bc4428f..7d5a265a2a 100644 --- a/src/widgets/s60framework/qs60mainappui.h +++ b/src/widgets/s60framework/qs60mainappui.h @@ -100,7 +100,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QS60MainAppUi : public QS60MainAppUiBase +class Q_WIDGETS_EXPORT QS60MainAppUi : public QS60MainAppUiBase { public: QS60MainAppUi(); diff --git a/src/widgets/s60framework/qs60maindocument.h b/src/widgets/s60framework/qs60maindocument.h index 6ede66a9bb..6a8e9a52f7 100644 --- a/src/widgets/s60framework/qs60maindocument.h +++ b/src/widgets/s60framework/qs60maindocument.h @@ -64,7 +64,7 @@ QT_MODULE(Gui) class QS60MainAppUi; -class Q_GUI_EXPORT QS60MainDocument : public QS60MainDocumentBase +class Q_WIDGETS_EXPORT QS60MainDocument : public QS60MainDocumentBase { public: diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index caa540a5d9..7862bd41d7 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #ifndef QT_NO_STATEMACHINE class QKeyEventTransitionPrivate; -class Q_GUI_EXPORT QKeyEventTransition : public QEventTransition +class Q_WIDGETS_EXPORT QKeyEventTransition : public QEventTransition { Q_OBJECT Q_PROPERTY(int key READ key WRITE setKey) diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 1304b43b0e..7255a968ac 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QMouseEventTransitionPrivate; class QPainterPath; -class Q_GUI_EXPORT QMouseEventTransition : public QEventTransition +class Q_WIDGETS_EXPORT QMouseEventTransition : public QEventTransition { Q_OBJECT Q_PROPERTY(Qt::MouseButton button READ button WRITE setButton) 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: diff --git a/src/widgets/symbian/qsymbianevent.h b/src/widgets/symbian/qsymbianevent.h index 6a7984ed0b..2ecc846a8e 100644 --- a/src/widgets/symbian/qsymbianevent.h +++ b/src/widgets/symbian/qsymbianevent.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QSymbianEvent +class Q_WIDGETS_EXPORT QSymbianEvent { public: enum Type { @@ -96,7 +96,7 @@ inline bool QSymbianEvent::isValid() const } #ifndef QT_NO_DEBUG_STREAM -Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QSymbianEvent *o); +Q_WIDGETS_EXPORT QDebug operator<<(QDebug dbg, const QSymbianEvent *o); #endif QT_END_NAMESPACE diff --git a/src/widgets/to_be_moved/qlinecontrol_p.h b/src/widgets/to_be_moved/qlinecontrol_p.h index d621627411..eab66c4908 100644 --- a/src/widgets/to_be_moved/qlinecontrol_p.h +++ b/src/widgets/to_be_moved/qlinecontrol_p.h @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QLineControl : public QObject +class Q_WIDGETS_EXPORT QLineControl : public QObject { Q_OBJECT diff --git a/src/widgets/to_be_moved/qshortcut.h b/src/widgets/to_be_moved/qshortcut.h index 7c505ddd86..6e3c647852 100644 --- a/src/widgets/to_be_moved/qshortcut.h +++ b/src/widgets/to_be_moved/qshortcut.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) #ifndef QT_NO_SHORTCUT class QShortcutPrivate; -class Q_GUI_EXPORT QShortcut : public QObject +class Q_WIDGETS_EXPORT QShortcut : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QShortcut) diff --git a/src/widgets/to_be_moved/qtextcontrol_p.h b/src/widgets/to_be_moved/qtextcontrol_p.h index fdc1e305f1..5a5215e1c6 100644 --- a/src/widgets/to_be_moved/qtextcontrol_p.h +++ b/src/widgets/to_be_moved/qtextcontrol_p.h @@ -79,7 +79,7 @@ class QAbstractScrollArea; class QEvent; class QTimerEvent; -class Q_GUI_EXPORT QTextControl : public QObject +class Q_WIDGETS_EXPORT QTextControl : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QTextControl) diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 61797ee645..c7e1b6e945 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -61,7 +61,7 @@ class QAbstractItemView; class QAbstractProxyModel; class QWidget; -class Q_GUI_EXPORT QCompleter : public QObject +class Q_WIDGETS_EXPORT QCompleter : public QObject { Q_OBJECT Q_PROPERTY(QString completionPrefix READ completionPrefix WRITE setCompletionPrefix) diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h index e095cf5eab..23c8b6e788 100644 --- a/src/widgets/util/qflickgesture_p.h +++ b/src/widgets/util/qflickgesture_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE class QFlickGesturePrivate; class QGraphicsItem; -class Q_GUI_EXPORT QFlickGesture : public QGesture +class Q_WIDGETS_EXPORT QFlickGesture : public QGesture { Q_OBJECT Q_DECLARE_PRIVATE(QFlickGesture) diff --git a/src/widgets/util/qscroller.h b/src/widgets/util/qscroller.h index fcd2be8ea4..3484139cbb 100644 --- a/src/widgets/util/qscroller.h +++ b/src/widgets/util/qscroller.h @@ -60,7 +60,7 @@ class QFlickGestureRecognizer; class QMouseFlickGestureRecognizer; #endif -class Q_GUI_EXPORT QScroller : public QObject +class Q_WIDGETS_EXPORT QScroller : public QObject { Q_OBJECT Q_PROPERTY(State state READ state NOTIFY stateChanged) diff --git a/src/widgets/util/qscrollerproperties.h b/src/widgets/util/qscrollerproperties.h index 46d1c2f44a..73c1125fe0 100644 --- a/src/widgets/util/qscrollerproperties.h +++ b/src/widgets/util/qscrollerproperties.h @@ -56,7 +56,7 @@ class QScroller; class QScrollerPrivate; class QScrollerPropertiesPrivate; -class Q_GUI_EXPORT QScrollerProperties +class Q_WIDGETS_EXPORT QScrollerProperties { public: QScrollerProperties(); diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index b77c545c58..3327ce4223 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -62,7 +62,7 @@ class QWheelEvent; class QMouseEvent; class QPoint; -class Q_GUI_EXPORT QSystemTrayIcon : public QObject +class Q_WIDGETS_EXPORT QSystemTrayIcon : public QObject { Q_OBJECT Q_PROPERTY(QString toolTip READ toolTip WRITE setToolTip) diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index 99026fc077..ce2dac2503 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -57,7 +57,7 @@ QT_MODULE(Gui) #ifndef QT_NO_UNDOGROUP -class Q_GUI_EXPORT QUndoGroup : public QObject +class Q_WIDGETS_EXPORT QUndoGroup : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QUndoGroup) diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index 2cbbc0ad4a..493d11fdb7 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -57,7 +57,7 @@ class QUndoStackPrivate; #ifndef QT_NO_UNDOCOMMAND -class Q_GUI_EXPORT QUndoCommand +class Q_WIDGETS_EXPORT QUndoCommand { QUndoCommandPrivate *d; @@ -88,7 +88,7 @@ private: #ifndef QT_NO_UNDOSTACK -class Q_GUI_EXPORT QUndoStack : public QObject +class Q_WIDGETS_EXPORT QUndoStack : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QUndoStack) diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index 6fb78bdeef..9df2995f9d 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -58,7 +58,7 @@ class QIcon; QT_MODULE(Gui) -class Q_GUI_EXPORT QUndoView : public QListView +class Q_WIDGETS_EXPORT QUndoView : public QListView { Q_OBJECT Q_DECLARE_PRIVATE(QUndoView) diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 74f36db44b..bf8eca6fc9 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -5,7 +5,7 @@ QT = core core-private gui gui-private CONFIG += module MODULE_PRI = ../modules/qt_widgets.pri -DEFINES += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE +DEFINES += QT_BUILD_WIDGETS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused diff --git a/src/widgets/widgets/qabstractbutton.cpp b/src/widgets/widgets/qabstractbutton.cpp index 57e517ab25..d777cc7567 100644 --- a/src/widgets/widgets/qabstractbutton.cpp +++ b/src/widgets/widgets/qabstractbutton.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE #define AUTO_REPEAT_DELAY 300 #define AUTO_REPEAT_INTERVAL 100 -Q_GUI_EXPORT extern bool qt_tab_all_widgets; +Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets; /*! \class QAbstractButton diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index 6921864ee5..9edfa1b267 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QButtonGroup; class QAbstractButtonPrivate; -class Q_GUI_EXPORT QAbstractButton : public QWidget +class Q_WIDGETS_EXPORT QAbstractButton : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index aad7324c0b..3f2a273297 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -56,7 +56,7 @@ class QMargins; class QScrollBar; class QAbstractScrollAreaPrivate; -class Q_GUI_EXPORT QAbstractScrollArea : public QFrame +class Q_WIDGETS_EXPORT QAbstractScrollArea : public QFrame { Q_OBJECT Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy WRITE setVerticalScrollBarPolicy) diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index 27ee19f579..5511d08f4e 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QScrollBar; class QAbstractScrollAreaScrollBarContainer; -class Q_GUI_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate +class Q_WIDGETS_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate { Q_DECLARE_PUBLIC(QAbstractScrollArea) diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index b7f0efdb5f..109798154e 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QAbstractSliderPrivate; -class Q_GUI_EXPORT QAbstractSlider : public QWidget +class Q_WIDGETS_EXPORT QAbstractSlider : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index cbb4d209c2..fb3ae2f5ee 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -58,7 +58,7 @@ class QLineEdit; class QAbstractSpinBoxPrivate; class QStyleOptionSpinBox; -class Q_GUI_EXPORT QAbstractSpinBox : public QWidget +class Q_WIDGETS_EXPORT QAbstractSpinBox : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index a0472fd2db..e3ef34644e 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -56,7 +56,7 @@ class QAbstractButton; class QAbstractButtonPrivate; class QButtonGroupPrivate; -class Q_GUI_EXPORT QButtonGroup : public QObject +class Q_WIDGETS_EXPORT QButtonGroup : public QObject { Q_OBJECT diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 343d161be4..a80bae2f49 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -57,7 +57,7 @@ class QDate; class QTextCharFormat; class QCalendarWidgetPrivate; -class Q_GUI_EXPORT QCalendarWidget : public QWidget +class Q_WIDGETS_EXPORT QCalendarWidget : public QWidget { Q_OBJECT Q_ENUMS(Qt::DayOfWeek) diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index af26e97a83..b040b13be1 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QCheckBoxPrivate; class QStyleOptionButton; -class Q_GUI_EXPORT QCheckBox : public QAbstractButton +class Q_WIDGETS_EXPORT QCheckBox : public QAbstractButton { Q_OBJECT diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 14179a3316..ed766cc004 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -59,7 +59,7 @@ class QLineEdit; class QComboBoxPrivate; class QCompleter; -class Q_GUI_EXPORT QComboBox : public QWidget +class Q_WIDGETS_EXPORT QComboBox : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 1c8187b57f..9d01e37b1b 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QCommandLinkButtonPrivate; -class Q_GUI_EXPORT QCommandLinkButton: public QPushButton +class Q_WIDGETS_EXPORT QCommandLinkButton: public QPushButton { Q_OBJECT diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index ab575e1d3f..a57a5f29e9 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -58,7 +58,7 @@ class QDateTimeEditPrivate; class QStyleOptionSpinBox; class QCalendarWidget; -class Q_GUI_EXPORT QDateTimeEdit : public QAbstractSpinBox +class Q_WIDGETS_EXPORT QDateTimeEdit : public QAbstractSpinBox { Q_OBJECT @@ -203,7 +203,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_resetButton()) }; -class Q_GUI_EXPORT QTimeEdit : public QDateTimeEdit +class Q_WIDGETS_EXPORT QTimeEdit : public QDateTimeEdit { Q_OBJECT public: @@ -211,7 +211,7 @@ public: QTimeEdit(const QTime &time, QWidget *parent = 0); }; -class Q_GUI_EXPORT QDateEdit : public QDateTimeEdit +class Q_WIDGETS_EXPORT QDateEdit : public QDateTimeEdit { Q_OBJECT public: diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index cfec90e2c2..7687b7e7a1 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QDialPrivate; class QStyleOptionSlider; -class Q_GUI_EXPORT QDial: public QAbstractSlider +class Q_WIDGETS_EXPORT QDial: public QAbstractSlider { Q_OBJECT diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index ee51e9b06f..0a6e231e3f 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -54,7 +54,7 @@ class QAbstractButton; class QPushButton; class QDialogButtonBoxPrivate; -class Q_GUI_EXPORT QDialogButtonBox : public QWidget +class Q_WIDGETS_EXPORT QDialogButtonBox : public QWidget { Q_OBJECT Q_FLAGS(StandardButtons) diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index 65f94d277b..cc81db2fc2 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -57,7 +57,7 @@ class QDockWidgetPrivate; class QMainWindow; class QStyleOptionDockWidget; -class Q_GUI_EXPORT QDockWidget : public QWidget +class Q_WIDGETS_EXPORT QDockWidget : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 416f3aaa87..4d3c4f4d70 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -128,7 +128,7 @@ public: bool isAnimating() const; }; -class Q_GUI_EXPORT QDockWidgetLayout : public QLayout +class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout { Q_OBJECT public: diff --git a/src/widgets/widgets/qeffects_p.h b/src/widgets/widgets/qeffects_p.h index 4290fd16ad..bae2bbf54a 100644 --- a/src/widgets/widgets/qeffects_p.h +++ b/src/widgets/widgets/qeffects_p.h @@ -74,8 +74,8 @@ struct QEffects typedef uint DirFlags; }; -extern void Q_GUI_EXPORT qScrollEffect(QWidget*, QEffects::DirFlags dir = QEffects::DownScroll, int time = -1); -extern void Q_GUI_EXPORT qFadeEffect(QWidget*, int time = -1); +extern void Q_WIDGETS_EXPORT qScrollEffect(QWidget*, QEffects::DirFlags dir = QEffects::DownScroll, int time = -1); +extern void Q_WIDGETS_EXPORT qFadeEffect(QWidget*, int time = -1); QT_END_NAMESPACE diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index da6d476715..f4f1d1c854 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QFocusFramePrivate; class QStyleOption; -class Q_GUI_EXPORT QFocusFrame : public QWidget +class Q_WIDGETS_EXPORT QFocusFrame : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 7dc5cedd1f..b0007207da 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QFontComboBoxPrivate; -class Q_GUI_EXPORT QFontComboBox : public QComboBox +class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox { Q_OBJECT Q_FLAGS(FontFilters) diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index c1013abada..80d41365cd 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QFramePrivate; -class Q_GUI_EXPORT QFrame : public QWidget +class Q_WIDGETS_EXPORT QFrame : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 717aaf2cf0..fba094d303 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QGroupBoxPrivate; class QStyleOptionGroupBox; -class Q_GUI_EXPORT QGroupBox : public QWidget +class Q_WIDGETS_EXPORT QGroupBox : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 0db3bb9de3..d8fc297299 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QLabelPrivate; -class Q_GUI_EXPORT QLabel : public QFrame +class Q_WIDGETS_EXPORT QLabel : public QFrame { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText) diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 81fa10b23d..7b104cbfcf 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) #ifndef QT_NO_LCDNUMBER class QLCDNumberPrivate; -class Q_GUI_EXPORT QLCDNumber : public QFrame // LCD number widget +class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget { Q_OBJECT Q_ENUMS(Mode SegmentStyle) diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index 663438ead9..b0971db968 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -63,7 +63,7 @@ class QStyleOptionFrame; class QAbstractSpinBox; class QDateTimeEdit; -class Q_GUI_EXPORT QLineEdit : public QWidget +class Q_WIDGETS_EXPORT QLineEdit : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index c0d68fc7d1..48eac4f490 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) class QMacCocoaViewContainerPrivate; -class Q_GUI_EXPORT QMacCocoaViewContainer : public QWidget +class Q_WIDGETS_EXPORT QMacCocoaViewContainer : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h index 97289075c3..935feac58e 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.h +++ b/src/widgets/widgets/qmacnativewidget_mac.h @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) class QMacNativeWidgetPrivate; -class Q_GUI_EXPORT QMacNativeWidget : public QWidget +class Q_WIDGETS_EXPORT QMacNativeWidget : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index f214bcb1a5..b3bd972497 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -116,7 +116,7 @@ QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *mainWindow) } #ifdef QT_EXPERIMENTAL_CLIENT_DECORATIONS -Q_GUI_EXPORT void qt_setMainWindowTitleWidget(QMainWindow *mainWindow, Qt::DockWidgetArea area, QWidget *widget) +Q_WIDGETS_EXPORT void qt_setMainWindowTitleWidget(QMainWindow *mainWindow, Qt::DockWidgetArea area, QWidget *widget) { QGridLayout *topLayout = qobject_cast<QGridLayout *>(mainWindow->layout()); Q_ASSERT(topLayout); diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index d05c060b6a..f060d3f460 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -60,7 +60,7 @@ class QStatusBar; class QToolBar; class QMenu; -class Q_GUI_EXPORT QMainWindow : public QWidget +class Q_WIDGETS_EXPORT QMainWindow : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 16c4954f48..f8116096c7 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -73,7 +73,7 @@ #if defined(Q_DEBUG_MAINWINDOW_LAYOUT) && !defined(QT_NO_DOCKWIDGET) QT_BEGIN_NAMESPACE class QTextStream; -Q_GUI_EXPORT void qt_dumpLayout(QTextStream &qout, QMainWindow *window); +Q_WIDGETS_EXPORT void qt_dumpLayout(QTextStream &qout, QMainWindow *window); QT_END_NAMESPACE #endif // Q_DEBUG_MAINWINDOW_LAYOUT && !QT_NO_DOCKWIDGET diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index 27d525bdf4..f1ffb29e53 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QMdiSubWindow; class QMdiAreaPrivate; -class Q_GUI_EXPORT QMdiArea : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QMdiArea : public QAbstractScrollArea { Q_OBJECT Q_ENUMS(ViewMode) diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index af4b581acc..88074c7ca5 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -57,7 +57,7 @@ class QMdiArea; namespace QMdi { class ControlContainer; } class QMdiSubWindowPrivate; -class Q_GUI_EXPORT QMdiSubWindow : public QWidget +class Q_WIDGETS_EXPORT QMdiSubWindow : public QWidget { Q_OBJECT Q_PROPERTY(int keyboardSingleStep READ keyboardSingleStep WRITE setKeyboardSingleStep) diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 407e10d292..f8bedb3da4 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -69,7 +69,7 @@ class QStyleOptionMenuItem; class QMenuItem; #endif -class Q_GUI_EXPORT QMenu : public QWidget +class Q_WIDGETS_EXPORT QMenu : public QWidget { private: Q_OBJECT diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index f56fe378c9..b2a2a227e9 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -59,7 +59,7 @@ class QWindowsStyle; class QMenuItem; #endif -class Q_GUI_EXPORT QMenuBar : public QWidget +class Q_WIDGETS_EXPORT QMenuBar : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qmenudata.h b/src/widgets/widgets/qmenudata.h index 3c0f171213..09d2bef802 100644 --- a/src/widgets/widgets/qmenudata.h +++ b/src/widgets/widgets/qmenudata.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QMenuItem : public QAction +class Q_WIDGETS_EXPORT QMenuItem : public QAction { Q_OBJECT diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index a6c627f75a..f302275365 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -66,7 +66,7 @@ class QPlainTextEditPrivate; class QMimeData; -class Q_GUI_EXPORT QPlainTextEdit : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QPlainTextEdit : public QAbstractScrollArea { Q_OBJECT Q_DECLARE_PRIVATE(QPlainTextEdit) @@ -277,7 +277,7 @@ private: class QPlainTextDocumentLayoutPrivate; -class Q_GUI_EXPORT QPlainTextDocumentLayout : public QAbstractTextDocumentLayout +class Q_WIDGETS_EXPORT QPlainTextDocumentLayout : public QAbstractTextDocumentLayout { Q_OBJECT Q_DECLARE_PRIVATE(QPlainTextDocumentLayout) diff --git a/src/widgets/widgets/qprintpreviewwidget.h b/src/widgets/widgets/qprintpreviewwidget.h index e6c3aac28c..87c908a589 100644 --- a/src/widgets/widgets/qprintpreviewwidget.h +++ b/src/widgets/widgets/qprintpreviewwidget.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QPrintPreviewWidgetPrivate; -class Q_GUI_EXPORT QPrintPreviewWidget : public QWidget +class Q_WIDGETS_EXPORT QPrintPreviewWidget : public QWidget { Q_OBJECT Q_DECLARE_PRIVATE(QPrintPreviewWidget) diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 1181e6471d..ac34f64a2e 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QProgressBarPrivate; class QStyleOptionProgressBar; -class Q_GUI_EXPORT QProgressBar : public QWidget +class Q_WIDGETS_EXPORT QProgressBar : public QWidget { Q_OBJECT Q_ENUMS(Direction) diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index af61bfa583..4f1f85dea4 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -54,7 +54,7 @@ class QPushButtonPrivate; class QMenu; class QStyleOptionButton; -class Q_GUI_EXPORT QPushButton : public QAbstractButton +class Q_WIDGETS_EXPORT QPushButton : public QAbstractButton { Q_OBJECT diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index b7a0fdb874..e3837253c8 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) class QRadioButtonPrivate; class QStyleOptionButton; -class Q_GUI_EXPORT QRadioButton : public QAbstractButton +class Q_WIDGETS_EXPORT QRadioButton : public QAbstractButton { Q_OBJECT diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index 35cfda0373..3d30004770 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QRubberBandPrivate; class QStyleOptionRubberBand; -class Q_GUI_EXPORT QRubberBand : public QWidget +class Q_WIDGETS_EXPORT QRubberBand : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index f8dbc739ae..2d62cc1bc4 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QScrollAreaPrivate; -class Q_GUI_EXPORT QScrollArea : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QScrollArea : public QAbstractScrollArea { Q_OBJECT Q_PROPERTY(bool widgetResizable READ widgetResizable WRITE setWidgetResizable) diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index 72f461fe63..534ff6e619 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -752,7 +752,7 @@ void QScrollBar::hideEvent(QHideEvent *) /*! \internal Returns the style option for scroll bar. */ -Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollbar) +Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollbar) { QStyleOptionSlider opt; scrollbar->initStyleOption(&opt); diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index a2bcaef1c1..2fd00de522 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QScrollBarPrivate; class QStyleOptionSlider; -class Q_GUI_EXPORT QScrollBar : public QAbstractSlider +class Q_WIDGETS_EXPORT QScrollBar : public QAbstractSlider { Q_OBJECT public: @@ -89,7 +89,7 @@ public: #endif private: - friend Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar); + friend Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar); Q_DISABLE_COPY(QScrollBar) Q_DECLARE_PRIVATE(QScrollBar) diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index af858ff355..9e75f38457 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -52,7 +52,7 @@ QT_MODULE(Gui) #ifndef QT_NO_SIZEGRIP class QSizeGripPrivate; -class Q_GUI_EXPORT QSizeGrip : public QWidget +class Q_WIDGETS_EXPORT QSizeGrip : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qslider.cpp b/src/widgets/widgets/qslider.cpp index 7529c3c923..2858b98781 100644 --- a/src/widgets/widgets/qslider.cpp +++ b/src/widgets/widgets/qslider.cpp @@ -654,7 +654,7 @@ int QSlider::tickInterval() const /*! \internal Returns the style option for slider. */ -Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider) +Q_WIDGETS_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider) { QStyleOptionSlider sliderOption; slider->initStyleOption(&sliderOption); diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 60326106a3..907548fcb2 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QSliderPrivate; class QStyleOptionSlider; -class Q_GUI_EXPORT QSlider : public QAbstractSlider +class Q_WIDGETS_EXPORT QSlider : public QAbstractSlider { Q_OBJECT @@ -119,7 +119,7 @@ public Q_SLOTS: #endif private: - friend Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider); + friend Q_WIDGETS_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider); Q_DISABLE_COPY(QSlider) Q_DECLARE_PRIVATE(QSlider) diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 62060e40c2..1421b1d6d2 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -53,7 +53,7 @@ QT_MODULE(Gui) #ifndef QT_NO_SPINBOX class QSpinBoxPrivate; -class Q_GUI_EXPORT QSpinBox : public QAbstractSpinBox +class Q_WIDGETS_EXPORT QSpinBox : public QAbstractSpinBox { Q_OBJECT @@ -123,7 +123,7 @@ private: }; class QDoubleSpinBoxPrivate; -class Q_GUI_EXPORT QDoubleSpinBox : public QAbstractSpinBox +class Q_WIDGETS_EXPORT QDoubleSpinBox : public QAbstractSpinBox { Q_OBJECT diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index c37ac1d617..0faaa628c8 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) #ifndef QT_NO_SPLASHSCREEN class QSplashScreenPrivate; -class Q_GUI_EXPORT QSplashScreen : public QWidget +class Q_WIDGETS_EXPORT QSplashScreen : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 7ade853726..09d7d3589d 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -59,7 +59,7 @@ template <typename T> class QList; class QSplitterHandle; -class Q_GUI_EXPORT QSplitter : public QFrame +class Q_WIDGETS_EXPORT QSplitter : public QFrame { Q_OBJECT @@ -149,13 +149,13 @@ private: //#ifdef QT3_SUPPORT #ifndef QT_NO_TEXTSTREAM -Q_GUI_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&); -Q_GUI_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&); +Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&); +Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&); #endif //#endif class QSplitterHandlePrivate; -class Q_GUI_EXPORT QSplitterHandle : public QWidget +class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget { Q_OBJECT public: diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 3c7ef1c4b6..e0275fe27f 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QStackedWidgetPrivate; -class Q_GUI_EXPORT QStackedWidget : public QFrame +class Q_WIDGETS_EXPORT QStackedWidget : public QFrame { Q_OBJECT diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 170b79b80f..32dfed8f7b 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -54,7 +54,7 @@ QT_MODULE(Gui) class QStatusBarPrivate; -class Q_GUI_EXPORT QStatusBar: public QWidget +class Q_WIDGETS_EXPORT QStatusBar: public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index 4d7c22fe5f..3e2ff3e9d0 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -56,7 +56,7 @@ class QIcon; class QTabBarPrivate; class QStyleOptionTab; -class Q_GUI_EXPORT QTabBar: public QWidget +class Q_WIDGETS_EXPORT QTabBar: public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index 912afb4d00..447560f332 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -57,7 +57,7 @@ class QTabBar; class QTabWidgetPrivate; class QStyleOptionTabWidgetFrame; -class Q_GUI_EXPORT QTabWidget : public QWidget +class Q_WIDGETS_EXPORT QTabWidget : public QWidget { Q_OBJECT Q_ENUMS(TabPosition TabShape) diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 0e4027f080..3f488975ec 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QTextBrowserPrivate; -class Q_GUI_EXPORT QTextBrowser : public QTextEdit +class Q_WIDGETS_EXPORT QTextBrowser : public QTextEdit { Q_OBJECT diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 30f4778b3c..11c81939ab 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -67,7 +67,7 @@ class QMenu; class QTextEditPrivate; class QMimeData; -class Q_GUI_EXPORT QTextEdit : public QAbstractScrollArea +class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea { Q_OBJECT Q_DECLARE_PRIVATE(QTextEdit) diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 20f47f5045..98c44f059a 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -59,7 +59,7 @@ class QIcon; class QMainWindow; class QStyleOptionToolBar; -class Q_GUI_EXPORT QToolBar : public QWidget +class Q_WIDGETS_EXPORT QToolBar : public QWidget { Q_OBJECT diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 33808d2990..b08d37e424 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -55,7 +55,7 @@ QT_MODULE(Gui) class QToolBoxPrivate; -class Q_GUI_EXPORT QToolBox : public QFrame +class Q_WIDGETS_EXPORT QToolBox : public QFrame { Q_OBJECT Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged) diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index a21211374e..7d1ff13409 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -56,7 +56,7 @@ class QToolButtonPrivate; class QMenu; class QStyleOptionToolButton; -class Q_GUI_EXPORT QToolButton : public QAbstractButton +class Q_WIDGETS_EXPORT QToolButton : public QAbstractButton { Q_OBJECT Q_ENUMS(Qt::ToolButtonStyle Qt::ArrowType ToolButtonPopupMode) diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h index 6d63572058..9d09d63967 100644 --- a/src/widgets/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/widgets/qwidgetresizehandler_p.h @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QMouseEvent; class QKeyEvent; -class Q_GUI_EXPORT QWidgetResizeHandler : public QObject +class Q_WIDGETS_EXPORT QWidgetResizeHandler : public QObject { Q_OBJECT diff --git a/src/widgets/widgets/qworkspace.h b/src/widgets/widgets/qworkspace.h index d24b0600bb..a251242542 100644 --- a/src/widgets/widgets/qworkspace.h +++ b/src/widgets/widgets/qworkspace.h @@ -57,7 +57,7 @@ class QWorkspaceChild; class QShowEvent; class QWorkspacePrivate; -class Q_GUI_EXPORT QWorkspace : public QWidget +class Q_WIDGETS_EXPORT QWorkspace : public QWidget { Q_OBJECT Q_PROPERTY(bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled) |