Git commit 864fd32c431f30bbfc3f4e2a623930041ede4006 by Human Dynamo. Committed on 29/09/2018 at 04:47. Pushed by cgilles into branch 'master'. fix clang warnings M +49 -41 core/utilities/geolocation/editor/kmlexport/kmlexport.cpp https://commits.kde.org/digikam/864fd32c431f30bbfc3f4e2a623930041ede4006 diff --git a/core/utilities/geolocation/editor/kmlexport/kmlexport.cpp b/co= re/utilities/geolocation/editor/kmlexport/kmlexport.cpp index 49bef8e90e..50edfa6a3d 100644 --- a/core/utilities/geolocation/editor/kmlexport/kmlexport.cpp +++ b/core/utilities/geolocation/editor/kmlexport/kmlexport.cpp @@ -98,13 +98,13 @@ QImage KmlExport::generateSquareThumbnail(const QImage&= fullImage, int size) con = int sx =3D 0, sy =3D 0; = - if (image.width()>size) + if (image.width() > size) { - sx =3D (image.width() - size)/2; + sx =3D (image.width() - size) / 2; } else { - sy =3D (image.height() - size)/2; + sy =3D (image.height() - size) / 2; } = painter.drawImage(0, 0, image, sx, sy, size, size); @@ -123,8 +123,9 @@ QImage KmlExport::generateBorderedThumbnail(const QImag= e& fullImage, int size) c QPixmap croppedPix(image.width() + (2*image_border), image.height() + = (2*image_border)); QPainter painter(&croppedPix); = - QColor BrushColor(255,255,255); - painter.fillRect(0,0,image.width() + (2*image_border),image.height() += (2*image_border),BrushColor); + QColor BrushColor(255, 255, 255); + painter.fillRect(0, 0, image.width() + (2*image_border),image.height()= + (2*image_border), BrushColor); + = /*! @todo add a corner to the thumbnail and a hotspot to the kml eleme= nt */ = painter.drawImage(image_border, image_border, image); @@ -195,12 +196,13 @@ void KmlExport::generateImagesthumb(const QUrl& image= URL, QDomElement& kmlAlbum) } = // Save images + /** @todo remove the extension of the file * it's appear with digikam but not with gwenview * which already seems to strip the extension */ QString baseFileName =3D webifyFileName(info.name()); - //baseFileName =3D mUniqueNameHelper.makeNameUnique(baseFileName= ); + //baseFileName =3D mUniqueNameHelper.makeNameUnique(baseFileNa= me); QString fullFileName; fullFileName =3D baseFileName + QLatin1Char('.') + imageFormat= .toLower(); QString destPath =3D m_imageDir.filePath(fullFileName); @@ -317,7 +319,7 @@ void KmlExport::generateImagesthumb(const QUrl& imageUR= L, QDomElement& kmlAlbum) = if (!icon.save(destPath, imageFormat.toLatin1().constData(), 85)) { - logWarning(i18n("Could not save icon for image '%1' to '%2'",p= ath,destPath)); + logWarning(i18n("Could not save icon for image '%1' to '%2'", = path, destPath)); } else { @@ -355,7 +357,7 @@ void KmlExport::addTrack(QDomElement& kmlAlbum) = if (!ret) { - logError(i18n("Cannot parse %1 GPX file.",m_GPXFile)); + logError(i18n("Cannot parse %1 GPX file.", m_GPXFile)); return; } = @@ -390,7 +392,7 @@ void KmlExport::addTrack(QDomElement& kmlAlbum) = // the KML color is not #RRGGBB but AABBGGRR QString KMLColorValue =3D QString::fromUtf8("%1%2%3%4") - .arg((int)m_GPXOpacity*256/100, 2, 16) + .arg((int)m_GPXOpacity * 256 / 100, 2, 16) .arg((&m_GPXColor)->blue(), 2, 16) .arg((&m_GPXColor)->green(), 2, 16) .arg((&m_GPXColor)->red(), 2, 16); @@ -432,8 +434,8 @@ void KmlExport::generate() = QList::ConstIterator imagesEnd (images.constEnd()); = - for (QList::ConstIterator selIt =3D images.constBegin(); - selIt !=3D imagesEnd; ++selIt, ++pos) + for (QList::ConstIterator selIt =3D images.constBegin() ; + selIt !=3D imagesEnd ; ++selIt, ++pos) { double alt, lat, lng; QUrl url =3D *selIt; @@ -445,6 +447,9 @@ void KmlExport::generate() lat =3D info.latitude(); lng =3D info.longitude(); alt =3D info.altitude(); + (void)lat; // Remove clang warnings. + (void)lng; // Remove clang warnings. + (void)alt; // Remove clang warnings. } else if (m_meta.load(url.toLocalFile())) { @@ -514,7 +519,7 @@ bool KmlExport::copyDir(const QString& srcFilePath, con= st QString& dstFilePath) = QStringList files =3D srcDir.entryList(QDir::Files | QDir::Dirs | = QDir::NoDotAndDotDot); = - foreach(const QString& file, files) + foreach (const QString& file, files) { const QString newSrcFilePath =3D srcDir.absolutePath() + QLati= n1Char('/') + file; const QString newDstFilePath =3D dstDir.absolutePath() + QLati= n1Char('/') + file; @@ -543,32 +548,32 @@ void KmlExport::getConfig() KSharedConfig::Ptr config =3D KSharedConfig::openConfig(); KConfigGroup group =3D config->group(QLatin1String("KMLExport S= ettings")); = - m_localTarget =3D group.readEntry(QLatin1String("localTarget"),= true); - m_optimize_googlemap =3D group.readEntry(QLatin1String("optimize_googl= emap"), false); - m_iconSize =3D group.readEntry(QLatin1String("iconSize"), 33= ); - // googlemapSize =3D group.readNumEntry(QLatin1String("googlemap= Size")); - m_size =3D group.readEntry(QLatin1String("size"), 320); + m_localTarget =3D group.readEntry(QLatin1String("localTarg= et"), true); + m_optimize_googlemap =3D group.readEntry(QLatin1String("optimize_= googlemap"), false); + m_iconSize =3D group.readEntry(QLatin1String("iconSize"= ), 33); + //googlemapSize =3D group.readNumEntry(QLatin1String("goog= lemapSize")); + m_size =3D group.readEntry(QLatin1String("size"), = 320); = // UrlDestDir have to have the trailing - m_baseDestDir =3D group.readEntry(QLatin1String("baseDestDir"),= QString::fromUtf8("/tmp/")); - m_UrlDestDir =3D group.readEntry(QLatin1String("UrlDestDir"), = QString::fromUtf8("http://www.example.com/")); - m_KMLFileName =3D group.readEntry(QLatin1String("KMLFileName"),= QString::fromUtf8("kmldocument")); - m_altitudeMode =3D group.readEntry(QLatin1String("Altitude Mode"= ), 0); + m_baseDestDir =3D group.readEntry(QLatin1String("baseDestD= ir"), QString::fromUtf8("/tmp/")); + m_UrlDestDir =3D group.readEntry(QLatin1String("UrlDestDi= r"), QString::fromUtf8("http://www.example.com/")); + m_KMLFileName =3D group.readEntry(QLatin1String("KMLFileNa= me"), QString::fromUtf8("kmldocument")); + m_altitudeMode =3D group.readEntry(QLatin1String("Altitude = Mode"), 0); = - m_GPXtracks =3D group.readEntry(QLatin1String("UseGPXTracks")= , false); - m_GPXFile =3D group.readEntry(QLatin1String("GPXFile"), = QString()); - m_TimeZone =3D group.readEntry(QLatin1String("Time Zone"), = 12); - m_LineWidth =3D group.readEntry(QLatin1String("Line Width"), = 4); - m_GPXColor =3D group.readEntry(QLatin1String("Track Color"),= QColor("#17eeee")); - m_GPXOpacity =3D group.readEntry(QLatin1String("Track Opacity"= ), 64); - m_GPXAltitudeMode =3D group.readEntry(QLatin1String("GPX Altitude M= ode"), 0); + m_GPXtracks =3D group.readEntry(QLatin1String("UseGPXTra= cks"), false); + m_GPXFile =3D group.readEntry(QLatin1String("GPXFile")= , QString()); + m_TimeZone =3D group.readEntry(QLatin1String("Time Zone= "), 12); + m_LineWidth =3D group.readEntry(QLatin1String("Line Widt= h"), 4); + m_GPXColor =3D group.readEntry(QLatin1String("Track Col= or"), QColor("#17eeee")); + m_GPXOpacity =3D group.readEntry(QLatin1String("Track Opa= city"), 64); + m_GPXAltitudeMode =3D group.readEntry(QLatin1String("GPX Altit= ude Mode"), 0); = - m_tempDestDir =3D QDir(QDir::temp().filePath(QString::fromLatin= 1("digiKam-kmlexport-%1").arg(qApp->applicationPid()))); + m_tempDestDir =3D QDir(QDir::temp().filePath(QString::from= Latin1("digiKam-kmlexport-%1").arg(qApp->applicationPid()))); = - m_imageDirBasename =3D QLatin1String("images"); - m_imageDir =3D QDir(m_tempDestDir.filePath(m_imageDirBasenam= e)); + m_imageDirBasename =3D QLatin1String("images"); + m_imageDir =3D QDir(m_tempDestDir.filePath(m_imageDirBa= sename)); = - m_googlemapSize =3D 32; + m_googlemapSize =3D 32; } = void KmlExport::logInfo(const QString& msg) @@ -591,8 +596,9 @@ void KmlExport::logWarning(const QString& msg) QDomElement KmlExport::addKmlElement(QDomElement& target, const QString& tag) const { - QDomElement kmlElement =3D m_kmlDocument->createElement( tag ); - target.appendChild( kmlElement ); + QDomElement kmlElement =3D m_kmlDocument->createElement(tag); + target.appendChild(kmlElement); + return kmlElement; } = @@ -600,10 +606,11 @@ QDomElement KmlExport::addKmlTextElement(QDomElement&= target, const QString& tag, const QString& text) const { - QDomElement kmlElement =3D m_kmlDocument->createElement( tag ); + QDomElement kmlElement =3D m_kmlDocument->createElement(tag); target.appendChild( kmlElement ); - QDomText kmlTextElement =3D m_kmlDocument->createTextNode( text ); - kmlElement.appendChild( kmlTextElement ); + QDomText kmlTextElement =3D m_kmlDocument->createTextNode(text); + kmlElement.appendChild(kmlTextElement); + return kmlElement; } = @@ -611,10 +618,11 @@ QDomElement KmlExport::addKmlHtmlElement(QDomElement&= target, const QString& tag, const QString& text) const { - QDomElement kmlElement =3D m_kmlDocument->createElement( tag ); - target.appendChild( kmlElement ); - QDomText kmlTextElement =3D m_kmlDocument->createCDATASection( text ); - kmlElement.appendChild( kmlTextElement ); + QDomElement kmlElement =3D m_kmlDocument->createElement(tag); + target.appendChild(kmlElement); + QDomText kmlTextElement =3D m_kmlDocument->createCDATASection(text); + kmlElement.appendChild(kmlTextElement); + return kmlElement; } =20