Change graphicsAPI to graphicsApi

Change-Id: I065f17abd1cb71cd8d6ead76abf7a544eb7a99c0
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

12 files changed, 20 insertions, 20 deletions

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 93ca8e9358..caec6cb36a 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -4094,7 +4094,7 @@ void QQuickContext2D::init(QQuickCanvasItem *canvasItem, const QVariantMap &args
     // Disable Framebuffer Object based rendering when not running with OpenGL
     if (m_renderTarget == QQuickCanvasItem::FramebufferObject) {
         QSGRendererInterface *rif = canvasItem->window()->rendererInterface();
-        if (rif && rif->graphicsAPI() != QSGRendererInterface::OpenGL)
+        if (rif && rif->graphicsApi() != QSGRendererInterface::OpenGL)
             m_renderTarget = QQuickCanvasItem::Image;
     }
 
diff --git a/src/quick/items/qquickrendererinfo.cpp b/src/quick/items/qquickrendererinfo.cpp
index e41f4ebbae..b31cfd7f94 100644
--- a/src/quick/items/qquickrendererinfo.cpp
+++ b/src/quick/items/qquickrendererinfo.cpp
@@ -96,12 +96,12 @@ QQuickRendererInfo *QQuickRendererInfo::qmlAttachedProperties(QObject *object)
 
 void QQuickRendererInfo::updateInfo()
 {
-    GraphicsAPI newAPI = Unknown;
+    GraphicsApi newAPI = Unknown;
 
     if (m_window && m_window->isSceneGraphInitialized()) {
         QSGRendererInterface *rif = m_window->rendererInterface();
         if (rif)
-            newAPI = GraphicsAPI(rif->graphicsAPI()); // this function is safe to call on the gui/main thread too
+            newAPI = GraphicsApi(rif->graphicsApi()); // this function is safe to call on the gui/main thread too
     }
 
     if (m_api != newAPI) {
diff --git a/src/quick/items/qquickrendererinfo_p.h b/src/quick/items/qquickrendererinfo_p.h
index d76f4010e0..d0298baa21 100644
--- a/src/quick/items/qquickrendererinfo_p.h
+++ b/src/quick/items/qquickrendererinfo_p.h
@@ -63,23 +63,23 @@ class QQuickWindow;
 class QQuickRendererInfo : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(GraphicsAPI api READ api NOTIFY apiChanged FINAL)
+    Q_PROPERTY(GraphicsApi api READ api NOTIFY apiChanged FINAL)
 
 public:
     // must match QSGRendererInterface
-    enum GraphicsAPI {
+    enum GraphicsApi {
         Unknown,
         Software,
         OpenGL,
         Direct3D12
     };
-    Q_ENUM(GraphicsAPI)
+    Q_ENUM(GraphicsApi)
 
     QQuickRendererInfo(QQuickItem *item = 0);
 
     static QQuickRendererInfo *qmlAttachedProperties(QObject *object);
 
-    GraphicsAPI api() const { return m_api; }
+    GraphicsApi api() const { return m_api; }
 
 Q_SIGNALS:
     void apiChanged();
@@ -90,7 +90,7 @@ private Q_SLOTS:
 
 private:
     QPointer<QQuickWindow> m_window;
-    GraphicsAPI m_api;
+    GraphicsApi m_api;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 6333bf704a..b3ca563f16 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3223,7 +3223,7 @@ QOpenGLContext *QQuickWindow::openglContext() const
     Q_D(const QQuickWindow);
     if (d->context && d->context->isValid()) {
         QSGRendererInterface *rif = d->context->sceneGraphContext()->rendererInterface(d->context);
-        if (rif && rif->graphicsAPI() == QSGRendererInterface::OpenGL) {
+        if (rif && rif->graphicsApi() == QSGRendererInterface::OpenGL) {
             auto openglRenderContext = static_cast<const QSGDefaultRenderContext *>(d->context);
             return openglRenderContext->openglContext();
         }
@@ -4453,7 +4453,7 @@ QSGRendererInterface *QQuickWindow::rendererInterface() const
 
     \since 5.8
  */
-void QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsAPI api)
+void QQuickWindow::setSceneGraphBackend(QSGRendererInterface::GraphicsApi api)
 {
     switch (api) {
     case QSGRendererInterface::Software:
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index 37be6d591c..c741772253 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -156,7 +156,7 @@ public:
 
     QSGRendererInterface *rendererInterface() const;
 
-    static void setSceneGraphBackend(QSGRendererInterface::GraphicsAPI api);
+    static void setSceneGraphBackend(QSGRendererInterface::GraphicsApi api);
     static void setSceneGraphBackend(const QString &backend);
 
 Q_SIGNALS:
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;