diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-04 21:20:19 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-04 21:20:19 (GMT) |
| commit | faf4a6485143a9b0d1bbc45ddb32ac1bcd111946 (patch) | |
| tree | c0a3b21e9409c40be3e8302066d41267df462f67 | |
| parent | 1e2e2f6944636ea26259688d46c67da57094d947 (diff) | |
Killed some warnings
| -rw-r--r-- | src/OpenCSGRenderer.cc | 2 | ||||
| -rw-r--r-- | src/ThrownTogetherRenderer.cc | 2 | ||||
| -rw-r--r-- | src/expr.cc | 2 | ||||
| -rw-r--r-- | src/glview.cc | 1 | ||||
| -rw-r--r-- | src/mainwin.cc | 4 | ||||
| -rw-r--r-- | src/primitives.cc | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/src/OpenCSGRenderer.cc b/src/OpenCSGRenderer.cc index 5d6b0da..a1aafc5 100644 --- a/src/OpenCSGRenderer.cc +++ b/src/OpenCSGRenderer.cc @@ -56,7 +56,7 @@ OpenCSGRenderer::OpenCSGRenderer(CSGChain *root_chain, CSGChain *highlights_chai { } -void OpenCSGRenderer::draw(bool showfaces, bool showedges) const +void OpenCSGRenderer::draw(bool /*showfaces*/, bool showedges) const { if (this->root_chain) { GLint *shaderinfo = this->shaderinfo; diff --git a/src/ThrownTogetherRenderer.cc b/src/ThrownTogetherRenderer.cc index 336c4c7..3ab13ea 100644 --- a/src/ThrownTogetherRenderer.cc +++ b/src/ThrownTogetherRenderer.cc @@ -40,7 +40,7 @@ ThrownTogetherRenderer::ThrownTogetherRenderer(CSGChain *root_chain, { } -void ThrownTogetherRenderer::draw(bool showfaces, bool showedges) const +void ThrownTogetherRenderer::draw(bool /*showfaces*/, bool showedges) const { if (this->root_chain) { glEnable(GL_CULL_FACE); diff --git a/src/expr.cc b/src/expr.cc index 7e1a25b..66a0d11 100644 --- a/src/expr.cc +++ b/src/expr.cc @@ -86,7 +86,7 @@ Value Expression::evaluate(const Context *context) const return *v1.vec[i]; } if (v1.type == Value::STRING && v2.type == Value::NUMBER) { - int i = (int)(v2.num); + int i = int(v2.num); if (i >= 0 && i < v1.text.size()) return Value(v1.text.substr(i, 1)); } diff --git a/src/glview.cc b/src/glview.cc index 8454cd6..bc287b5 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -535,7 +535,6 @@ void GLView::mouseMoveEvent(QMouseEvent *event) double dx = (this_mouse.x()-last_mouse.x()) * 0.7; double dy = (this_mouse.y()-last_mouse.y()) * 0.7; if (mouse_drag_active) { - int i = event->buttons(); if (event->buttons() & Qt::LeftButton #ifdef Q_WS_MAC && !(event->modifiers() & Qt::MetaModifier) diff --git a/src/mainwin.cc b/src/mainwin.cc index 22fb82c..29c84b0 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -849,11 +849,11 @@ void MainWindow::compileCSG(bool procevents) } if (root_chain->polysets.size() > 1000) { - PRINTF("WARNING: Normalized tree has %d elements!", root_chain->polysets.size()); + PRINTF("WARNING: Normalized tree has %d elements!", int(root_chain->polysets.size())); PRINTF("WARNING: OpenCSG rendering has been disabled."); } else { - PRINTF("Normalized CSG tree has %d elements", root_chain->polysets.size()); + PRINTF("Normalized CSG tree has %d elements", int(root_chain->polysets.size())); this->opencsgRenderer = new OpenCSGRenderer(this->root_chain, this->highlights_chain, this->background_chain, diff --git a/src/primitives.cc b/src/primitives.cc index b18a816..67e19c3 100644 --- a/src/primitives.cc +++ b/src/primitives.cc @@ -505,7 +505,7 @@ sphere_next_r2: for (size_t i=0; i<this->points.vec.size(); i++) { double x,y; if (!this->points.vec[i]->getv2(x, y)) { - PRINTF("ERROR: Unable to convert point at index %d to a vec2 of numbers", i); + PRINTF("ERROR: Unable to convert point at index %d to a vec2 of numbers", int(i)); delete p; return NULL; } |