Changeset 468fa8e7e5 in tspsg

Timestamp:

Mar 27, 2016, 8:36:12 PM (9 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master

Children:

08d3a94c1c, 21361c757d, 7373d6357f

Parents:

b9167cec6d

git-author:

Oleksii Serdiuk <contacts@…> (03/27/16 20:36:12)

git-committer:

Oleksii Serdiuk <contacts@…> (04/18/16 19:18:49)

Message:

Fix compilation errors when C++11 is enabled

Location:

src

Files:

• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp (modified) (1 diff)
• globals.h (modified) (1 diff)
• mainwindow.cpp (modified) (1 diff)

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

@@ -66 +66 @@
 #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

src/globals.h

@@ -129 +129 @@
 
 #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

src/mainwindow.cpp

@@ -1446 +1446 @@
             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 {