Permalink
Browse files

Fix compilation errors when C++11 is enabled

  • Loading branch information...
1 parent 81b44a2 commit 55407ad017fe2113296157271804e2f24fa36777 @leppa committed with Oleksii Serdiuk Mar 27, 2016
Showing with 5 additions and 5 deletions.
  1. +2 −2 src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp
  2. +2 −2 src/globals.h
  3. +1 −1 src/mainwindow.cpp
@@ -65,9 +65,9 @@
#ifndef GET_ICON
# if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
-# define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/"x".png"))
+# define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/" x ".png"))
# else
-# define GET_ICON(x) QIcon(":/images/icons/128x128/"x".png")
+# define GET_ICON(x) QIcon(":/images/icons/128x128/" x ".png")
# endif
#endif
View
@@ -128,9 +128,9 @@ void toggleStyle(QWidget *widget, bool enable);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
-# define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
+# define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/" ICON_SIZE "/" x "." ICON_FORMAT))
#else
-# define GET_ICON(x) QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT)
+# define GET_ICON(x) QIcon(":/images/icons/" ICON_SIZE "/" x "." ICON_FORMAT)
// No QVariant::toReal() member in Qt < 4.6
// A quick hack to maintain compatibility with Qt 4.5.x
# define toReal toDouble
View
@@ -1445,7 +1445,7 @@ QFont font;
if (step->price != INFINITY) {
pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, isInteger(step->price) ? QString("\n%1").arg(step->price) : QString("\n%1").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
} else {
- pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
+ pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n" INFSTR);
}
} else {
pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, tr("Root"));

0 comments on commit 55407ad

Please sign in to comment.