summaryrefslogtreecommitdiffstats
path: root/src/widgets/accessible
diff options
context:
space:
mode:
authorOlli Werwolff <qt-info@nokia.com>2011-06-08 09:51:07 +0200
committerOlli Werwolff <qt-info@nokia.com>2011-06-08 10:43:55 +0200
commit819f9ca965279562f34895dab405f28162c0b8ab (patch)
tree8e129b6846ec1762c5d33c4788be58abb29ad95b /src/widgets/accessible
parent6a243e555901b4345fec83b064ff378863f2d147 (diff)
Use Q_WIDGETS_EXPORT for widgets library
Reviewed-by: Lars Knoll
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r--src/widgets/accessible/qaccessible.h8
-rw-r--r--src/widgets/accessible/qaccessible2.h16
-rw-r--r--src/widgets/accessible/qaccessiblebridge.h4
-rw-r--r--src/widgets/accessible/qaccessibleobject.h6
-rw-r--r--src/widgets/accessible/qaccessibleplugin.h4
-rw-r--r--src/widgets/accessible/qaccessiblewidget.cpp4
-rw-r--r--src/widgets/accessible/qaccessiblewidget.h4
7 files changed, 23 insertions, 23 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 &params) = 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());