Changeset 468fa8e7e5 in tspsg


Ignore:
Timestamp:
Mar 27, 2016, 8:36:12 PM (13 months ago)
Author:
leppa
Branches:
appveyor, master
Children:
02fedc7af6
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:
3 edited

Legend:

Unmodified
Added
Removed
  • src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

    rb9167cec6d r468fa8e7e5  
    6666#ifndef GET_ICON
    6767#   if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
    68 #       define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/"x".png"))
     68#       define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/128x128/" x ".png"))
    6969#   else
    70 #       define GET_ICON(x) QIcon(":/images/icons/128x128/"x".png")
     70#       define GET_ICON(x) QIcon(":/images/icons/128x128/" x ".png")
    7171#   endif
    7272#endif
  • src/globals.h

    rb9167cec6d r468fa8e7e5  
    129129
    130130#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
    131 #   define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT))
     131#   define GET_ICON(x) QIcon::fromTheme(x, QIcon(":/images/icons/" ICON_SIZE "/" x "." ICON_FORMAT))
    132132#else
    133 #   define GET_ICON(x) QIcon(":/images/icons/"ICON_SIZE"/"x"."ICON_FORMAT)
     133#   define GET_ICON(x) QIcon(":/images/icons/" ICON_SIZE "/" x "." ICON_FORMAT)
    134134// No QVariant::toReal() member in Qt < 4.6
    135135// A quick hack to maintain compatibility with Qt 4.5.x
  • src/mainwindow.cpp

    rb9167cec6d r468fa8e7e5  
    14461446            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()));
    14471447        } else {
    1448             pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
     1448            pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n" INFSTR);
    14491449        }
    14501450    } else {
Note: See TracChangeset for help on using the changeset viewer.