diff options
author | Liang Qi <liang.qi@nokia.com> | 2011-01-12 21:06:11 +0100 |
---|---|---|
committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:52 +0200 |
commit | 80473d3c2c19781e0b9625dfb08a11e620e66589 (patch) | |
tree | 7e856cfb97ec20776bddf854aa992d54fc7a2d74 /tools | |
parent | a3d79d1d3c99e085d9e550d475c97fd815090a17 (diff) |
Move uitools from QtTools to QtBase
Diffstat (limited to 'tools')
-rw-r--r-- | tools/uilib/abstractformbuilder.h | 2 | ||||
-rw-r--r-- | tools/uilib/customwidget.h | 2 | ||||
-rw-r--r-- | tools/uilib/extension.h | 109 | ||||
-rw-r--r-- | tools/uilib/formbuilder.h | 4 | ||||
-rw-r--r-- | tools/uilib/formscriptrunner_p.h | 2 | ||||
-rw-r--r-- | tools/uilib/properties_p.h | 2 | ||||
-rw-r--r-- | tools/uilib/resourcebuilder_p.h | 2 | ||||
-rw-r--r-- | tools/uilib/textbuilder_p.h | 2 |
8 files changed, 117 insertions, 8 deletions
diff --git a/tools/uilib/abstractformbuilder.h b/tools/uilib/abstractformbuilder.h index b76f0e42b2..2f99b36515 100644 --- a/tools/uilib/abstractformbuilder.h +++ b/tools/uilib/abstractformbuilder.h @@ -42,7 +42,7 @@ #ifndef ABSTRACTFORMBUILDER_H #define ABSTRACTFORMBUILDER_H -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QHash> diff --git a/tools/uilib/customwidget.h b/tools/uilib/customwidget.h index 52c234207c..0a04c93c6d 100644 --- a/tools/uilib/customwidget.h +++ b/tools/uilib/customwidget.h @@ -42,7 +42,7 @@ #ifndef CUSTOMWIDGET_H #define CUSTOMWIDGET_H -#include <QtDesigner/extension.h> +#include "extension.h" #include <QtCore/QObject> #include <QtCore/QString> #include <QtGui/QIcon> diff --git a/tools/uilib/extension.h b/tools/uilib/extension.h new file mode 100644 index 0000000000..d13e5173e1 --- /dev/null +++ b/tools/uilib/extension.h @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the Qt Designer of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef EXTENSION_H +#define EXTENSION_H + +#include <QtCore/QString> +#include <QtCore/QObject> + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +#define Q_TYPEID(IFace) QLatin1String(IFace##_iid) + +class QAbstractExtensionFactory +{ +public: + virtual ~QAbstractExtensionFactory() {} + + virtual QObject *extension(QObject *object, const QString &iid) const = 0; +}; +Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "com.trolltech.Qt.QAbstractExtensionFactory") + +class QAbstractExtensionManager +{ +public: + virtual ~QAbstractExtensionManager() {} + + virtual void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; + virtual void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0; + + virtual QObject *extension(QObject *object, const QString &iid) const = 0; +}; +Q_DECLARE_INTERFACE(QAbstractExtensionManager, "com.trolltech.Qt.QAbstractExtensionManager") + +#if defined(Q_CC_MSVC) && (_MSC_VER < 1300) + +template <class T> +inline T qt_extension_helper(QAbstractExtensionManager *, QObject *, T) +{ return 0; } + +template <class T> +inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) +{ return qt_extension_helper(manager, object, T(0)); } + +#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ +const char * const IFace##_iid = IId; \ +Q_DECLARE_INTERFACE(IFace, IId) \ +template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager *manager, QObject *object, IFace *) \ +{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return (IFace *)(extension ? extension->qt_metacast(IFace##_iid) : 0); } + +#else + +template <class T> +inline T qt_extension(QAbstractExtensionManager* manager, QObject *object) +{ return 0; } + +#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \ +const char * const IFace##_iid = IId; \ +Q_DECLARE_INTERFACE(IFace, IId) \ +template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \ +{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(0); } + +#endif + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // EXTENSION_H diff --git a/tools/uilib/formbuilder.h b/tools/uilib/formbuilder.h index 01aeb16a09..1d3dc5a395 100644 --- a/tools/uilib/formbuilder.h +++ b/tools/uilib/formbuilder.h @@ -42,8 +42,8 @@ #ifndef FORMBUILDER_H #define FORMBUILDER_H -#include <QtDesigner/uilib_global.h> -#include <QtDesigner/QAbstractFormBuilder> +#include "uilib_global.h" +#include "abstractformbuilder.h" #include <QtCore/QStringList> #include <QtCore/QMap> diff --git a/tools/uilib/formscriptrunner_p.h b/tools/uilib/formscriptrunner_p.h index 117b4e88ee..c13bd4ca7c 100644 --- a/tools/uilib/formscriptrunner_p.h +++ b/tools/uilib/formscriptrunner_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QFlags> #include <QtCore/QString> diff --git a/tools/uilib/properties_p.h b/tools/uilib/properties_p.h index 5f40f87d32..e57f9ed2ed 100644 --- a/tools/uilib/properties_p.h +++ b/tools/uilib/properties_p.h @@ -53,7 +53,7 @@ #ifndef UILIBPROPERTIES_H #define UILIBPROPERTIES_H -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QObject> #include <QtCore/QMetaProperty> diff --git a/tools/uilib/resourcebuilder_p.h b/tools/uilib/resourcebuilder_p.h index a3ccbf8168..549d81694d 100644 --- a/tools/uilib/resourcebuilder_p.h +++ b/tools/uilib/resourcebuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QString> diff --git a/tools/uilib/textbuilder_p.h b/tools/uilib/textbuilder_p.h index 8da296d041..066733cf59 100644 --- a/tools/uilib/textbuilder_p.h +++ b/tools/uilib/textbuilder_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtDesigner/uilib_global.h> +#include "uilib_global.h" #include <QtCore/QList> #include <QtCore/QString> |