Designer: Remove QDesignerIconCacheInterface and Brush manager.

Removed QDesignerIconCacheInterface obsoleted by resource system
in Qt 4.4.
Remove unused Brush manager.

Rubber-stamped-by: Jarek Kobus <jkobus@trolltech.com>

8 files changed, 1 insertions, 347 deletions

diff --git a/src/designer/src/lib/sdk/abstractbrushmanager.h b/src/designer/src/lib/sdk/abstractbrushmanager.h
deleted file mode 100644
index 87b1bf2c0..000000000
--- a/src/designer/src/lib/sdk/abstractbrushmanager.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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 ABSTRACTBRUSHMANAGER_H
-#define ABSTRACTBRUSHMANAGER_H
-
-#include <QtDesigner/sdk_global.h>
-
-#include <QtCore/qobject.h>
-#include <QtCore/qmap.h>
-#include <QtGui/qbrush.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QObject;
-
-class QDESIGNER_SDK_EXPORT QDesignerBrushManagerInterface : public QObject
-{
-    Q_OBJECT
-public:
-    QDesignerBrushManagerInterface(QObject *parentObject = 0) : QObject(parentObject) {}
-
-    virtual QBrush brush(const QString &name) const = 0;
-    virtual QMap<QString, QBrush> brushes() const = 0;
-    virtual QString currentBrush() const = 0;
-
-    virtual QString addBrush(const QString &name, const QBrush &brush) = 0;
-    virtual void removeBrush(const QString &name) = 0;
-    virtual void setCurrentBrush(const QString &name) = 0;
-
-    virtual QPixmap brushPixmap(const QBrush &brush) const = 0;
-Q_SIGNALS:
-    void brushAdded(const QString &name, const QBrush &brush);
-    void brushRemoved(const QString &name);
-    void currentBrushChanged(const QString &name, const QBrush &brush);
-
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif
diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp
index 563781631..4fb3903ca 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.cpp
+++ b/src/designer/src/lib/sdk/abstractformeditor.cpp
@@ -53,9 +53,7 @@
 #include <QtDesigner/QDesignerWidgetDataBaseInterface>
 #include <QtDesigner/QDesignerWidgetFactoryInterface>
 #include <QtDesigner/QDesignerObjectInspectorInterface>
-#include <QtDesigner/QDesignerBrushManagerInterface>
 #include <QtDesigner/QDesignerIntegrationInterface>
-#include <QtDesigner/QDesignerIconCacheInterface>
 #include <QtDesigner/QDesignerActionEditorInterface>
 #include <pluginmanager_p.h>
 #include <qtresourcemodel_p.h>
@@ -97,9 +95,7 @@ public:
     QPointer<QDesignerWidgetDataBaseInterface> m_widgetDataBase;
     QPointer<QDesignerWidgetFactoryInterface> m_widgetFactory;
     QPointer<QDesignerObjectInspectorInterface> m_objectInspector;
-    QPointer<QDesignerBrushManagerInterface> m_brushManager;
     QPointer<QDesignerIntegrationInterface> m_integration;
-    QPointer<QDesignerIconCacheInterface> m_iconCache;
     QPointer<QDesignerActionEditorInterface> m_actionEditor;
     QDesignerSettingsInterface *m_settingsManager;
     QDesignerPluginManager *m_pluginManager;
@@ -192,7 +188,6 @@ QDesignerFormEditorInterface::QDesignerFormEditorInterface(QObject *parent)
 */
 QDesignerFormEditorInterface::~QDesignerFormEditorInterface()
 {
-    delete d;
 }
 
 /*!
@@ -404,24 +399,6 @@ void QDesignerFormEditorInterface::setObjectInspector(QDesignerObjectInspectorIn
 /*!
     \internal
 
-    Returns an interface to the brush manager used by the palette editor.
-*/
-QDesignerBrushManagerInterface *QDesignerFormEditorInterface::brushManager() const
-{
-    return d->m_brushManager;
-}
-
-/*!
-    \internal
-*/
-void QDesignerFormEditorInterface::setBrushManager(QDesignerBrushManagerInterface *brushManager)
-{
-    d->m_brushManager = brushManager;
-}
-
-/*!
-    \internal
-
     Returns an interface to the integration.
 */
 QDesignerIntegrationInterface *QDesignerFormEditorInterface::integration() const
@@ -439,25 +416,6 @@ void QDesignerFormEditorInterface::setIntegration(QDesignerIntegrationInterface
 
 /*!
     \internal
-
-    Returns an interface to the icon cache used by the form editor to
-    manage icons.
-*/
-QDesignerIconCacheInterface *QDesignerFormEditorInterface::iconCache() const
-{
-    return d->m_iconCache;
-}
-
-/*!
-    \internal
-*/
-void QDesignerFormEditorInterface::setIconCache(QDesignerIconCacheInterface *cache)
-{
-    d->m_iconCache = cache;
-}
-
-/*!
-    \internal
     \since 4.5
     Returns the list of options pages that allow the user to configure \QD components.
 */
diff --git a/src/designer/src/lib/sdk/abstractformeditor.h b/src/designer/src/lib/sdk/abstractformeditor.h
index fd83ee55d..c6264732e 100644
--- a/src/designer/src/lib/sdk/abstractformeditor.h
+++ b/src/designer/src/lib/sdk/abstractformeditor.h
@@ -59,8 +59,6 @@ class QDesignerMetaDataBaseInterface;
 class QDesignerWidgetFactoryInterface;
 class QDesignerObjectInspectorInterface;
 class QDesignerPromotionInterface;
-class QDesignerBrushManagerInterface;
-class QDesignerIconCacheInterface;
 class QDesignerActionEditorInterface;
 class QDesignerIntegrationInterface;
 class QDesignerPluginManager;
@@ -95,8 +93,6 @@ public:
     QDesignerMetaDataBaseInterface *metaDataBase() const;
     QDesignerPromotionInterface *promotion() const;
     QDesignerWidgetFactoryInterface *widgetFactory() const;
-    QDesignerBrushManagerInterface *brushManager() const;
-    QDesignerIconCacheInterface *iconCache() const;
     QDesignerActionEditorInterface *actionEditor() const;
     QDesignerIntegrationInterface *integration() const;
     QDesignerPluginManager *pluginManager() const;
@@ -129,23 +125,9 @@ protected:
     void setPromotion(QDesignerPromotionInterface *promotion);
     void setWidgetFactory(QDesignerWidgetFactoryInterface *widgetFactory);
     void setExtensionManager(QExtensionManager *extensionManager);
-    void setBrushManager(QDesignerBrushManagerInterface *brushManager);
-    void setIconCache(QDesignerIconCacheInterface *cache);
 
 private:
-    QPointer<QWidget> m_pad1;
-    QPointer<QDesignerWidgetBoxInterface> m_pad2;
-    QPointer<QDesignerPropertyEditorInterface> m_pad3;
-    QPointer<QDesignerFormWindowManagerInterface> m_pad4;
-    QPointer<QExtensionManager> m_pad5;
-    QPointer<QDesignerMetaDataBaseInterface> m_pad6;
-    QPointer<QDesignerWidgetDataBaseInterface> m_pad7;
-    QPointer<QDesignerWidgetFactoryInterface> m_pad8;
-    QPointer<QDesignerObjectInspectorInterface> m_pad9;
-    QPointer<QDesignerBrushManagerInterface> m_pad10;
-    QPointer<QDesignerIconCacheInterface> m_pad11;
-    QPointer<QDesignerActionEditorInterface> m_pad12;
-    QDesignerFormEditorInterfacePrivate *d;
+    QScopedPointer<QDesignerFormEditorInterfacePrivate> d;
 
 private:
     QDesignerFormEditorInterface(const QDesignerFormEditorInterface &other);
diff --git a/src/designer/src/lib/sdk/abstracticoncache.h b/src/designer/src/lib/sdk/abstracticoncache.h
deleted file mode 100644
index ce2ed9d83..000000000
--- a/src/designer/src/lib/sdk/abstracticoncache.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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 ABSTRACTICONCACHE_H
-#define ABSTRACTICONCACHE_H
-
-#include <QtDesigner/sdk_global.h>
-
-#include <QtCore/QObject>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QIcon;
-class QPixmap;
-class QString;
-
-class QDESIGNER_SDK_EXPORT QDesignerIconCacheInterface : public QObject
-{
-    Q_OBJECT
-public:
-    QDesignerIconCacheInterface(QObject *parent_)
-        : QObject(parent_) {}
-
-    virtual QIcon nameToIcon(const QString &filePath, const QString &qrcPath = QString()) = 0;
-    virtual QPixmap nameToPixmap(const QString &filePath, const QString &qrcPath = QString()) = 0;
-
-    virtual QString iconToFilePath(const QIcon &pm) const = 0;
-    virtual QString iconToQrcPath(const QIcon &pm) const = 0;
-
-    virtual QString pixmapToFilePath(const QPixmap &pm) const = 0;
-    virtual QString pixmapToQrcPath(const QPixmap &pm) const = 0;
-
-    virtual QList<QPixmap> pixmapList() const = 0;
-    virtual QList<QIcon> iconList() const = 0;
-
-    virtual QString resolveQrcPath(const QString &filePath, const QString &qrcPath, const QString &workingDirectory = QString()) const = 0;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // ABSTRACTICONCACHE_H
diff --git a/src/designer/src/lib/sdk/abstracticoncache.qdoc b/src/designer/src/lib/sdk/abstracticoncache.qdoc
deleted file mode 100644
index f211c533c..000000000
--- a/src/designer/src/lib/sdk/abstracticoncache.qdoc
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of this
-** file.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \class QDesignerIconCacheInterface
-    \brief The QDesignerIconCacheInterface class provides an interface to \QD's icon cache.
-    \inmodule QtDesigner
-    \internal
-*/
-
-/*!
-    \fn QDesignerIconCacheInterface::QDesignerIconCacheInterface(QObject *parent)
-
-    Constructs a new interface with the given \a parent.
-*/
-
-/*!
-    \fn QIcon QDesignerIconCacheInterface::nameToIcon(const QString &filePath, const QString &qrcPath)
-
-    Returns the icon associated with the name specified by \a filePath in the resource
-    file specified by \a qrcPath.
-
-    If \a qrcPath refers to a valid resource file, the name used for the file path is a path
-    within those resources; otherwise the file path refers to a local file.
-
-    \sa {The Qt Resource System}, nameToPixmap()
-*/
-
-/*!
-    \fn QPixmap QDesignerIconCacheInterface::nameToPixmap(const QString &filePath, const QString &qrcPath)
-
-    Returns the pixmap associated with the name specified by \a filePath in the resource
-    file specified by \a qrcPath.
-
-    If \a qrcPath refers to a valid resource file, the name used for the file path is a path
-    within those resources; otherwise the file path refers to a local file.
-
-    \sa {The Qt Resource System}, nameToIcon()
-*/
-
-/*!
-    \fn QString QDesignerIconCacheInterface::iconToFilePath(const QIcon &icon) const
-
-    Returns the file path associated with the given \a icon. The file path is a path within
-    an application resources.
-*/
-
-/*!
-    \fn QString QDesignerIconCacheInterface::iconToQrcPath(const QIcon &icon) const
-
-    Returns the path to the resource file that refers to the specified \a icon. The resource
-    path refers to a local file.
-*/
-
-/*!
-    \fn QString QDesignerIconCacheInterface::pixmapToFilePath(const QPixmap &pixmap) const
-
-    Returns the file path associated with the given \a pixmap. The file path is a path within
-    an application resources.
-*/
-
-/*!
-    \fn QString QDesignerIconCacheInterface::pixmapToQrcPath(const QPixmap &pixmap) const
-
-    Returns the path to the resource file that refers to the specified \a pixmap. The resource
-    path refers to a local file.
-*/
-
-/*!
-    \fn QList<QPixmap> QDesignerIconCacheInterface::pixmapList() const
-
-    Returns a list of pixmaps for the icons provided by the icon cache.
-*/
-
-/*!
-    \fn QList<QIcon> QDesignerIconCacheInterface::iconList() const
-
-    Returns a list of icons provided by the icon cache.
-*/
-
-/*!
-    \fn QString QDesignerIconCacheInterface::resolveQrcPath(const QString &filePath, const QString &qrcPath, const QString &workingDirectory) const
-
-    Returns a path to a resource specified by the \a filePath within
-    the resource file located at \a qrcPath. If \a workingDirectory is
-    a valid path to a directory, the path returned will be relative to
-    that directory; otherwise an absolute path is returned.
-
-    \omit
-    ### Needs checking
-    \endomit
-*/
diff --git a/src/designer/src/lib/sdk/sdk.pri b/src/designer/src/lib/sdk/sdk.pri
index bc46a1edb..c6a474b64 100644
--- a/src/designer/src/lib/sdk/sdk.pri
+++ b/src/designer/src/lib/sdk/sdk.pri
@@ -18,8 +18,6 @@ HEADERS += $$PWD/abstractformeditor.h \
     $$PWD/abstractwidgetfactory.h \
     $$PWD/abstractobjectinspector.h \
     $$PWD/abstractactioneditor.h \
-    $$PWD/abstractbrushmanager.h \
-    $$PWD/abstracticoncache.h \
     $$PWD/abstractlanguage.h \
     $$PWD/abstractoptionspage_p.h \
     $$PWD/propertysheet.h \
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index fb882c30b..55515842e 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -58,7 +58,6 @@
 #include <QtDesigner/QDesignerPropertySheetExtension>
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
-#include <QtDesigner/QDesignerIconCacheInterface>
 #include <QtDesigner/private/abstractsettings_p.h>
 
 #include <QtGui/QMenu>
diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp
index 1c6c8547c..5f0a68595 100644
--- a/src/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/src/designer/src/lib/shared/qdesigner_utils.cpp
@@ -46,7 +46,6 @@
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowInterface>
-#include <QtDesigner/QDesignerIconCacheInterface>
 #include <QtDesigner/QDesignerResourceBrowserInterface>
 #include <QtDesigner/QDesignerLanguageExtension>
 #include <QtDesigner/QDesignerTaskMenuExtension>