Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

added const to copy constructors

Browse source
This commit is contained in:
Thijs Wenker 2014-11-15 00:21:50 +01:00
parent 1a9f7c6e21
commit 38ed104397
36 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/overlays/Base3DOverlay.cpp
View file

@ -31,7 +31,7 @@ Base3DOverlay::Base3DOverlay() :
{
}
Base3DOverlay::Base3DOverlay(Base3DOverlay* base3DOverlay) :
Base3DOverlay::Base3DOverlay(const Base3DOverlay* base3DOverlay) :
Overlay(base3DOverlay),
_position(base3DOverlay->_position),
_lineWidth(base3DOverlay->_lineWidth),

2
interface/src/ui/overlays/Base3DOverlay.h
View file

@ -23,7 +23,7 @@ class Base3DOverlay : public Overlay {
public:
Base3DOverlay();
Base3DOverlay(Base3DOverlay* base3DOverlay);
Base3DOverlay(const Base3DOverlay* base3DOverlay);
~Base3DOverlay();
// getters

4
interface/src/ui/overlays/BillboardOverlay.cpp
View file

@ -24,7 +24,7 @@ BillboardOverlay::BillboardOverlay() :
_isLoaded = false;
}
BillboardOverlay::BillboardOverlay(BillboardOverlay* billboardOverlay) :
BillboardOverlay::BillboardOverlay(const BillboardOverlay* billboardOverlay) :
Base3DOverlay(billboardOverlay),
_newTextureNeeded(true),
_scale(billboardOverlay->_scale),
@ -226,6 +226,6 @@ bool BillboardOverlay::findRayIntersection(const glm::vec3& origin, const glm::v
return false;
}
BillboardOverlay* BillboardOverlay::createClone() {
BillboardOverlay* BillboardOverlay::createClone() const {
return new BillboardOverlay(this);
}

4
interface/src/ui/overlays/BillboardOverlay.h
View file

@ -22,7 +22,7 @@ class BillboardOverlay : public Base3DOverlay {
Q_OBJECT
public:
BillboardOverlay();
BillboardOverlay(BillboardOverlay* billboardOverlay);
BillboardOverlay(const BillboardOverlay* billboardOverlay);
virtual void render(RenderArgs* args);
@ -37,7 +37,7 @@ public:
virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, BoxFace& face) const;
virtual BillboardOverlay* createClone();
virtual BillboardOverlay* createClone() const;
private slots:
void replyFinished();

4
interface/src/ui/overlays/Circle3DOverlay.cpp
View file

@ -33,7 +33,7 @@ Circle3DOverlay::Circle3DOverlay() :
_minorTickMarksColor.red = _minorTickMarksColor.green = _minorTickMarksColor.blue = (unsigned char)0;
}
Circle3DOverlay::Circle3DOverlay(Circle3DOverlay* circle3DOverlay) :
Circle3DOverlay::Circle3DOverlay(const Circle3DOverlay* circle3DOverlay) :
Planar3DOverlay(circle3DOverlay),
_startAt(circle3DOverlay->_startAt),
_endAt(circle3DOverlay->_endAt),
@ -374,6 +374,6 @@ bool Circle3DOverlay::findRayIntersection(const glm::vec3& origin,
return intersects;
}
Circle3DOverlay* Circle3DOverlay::createClone() {
Circle3DOverlay* Circle3DOverlay::createClone() const {
return new Circle3DOverlay(this);
}

4
interface/src/ui/overlays/Circle3DOverlay.h
View file

@ -18,7 +18,7 @@ class Circle3DOverlay : public Planar3DOverlay {
public:
Circle3DOverlay();
Circle3DOverlay(Circle3DOverlay* circle3DOverlay);
Circle3DOverlay(const Circle3DOverlay* circle3DOverlay);
~Circle3DOverlay();
virtual void render(RenderArgs* args);
virtual void setProperties(const QScriptValue& properties);
@ -50,7 +50,7 @@ public:
virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance, BoxFace& face) const;
virtual Circle3DOverlay* createClone();
virtual Circle3DOverlay* createClone() const;
protected:
float _startAt;

4
interface/src/ui/overlays/Cube3DOverlay.cpp
View file

@ -22,7 +22,7 @@
Cube3DOverlay::Cube3DOverlay() {
}
Cube3DOverlay::Cube3DOverlay(Cube3DOverlay* cube3DOverlay) :
Cube3DOverlay::Cube3DOverlay(const Cube3DOverlay* cube3DOverlay) :
Volume3DOverlay(cube3DOverlay)
{
}
@ -108,6 +108,6 @@ void Cube3DOverlay::render(RenderArgs* args) {
}
}
Cube3DOverlay* Cube3DOverlay::createClone() {
Cube3DOverlay* Cube3DOverlay::createClone() const {
return new Cube3DOverlay(this);
}

4
interface/src/ui/overlays/Cube3DOverlay.h
View file

@ -18,11 +18,11 @@ class Cube3DOverlay : public Volume3DOverlay {
public:
Cube3DOverlay();
Cube3DOverlay(Cube3DOverlay* cube3DOverlay);
Cube3DOverlay(const Cube3DOverlay* cube3DOverlay);
~Cube3DOverlay();
virtual void render(RenderArgs* args);
virtual Cube3DOverlay* createClone();
virtual Cube3DOverlay* createClone() const;
};

4
interface/src/ui/overlays/Grid3DOverlay.cpp
View file

@ -20,7 +20,7 @@ Grid3DOverlay::Grid3DOverlay() : Base3DOverlay(),
_majorGridEvery(5) {
}
Grid3DOverlay::Grid3DOverlay(Grid3DOverlay* grid3DOverlay) :
Grid3DOverlay::Grid3DOverlay(const Grid3DOverlay* grid3DOverlay) :
Base3DOverlay(grid3DOverlay),
_minorGridWidth(grid3DOverlay->_minorGridWidth),
_majorGridEvery(grid3DOverlay->_majorGridEvery)
@ -135,6 +135,6 @@ QScriptValue Grid3DOverlay::getProperty(const QString& property) {
return Base3DOverlay::getProperty(property);
}
Grid3DOverlay* Grid3DOverlay::createClone() {
Grid3DOverlay* Grid3DOverlay::createClone() const {
return new Grid3DOverlay(this);
}

4
interface/src/ui/overlays/Grid3DOverlay.h
View file

@ -29,14 +29,14 @@ class Grid3DOverlay : public Base3DOverlay {
public:
Grid3DOverlay();
Grid3DOverlay(Grid3DOverlay* grid3DOverlay);
Grid3DOverlay(const Grid3DOverlay* grid3DOverlay);
~Grid3DOverlay();
virtual void render(RenderArgs* args);
virtual void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property);
virtual Grid3DOverlay* createClone();
virtual Grid3DOverlay* createClone() const;
private:
float _minorGridWidth;

4
interface/src/ui/overlays/ImageOverlay.cpp
View file

@ -27,7 +27,7 @@ ImageOverlay::ImageOverlay() :
_isLoaded = false;
}
ImageOverlay::ImageOverlay(ImageOverlay* imageOverlay) :
ImageOverlay::ImageOverlay(const ImageOverlay* imageOverlay) :
Overlay2D(imageOverlay),
_textureID(0),
_textureBound(false),
@ -172,6 +172,6 @@ QScriptValue ImageOverlay::getProperty(const QString& property) {
return Overlay2D::getProperty(property);
}
ImageOverlay* ImageOverlay::createClone() {
ImageOverlay* ImageOverlay::createClone() const {
return new ImageOverlay(this);
}

4
interface/src/ui/overlays/ImageOverlay.h
View file

@ -33,7 +33,7 @@ class ImageOverlay : public Overlay2D {
public:
ImageOverlay();
ImageOverlay(ImageOverlay* imageOverlay);
ImageOverlay(const ImageOverlay* imageOverlay);
~ImageOverlay();
virtual void render(RenderArgs* args);
@ -47,7 +47,7 @@ public:
virtual void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property);
virtual ImageOverlay* createClone();
virtual ImageOverlay* createClone() const;
private slots:
void replyFinished(); // we actually want to hide this...

4
interface/src/ui/overlays/Line3DOverlay.cpp
View file

@ -18,7 +18,7 @@
Line3DOverlay::Line3DOverlay() {
}
Line3DOverlay::Line3DOverlay(Line3DOverlay* line3DOverlay) :
Line3DOverlay::Line3DOverlay(const Line3DOverlay* line3DOverlay) :
Base3DOverlay(line3DOverlay),
_end(line3DOverlay->_end)
{
@ -94,6 +94,6 @@ QScriptValue Line3DOverlay::getProperty(const QString& property) {
return Base3DOverlay::getProperty(property);
}
Line3DOverlay* Line3DOverlay::createClone() {
Line3DOverlay* Line3DOverlay::createClone() const {
return new Line3DOverlay(this);
}

4
interface/src/ui/overlays/Line3DOverlay.h
View file

@ -18,7 +18,7 @@ class Line3DOverlay : public Base3DOverlay {
public:
Line3DOverlay();
Line3DOverlay(Line3DOverlay* line3DOverlay);
Line3DOverlay(const Line3DOverlay* line3DOverlay);
~Line3DOverlay();
virtual void render(RenderArgs* args);
@ -31,7 +31,7 @@ public:
virtual void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property);
virtual Line3DOverlay* createClone();
virtual Line3DOverlay* createClone() const;
protected:
glm::vec3 _end;

8
interface/src/ui/overlays/LocalModelsOverlay.cpp
View file

@ -18,9 +18,9 @@ LocalModelsOverlay::LocalModelsOverlay(EntityTreeRenderer* entityTreeRenderer) :
_entityTreeRenderer(entityTreeRenderer) {
}
LocalModelsOverlay::LocalModelsOverlay(EntityTreeRenderer* entityTreeRenderer, LocalModelsOverlay* localModelsOverlay) :
LocalModelsOverlay::LocalModelsOverlay(const LocalModelsOverlay* localModelsOverlay) :
Volume3DOverlay(localModelsOverlay),
_entityTreeRenderer(entityTreeRenderer)
_entityTreeRenderer(localModelsOverlay->_entityTreeRenderer)
{
}
@ -56,6 +56,6 @@ void LocalModelsOverlay::render(RenderArgs* args) {
}
}
LocalModelsOverlay* LocalModelsOverlay::createClone() {
return new LocalModelsOverlay(Application::getInstance()->getEntityClipboardRenderer(), this);
LocalModelsOverlay* LocalModelsOverlay::createClone() const {
return new LocalModelsOverlay(this);
}

4
interface/src/ui/overlays/LocalModelsOverlay.h
View file

@ -20,13 +20,13 @@ class LocalModelsOverlay : public Volume3DOverlay {
Q_OBJECT
public:
LocalModelsOverlay(EntityTreeRenderer* entityTreeRenderer);
LocalModelsOverlay(EntityTreeRenderer* entityTreeRenderer, LocalModelsOverlay* localModelsOverlay);
LocalModelsOverlay(const LocalModelsOverlay* localModelsOverlay);
~LocalModelsOverlay();
virtual void update(float deltatime);
virtual void render(RenderArgs* args);
virtual LocalModelsOverlay* createClone();
virtual LocalModelsOverlay* createClone() const;
private:
EntityTreeRenderer* _entityTreeRenderer;

4
interface/src/ui/overlays/LocalVoxelsOverlay.cpp
View file

@ -28,7 +28,7 @@ LocalVoxelsOverlay::LocalVoxelsOverlay() :
{
}
LocalVoxelsOverlay::LocalVoxelsOverlay(LocalVoxelsOverlay* localVoxelsOverlay) :
LocalVoxelsOverlay::LocalVoxelsOverlay(const LocalVoxelsOverlay* localVoxelsOverlay) :
Volume3DOverlay(localVoxelsOverlay),
_voxelCount(localVoxelsOverlay->_voxelCount)
{
@ -109,7 +109,7 @@ void LocalVoxelsOverlay::setProperties(const QScriptValue &properties) {
}
}
LocalVoxelsOverlay* LocalVoxelsOverlay::createClone() {
LocalVoxelsOverlay* LocalVoxelsOverlay::createClone() const {
return new LocalVoxelsOverlay(this);
}

4
interface/src/ui/overlays/LocalVoxelsOverlay.h
View file

@ -32,7 +32,7 @@ class LocalVoxelsOverlay : public Volume3DOverlay {
Q_OBJECT
public:
LocalVoxelsOverlay();
LocalVoxelsOverlay(LocalVoxelsOverlay* localVoxelsOverlay);
LocalVoxelsOverlay(const LocalVoxelsOverlay* localVoxelsOverlay);
~LocalVoxelsOverlay();
virtual void update(float deltatime);
@ -41,7 +41,7 @@ public:
virtual void setProperties(const QScriptValue& properties);
virtual QScriptValue getProperty(const QString& property);
virtual LocalVoxelsOverlay* createClone();
virtual LocalVoxelsOverlay* createClone() const;
private:
static QMap<QString, WeakVoxelSystemPointer> _voxelSystemMap; // treeName/voxelSystem

4
interface/src/ui/overlays/ModelOverlay.cpp
View file

@ -22,7 +22,7 @@ ModelOverlay::ModelOverlay()
_isLoaded = false;
}
ModelOverlay::ModelOverlay(ModelOverlay* modelOverlay) :
ModelOverlay::ModelOverlay(const ModelOverlay* modelOverlay) :
Base3DOverlay(modelOverlay),
_model(),
_modelTextures(QVariantMap()),
@ -182,6 +182,6 @@ bool ModelOverlay::findRayIntersectionExtraInfo(const glm::vec3& origin, const g
return _model.findRayIntersectionAgainstSubMeshes(origin, direction, distance, face, extraInfo);
}
ModelOverlay* ModelOverlay::createClone() {
ModelOverlay* ModelOverlay::createClone() const {
return new ModelOverlay(this);
}

4
interface/src/ui/overlays/ModelOverlay.h
View file

@ -20,7 +20,7 @@ class ModelOverlay : public Base3DOverlay {
Q_OBJECT
public:
ModelOverlay();
ModelOverlay(ModelOverlay* modelOverlay);
ModelOverlay(const ModelOverlay* modelOverlay);
virtual void update(float deltatime);
virtual void render(RenderArgs* args);
@ -30,7 +30,7 @@ public:
virtual bool findRayIntersectionExtraInfo(const glm::vec3& origin, const glm::vec3& direction,
float& distance, BoxFace& face, QString& extraInfo) const;
virtual ModelOverlay* createClone();
virtual ModelOverlay* createClone() const;
private:

2
interface/src/ui/overlays/Overlay.cpp
View file

@ -39,7 +39,7 @@ Overlay::Overlay() :
{
}
Overlay::Overlay(Overlay* overlay) :
Overlay::Overlay(const Overlay* overlay) :
_parent(NULL),
_alpha(overlay->_alpha),
_lastPulseUpdate(usecTimestampNow()),

4
interface/src/ui/overlays/Overlay.h
View file

@ -36,7 +36,7 @@ public:
};
Overlay();
Overlay(Overlay* overlay);
Overlay(const Overlay* overlay);
~Overlay();
void init(QGLWidget* parent, QScriptEngine* scriptEngine);
virtual void update(float deltatime) {}
@ -79,7 +79,7 @@ public:
void setAlphaPulse(float value) { _alphaPulse = value; }
virtual void setProperties(const QScriptValue& properties);
virtual Overlay* createClone() = 0;
virtual Overlay* createClone() const = 0;
virtual QScriptValue getProperty(const QString& property);
protected:

2
interface/src/ui/overlays/Overlay2D.cpp
View file

@ -22,7 +22,7 @@
Overlay2D::Overlay2D() {
}
Overlay2D::Overlay2D(Overlay2D* overlay2D) :
Overlay2D::Overlay2D(const Overlay2D* overlay2D) :
Overlay(overlay2D),
_bounds(overlay2D->_bounds)
{

2
interface/src/ui/overlays/Overlay2D.h
View file

@ -28,7 +28,7 @@ class Overlay2D : public Overlay {
public:
Overlay2D();
Overlay2D(Overlay2D* overlay2D);
Overlay2D(const Overlay2D* overlay2D);
~Overlay2D();
virtual bool is3D() const { return false; }

2
interface/src/ui/overlays/Planar3DOverlay.cpp
View file

@ -26,7 +26,7 @@ Planar3DOverlay::Planar3DOverlay() :
{
}
Planar3DOverlay::Planar3DOverlay(Planar3DOverlay* planar3DOverlay) :
Planar3DOverlay::Planar3DOverlay(const Planar3DOverlay* planar3DOverlay) :
Base3DOverlay(planar3DOverlay),
_dimensions(planar3DOverlay->_dimensions)
{

2
interface/src/ui/overlays/Planar3DOverlay.h
View file

@ -26,7 +26,7 @@ class Planar3DOverlay : public Base3DOverlay {
public:
Planar3DOverlay();
Planar3DOverlay(Planar3DOverlay* planar3DOverlay);
Planar3DOverlay(const Planar3DOverlay* planar3DOverlay);
~Planar3DOverlay();
// getters

4
interface/src/ui/overlays/Rectangle3DOverlay.cpp
View file

@ -20,7 +20,7 @@
Rectangle3DOverlay::Rectangle3DOverlay() {
}
Rectangle3DOverlay::Rectangle3DOverlay(Rectangle3DOverlay* rectangle3DOverlay) :
Rectangle3DOverlay::Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay) :
Planar3DOverlay(rectangle3DOverlay)
{
}
@ -111,6 +111,6 @@ void Rectangle3DOverlay::setProperties(const QScriptValue &properties) {
Planar3DOverlay::setProperties(properties);
}
Rectangle3DOverlay* Rectangle3DOverlay::createClone() {
Rectangle3DOverlay* Rectangle3DOverlay::createClone() const {
return new Rectangle3DOverlay(this);
}

4
interface/src/ui/overlays/Rectangle3DOverlay.h
View file

@ -18,12 +18,12 @@ class Rectangle3DOverlay : public Planar3DOverlay {
public:
Rectangle3DOverlay();
Rectangle3DOverlay(Rectangle3DOverlay* rectangle3DOverlay);
Rectangle3DOverlay(const Rectangle3DOverlay* rectangle3DOverlay);
~Rectangle3DOverlay();
virtual void render(RenderArgs* args);
virtual void setProperties(const QScriptValue& properties);
virtual Rectangle3DOverlay* createClone();
virtual Rectangle3DOverlay* createClone() const;
};

4
interface/src/ui/overlays/Sphere3DOverlay.cpp
View file

@ -21,7 +21,7 @@
Sphere3DOverlay::Sphere3DOverlay() {
}
Sphere3DOverlay::Sphere3DOverlay(Sphere3DOverlay* Sphere3DOverlay) :
Sphere3DOverlay::Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay) :
Volume3DOverlay(Sphere3DOverlay)
{
}
@ -76,6 +76,6 @@ void Sphere3DOverlay::render(RenderArgs* args) {
}
Sphere3DOverlay* Sphere3DOverlay::createClone() {
Sphere3DOverlay* Sphere3DOverlay::createClone() const {
return new Sphere3DOverlay(this);
}

4
interface/src/ui/overlays/Sphere3DOverlay.h
View file

@ -18,11 +18,11 @@ class Sphere3DOverlay : public Volume3DOverlay {
public:
Sphere3DOverlay();
Sphere3DOverlay(Sphere3DOverlay* Sphere3DOverlay);
Sphere3DOverlay(const Sphere3DOverlay* Sphere3DOverlay);
~Sphere3DOverlay();
virtual void render(RenderArgs* args);
virtual Sphere3DOverlay* createClone();
virtual Sphere3DOverlay* createClone() const;
};

4
interface/src/ui/overlays/Text3DOverlay.cpp
View file

@ -31,7 +31,7 @@ Text3DOverlay::Text3DOverlay() :
{
}
Text3DOverlay::Text3DOverlay(Text3DOverlay* text3DOverlay) :
Text3DOverlay::Text3DOverlay(const Text3DOverlay* text3DOverlay) :
Planar3DOverlay(text3DOverlay),
_text(text3DOverlay->_text),
_backgroundColor(text3DOverlay->_backgroundColor),
@ -220,7 +220,7 @@ QScriptValue Text3DOverlay::getProperty(const QString& property) {
return Planar3DOverlay::getProperty(property);
}
Text3DOverlay* Text3DOverlay::createClone() {
Text3DOverlay* Text3DOverlay::createClone() const {
return new Text3DOverlay(this);;
}

4
interface/src/ui/overlays/Text3DOverlay.h
View file

@ -24,7 +24,7 @@ class Text3DOverlay : public Planar3DOverlay {
public:
Text3DOverlay();
Text3DOverlay(Text3DOverlay* text3DOverlay);
Text3DOverlay(const Text3DOverlay* text3DOverlay);
~Text3DOverlay();
virtual void render(RenderArgs* args);
@ -52,7 +52,7 @@ public:
float textWidth(const QString& text) const; // Meters
virtual Text3DOverlay* createClone();
virtual Text3DOverlay* createClone() const;
private:
void enableClipPlane(GLenum plane, float x, float y, float z, float w);

6
interface/src/ui/overlays/TextOverlay.cpp
View file

@ -25,7 +25,7 @@ TextOverlay::TextOverlay() :
{
}
TextOverlay::TextOverlay(TextOverlay* textOverlay) :
TextOverlay::TextOverlay(const TextOverlay* textOverlay) :
Overlay2D(textOverlay),
_text(textOverlay->_text),
_backgroundColor(textOverlay->_backgroundColor),
@ -134,8 +134,8 @@ void TextOverlay::setProperties(const QScriptValue& properties) {
}
}
TextOverlay* TextOverlay::createClone() {
return new TextOverlay(this);;
TextOverlay* TextOverlay::createClone() const {
return new TextOverlay(this);
}
QScriptValue TextOverlay::getProperty(const QString& property) {

4
interface/src/ui/overlays/TextOverlay.h
View file

@ -37,7 +37,7 @@ class TextOverlay : public Overlay2D {
public:
TextOverlay();
TextOverlay(TextOverlay* textOverlay);
TextOverlay(const TextOverlay* textOverlay);
~TextOverlay();
virtual void render(RenderArgs* args);
@ -54,7 +54,7 @@ public:
void setFontSize(int fontSize) { _fontSize = fontSize; }
virtual void setProperties(const QScriptValue& properties);
virtual TextOverlay* createClone();
virtual TextOverlay* createClone() const;
virtual QScriptValue getProperty(const QString& property);
float textWidth(const QString& text) const; // Pixels

2
interface/src/ui/overlays/Volume3DOverlay.cpp
View file

@ -28,7 +28,7 @@ Volume3DOverlay::Volume3DOverlay() :
{
}
Volume3DOverlay::Volume3DOverlay(Volume3DOverlay* volume3DOverlay) :
Volume3DOverlay::Volume3DOverlay(const Volume3DOverlay* volume3DOverlay) :
Base3DOverlay(volume3DOverlay),
_dimensions(volume3DOverlay->_dimensions)
{

2
interface/src/ui/overlays/Volume3DOverlay.h
View file

@ -26,7 +26,7 @@ class Volume3DOverlay : public Base3DOverlay {
public:
Volume3DOverlay();
Volume3DOverlay(Volume3DOverlay* volume3DOverlay);
Volume3DOverlay(const Volume3DOverlay* volume3DOverlay);
~Volume3DOverlay();
// getters