From b34296671b0a1a314153cefd817c06478839d65d Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 1 Jun 2016 09:58:27 +0200 Subject: Change graphicsAPI to graphicsApi Change-Id: I065f17abd1cb71cd8d6ead76abf7a544eb7a99c0 Reviewed-by: Andy Nichols --- src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp | 2 +- src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h | 2 +- src/quick/scenegraph/coreapi/qsgrendererinterface.cpp | 4 ++-- src/quick/scenegraph/coreapi/qsgrendererinterface.h | 4 ++-- src/quick/scenegraph/qsgcontext.cpp | 2 +- src/quick/scenegraph/qsgdefaultcontext.cpp | 2 +- src/quick/scenegraph/qsgdefaultcontext_p.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/quick/scenegraph') diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp index a9dbd7e325..fe9ad67901 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext.cpp @@ -174,7 +174,7 @@ QSGRendererInterface *QSGSoftwareContext::rendererInterface(QSGRenderContext *re return this; } -QSGRendererInterface::GraphicsAPI QSGSoftwareContext::graphicsAPI() const +QSGRendererInterface::GraphicsApi QSGSoftwareContext::graphicsApi() const { return Software; } diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h index 12568706d4..023a33cbd5 100644 --- a/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h +++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarecontext_p.h @@ -95,7 +95,7 @@ public: QSurfaceFormat defaultSurfaceFormat() const override; QSGRendererInterface *rendererInterface(QSGRenderContext *renderContext) override; - GraphicsAPI graphicsAPI() const override; + GraphicsApi graphicsApi() const override; }; QT_END_NAMESPACE diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp index b680dbe3d5..2920a187e2 100644 --- a/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp +++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE */ /*! - \enum QSGRenderNode::GraphicsAPI + \enum QSGRenderNode::GraphicsApi \value Unknown An unknown graphics API is in use \value Software The Qt Quick 2D Renderer is in use \value OpenGL OpenGL ES 2.0 or higher @@ -84,7 +84,7 @@ QSGRendererInterface::~QSGRendererInterface() } /*! - \fn QSGRenderNode::GraphicsAPI QSGRenderNode::graphicsAPI() const + \fn QSGRenderNode::GraphicsApi QSGRenderNode::graphicsApi() const Returns the graphics API that is in use by the Qt Quick scenegraph. diff --git a/src/quick/scenegraph/coreapi/qsgrendererinterface.h b/src/quick/scenegraph/coreapi/qsgrendererinterface.h index a34b4b3c26..75b79336fd 100644 --- a/src/quick/scenegraph/coreapi/qsgrendererinterface.h +++ b/src/quick/scenegraph/coreapi/qsgrendererinterface.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGRendererInterface { public: - enum GraphicsAPI { + enum GraphicsApi { Unknown, Software, OpenGL, @@ -62,7 +62,7 @@ public: virtual ~QSGRendererInterface(); - virtual GraphicsAPI graphicsAPI() const = 0; + virtual GraphicsApi graphicsApi() const = 0; virtual void *getResource(Resource resource) const; virtual void *getResource(const char *resource) const; diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 27d0f01753..40d65d99aa 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -318,7 +318,7 @@ QSize QSGContext::minimumFBOSize() const Returns a pointer to the (presumably) global renderer interface. \note This function may be called on the gui thread in order to get access - to QSGRendererInterface::graphicsAPI(). + to QSGRendererInterface::graphicsApi(). */ QSGRendererInterface *QSGContext::rendererInterface(QSGRenderContext *renderContext) { diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp index 4b05f64887..46127544a0 100644 --- a/src/quick/scenegraph/qsgdefaultcontext.cpp +++ b/src/quick/scenegraph/qsgdefaultcontext.cpp @@ -246,7 +246,7 @@ QSGRendererInterface *QSGDefaultContext::rendererInterface(QSGRenderContext *ren return this; } -QSGRendererInterface::GraphicsAPI QSGDefaultContext::graphicsAPI() const +QSGRendererInterface::GraphicsApi QSGDefaultContext::graphicsApi() const { return OpenGL; } diff --git a/src/quick/scenegraph/qsgdefaultcontext_p.h b/src/quick/scenegraph/qsgdefaultcontext_p.h index 923d1ee7ec..d14d9d6812 100644 --- a/src/quick/scenegraph/qsgdefaultcontext_p.h +++ b/src/quick/scenegraph/qsgdefaultcontext_p.h @@ -78,7 +78,7 @@ public: void setDistanceFieldEnabled(bool enabled); bool isDistanceFieldEnabled() const; - GraphicsAPI graphicsAPI() const override; + GraphicsApi graphicsApi() const override; private: QMutex m_mutex; -- cgit v1.2.3