Git commit e31b70aec96651a6202d732339c0d2ba2e710044 by Friedrich W. H. Koss= ebau. Committed on 31/01/2018 at 21:23. Pushed by kossebau into branch 'master'. Enable QT_NO_CAST_FROM_ASCII also for applets/comic, string code adapted M +0 -3 applets/comic/CMakeLists.txt M +1 -1 applets/comic/activecomicmodel.cpp M +5 -5 applets/comic/checknewstrips.cpp M +54 -46 applets/comic/comic.cpp M +4 -4 applets/comic/comicarchivedialog.cpp M +18 -18 applets/comic/comicarchivejob.cpp M +34 -33 applets/comic/comicdata.cpp M +3 -3 applets/comic/comicsaver.cpp M +3 -3 applets/comic/stripselector.cpp https://commits.kde.org/kdeplasma-addons/e31b70aec96651a6202d732339c0d2ba2e= 710044 diff --git a/applets/comic/CMakeLists.txt b/applets/comic/CMakeLists.txt index bfead9607..9d7b20ca1 100644 --- a/applets/comic/CMakeLists.txt +++ b/applets/comic/CMakeLists.txt @@ -1,8 +1,5 @@ add_definitions(-DTRANSLATION_DOMAIN=3D\"plasma_applet_org.kde.plasma.comi= c\") = -remove_definitions( - -DQT_NO_CAST_FROM_ASCII -) set(comic_SRCS comic.cpp comicmodel.cpp diff --git a/applets/comic/activecomicmodel.cpp b/applets/comic/activecomic= model.cpp index 5beeb412d..fdd65a055 100644 --- a/applets/comic/activecomicmodel.cpp +++ b/applets/comic/activecomicmodel.cpp @@ -61,7 +61,7 @@ QVariantHash ActiveComicModel::get(int row) const const auto roleNames =3D this->roleNames(); hash.reserve(roleNames.size()); for (auto end =3D roleNames.constEnd(), it =3D roleNames.constBegin();= it !=3D end; ++it) { - hash.insert(it.value(), data(idx, it.key())); + hash.insert(QString::fromUtf8(it.value()), data(idx, it.key())); } = return hash; diff --git a/applets/comic/checknewstrips.cpp b/applets/comic/checknewstrip= s.cpp index 88bacf60a..4a45a628a 100644 --- a/applets/comic/checknewstrips.cpp +++ b/applets/comic/checknewstrips.cpp @@ -41,8 +41,8 @@ void CheckNewStrips::dataUpdated( const QString &source, = const Plasma::DataEngin { QString lastIdentifierSuffix; = - if ( !data[ "Error" ].toBool() ) { - lastIdentifierSuffix =3D data[ "Identifier" ].toString(); + if (!data[QStringLiteral("Error")].toBool()) { + lastIdentifierSuffix =3D data[QStringLiteral("Identifier")].toStri= ng(); lastIdentifierSuffix.remove( source ); } = @@ -50,13 +50,13 @@ void CheckNewStrips::dataUpdated( const QString &source= , const Plasma::DataEngin = if ( !lastIdentifierSuffix.isEmpty() ) { QString temp =3D source; - temp.remove( ':' ); + temp.remove(QLatin1Char(':')); emit lastStrip( mIndex, temp, lastIdentifierSuffix ); } ++mIndex; = if ( mIndex < mIdentifiers.count() ) { - const QString newSource =3D mIdentifiers[mIndex] + ':'; + const QString newSource =3D mIdentifiers[mIndex] + QLatin1Char(':'= ); mEngine->connectSource( newSource, this ); } else { mIndex =3D 0; @@ -71,7 +71,7 @@ void CheckNewStrips::start() } = if ( mIndex < mIdentifiers.count() ) { - const QString newSource =3D mIdentifiers[mIndex] + ':'; + const QString newSource =3D mIdentifiers[mIndex] + QLatin1Char(':'= ); mEngine->connectSource( newSource, this ); } } diff --git a/applets/comic/comic.cpp b/applets/comic/comic.cpp index 928139ca6..823fbafb5 100644 --- a/applets/comic/comic.cpp +++ b/applets/comic/comic.cpp @@ -84,8 +84,8 @@ void ComicApplet::init() = configChanged(); = - mEngine =3D Plasma::PluginLoader::self()->loadDataEngine( "comic" ); - mModel =3D new ComicModel( mEngine, "providers", mTabIdentifier, this = ); + mEngine =3D Plasma::PluginLoader::self()->loadDataEngine(QStringLitera= l("comic")); + mModel =3D new ComicModel(mEngine, QStringLiteral("providers"), mTabId= entifier, this); mProxy =3D new QSortFilterProxyModel( this ); mProxy->setSourceModel( mModel ); mProxy->setSortCaseSensitivity( Qt::CaseInsensitive ); @@ -104,21 +104,25 @@ void ComicApplet::init() mDateChangedTimer->setInterval( 5 * 60 * 1000 ); // every 5 minutes mDateChangedTimer->start(); = - mActionNextNewStripTab =3D new QAction( QIcon::fromTheme( "go-next-vie= w" ), i18nc( "here strip means comic strip", "&Next Tab with a new Strip" )= , this ); + mActionNextNewStripTab =3D new QAction(QIcon::fromTheme(QStringLiteral= ("go-next-view")), + i18nc("here strip means comic str= ip", "&Next Tab with a new Strip"), this); mActionNextNewStripTab->setShortcuts( KStandardShortcut::openNew() ); - actions()->addAction( "next new strip" , mActionNextNewStripTab ); + actions()->addAction(QStringLiteral("next new strip"), mActionNextNewS= tripTab); mActions.append( mActionNextNewStripTab ); connect( mActionNextNewStripTab, &QAction::triggered, this, &ComicAppl= et::showNextNewStrip ); = - mActionGoFirst =3D new QAction( QIcon::fromTheme( "go-first" ), i18n( = "Jump to &first Strip" ), this ); + mActionGoFirst =3D new QAction(QIcon::fromTheme(QStringLiteral("go-fir= st")), + i18n("Jump to &first Strip"), this); mActions.append( mActionGoFirst ); connect( mActionGoFirst, &QAction::triggered, this, &ComicApplet::slot= FirstDay ); = - mActionGoLast =3D new QAction( QIcon::fromTheme( "go-last" ), i18n( "J= ump to ¤t Strip" ), this ); + mActionGoLast =3D new QAction(QIcon::fromTheme(QStringLiteral("go-last= ")), + i18n("Jump to ¤t Strip"), this); mActions.append( mActionGoLast ); connect( mActionGoLast, &QAction::triggered, this, &ComicApplet::slotC= urrentDay ); = - mActionGoJump =3D new QAction( QIcon::fromTheme( "go-jump" ), i18n( "J= ump to Strip ..." ), this ); + mActionGoJump =3D new QAction(QIcon::fromTheme(QStringLiteral("go-jump= ")), + i18n("Jump to Strip ..."), this); mActions.append( mActionGoJump ); connect( mActionGoJump, &QAction::triggered, this, &ComicApplet::slotG= oJump ); = @@ -127,21 +131,25 @@ void ComicApplet::init() mActions.append( mActionShop ); connect( mActionShop, &QAction::triggered, this, &ComicApplet::slotSho= p ); = - QAction *action =3D new QAction( QIcon::fromTheme( "document-save-as" = ), i18n( "&Save Comic As..." ), this ); + QAction *action =3D new QAction(QIcon::fromTheme(QStringLiteral("docum= ent-save-as")), + i18n("&Save Comic As..."), this); mActions.append( action ); connect( action, &QAction::triggered, this, &ComicApplet::slotSaveComi= cAs ); = - action =3D new QAction( QIcon::fromTheme( "application-epub+zip" ), i1= 8n( "&Create Comic Book Archive..." ), this ); + action =3D new QAction(QIcon::fromTheme(QStringLiteral("application-ep= ub+zip")), + i18n("&Create Comic Book Archive..."), this); mActions.append( action ); connect( action, &QAction::triggered, this, &ComicApplet::createComicB= ook ); = - mActionScaleContent =3D new QAction( QIcon::fromTheme( "zoom-original"= ), i18nc( "@option:check Context menu of comic image", "&Actual Size" ), t= his ); + mActionScaleContent =3D new QAction(QIcon::fromTheme(QStringLiteral("z= oom-original")), + i18nc("@option:check Context menu of= comic image", "&Actual Size"), this); mActionScaleContent->setCheckable( true ); mActionScaleContent->setChecked( mCurrent.scaleComic() ); mActions.append( mActionScaleContent ); connect( mActionScaleContent, &QAction::triggered, this, &ComicApplet:= :slotScaleToContent ); = - mActionStorePosition =3D new QAction( QIcon::fromTheme( "go-home" ), i= 18nc( "@option:check Context menu of comic image", "Store current &Position= " ), this); + mActionStorePosition =3D new QAction(QIcon::fromTheme(QStringLiteral("= go-home")), + i18nc("@option:check Context menu o= f comic image", "Store current &Position"), this); mActionStorePosition->setCheckable( true ); mActionStorePosition->setChecked(mCurrent.hasStored()); mActions.append( mActionStorePosition ); @@ -179,10 +187,10 @@ void ComicApplet::dataUpdated( const QString &source,= const Plasma::DataEngine:: setConfigurationRequired( false ); = //there was an error, display information as image - const bool hasError =3D data[ "Error" ].toBool(); - const bool errorAutoFixable =3D data[ "Error automatically fixable" ].= toBool(); + const bool hasError =3D data[QStringLiteral("Error")].toBool(); + const bool errorAutoFixable =3D data[QStringLiteral("Error automatical= ly fixable")].toBool(); if ( hasError ) { - const QString previousIdentifierSuffix =3D data[ "Previous identif= ier suffix" ].toString(); + const QString previousIdentifierSuffix =3D data[QStringLiteral("Pr= evious identifier suffix")].toString(); if (mEngine && !mShowErrorPicture && !previousIdentifierSuffix.isE= mpty() ) { mEngine->disconnectSource( source, this ); updateComic( previousIdentifierSuffix ); @@ -212,11 +220,11 @@ void ComicApplet::dataUpdated( const QString &source,= const Plasma::DataEngine:: = //prefetch the previous and following comic for faster navigation if (mCurrent.hasNext()) { - const QString prefetch =3D mCurrent.id() + ':' + mCurrent.next= (); + const QString prefetch =3D mCurrent.id() + QLatin1Char(':') + = mCurrent.next(); mEngine->connectSource( prefetch, this ); } if ( mCurrent.hasPrev()) { - const QString prefetch =3D mCurrent.id() + ':' + mCurrent.prev= (); + const QString prefetch =3D mCurrent.id() + QLatin1Char(':') + = mCurrent.prev(); mEngine->connectSource( prefetch, this ); } } @@ -237,7 +245,7 @@ void ComicApplet::getNewComics() return; } if (!m_newStuffDialog) { - m_newStuffDialog =3D new KNS3::DownloadDialog( QString::fromLatin1= ("comic.knsrc") ); + m_newStuffDialog =3D new KNS3::DownloadDialog( QStringLiteral("com= ic.knsrc") ); KNS3::DownloadDialog *strong =3D m_newStuffDialog.data(); strong->setTitle(i18n("Download Comics")); connect(m_newStuffDialog.data(), SIGNAL(finished(int)), mEngine, S= LOT(loadProviders())); @@ -299,7 +307,7 @@ void ComicApplet::updateUsedComics() const QString iconPath =3D data.data( Qt::DecorationRole ).val= ue().name(); //found a newer strip last time, which was not visited = - if ( mCheckNewComicStripsInterval && !cg.readEntry( "lastStrip= Visited_" + identifier, true ) ) { + if (mCheckNewComicStripsInterval && !cg.readEntry(QLatin1Strin= g("lastStripVisited_") + identifier, true)) { mActiveComicModel->addComic(identifier, name, iconPath, tr= ue); } else { mActiveComicModel->addComic(identifier, name, iconPath); @@ -408,9 +416,9 @@ void ComicApplet::slotFoundLastStrip( int index, const = QString &identifier, cons Q_UNUSED(index) = KConfigGroup cg =3D config(); - if (suffix !=3D cg.readEntry( "lastStrip_" + identifier, QString() ) )= { + if (suffix !=3D cg.readEntry(QLatin1String("lastStrip_") + identifier,= QString())) { qDebug() << identifier << "has a newer strip."; - cg.writeEntry( "lastStripVisited_" + identifier, false ); + cg.writeEntry(QLatin1String("lastStripVisited_") + identifier, fal= se); updateComic(suffix); } } @@ -453,8 +461,8 @@ void ComicApplet::slotArchive( int archiveType, const Q= Url &dest, const QString const QString id =3D mCurrent.id(); qDebug() << "Archiving:" << id << archiveType << dest << fromIdentifi= er << toIdentifier; ComicArchiveJob *job =3D new ComicArchiveJob(dest, mEngine, static_cas= t< ComicArchiveJob::ArchiveType >( archiveType ), mCurrent.type(), id, thi= s); - job->setFromIdentifier(id + ':' + fromIdentifier); - job->setToIdentifier(id + ':' + toIdentifier); + job->setFromIdentifier(id + QLatin1Char(':') + fromIdentifier); + job->setToIdentifier(id + QLatin1Char(':') + toIdentifier); if (job->isValid()) { connect(job, &ComicArchiveJob::finished, this, &ComicApplet::slotA= rchiveFinished); KIO::getJobTracker()->registerJob(job); @@ -468,7 +476,7 @@ void ComicApplet::slotArchive( int archiveType, const Q= Url &dest, const QString void ComicApplet::slotArchiveFinished (KJob *job ) { if ( job->error() ) { - KNotification::event( KNotification::Warning, i18n( "Archiving com= ic failed" ), job->errorText(), QIcon::fromTheme( "dialog-warning" ).pixmap= ( KIconLoader::SizeMedium ) ); + KNotification::event( KNotification::Warning, i18n( "Archiving com= ic failed" ), job->errorText(), QIcon::fromTheme(QStringLiteral("dialog-war= ning")).pixmap(KIconLoader::SizeMedium)); } } = @@ -486,7 +494,7 @@ void ComicApplet::updateComic( const QString &identifie= rSuffix ) = setBusy(true); = - const QString identifier =3D id + ':' + identifierSuffix; + const QString identifier =3D id + QLatin1Char(':') + identifierSuf= fix; = //disconnecting of the oldSource is needed, otherwise you could ge= t data for comics you are not looking at if you use tabs //if there was an error only disconnect the oldSource if it had no= thing to do with the error or if the comic changed, that way updates of the= error can come in @@ -668,28 +676,28 @@ void ComicApplet::setTabIdentifiers(const QStringList= &tabs) = void ComicApplet::refreshComicData() { - mComicData["image"] =3D mCurrent.image(); - mComicData["prev"] =3D mCurrent.prev(); - mComicData["next"] =3D mCurrent.next(); - mComicData["additionalText"] =3D mCurrent.additionalText(); - - mComicData["websiteUrl"] =3D mCurrent.websiteUrl().toString(); - mComicData["websiteHost"] =3D mCurrent.websiteUrl().host(); - mComicData["imageUrl"] =3D mCurrent.websiteUrl().toString(); - mComicData["shopUrl"] =3D mCurrent.websiteUrl().toString(); - mComicData["first"] =3D mCurrent.first(); - mComicData["stripTitle"] =3D mCurrent.stripTitle(); - mComicData["author"] =3D mCurrent.author(); - mComicData["title"] =3D mCurrent.title(); - - mComicData["suffixType"] =3D "Date"; - mComicData["current"] =3D mCurrent.current(); - //mComicData["last"] =3D mCurrent.last(); - mComicData["currentReadable"] =3D mCurrent.currentReadable(); - mComicData["firstStripNum"] =3D mCurrent.firstStripNum(); - mComicData["maxStripNum"] =3D mCurrent.maxStripNum(); - mComicData["isLeftToRight"] =3D mCurrent.isLeftToRight(); - mComicData["isTopToBottom"] =3D mCurrent.isTopToBottom(); + mComicData[QStringLiteral("image")] =3D mCurrent.image(); + mComicData[QStringLiteral("prev")] =3D mCurrent.prev(); + mComicData[QStringLiteral("next")] =3D mCurrent.next(); + mComicData[QStringLiteral("additionalText")] =3D mCurrent.additionalTe= xt(); + + mComicData[QStringLiteral("websiteUrl")] =3D mCurrent.websiteUrl().toS= tring(); + mComicData[QStringLiteral("websiteHost")] =3D mCurrent.websiteUrl().ho= st(); + mComicData[QStringLiteral("imageUrl")] =3D mCurrent.websiteUrl().toStr= ing(); + mComicData[QStringLiteral("shopUrl")] =3D mCurrent.websiteUrl().toStri= ng(); + mComicData[QStringLiteral("first")] =3D mCurrent.first(); + mComicData[QStringLiteral("stripTitle")] =3D mCurrent.stripTitle(); + mComicData[QStringLiteral("author")] =3D mCurrent.author(); + mComicData[QStringLiteral("title")] =3D mCurrent.title(); + + mComicData[QStringLiteral("suffixType")] =3D QStringLiteral("Date"); + mComicData[QStringLiteral("current")] =3D mCurrent.current(); + //mComicData[QStringLiteral("last")] =3D mCurrent.last(); + mComicData[QStringLiteral("currentReadable")] =3D mCurrent.currentRead= able(); + mComicData[QStringLiteral("firstStripNum")] =3D mCurrent.firstStripNum= (); + mComicData[QStringLiteral("maxStripNum")] =3D mCurrent.maxStripNum(); + mComicData[QStringLiteral("isLeftToRight")] =3D mCurrent.isLeftToRight= (); + mComicData[QStringLiteral("isTopToBottom")] =3D mCurrent.isTopToBottom= (); = emit comicDataChanged(); } diff --git a/applets/comic/comicarchivedialog.cpp b/applets/comic/comicarch= ivedialog.cpp index 0b2ee943d..3306d8adf 100644 --- a/applets/comic/comicarchivedialog.cpp +++ b/applets/comic/comicarchivedialog.cpp @@ -40,8 +40,8 @@ ComicArchiveDialog::ComicArchiveDialog( const QString &pl= uginName, const QString = switch ( mIdentifierType ) { case Date: { - const QDate current =3D QDate::fromString( currentIdentifierSu= ffix, "yyyy-MM-dd" ); - const QDate first =3D QDate::fromString( firstIdentifierSuffix= , "yyyy-MM-dd" ); + const QDate current =3D QDate::fromString(currentIdentifierSuf= fix, QStringLiteral("yyyy-MM-dd")); + const QDate first =3D QDate::fromString(firstIdentifierSuffix,= QStringLiteral("yyyy-MM-dd")); const QDate today =3D QDate::currentDate(); QDate maxDate =3D today; if ( current.isValid() ) { @@ -162,8 +162,8 @@ void ComicArchiveDialog::slotOkClicked() = switch ( mIdentifierType ) { case Date: - fromIdentifier =3D ui.fromDate->date().toString( "yyyy-MM-dd" = ); - toIdentifier =3D ui.toDate->date().toString( "yyyy-MM-dd" ); + fromIdentifier =3D ui.fromDate->date().toString(QStringLiteral= ("yyyy-MM-dd")); + toIdentifier =3D ui.toDate->date().toString(QStringLiteral("yy= yy-MM-dd")); break; case Number: { fromIdentifier =3D QString::number( ui.fromNumber->value() ); diff --git a/applets/comic/comicarchivejob.cpp b/applets/comic/comicarchive= job.cpp index 7a67b373c..2698e7914 100644 --- a/applets/comic/comicarchivejob.cpp +++ b/applets/comic/comicarchivejob.cpp @@ -95,14 +95,14 @@ void ComicArchiveJob::setToIdentifier( const QString &t= oIdentifier ) { mToIdentifier =3D toIdentifier; mToIdentifierSuffix =3D mToIdentifier; - mToIdentifierSuffix.remove( mPluginName + ':' ); + mToIdentifierSuffix.remove(mPluginName + QLatin1Char(':')); } = void ComicArchiveJob::setFromIdentifier( const QString &fromIdentifier ) { mFromIdentifier =3D fromIdentifier; mFromIdentifierSuffix =3D mFromIdentifier; - mFromIdentifierSuffix.remove( mPluginName + ':' ); + mFromIdentifierSuffix.remove(mPluginName + QLatin1Char(':')); } = void ComicArchiveJob::start() @@ -139,21 +139,21 @@ void ComicArchiveJob::dataUpdated( const QString &sou= rce, const Plasma::DataEngi return; } = - const QString currentIdentifier =3D data[ "Identifier" ].toString(); + const QString currentIdentifier =3D data[QStringLiteral("Identifier")]= .toString(); QString currentIdentifierSuffix =3D currentIdentifier; - currentIdentifierSuffix.remove( mPluginName + ':' ); + currentIdentifierSuffix.remove(mPluginName + QLatin1Char(':')); = - const QImage image =3D data[ "Image" ].value(); - const bool hasError =3D data[ "Error" ].toBool() || image.isNull(); - const QString previousIdentifierSuffix =3D data[ "Previous identifier = suffix" ].toString(); - const QString nextIdentifierSuffix =3D data[ "Next identifier suffix" = ].toString(); - const QString firstIdentifierSuffix =3D data[ "First strip identifier = suffix" ].toString(); + const QImage image =3D data[QStringLiteral("Image")].value(); + const bool hasError =3D data[QStringLiteral("Error")].toBool() || imag= e.isNull(); + const QString previousIdentifierSuffix =3D data[QStringLiteral("Previo= us identifier suffix")].toString(); + const QString nextIdentifierSuffix =3D data[QStringLiteral("Next ident= ifier suffix")].toString(); + const QString firstIdentifierSuffix =3D data[QStringLiteral("First str= ip identifier suffix")].toString(); = - mAuthors << data[ "Comic Author" ].toString().split( ',', QString::Ski= pEmptyParts ); + mAuthors << data[QStringLiteral("Comic Author")].toString().split(QLat= in1Char(','), QString::SkipEmptyParts); mAuthors.removeDuplicates(); = if ( mComicTitle.isEmpty() ) { - mComicTitle =3D data[ "Title" ].toString(); + mComicTitle =3D data[QStringLiteral("Title")].toString(); } = if ( hasError ) { @@ -272,8 +272,8 @@ void ComicArchiveJob::defineTotalNumber( const QString = ¤tSuffix ) //if there are no strips for certain days/numbers if ( !currentSuffix.isEmpty() ) { if ( mIdentifierType =3D=3D Date ) { - const QDate current =3D QDate::fromString( currentSuffix, "yyy= y-MM-dd" ); - const QDate to =3D QDate::fromString( mToIdentifierSuffix, "yy= yy-MM-dd" ); + const QDate current =3D QDate::fromString(currentSuffix, QStri= ngLiteral("yyyy-MM-dd")); + const QDate to =3D QDate::fromString(mToIdentifierSuffix, QStr= ingLiteral("yyyy-MM-dd")); if ( current.isValid() && to.isValid() ) { //processed files + files still to download mTotalFiles =3D mProcessedFiles + qAbs( current.daysTo( to= ) ); @@ -304,8 +304,8 @@ void ComicArchiveJob::findTotalNumberFromTo() } = if ( mIdentifierType =3D=3D Date ) { - const QDate from =3D QDate::fromString( mFromIdentifierSuffix, "yy= yy-MM-dd" ); - const QDate to =3D QDate::fromString( mToIdentifierSuffix, "yyyy-M= M-dd" ); + const QDate from =3D QDate::fromString( mFromIdentifierSuffix, QSt= ringLiteral("yyyy-MM-dd")); + const QDate to =3D QDate::fromString(mToIdentifierSuffix, QStringL= iteral("yyyy-MM-dd")); if ( from.isValid() && to.isValid() ) { mTotalFiles =3D qAbs( from.daysTo( to ) ) + 1; } @@ -324,7 +324,7 @@ void ComicArchiveJob::findTotalNumberFromTo() = QString ComicArchiveJob::suffixToIdentifier( const QString &suffix ) const { - return mPluginName + ':' + suffix; + return mPluginName + QLatin1Char(':') + suffix; } = void ComicArchiveJob::requestComic( QString identifier ) //krazy:exclude= =3Dpassbyvalue @@ -336,8 +336,8 @@ void ComicArchiveJob::requestComic( QString identifier = ) //krazy:exclude=3Dpassbyv } = emit description( this, i18n( "Creating Comic Book Archive" ), - qMakePair( QString( "source" ), identifier ), - qMakePair( QString( "destination" ), mDest.toString(= ) ) ); + qMakePair(QStringLiteral("source"), identifier), + qMakePair(QStringLiteral("destination"), mDest.toStr= ing())); = mEngine->connectSource( identifier, this ); // mEngine->query( identifier ); diff --git a/applets/comic/comicdata.cpp b/applets/comic/comicdata.cpp index 2a03f6965..37f6248aa 100644 --- a/applets/comic/comicdata.cpp +++ b/applets/comic/comicdata.cpp @@ -37,21 +37,21 @@ void ComicData::init(const QString &id, const KConfigGr= oup &config) = void ComicData::load() { - mScaleComic =3D mCfg.readEntry("scaleToContent_" + mId, false); - mMaxStripNum =3D mCfg.readEntry("maxStripNum_" + mId, 0); - mStored =3D mCfg.readEntry("storedPosition_" + mId, QString()); + mScaleComic =3D mCfg.readEntry(QLatin1String("scaleToContent_") + mId,= false); + mMaxStripNum =3D mCfg.readEntry(QLatin1String("maxStripNum_") + mId, 0= ); + mStored =3D mCfg.readEntry(QLatin1String("storedPosition_") + mId, QSt= ring()); } = void ComicData::save() { - mCfg.writeEntry("scaleToContent_" + mId, mScaleComic); - mCfg.writeEntry("maxStripNum_" + mId, mMaxStripNum); - mCfg.writeEntry("storedPosition_" + id(), mStored); + mCfg.writeEntry(QLatin1String("scaleToContent_") + mId, mScaleComic); + mCfg.writeEntry(QLatin1String("maxStripNum_") + mId, mMaxStripNum); + mCfg.writeEntry(QLatin1String("storedPosition_") + id(), mStored); = // no next, thus the most recent strip if (!hasNext()) { - mCfg.writeEntry("lastStripVisited_" + mId, true); - mCfg.writeEntry("lastStrip_" + mId, mLast); + mCfg.writeEntry(QLatin1String("lastStripVisited_") + mId, true); + mCfg.writeEntry(QLatin1String("lastStrip_") + mId, mLast); } } = @@ -69,40 +69,40 @@ void ComicData::storePosition(bool store) = void ComicData::setData(const Plasma::DataEngine::Data &data) { - const bool hasError =3D data[ "Error" ].toBool(); + const bool hasError =3D data[QStringLiteral("Error")].toBool(); if (!hasError) { - mImage =3D data["Image"].value(); - mPrev =3D data["Previous identifier suffix"].toString(); - mNext =3D data["Next identifier suffix"].toString(); - mAdditionalText =3D data["Additional text"].toString(); + mImage =3D data[QStringLiteral("Image")].value(); + mPrev =3D data[QStringLiteral("Previous identifier suffix")].toStr= ing(); + mNext =3D data[QStringLiteral("Next identifier suffix")].toString(= ); + mAdditionalText =3D data[QStringLiteral("Additional text")].toStri= ng(); } = - mWebsiteUrl =3D data[ "Website Url" ].value(); - mImageUrl =3D data["Image Url"].value(); - mShopUrl =3D data[ "Shop Url" ].value(); - mFirst =3D data[ "First strip identifier suffix" ].toString(); - mStripTitle =3D data[ "Strip title" ].toString(); - mAuthor =3D data[ "Comic Author" ].toString(); - mTitle =3D data[ "Title" ].toString(); + mWebsiteUrl =3D data[QStringLiteral("Website Url")].value(); + mImageUrl =3D data[QStringLiteral("Image Url")].value(); + mShopUrl =3D data[QStringLiteral("Shop Url")].value(); + mFirst =3D data[QStringLiteral("First strip identifier suffix")].toStr= ing(); + mStripTitle =3D data[QStringLiteral("Strip title")].toString(); + mAuthor =3D data[QStringLiteral("Comic Author")].toString(); + mTitle =3D data[QStringLiteral("Title")].toString(); = - const QString suffixType =3D data[ "SuffixType" ].toString(); - if ( suffixType =3D=3D "Date" ) { + const QString suffixType =3D data[QStringLiteral("SuffixType")].toStri= ng(); + if ( suffixType =3D=3D QLatin1String("Date")) { mType =3D Date; - } else if ( suffixType =3D=3D "Number" ) { + } else if ( suffixType =3D=3D QLatin1String("Number")) { mType =3D Number; } else { mType =3D String; } = - QString temp =3D data["Identifier"].toString(); - mCurrent =3D temp.remove(mId + ':'); + QString temp =3D data[QStringLiteral("Identifier")].toString(); + mCurrent =3D temp.remove(mId + QLatin1Char(':')); = //found a new last identifier if (!hasNext()) { mLast =3D mCurrent; } = - mCurrentReadable =3D ""; + mCurrentReadable.clear(); if ( mType =3D=3D Number ) { mCurrentReadable =3D i18nc("an abbreviation for Number", "# %1", m= Current); int tempNum =3D mCurrent.toInt(); @@ -110,16 +110,16 @@ void ComicData::setData(const Plasma::DataEngine::Dat= a &data) mMaxStripNum =3D tempNum; } = - temp =3D mFirst.remove(mId + ':'); + temp =3D mFirst.remove(mId + QLatin1Char(':')); mFirstStripNum =3D temp.toInt(); - } else if ( mType =3D=3D Date && QDate::fromString( temp, "yyyy-MM-dd"= ).isValid() ) { + } else if (mType =3D=3D Date && QDate::fromString(temp, QStringLiteral= ("yyyy-MM-dd")).isValid()) { mCurrentReadable =3D mCurrent; } else if ( mType =3D=3D String ) { mCurrentReadable =3D mCurrent; } = - mIsLeftToRight =3D data["isLeftToRight"].toBool(); - mIsTopToBottom =3D data["isTopToBottom"].toBool(); + mIsLeftToRight =3D data[QStringLiteral("isLeftToRight")].toBool(); + mIsTopToBottom =3D data[QStringLiteral("isTopToBottom")].toBool(); = save(); } @@ -137,10 +137,11 @@ void ComicData::createErrorPicture(const Plasma::Data= Engine::Data &data) p.drawText( QRect( 10, 10 , 480, 100 ), Qt::TextWordWrap | Qt::AlignHC= enter | Qt::AlignVCenter, title ); QString text =3D i18n( "Maybe there is no Internet connection.\nMaybe = the comic plugin is broken.\nAnother reason might be that there is no comic= for this day/number/string, so choosing a different one might work." ); = - mPrev =3D data["Previous identifier suffix"].toString(); + mPrev =3D data[QStringLiteral("Previous identifier suffix")].toString(= ); if (hasPrev()) { - if (!data["Identifier"].toString().isEmpty() ) { - mErrorStrip =3D data["Identifier"].toString(); + const auto identifier =3D data[QStringLiteral("Identifier")].toStr= ing(); + if (!identifier.isEmpty()) { + mErrorStrip =3D identifier; } text.append( i18n( "\n\nChoose the previous strip to go to the las= t cached strip." ) ); } diff --git a/applets/comic/comicsaver.cpp b/applets/comic/comicsaver.cpp index 27cdd7170..36fa11a8f 100644 --- a/applets/comic/comicsaver.cpp +++ b/applets/comic/comicsaver.cpp @@ -36,10 +36,10 @@ bool ComicSaver::save(const ComicData &comic) { const QString title =3D comic.title(); = - const QString name =3D title + " - " + comic.current() + ".png"; - QUrl destUrl =3D QUrl::fromLocalFile( mSavingDir->getDir() + '/'+ name= ); + const QString name =3D title + QLatin1String(" - ") + comic.current() = + QLatin1String(".png"); + QUrl destUrl =3D QUrl::fromLocalFile(mSavingDir->getDir() + QLatin1Cha= r('/') + name); = - destUrl =3D QFileDialog::getSaveFileUrl(nullptr, QString(), destUrl, "= *.png" ); + destUrl =3D QFileDialog::getSaveFileUrl(nullptr, QString(), destUrl, Q= StringLiteral("*.png")); = if ( !destUrl.isValid() ) { return false; diff --git a/applets/comic/stripselector.cpp b/applets/comic/stripselector.= cpp index 94af85c09..8a71182ab 100644 --- a/applets/comic/stripselector.cpp +++ b/applets/comic/stripselector.cpp @@ -154,7 +154,7 @@ void DateStripSelector::select(const ComicData ¤t= Strip) KDatePicker *calendar =3D new KDatePicker; calendar->setAttribute(Qt::WA_DeleteOnClose);//to have destroyed emitt= ed upon closing calendar->setMinimumSize(calendar->sizeHint()); - calendar->setDate(QDate::fromString(currentStrip.current(), "yyyy-MM-d= d")); + calendar->setDate(QDate::fromString(currentStrip.current(), QStringLit= eral("yyyy-MM-dd"))); = connect(calendar, &KDatePicker::dateSelected, this, &DateStripSelector= ::slotChosenDay); connect(calendar, &KDatePicker::dateEntered, this, &DateStripSelector:= :slotChosenDay); @@ -167,11 +167,11 @@ void DateStripSelector::select(const ComicData &curre= ntStrip) void DateStripSelector::slotChosenDay(const QDate &date) { if (date <=3D QDate::currentDate()) { - QDate temp =3D QDate::fromString(mFirstIdentifierSuffix, "yyyy-MM-= dd"); + QDate temp =3D QDate::fromString(mFirstIdentifierSuffix, QStringLi= teral("yyyy-MM-dd")); // only update if date >=3D first strip date, or if there is no fi= rst // strip date if (temp.isValid() || date >=3D temp) { - emit stripChosen(date.toString("yyyy-MM-dd")); + emit stripChosen(date.toString(QStringLiteral("yyyy-MM-dd"))); } } }