diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-10-14 10:51:42 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 11:53:26 +0200 |
commit | bfb3c424abc7c839dc44de0e36024ede99ece736 (patch) | |
tree | b6814d0238bead8518b23c078beb818432de6ce4 /src/declarative/scenegraph/qsgadaptationlayer_p.h | |
parent | 2d119a137f1bc0c8b1113cd6c58413a1b89a4c1c (diff) |
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Diffstat (limited to 'src/declarative/scenegraph/qsgadaptationlayer_p.h')
-rw-r--r-- | src/declarative/scenegraph/qsgadaptationlayer_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/scenegraph/qsgadaptationlayer_p.h b/src/declarative/scenegraph/qsgadaptationlayer_p.h index f1e9a89f43..0ad60913b3 100644 --- a/src/declarative/scenegraph/qsgadaptationlayer_p.h +++ b/src/declarative/scenegraph/qsgadaptationlayer_p.h @@ -44,7 +44,6 @@ #include "qsgnode.h" #include "qsgtexture.h" -#include <private/qsgtext_p.h> #include <QtCore/qobject.h> #include <QtCore/qrect.h> #include <QtGui/qbrush.h> @@ -53,7 +52,8 @@ #include <QtGui/qglyphrun.h> #include <QtCore/qurl.h> -#include <private/qsgtext_p.h> +// ### remove +#include <private/qquicktext_p.h> QT_BEGIN_HEADER @@ -109,7 +109,7 @@ public: virtual void setGlyphs(const QPointF &position, const QGlyphRun &glyphs) = 0; virtual void setColor(const QColor &color) = 0; - virtual void setStyle(QSGText::TextStyle style) = 0; + virtual void setStyle(QQuickText::TextStyle style) = 0; virtual void setStyleColor(const QColor &color) = 0; virtual QPointF baseLine() const = 0; |