[Marble-devel] Review Request 125011: Use QStringLiteral for QFont

[Dāvis Mosāns]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125011/
-----------------------------------------------------------

(Updated Sept. 17, 2015, 1:03 a.m.)


Review request for Marble.


Changes
-------

rebase and QStringLiteral is preferable over QLatin1String for QFont because it accepts QString and not QLatin1String


Repository: marble


Description
-------

QFont accepts QString which can't be casted to char * when QT_NO_CAST_FROM_ASCII is used.

And it caused libkgeomap compile failure
In file included from /usr/include/qt/QtCore/qbytearray.h:680:0,
                 from /usr/include/qt/QtCore/qvariant.h:38,
                 from /usr/include/qt/QtCore/qabstractitemmodel.h:37,
                 from /usr/include/qt/QtCore/QModelIndex:1,
                 from /mnt/KDE/kde/kdegraphics/libs/libkgeomap/src/backend_map.h:34,
                 from /mnt/KDE/kde/kdegraphics/libs/libkgeomap/src/backend_map_marble.h:34,
                 from /mnt/KDE/kde/kdegraphics/libs/libkgeomap/src/backend_map_marble.cpp:29:
/usr/include/qt/QtCore/qstring.h:771:5: error: ‘QString::QString(const char*)’ is private
     QString(const char *ch);
     ^
In file included from /mnt/KDE/kde/kdegraphics/libs/libkgeomap/src/backend_map_marble.cpp:46:0:
/usr/include/marble/GeoPainter.h:312:101: error: within this context
                         const QColor& labelcolor = Qt::black, const QFont& labelFont = QFont("Arial"));
                                                                                                     ^
src/CMakeFiles/KF5KGeoMap.dir/build.make:518: recipe for target 'src/CMakeFiles/KF5KGeoMap.dir/backend_map_marble.cpp.o' failed


Diffs (updated)
-----

  src/lib/marble/AbstractFloatItem.cpp 7c380f17edc4cce7908836afe76d86136c0d2312 
  src/lib/marble/GeoPainter.h 47b15cd0d7ed05c1a65f8bf1e3e8ce9675dae482 
  src/lib/marble/LayerManager.cpp 4c946d39d4a8899d4d5f243f59dec0cd700c64d0 
  src/lib/marble/geodata/data/GeoDataFeature.cpp 6099425886020b0683ee7ab0a1654747d02a105c 
  src/lib/marble/geodata/data/GeoDataFeature_p.h b84bb56c631305b0d743997602f262b3ac18ba78 
  src/lib/marble/geodata/data/GeoDataLabelStyle.cpp 11f37ffe7a8162799ce3738342a97492d13eab37 
  src/lib/marble/layers/FpsLayer.cpp 7b78a9def5b1dab9f24dd9c0c715ad4c6f24ed97 
  src/plasmoid/worldclock.cpp 7b60228c57cf5946a6e3764f9f93085102a52f30 
  src/plugins/render/earthquake/EarthquakeItem.cpp e1be854331cfebb94b22a5ff710938f613753e9f 
  src/plugins/render/foursquare/FoursquareItem.cpp edab93c4ab6b810f50a14bb75247beeaa0e2382e 
  src/plugins/render/measure/MeasureToolPlugin.cpp 097d4e1bae0b6b833bf9e3852a354c7242a245bf 
  src/plugins/render/opencaching/OpenCachingItem.cpp fd63059e8a89bd8f3a734e53814f9c2fd1422b06 
  src/plugins/render/postalcode/PostalCodeItem.cpp dab8c5a13f114b658698b384ced2d6dc50758d85 
  src/plugins/render/weather/WeatherItem.cpp 2aef7afb82220ad83657307e840b19c454fbfa1f 
  tests/TestEquality.cpp 37666b597c768022f3ee692ae69db35fe92338d1 
  tests/TestGeoDataCopy.cpp c354d8fc9a9edbe9027f432a9f03ef0bc658e3bb 

Diff: https://git.reviewboard.kde.org/r/125011/diff/


Testing
-------

Compiles and libkgeomap compiles too


Thanks,

Dāvis Mosāns

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/marble-devel/attachments/20150916/6f2a9eca/attachment.html>