Class QRendererSettings rename to QRenderSettings

Task-number: QTBUG-51459
Change-Id: Id304a16f81d310345792cf13c95fde7741246f5c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

6 files changed, 41 insertions, 41 deletions

diff --git a/src/render/backend/abstractrenderer_p.h b/src/render/backend/abstractrenderer_p.h
index 13eceb3c5..92ff9e456 100644
--- a/src/render/backend/abstractrenderer_p.h
+++ b/src/render/backend/abstractrenderer_p.h
@@ -77,7 +77,7 @@ namespace Render {
 class NodeManagers;
 class Entity;
 class FrameGraphNode;
-class RendererSettings;
+class RenderSettings;
 class BackendNode;
 
 
@@ -142,8 +142,8 @@ public:
     virtual Qt3DCore::QAbstractFrameAdvanceService *frameAdvanceService() const = 0;
     virtual void registerEventFilter(Qt3DCore::QEventFilterService *service) = 0;
 
-    virtual void setSettings(RendererSettings *settings) = 0;
-    virtual RendererSettings *settings() const = 0;
+    virtual void setSettings(RenderSettings *settings) = 0;
+    virtual RenderSettings *settings() const = 0;
 
 };
 
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index c8e8784ea..1ec388bab 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -31,7 +31,7 @@ HEADERS += \
     $$PWD/trianglesvisitor_p.h \
     $$PWD/abstractrenderer_p.h \
     $$PWD/computejob_p.h \
-    $$PWD/renderersettings_p.h \
+    $$PWD/rendersettings_p.h \
     $$PWD/stringtoint_p.h \
     $$PWD/backendnode_p.h \
     $$PWD/rendertargetoutput_p.h
@@ -59,7 +59,7 @@ SOURCES += \
     $$PWD/trianglesextractor.cpp \
     $$PWD/trianglesvisitor.cpp \
     $$PWD/computejob.cpp \
-    $$PWD/renderersettings.cpp \
+    $$PWD/rendersettings.cpp \
     $$PWD/stringtoint.cpp \
     $$PWD/backendnode.cpp \
     $$PWD/rendertargetoutput.cpp
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 570560feb..727768a5c 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -107,7 +107,7 @@ namespace Render {
 
 const QString SCENE_PARSERS_PATH = QStringLiteral("/sceneparsers");
 
-const RendererSettings Renderer::ms_defaultSettings;
+const RenderSettings Renderer::ms_defaultSettings;
 
 /*!
     \internal
@@ -144,7 +144,7 @@ Renderer::Renderer(QRenderAspect::RenderType type)
     , m_glContext(Q_NULLPTR)
     , m_pickBoundingVolumeJob(Q_NULLPTR)
     , m_time(0)
-    , m_settings(const_cast<RendererSettings *>(&ms_defaultSettings))
+    , m_settings(const_cast<RenderSettings *>(&ms_defaultSettings))
 {
     // Set renderer as running - it will wait in the context of the
     // RenderThread for RenderViews to be submitted
@@ -439,17 +439,17 @@ void Renderer::registerEventFilter(QEventFilterService *service)
     service->registerEventFilter(m_pickEventFilter.data(), 1024);
 }
 
-void Renderer::setSettings(RendererSettings *settings)
+void Renderer::setSettings(RenderSettings *settings)
 {
     // If default settings not in use, clean up
     if (m_settings != &ms_defaultSettings)
         delete m_settings;
 
     // If removing settings, restore to default
-    m_settings = (settings != Q_NULLPTR) ? settings : const_cast<RendererSettings *>(&ms_defaultSettings);
+    m_settings = (settings != Q_NULLPTR) ? settings : const_cast<RenderSettings *>(&ms_defaultSettings);
 }
 
-RendererSettings *Renderer::settings() const
+RenderSettings *Renderer::settings() const
 {
     return m_settings;
 }
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 6933c4ead..617cd773f 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -60,7 +60,7 @@
 #include <Qt3DCore/qaspectjob.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
 #include <Qt3DRender/private/pickboundingvolumejob_p.h>
-#include <Qt3DRender/private/renderersettings_p.h>
+#include <Qt3DRender/private/rendersettings_p.h>
 
 #include <QHash>
 #include <QMatrix4x4>
@@ -169,8 +169,8 @@ public:
 
     void registerEventFilter(Qt3DCore::QEventFilterService *service) Q_DECL_OVERRIDE;
 
-    virtual void setSettings(RendererSettings *settings) Q_DECL_OVERRIDE;
-    virtual RendererSettings *settings() const Q_DECL_OVERRIDE;
+    virtual void setSettings(RenderSettings *settings) Q_DECL_OVERRIDE;
+    virtual RenderSettings *settings() const Q_DECL_OVERRIDE;
 
     bool executeCommands(const RenderView *rv);
     Attribute *updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
@@ -264,8 +264,8 @@ private:
 
     qint64 m_time;
 
-    RendererSettings *m_settings;
-    static const RendererSettings ms_defaultSettings;
+    RenderSettings *m_settings;
+    static const RenderSettings ms_defaultSettings;
 
     void performDraw(Geometry *rGeometry, GeometryRenderer *rGeometryRenderer,
                      GLsizei primitiveCount, Attribute *indexAttribute);
diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/rendersettings.cpp
index db6bfc55a..e51379e5a 100644
--- a/src/render/backend/renderersettings.cpp
+++ b/src/render/backend/rendersettings.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#include "renderersettings_p.h"
+#include "rendersettings_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/private/abstractrenderer_p.h>
@@ -49,64 +49,64 @@ using namespace Qt3DCore;
 namespace Qt3DRender {
 namespace Render {
 
-RendererSettings::RendererSettings()
+RenderSettings::RenderSettings()
     : BackendNode()
 {
 }
 
-void RendererSettings::updateFromPeer(Qt3DCore::QNode *peer)
+void RenderSettings::updateFromPeer(Qt3DCore::QNode *peer)
 {
-    QRendererSettings *settings = static_cast<QRendererSettings *>(peer);
+    QRenderSettings *settings = static_cast<QRenderSettings *>(peer);
     m_pickMethod = settings->pickMethod();
     m_pickResultMode = settings->pickResultMode();
 }
 
-void RendererSettings::cleanup()
+void RenderSettings::cleanup()
 {
-    m_pickMethod = QRendererSettings::BoundingVolumePicking;
-    m_pickResultMode = QRendererSettings::NearestPick;
+    m_pickMethod = QRenderSettings::BoundingVolumePicking;
+    m_pickResultMode = QRenderSettings::NearestPick;
 }
 
-void RendererSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
+void RenderSettings::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     if (e->type() == NodeUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->propertyName() == QByteArrayLiteral("pickMethod"))
-            m_pickMethod = propertyChange->value().value<QRendererSettings::PickMethod>();
+            m_pickMethod = propertyChange->value().value<QRenderSettings::PickMethod>();
         else if (propertyChange->propertyName() == QByteArrayLiteral("pickResult"))
-            m_pickResultMode = propertyChange->value().value<QRendererSettings::PickResultMode>();
+            m_pickResultMode = propertyChange->value().value<QRenderSettings::PickResultMode>();
         markDirty(AbstractRenderer::AllDirty);
     }
 }
 
 
-RendererSettingsFunctor::RendererSettingsFunctor(AbstractRenderer *renderer)
+RenderSettingsFunctor::RenderSettingsFunctor(AbstractRenderer *renderer)
     : m_renderer(renderer)
 {
 }
 
-Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *frontend) const
+Qt3DCore::QBackendNode *RenderSettingsFunctor::create(Qt3DCore::QNode *frontend) const
 {
-    QRendererSettings *settingsFrontend = static_cast<QRendererSettings *>(frontend);
+    QRenderSettings *settingsFrontend = static_cast<QRenderSettings *>(frontend);
     if (m_renderer->settings() != Q_NULLPTR) {
         qWarning() << "Renderer settings already exists";
         return Q_NULLPTR;
     }
 
-    RendererSettings *settings = new RendererSettings;
+    RenderSettings *settings = new RenderSettings;
     settings->setPeer(settingsFrontend);
     settings->setRenderer(m_renderer);
     m_renderer->setSettings(settings);
     return settings;
 }
 
-Qt3DCore::QBackendNode *RendererSettingsFunctor::get(Qt3DCore::QNodeId id) const
+Qt3DCore::QBackendNode *RenderSettingsFunctor::get(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
     return Q_NULLPTR;
 }
 
-void RendererSettingsFunctor::destroy(Qt3DCore::QNodeId id) const
+void RenderSettingsFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
     // Deletes the old settings object
diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/rendersettings_p.h
index 802519cca..fdca3e0bc 100644
--- a/src/render/backend/renderersettings_p.h
+++ b/src/render/backend/rendersettings_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERERSETTINGS_H
-#define QT3DRENDER_RENDER_RENDERERSETTINGS_H
+#ifndef QT3DRENDER_RENDER_RENDERSETTINGS_H
+#define QT3DRENDER_RENDER_RENDERSETTINGS_H
 
 //
 //  W A R N I N G
@@ -52,7 +52,7 @@
 //
 
 #include <Qt3DRender/private/backendnode_p.h>
-#include <Qt3DRender/qrenderersettings.h>
+#include <Qt3DRender/qrendersettings.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -61,24 +61,24 @@ namespace Render {
 
 class AbstractRenderer;
 
-class RendererSettings : public BackendNode
+class RenderSettings : public BackendNode
 {
 public:
-    RendererSettings();
+    RenderSettings();
 
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void cleanup();
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    QRendererSettings::PickMethod m_pickMethod;
-    QRendererSettings::PickResultMode m_pickResultMode;
+    QRenderSettings::PickMethod m_pickMethod;
+    QRenderSettings::PickResultMode m_pickResultMode;
 };
 
-class RendererSettingsFunctor : public Qt3DCore::QBackendNodeMapper
+class RenderSettingsFunctor : public Qt3DCore::QBackendNodeMapper
 {
 public:
-    explicit RendererSettingsFunctor(AbstractRenderer *renderer);
+    explicit RenderSettingsFunctor(AbstractRenderer *renderer);
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE;
     Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
     void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
@@ -92,4 +92,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERERSETTINGS_H
+#endif // QT3DRENDER_RENDER_RENDERSETTINGS_H