From 1d9f240811e4717d1744756b891e0b3d48a918be Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Fri, 31 Jul 2009 15:58:51 +1000 Subject: Make QFxScaleGrid private As per API review --- src/declarative/fx/fx.pri | 2 +- src/declarative/fx/qfximage.h | 7 ++- src/declarative/fx/qfximage_p.h | 1 + src/declarative/fx/qfxitem.cpp | 1 - src/declarative/fx/qfxscalegrid.cpp | 2 +- src/declarative/fx/qfxscalegrid.h | 119 ------------------------------------ src/declarative/fx/qfxscalegrid_p.h | 119 ++++++++++++++++++++++++++++++++++++ src/declarative/fx/qfxwebview.cpp | 1 - 8 files changed, 126 insertions(+), 126 deletions(-) delete mode 100644 src/declarative/fx/qfxscalegrid.h create mode 100644 src/declarative/fx/qfxscalegrid_p.h diff --git a/src/declarative/fx/fx.pri b/src/declarative/fx/fx.pri index e43c0cb..2c98dd3 100644 --- a/src/declarative/fx/fx.pri +++ b/src/declarative/fx/fx.pri @@ -31,7 +31,7 @@ HEADERS += \ fx/qfxrect_p.h \ fx/qfxrepeater.h \ fx/qfxrepeater_p.h \ - fx/qfxscalegrid.h \ + fx/qfxscalegrid_p.h \ fx/qfxlineedit.h \ fx/qfxlineedit_p.h \ fx/qfxtextedit.h \ diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 9ab4456..9c2ef30 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -43,7 +43,6 @@ #define QFXIMAGE_H #include -#include #include @@ -53,6 +52,9 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QFxImagePrivate; +class QFxScaleGrid; +class QFxGridScaledImage; + class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem { Q_OBJECT @@ -72,8 +74,6 @@ public: QFxImage(QFxItem *parent=0); ~QFxImage(); - QFxScaleGrid *scaleGrid(); - enum FillMode { Stretch, PreserveAspect, Tile, TileVertically, TileHorizontally }; FillMode fillMode() const; void setFillMode(FillMode); @@ -112,6 +112,7 @@ private: Q_DISABLE_COPY(QFxImage) Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr, QFxImage) void setGridScaledImage(const QFxGridScaledImage& sci); + QFxScaleGrid *scaleGrid(); }; QT_END_NAMESPACE diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qfximage_p.h index 32529c4..41b628c 100644 --- a/src/declarative/fx/qfximage_p.h +++ b/src/declarative/fx/qfximage_p.h @@ -54,6 +54,7 @@ // #include "qfxitem_p.h" +#include "qfxscalegrid_p.h" #include diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 5eb2516..6488e0d 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -55,7 +55,6 @@ #include "qlistmodelinterface.h" #include "qfxanchors_p.h" -#include "qfxscalegrid.h" #include "qfxview.h" #include "qmlstategroup.h" diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp index abe8e0d..74ef0a1 100644 --- a/src/declarative/fx/qfxscalegrid.cpp +++ b/src/declarative/fx/qfxscalegrid.cpp @@ -41,7 +41,7 @@ #include #include -#include "qfxscalegrid.h" +#include "qfxscalegrid_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/fx/qfxscalegrid.h b/src/declarative/fx/qfxscalegrid.h deleted file mode 100644 index 986bcda..0000000 --- a/src/declarative/fx/qfxscalegrid.h +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtDeclarative module 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 either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** 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.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QFXSCALEGRID_H -#define QFXSCALEGRID_H - -#include -#include -#include -#include -#include - - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Declarative) -class Q_DECLARATIVE_EXPORT QFxScaleGrid : public QObject -{ - Q_OBJECT - - Q_PROPERTY(int left READ left WRITE setLeft) - Q_PROPERTY(int top READ top WRITE setTop) - Q_PROPERTY(int right READ right WRITE setRight) - Q_PROPERTY(int bottom READ bottom WRITE setBottom) -public: - QFxScaleGrid(); - ~QFxScaleGrid(); - - bool isNull() const; - - int left() const { return _left; } - void setLeft(int); - - int top() const { return _top; } - void setTop(int); - - int right() const { return _right; } - void setRight(int); - - int bottom() const { return _bottom; } - void setBottom(int); - -private: - int _left; - int _top; - int _right; - int _bottom; -}; - -class Q_DECLARATIVE_EXPORT QFxGridScaledImage -{ -public: - QFxGridScaledImage(); - QFxGridScaledImage(const QFxGridScaledImage &); - QFxGridScaledImage(QIODevice*); - QFxGridScaledImage &operator=(const QFxGridScaledImage &); - bool isValid() const; - int gridLeft() const; - int gridRight() const; - int gridTop() const; - int gridBottom() const; - - QString pixmapUrl() const; - -private: - int _l; - int _r; - int _t; - int _b; - QString _pix; -}; - -QT_END_NAMESPACE - -QML_DECLARE_TYPE(QFxScaleGrid) - -QT_END_HEADER - -#endif // QFXSCALEGRID_H diff --git a/src/declarative/fx/qfxscalegrid_p.h b/src/declarative/fx/qfxscalegrid_p.h new file mode 100644 index 0000000..986bcda --- /dev/null +++ b/src/declarative/fx/qfxscalegrid_p.h @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Qt Software Information (qt-info@nokia.com) +** +** This file is part of the QtDeclarative module 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 either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** 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.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QFXSCALEGRID_H +#define QFXSCALEGRID_H + +#include +#include +#include +#include +#include + + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Declarative) +class Q_DECLARATIVE_EXPORT QFxScaleGrid : public QObject +{ + Q_OBJECT + + Q_PROPERTY(int left READ left WRITE setLeft) + Q_PROPERTY(int top READ top WRITE setTop) + Q_PROPERTY(int right READ right WRITE setRight) + Q_PROPERTY(int bottom READ bottom WRITE setBottom) +public: + QFxScaleGrid(); + ~QFxScaleGrid(); + + bool isNull() const; + + int left() const { return _left; } + void setLeft(int); + + int top() const { return _top; } + void setTop(int); + + int right() const { return _right; } + void setRight(int); + + int bottom() const { return _bottom; } + void setBottom(int); + +private: + int _left; + int _top; + int _right; + int _bottom; +}; + +class Q_DECLARATIVE_EXPORT QFxGridScaledImage +{ +public: + QFxGridScaledImage(); + QFxGridScaledImage(const QFxGridScaledImage &); + QFxGridScaledImage(QIODevice*); + QFxGridScaledImage &operator=(const QFxGridScaledImage &); + bool isValid() const; + int gridLeft() const; + int gridRight() const; + int gridTop() const; + int gridBottom() const; + + QString pixmapUrl() const; + +private: + int _l; + int _r; + int _t; + int _b; + QString _pix; +}; + +QT_END_NAMESPACE + +QML_DECLARE_TYPE(QFxScaleGrid) + +QT_END_HEADER + +#endif // QFXSCALEGRID_H diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 75cb624..47199ef 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -55,7 +55,6 @@ #include "qml.h" #include "qmlengine.h" #include "qmlstate.h" -#include "qfxscalegrid.h" #include "qlistmodelinterface.h" #include "qfxwebview.h" -- cgit v0.12