summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-10 08:56:56 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-05-10 10:47:37 -0700
commitc129902793446cda9137f2b44c59d5840e4eeaec (patch)
tree798629c0e7b0d6ef4869ba5e39bfa2691a022475
parentb3b1b3f58f39d1b87028908691b46d89a12d2143 (diff)
downloadsubsurface-c129902793446cda9137f2b44c59d5840e4eeaec.tar.gz
Fix some compiler warnings
Passing the alignment as int instead of float or double was actually a bug as CENTER is defined as (-0.5) ... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--profile.h2
-rw-r--r--qt-ui/profilegraphics.cpp4
-rw-r--r--qt-ui/profilegraphics.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/profile.h b/profile.h
index 89324530a..2b2c7bff5 100644
--- a/profile.h
+++ b/profile.h
@@ -14,7 +14,7 @@ struct graphics_context;
struct plot_info;
struct plot_data {
unsigned int in_deco:1;
- unsigned int cylinderindex;
+ int cylinderindex;
int sec;
/* pressure[0] is sensor pressure
* pressure[1] is interpolated pressure */
diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index 01f627622..9c21028d9 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -550,7 +550,7 @@ void ProfileGraphicsView::plot_cylinder_pressure_text()
}
}
-void ProfileGraphicsView::plot_pressure_value(int mbar, int sec, int xalign, int yalign)
+void ProfileGraphicsView::plot_pressure_value(int mbar, int sec, double xalign, double yalign)
{
int pressure;
const char *unit;
@@ -1234,7 +1234,6 @@ void ToolTipItem::setRect(const QRectF& r)
void ToolTipItem::collapse()
{
- QRectF newRect = childrenBoundingRect();
QPropertyAnimation *animation = new QPropertyAnimation(this, "rect");
animation->setDuration(100);
animation->setStartValue(boundingRect());
@@ -1244,7 +1243,6 @@ void ToolTipItem::collapse()
void ToolTipItem::expand()
{
- QRectF currentRect = rectangle;
QRectF nextRectangle;
double width = 0, height = title->boundingRect().height() + SPACING;
diff --git a/qt-ui/profilegraphics.h b/qt-ui/profilegraphics.h
index 996c5927a..08dffd6a3 100644
--- a/qt-ui/profilegraphics.h
+++ b/qt-ui/profilegraphics.h
@@ -83,7 +83,7 @@ private:
void plot_text_samples();
void plot_depth_sample(struct plot_data *entry, text_render_options_t *tro);
void plot_cylinder_pressure_text();
- void plot_pressure_value(int mbar, int sec, int xalign, int yalign);
+ void plot_pressure_value(int mbar, int sec, double xalign, double yalign);
void plot_deco_text();
void plot_pp_gas_profile();
void plot_pp_text();