aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-07-02 13:58:03 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-07-02 13:58:03 -0700
commit6b08a6d42877f80912aebf74558a6a37c6fbabc4 (patch)
tree2f618608e37b085d6c5d1aa145139bd5dc2feab1
parentbe6e6638de10fd120a7adeb5d85121f41e99a9c9 (diff)
downloadsubsurface-6b08a6d42877f80912aebf74558a6a37c6fbabc4.tar.gz
Silence some warnings
One of them actually looks like it was a bug... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/diveplanner.cpp5
-rw-r--r--qt-ui/profilegraphics.cpp5
2 files changed, 6 insertions, 4 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 4a8ade9df..b0a763a04 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -27,8 +27,6 @@ DivePlannerGraphics::DivePlannerGraphics(QWidget* parent): QGraphicsView(parent)
setScene(new QGraphicsScene());
scene()->setSceneRect(0,0,1920,1080);
- QRectF r = scene()->sceneRect();
-
verticalLine = new QGraphicsLineItem(
fromPercent(0, Qt::Horizontal),
fromPercent(0, Qt::Vertical),
@@ -439,7 +437,7 @@ void Ruler::updateTicks()
double steps = (max - min) / interval;
double stepSize = (m.x2() - m.x1()) / steps;
qreal pos;
- for (qreal pos = m.x1(); pos < m.x2(); pos += stepSize) {
+ for (pos = m.x1(); pos < m.x2(); pos += stepSize) {
item = new QGraphicsLineItem(pos, m.y1(), pos, m.y1() + tickSize, this);
item->setPen(pen());
ticks.push_back(item);
@@ -500,7 +498,6 @@ qreal Ruler::posAtValue(qreal value)
qreal Ruler::percentAt(const QPointF& p)
{
qreal value = valueAt(p);
- QLineF m = line();
double size = max - min;
double percent = value / size;
return percent;
diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index f7a881bd2..7adabc6d3 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -28,7 +28,10 @@
#include <libdivecomputer/version.h>
static struct graphics_context last_gc;
+
+#if PRINT_IMPLEMENTED
static double plot_scale = SCALE_SCREEN;
+#endif
struct text_render_options{
double size;
@@ -122,6 +125,7 @@ bool ProfileGraphicsView::eventFilter(QObject* obj, QEvent* event)
return QGraphicsView::eventFilter(obj, event);
}
+#if PRINT_IMPLEMENTED
static void plot_set_scale(scale_mode_t scale)
{
switch (scale) {
@@ -134,6 +138,7 @@ static void plot_set_scale(scale_mode_t scale)
break;
}
}
+#endif
void ProfileGraphicsView::showEvent(QShowEvent* event)
{