diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:34:59 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-15 11:36:17 +0200 |
| commit | 64d6b482bfb9dbacd548b72cb9c073513f6aa56f (patch) | |
| tree | 6adea7f584f31d2b650379a4dba9ff6d7de527e3 /src/datavisualization/engine/abstract3drenderer_p.h | |
| parent | ca8eb71e320d08071f0f43393da3bb3fabf56da7 (diff) | |
Removed QDataVis and namespace macros
- docs will be fixed in QTRD-2594
Task-number: QTRD-2699
Task-number: QTRD-2700
Change-Id: Ia89d365c2de5d9254b165feb4f0a54ec099084be
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index c375b0b8..c38135ed 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -41,7 +41,7 @@ //#define DISPLAY_RENDER_SPEED -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +namespace QtDataVisualization { class TextureHelper; class Theme; @@ -70,7 +70,7 @@ public: virtual void render(GLuint defaultFboHandle); virtual void updateTheme(Q3DTheme *theme); - virtual void updateSelectionMode(QDataVis::SelectionFlags newMode); + virtual void updateSelectionMode(QAbstract3DGraph::SelectionFlags newMode); virtual void updateScene(Q3DScene *scene); virtual void updateTextures() = 0; virtual void initSelectionBuffer() = 0; @@ -80,7 +80,7 @@ public: #if !defined(QT_OPENGL_ES_2) virtual void updateDepthBuffer() = 0; #endif - virtual void updateShadowQuality(QDataVis::ShadowQuality quality) = 0; + virtual void updateShadowQuality(QAbstract3DGraph::ShadowQuality quality) = 0; virtual void initShaders(const QString &vertexShader, const QString &fragmentShader) = 0; virtual void initGradientShaders(const QString &vertexShader, const QString &fragmentShader); virtual void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader) = 0; @@ -97,7 +97,7 @@ public: signals: void needRender(); // Emit this if something in renderer causes need for another render pass. - void requestShadowQuality(QDataVis::ShadowQuality quality); // For automatic quality adjustments + void requestShadowQuality(QAbstract3DGraph::ShadowQuality quality); // For automatic quality adjustments protected: Abstract3DRenderer(Abstract3DController *controller); @@ -118,10 +118,10 @@ protected: Q3DTheme *m_cachedTheme; Drawer *m_drawer; QRect m_viewport; - QDataVis::ShadowQuality m_cachedShadowQuality; + QAbstract3DGraph::ShadowQuality m_cachedShadowQuality; GLfloat m_autoScaleAdjustment; - QDataVis::SelectionFlags m_cachedSelectionMode; + QAbstract3DGraph::SelectionFlags m_cachedSelectionMode; AxisRenderCache m_axisCacheX; AxisRenderCache m_axisCacheY; @@ -146,6 +146,6 @@ protected: #endif }; -QT_DATAVISUALIZATION_END_NAMESPACE +} #endif // ABSTRACT3DRENDERER_P_H |