[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [amarok] /: Prefer QChar overloads over the QString ones for efficiency
From: Edward Toroshchin <edward.hades () gmail ! com>
Date: 2013-08-20 10:56:05
Message-ID: E1VBjbZ-0005nN-5B () scm ! kde ! org
[Download RAW message or body]
Git commit fe022cb54e80b5d04e7cbdd7a5820d327328e524 by Edward Toroshchin, on behalf \
of Frank Meerkoetter. Committed on 20/08/2013 at 10:51.
Pushed by hades into branch 'master'.
Prefer QChar overloads over the QString ones for efficiency
http://www.englishbreakfastnetwork.org/krazy/reports/extragear/multimedia/amarok/index.html
[...]
7. Check single-char QString operations for efficiency [doublequote_chars]...OOPS! 60 \
issues found! [...]
M +1 -1 shared/TagsFromFileNameGuesser.cpp
M +2 -2 src/EngineController.cpp
M +1 -1 src/amarokurls/ContextUrlRunner.cpp
M +1 -1 src/browsers/filebrowser/FileBrowser.cpp
M +1 -1 src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp
M +6 -6 src/context/applets/labels/LabelsApplet.cpp
M +2 -2 src/context/applets/tabs/TabsView.cpp
M +4 -4 src/context/engines/lyrics/LyricsEngine.cpp
M +1 -1 src/core-impl/collections/db/sql/SqlCollection.cpp
M +1 -1 src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
M +1 -1 src/core-impl/collections/db/sql/SqlMeta.cpp
M +1 -1 src/core-impl/collections/db/sql/SqlRegistry_p.cpp
M +1 -1 src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp
M +7 -7 src/core-impl/collections/upnpcollection/UpnpCache.cpp
M +1 -1 src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp
M +1 -1 src/core-impl/podcasts/sql/SqlPodcastMeta.cpp
M +1 -1 src/core/podcasts/PodcastImageFetcher.cpp
M +2 -2 src/dialogs/TagGuesser.cpp
M +4 -4 src/dynamic/DynamicModel.cpp
M +1 -1 src/musicbrainz/MusicBrainzFinder.cpp
M +1 -1 src/network/NetworkAccessManagerProxy.cpp
M +1 -1 src/playlist/PlaylistModel.cpp
M +1 -1 src/playlist/PlaylistSortWidget.cpp
M +1 -1 src/playlist/proxymodels/ProxyBase.cpp
M +1 -1 src/playlistgenerator/constraints/TagMatch.cpp
M +1 -1 src/services/jamendo/JamendoDatabaseHandler.cpp
M +1 -1 src/services/lastfm/biases/WeeklyTopBias.cpp
M +2 -2 src/widgets/MetaQueryWidget.cpp
M +1 -1 src/widgets/ProgressWidget.cpp
M +1 -1 tests/TestDebug.cpp
M +1 -1 tests/TestTrackOrganizer.cpp
M +1 -1 tests/browsers/TestSingleCollectionTreeItemModel.cpp
M +1 -1 tests/context/engines/TestDataEngineBlackBox.cpp
M +1 -1 tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp
M +1 -1 tests/core-impl/collections/db/sql/TestSqlScanManager.cpp
M +1 -1 tests/synchronization/TestMasterSlaveSynchronizationJob.cpp
M +1 -1 tests/synchronization/TestUnionJob.cpp
M +1 -1 utilities/amzdownloader/AmzDownloader.cpp
http://commits.kde.org/amarok/fe022cb54e80b5d04e7cbdd7a5820d327328e524
diff --git a/shared/TagsFromFileNameGuesser.cpp b/shared/TagsFromFileNameGuesser.cpp
index f2ec2ba..0ae8dbd 100644
--- a/shared/TagsFromFileNameGuesser.cpp
+++ b/shared/TagsFromFileNameGuesser.cpp
@@ -116,7 +116,7 @@ Meta::Tag::TagGuesser::guessTagsByScheme( const QString \
&fileName, const QString {
value = rx.cap( i + 1 );
if( convertUnderscores )
- value.replace( "_", " " );
+ value.replace( '_', ' ' );
if( cutTrailingSpaces )
value = value.trimmed();
metadata.insert( tokens[i], value );
diff --git a/src/EngineController.cpp b/src/EngineController.cpp
index 70afbb2..99adb53 100644
--- a/src/EngineController.cpp
+++ b/src/EngineController.cpp
@@ -1435,8 +1435,8 @@ QString EngineController::prettyNowPlaying( bool progress ) \
const
QString length = Qt::escape( Meta::msToPrettyTime( track->length() ) );
title += " (";
if( progress )
- title+= Qt::escape( Meta::msToPrettyTime( m_lastTickPosition ) ) \
+ "/";
- title += length + ")";
+ title+= Qt::escape( Meta::msToPrettyTime( m_lastTickPosition ) ) \
+ '/'; + title += length + ')';
}
return title;
diff --git a/src/amarokurls/ContextUrlRunner.cpp \
b/src/amarokurls/ContextUrlRunner.cpp index 05719ed..5c7d96c 100644
--- a/src/amarokurls/ContextUrlRunner.cpp
+++ b/src/amarokurls/ContextUrlRunner.cpp
@@ -48,7 +48,7 @@ bool ContextUrlRunner::run( AmarokUrl url )
QString appletsString = url.args().value( "applets" );
debug() << "applet string: " << appletsString;
- QStringList appletList = appletsString.split( "," );
+ QStringList appletList = appletsString.split( ',' );
Context::ContextView::self()->clearNoSave();
Context::Containment* cont = dynamic_cast< Context::Containment* >( \
Context::ContextView::self()->containment() );
diff --git a/src/browsers/filebrowser/FileBrowser.cpp \
b/src/browsers/filebrowser/FileBrowser.cpp index 82dad74..1c2b026 100644
--- a/src/browsers/filebrowser/FileBrowser.cpp
+++ b/src/browsers/filebrowser/FileBrowser.cpp
@@ -448,7 +448,7 @@ FileBrowser::setupAddItems()
callback = workingUrl.left( currentPosition );
name = callback;
if( name == "file:///" )
- name = "/"; // just niceness
+ name = '/'; // just niceness
else
name.remove( QRegExp( "/$" ) );
}
diff --git a/src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp \
b/src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp index e631de2..4d2352d \
100644
--- a/src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp
+++ b/src/browsers/playlistbrowser/PlaylistBrowserCategory.cpp
@@ -250,7 +250,7 @@ PlaylistBrowserCategory::slotToggleProviderButton()
QAction *action = m_providerActions.value( p );
if( action->isChecked() )
{
- QString escapedName = QRegExp::escape( p->prettyName() ).replace( " ", \
"\\ " ); + QString escapedName = QRegExp::escape( p->prettyName() \
).replace( ' ', "\\ " );
filter += QString( filter.isEmpty() ? "%1" : "|%1" ).arg( escapedName );
checkedActions << action;
action->setEnabled( true );
diff --git a/src/context/applets/labels/LabelsApplet.cpp \
b/src/context/applets/labels/LabelsApplet.cpp index a3f80fb..f5bc55d 100644
--- a/src/context/applets/labels/LabelsApplet.cpp
+++ b/src/context/applets/labels/LabelsApplet.cpp
@@ -148,7 +148,7 @@ LabelsApplet::init()
const QStringList replacementList = config.readEntry( "ReplacementList", \
QStringList() ); foreach( const QString replacement, replacementList )
{
- const QStringList parts = replacement.split( "|" );
+ const QStringList parts = replacement.split( '|' );
QString label = parts.at(0);
label = label.replace( "%s", "|" );
label = label.replace( "%p", "%" );
@@ -817,12 +817,12 @@ LabelsApplet::saveSettings()
{
it.next();
QString label = it.key();
- label = label.replace( "%", "%p" );
- label = label.replace( "|", "%s" );
+ label = label.replace( '%', "%p" );
+ label = label.replace( '|', "%s" );
QString replacement = it.value();
- replacement = replacement.replace( "%", "%p" );
- replacement = replacement.replace( "|", "%s" );
- replacementList.append( label + "|" + replacement );
+ replacement = replacement.replace( '%', "%p" );
+ replacement = replacement.replace( '|', "%s" );
+ replacementList.append( label + '|' + replacement );
}
config.writeEntry( "ReplacementList", replacementList );
diff --git a/src/context/applets/tabs/TabsView.cpp \
b/src/context/applets/tabs/TabsView.cpp index fc11c4a..cb5b540 100644
--- a/src/context/applets/tabs/TabsView.cpp
+++ b/src/context/applets/tabs/TabsView.cpp
@@ -143,7 +143,7 @@ TabsView::showTab( TabsItem *tab )
QString tabText = tab->getTabData();
if( tabText.length() > 0 )
{
- tabText.replace( "\n", "<br></br>", Qt::CaseInsensitive );
+ tabText.replace( '\n', "<br></br>", Qt::CaseInsensitive );
QFont tabFont( "monospace");
tabFont.setStyleHint( QFont::Courier );
@@ -163,7 +163,7 @@ TabsView::showTab( TabsItem *tab )
QString htmlData = "<html>";
htmlData += "<body style=\"font-family:'" + tabFont.family() + \
"';";
htmlData += "font-size:" + QString::number( tabFont.pointSize() \
) + "pt;";
- htmlData += "font-weight:" + QString::number( tabFont.weight() ) \
+ ";"; + htmlData += "font-weight:" + QString::number( \
tabFont.weight() ) + ';'; htmlData += "color:" + textColor + ";\">";
// tab heading + tab source
diff --git a/src/context/engines/lyrics/LyricsEngine.cpp \
b/src/context/engines/lyrics/LyricsEngine.cpp index a65be19..d3273b0 100644
--- a/src/context/engines/lyrics/LyricsEngine.cpp
+++ b/src/context/engines/lyrics/LyricsEngine.cpp
@@ -99,9 +99,9 @@ void LyricsEngine::update()
// -- clean up title
const QString magnatunePreviewString = QLatin1String( "PREVIEW: buy it at \
www.magnatune.com" ); if( title.contains(magnatunePreviewString, Qt::CaseSensitive) \
)
- title = title.remove( " (" + magnatunePreviewString + ")" );
+ title = title.remove( " (" + magnatunePreviewString + ')' );
if( artist.contains(magnatunePreviewString, Qt::CaseSensitive) )
- artist = artist.remove( " (" + magnatunePreviewString + ")" );
+ artist = artist.remove( " (" + magnatunePreviewString + ')' );
if( title.isEmpty() && currentTrack )
{
@@ -114,13 +114,13 @@ void LyricsEngine::update()
{
title = prettyTitle.mid( h + 1 ).trimmed();
if( title.contains(magnatunePreviewString, Qt::CaseSensitive) )
- title = title.remove( " (" + magnatunePreviewString + ")" );
+ title = title.remove( " (" + magnatunePreviewString + ')' );
if( artist.isEmpty() )
{
artist = prettyTitle.mid( 0, h ).trimmed();
if( artist.contains(magnatunePreviewString, Qt::CaseSensitive) )
- artist = artist.remove( " (" + magnatunePreviewString + ")" );
+ artist = artist.remove( " (" + magnatunePreviewString + ')' );
}
}
}
diff --git a/src/core-impl/collections/db/sql/SqlCollection.cpp \
b/src/core-impl/collections/db/sql/SqlCollection.cpp index c420e35..4f20b85 100644
--- a/src/core-impl/collections/db/sql/SqlCollection.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollection.cpp
@@ -120,7 +120,7 @@ protected:
{
QString path = KGlobal::dirs()->saveLocation( "data", \
QString("amarok/"), false ) + "amarokcollectionscanner_batchscan.xml"; while( \
QFile::exists( path ) )
- path += "_";
+ path += '_';
CollectionScanner::BatchFile batchfile;
batchfile.setTimeDefinitions( knownDirs );
diff --git a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp \
b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp index 1e20535..c11a6bd \
100644
--- a/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
+++ b/src/core-impl/collections/db/sql/SqlCollectionLocation.cpp
@@ -674,7 +674,7 @@ KUrl
SqlCollectionLocation::moodFile( const KUrl &track ) const
{
KUrl moodPath = track;
- moodPath.setFileName( "." + moodPath.fileName().replace( QRegExp( \
"(\\.\\w{2,5})$" ), ".mood" ) ); + moodPath.setFileName( '.' + \
moodPath.fileName().replace( QRegExp( "(\\.\\w{2,5})$" ), ".mood" ) ); return \
moodPath; }
diff --git a/src/core-impl/collections/db/sql/SqlMeta.cpp \
b/src/core-impl/collections/db/sql/SqlMeta.cpp index fd464cb..b399ed3 100644
--- a/src/core-impl/collections/db/sql/SqlMeta.cpp
+++ b/src/core-impl/collections/db/sql/SqlMeta.cpp
@@ -1645,7 +1645,7 @@ SqlAlbum::setImage( const QImage &image )
QString path = largeDiskCachePath();
// make sure not to overwrite existing images
while( QFile(path).exists() )
- path += "_"; // not that nice but it shouldn't happen that often.
+ path += '_'; // not that nice but it shouldn't happen that often.
image.save( path, "JPG" );
setImage( path );
diff --git a/src/core-impl/collections/db/sql/SqlRegistry_p.cpp \
b/src/core-impl/collections/db/sql/SqlRegistry_p.cpp index 21b9d45..b7cba3a 100644
--- a/src/core-impl/collections/db/sql/SqlRegistry_p.cpp
+++ b/src/core-impl/collections/db/sql/SqlRegistry_p.cpp
@@ -186,7 +186,7 @@ AbstractTrackTableCommitter::nullDate( const QDateTime &date ) \
const QString
AbstractTrackTableCommitter::escape( const QString &str ) const
{
- return "'"+m_storage->escape(str)+"'";
+ return '\'' + m_storage->escape( str ) + '\'';
}
diff --git a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp \
b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp index \
2cdd10a..6b5cba5 100644
--- a/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp
+++ b/src/core-impl/collections/nepomukcollection/NepomukQueryMaker.cpp
@@ -345,7 +345,7 @@ NepomukQueryMakerPrivate::addFilter( QString expression )
void
NepomukQueryMakerPrivate::matchNothing()
{
- filters = "0";
+ filters = '0';
filterNeedsConjunction = true;
}
diff --git a/src/core-impl/collections/upnpcollection/UpnpCache.cpp \
b/src/core-impl/collections/upnpcollection/UpnpCache.cpp index 21f8264..f0e05fd \
100644
--- a/src/core-impl/collections/upnpcollection/UpnpCache.cpp
+++ b/src/core-impl/collections/upnpcollection/UpnpCache.cpp
@@ -28,24 +28,24 @@ static qint64 duration( QString duration ) {
if( duration.isEmpty() )
return 0;
- QStringList parts = duration.split(":");
+ QStringList parts = duration.split( ':' );
int hours = parts.takeFirst().toInt();
int minutes = parts.takeFirst().toInt();
QString rest = parts.takeFirst();
int seconds = 0;
int mseconds = 0;
- if( rest.contains(".") ) {
- int dotIndex = rest.indexOf(".");
+ if( rest.contains( '.' ) ) {
+ int dotIndex = rest.indexOf( "." );
seconds = rest.left( dotIndex ).toInt();
QString frac = rest.mid( dotIndex + 1 );
- if( frac.contains( "/" ) ) {
- int slashIndex = frac.indexOf("/");
- int num = frac.left( frac.indexOf("/") ).toInt();
+ if( frac.contains( '/' ) ) {
+ int slashIndex = frac.indexOf( '/' );
+ int num = frac.left( frac.indexOf( '/' ) ).toInt();
int den = frac.mid( slashIndex + 1 ).toInt();
mseconds = num * 1000 / den;
}
else {
- mseconds = QString("." + frac).toFloat() * 1000;
+ mseconds = QString( '.' + frac ).toFloat() * 1000;
}
}
else {
diff --git a/src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp \
b/src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp index \
ead5d79..80ea8de 100644
--- a/src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp
+++ b/src/core-impl/collections/upnpcollection/UpnpCollectionFactory.cpp
@@ -168,7 +168,7 @@ void UpnpCollectionFactory::slotDeviceAdded( const DeviceTypeMap \
&map ) void UpnpCollectionFactory::slotDeviceRemoved( const DeviceTypeMap &map )
{
foreach( QString udn, map.keys() ) {
- udn.replace("uuid:", "");
+ udn.remove("uuid:");
if( m_devices.contains(udn) ) {
m_devices[udn]->removeCollection();
m_devices.remove(udn);
diff --git a/src/core-impl/podcasts/sql/SqlPodcastMeta.cpp \
b/src/core-impl/podcasts/sql/SqlPodcastMeta.cpp index 73192a8..20bcaff 100644
--- a/src/core-impl/podcasts/sql/SqlPodcastMeta.cpp
+++ b/src/core-impl/podcasts/sql/SqlPodcastMeta.cpp
@@ -539,7 +539,7 @@ SqlPodcastChannel::SqlPodcastChannel( SqlPodcastProvider \
*provider, m_description = *(iter++);
m_copyright = *(iter++);
m_directory = KUrl( *(iter++) );
- m_labels = QStringList( QString( *(iter++) ).split( ",", QString::SkipEmptyParts \
) ); + m_labels = QStringList( QString( *(iter++) ).split( ',', \
QString::SkipEmptyParts ) ); m_subscribeDate = QDate::fromString( *(iter++) );
m_autoScan = sqlStorage->boolTrue() == *(iter++);
m_fetchType = (*(iter++)).toInt() == DownloadWhenAvailable ? \
DownloadWhenAvailable : StreamOrDownloadOnDemand;
diff --git a/src/core/podcasts/PodcastImageFetcher.cpp \
b/src/core/podcasts/PodcastImageFetcher.cpp index afd4929..dc3927c 100644
--- a/src/core/podcasts/PodcastImageFetcher.cpp
+++ b/src/core/podcasts/PodcastImageFetcher.cpp
@@ -72,7 +72,7 @@ PodcastImageFetcher::cachedImagePath( Podcasts::PodcastChannel \
*channel ) imagePath = Amarok::saveLocation( "podcasts" );
KMD5 md5( channel->url().url().toLocal8Bit() );
QString extension = Amarok::extension( channel->imageUrl().fileName() );
- imagePath.addPath( md5.hexDigest() + "." + extension );
+ imagePath.addPath( md5.hexDigest() + '.' + extension );
return imagePath.toLocalFile();
}
diff --git a/src/dialogs/TagGuesser.cpp b/src/dialogs/TagGuesser.cpp
index deb403f..5b3267f 100644
--- a/src/dialogs/TagGuesser.cpp
+++ b/src/dialogs/TagGuesser.cpp
@@ -106,13 +106,13 @@ TagGuesser::convertTagCaseType( const QString &tag, int type )
case 2:
{
QString complete;
- QStringList splitted = tag.toLower().split( " ", QString::SkipEmptyParts \
); + QStringList splitted = tag.toLower().split( ' ', \
QString::SkipEmptyParts );
foreach( QString word, splitted )
{
if( word.length() > 1 )
word.replace( 0, 1, word.left( 1 ).toUpper() );
- complete += word + " ";
+ complete += word + ' ';
}
complete.truncate( complete.length() - 1 );
diff --git a/src/dynamic/DynamicModel.cpp b/src/dynamic/DynamicModel.cpp
index 201cc93..a2b7e93 100644
--- a/src/dynamic/DynamicModel.cpp
+++ b/src/dynamic/DynamicModel.cpp
@@ -917,11 +917,11 @@ Dynamic::DynamicModel::initPlaylists()
// - a playlist demonstrating the SearchQueryBias
playlist = new Dynamic::BiasedPlaylist( this );
playlist->setTitle( i18n("Rock and Pop") );
- QString query = Meta::shortI18nForField( Meta::valGenre ) + ":" + i18n( "Rock" \
); + QString query = Meta::shortI18nForField( Meta::valGenre ) + ':' + i18n( \
"Rock" );
/* following cannot be currently translated, see \
ExpressionParser::isAdvancedExpression()
* and ExpressionParser::finishedToken() */
query += " AND ";
- query += Meta::shortI18nForField( Meta::valGenre ) + ":" + i18n( "Pop" );
+ query += Meta::shortI18nForField( Meta::valGenre ) + ':' + i18n( "Pop" );
playlist->bias()->replace( Dynamic::BiasPtr( new Dynamic::SearchQueryBias( query \
) ) ); insertPlaylist( 1, playlist );
@@ -1120,7 +1120,7 @@ static QString
biasToString( Dynamic::BiasPtr bias, int level )
{
QString result;
- result += QString(" ").repeated(level) + bias->toString() + " " + \
QString::number(quintptr(bias.data()), 16) + "\n"; + result += QString(" \
").repeated(level) + bias->toString() + ' ' + QString::number(quintptr(bias.data()), \
16) + '\n';
if( Dynamic::AndBias* aBias = qobject_cast<Dynamic::AndBias*>(bias.data()) )
{
foreach( Dynamic::BiasPtr bias2, aBias->biases() )
@@ -1136,7 +1136,7 @@ Dynamic::DynamicModel::toString()
foreach( Dynamic::DynamicPlaylist* playlist, m_playlists )
{
- result += playlist->title() + " " + QString::number(quintptr(playlist), 16) \
+ "\n"; + result += playlist->title() + ' ' + \
QString::number(quintptr(playlist), 16) + '\n';
if( Dynamic::BiasedPlaylist* bPlaylist = \
qobject_cast<Dynamic::BiasedPlaylist*>(playlist ) ) result += biasToString( \
bPlaylist->bias(), 1 ); }
diff --git a/src/musicbrainz/MusicBrainzFinder.cpp \
b/src/musicbrainz/MusicBrainzFinder.cpp index 6892232..9a1b3bb 100644
--- a/src/musicbrainz/MusicBrainzFinder.cpp
+++ b/src/musicbrainz/MusicBrainzFinder.cpp
@@ -597,7 +597,7 @@ MusicBrainzFinder::compileTrackRequest( const Meta::TrackPtr \
&track )
* We might be tempted to search also by qdur (quantized duration), but this has
* proved to exclude lots of good results.
*/
-#define VALUE( k ) metadata.value( k ).toString().replace( unsafe, "" ).replace( \
special, escape ).replace( endOfWord, fuzzy ) +#define VALUE( k ) metadata.value( k \
).toString().remove( unsafe ).replace( special, escape ).replace( endOfWord, fuzzy ) \
if( metadata.contains( Meta::Field::TITLE ) )
query += QString( "(\"%1\"^20 %1)" ).arg( VALUE( Meta::Field::TITLE ) );
if( metadata.contains( Meta::Field::ARTIST ) )
diff --git a/src/network/NetworkAccessManagerProxy.cpp \
b/src/network/NetworkAccessManagerProxy.cpp index a2694bf..ba7238c 100644
--- a/src/network/NetworkAccessManagerProxy.cpp
+++ b/src/network/NetworkAccessManagerProxy.cpp
@@ -272,7 +272,7 @@ NetworkAccessManagerProxy::createRequest( Operation op, const \
QNetworkRequest &r QNetworkRequest request = req;
request.setAttribute( QNetworkRequest::HttpPipeliningAllowedAttribute, true );
if ( request.hasRawHeader( "User-Agent" ) )
- request.setRawHeader( "User-Agent", d->userAgent.toLocal8Bit() + " " + \
request.rawHeader( "User-Agent" ) ); + request.setRawHeader( "User-Agent", \
d->userAgent.toLocal8Bit() + ' ' + request.rawHeader( "User-Agent" ) ); else
request.setRawHeader( "User-Agent", d->userAgent.toLocal8Bit() );
diff --git a/src/playlist/PlaylistModel.cpp b/src/playlist/PlaylistModel.cpp
index e93bd06..9c49ff6 100644
--- a/src/playlist/PlaylistModel.cpp
+++ b/src/playlist/PlaylistModel.cpp
@@ -110,7 +110,7 @@ breakLongLinesHTML(const QString& text)
textInLines += wordPart + "<br/>";
}
}
- textInLines += word + " ";
+ textInLines += word + ' ';
lineLength += word.size() + 1;
words.removeFirst();
}
diff --git a/src/playlist/PlaylistSortWidget.cpp \
b/src/playlist/PlaylistSortWidget.cpp index eae75f8..734f98f 100644
--- a/src/playlist/PlaylistSortWidget.cpp
+++ b/src/playlist/PlaylistSortWidget.cpp
@@ -154,7 +154,7 @@ SortWidget::sortPath() const
{
QString name( qobject_cast< BreadcrumbItem * >( m_ribbon->itemAt( i \
)->widget() )->name() );
Qt::SortOrder sortOrder = qobject_cast< BreadcrumbItem * >( \
m_ribbon->itemAt( i )->widget() )->sortOrder();
- QString level = name + "_" + ( sortOrder ? "des" : "asc" );
+ QString level = name + '_' + ( sortOrder ? "des" : "asc" );
path.append( ( i == m_ribbon->count() - 1 ) ? level : ( level + '-' ) );
}
return path;
diff --git a/src/playlist/proxymodels/ProxyBase.cpp \
b/src/playlist/proxymodels/ProxyBase.cpp index 47d36f4..e8fca94 100644
--- a/src/playlist/proxymodels/ProxyBase.cpp
+++ b/src/playlist/proxymodels/ProxyBase.cpp
@@ -296,7 +296,7 @@ ProxyBase::rowMatch( int sourceModelRow, const QString \
&searchTerms, int searchF
Meta::TrackPtr track = m_belowModel->trackAt( sourceModelRow );
- QStringList searchList = searchTerms.split(" ", QString::SkipEmptyParts);
+ QStringList searchList = searchTerms.split(' ', QString::SkipEmptyParts);
foreach( const QString& searchTerm, searchList )
{
diff --git a/src/playlistgenerator/constraints/TagMatch.cpp \
b/src/playlistgenerator/constraints/TagMatch.cpp index d53ca53..1c0715f 100644
--- a/src/playlistgenerator/constraints/TagMatch.cpp
+++ b/src/playlistgenerator/constraints/TagMatch.cpp
@@ -80,7 +80,7 @@ ConstraintTypes::TagMatch::TagMatch( QDomElement& xmlelem, \
ConstraintNode* p ) m_value = a.value().toInt();
} else if ( m_fieldsModel->type_of( m_field ) == FieldTypeDate ) {
if ( m_comparison == CompareDateWithin ) {
- QStringList parts = a.value().split(" ");
+ QStringList parts = a.value().split(' ');
if ( parts.size() == 2 ) {
int u = parts.at( 0 ).toInt();
int v = 0;
diff --git a/src/services/jamendo/JamendoDatabaseHandler.cpp \
b/src/services/jamendo/JamendoDatabaseHandler.cpp index 1e7dc2d..a05cfd0 100644
--- a/src/services/jamendo/JamendoDatabaseHandler.cpp
+++ b/src/services/jamendo/JamendoDatabaseHandler.cpp
@@ -184,7 +184,7 @@ JamendoDatabaseHandler::insertAlbum( ServiceAlbum *album )
popularity = QString::number( jAlbum->popularity() );
if( popularity == "nan" ) // sometimes this seems to happen, I don't know why
- popularity = "0";
+ popularity = '0';
queryString = "INSERT INTO jamendo_albums ( id, name, description, "
"popularity, cover_url, launch_year, genre, "
diff --git a/src/services/lastfm/biases/WeeklyTopBias.cpp \
b/src/services/lastfm/biases/WeeklyTopBias.cpp index c99c538..2fa0545 100644
--- a/src/services/lastfm/biases/WeeklyTopBias.cpp
+++ b/src/services/lastfm/biases/WeeklyTopBias.cpp
@@ -467,7 +467,7 @@ Dynamic::WeeklyTopBias::loadFromFile()
while( !in.atEnd() )
{
QString line = in.readLine();
- m_weeklyArtistMap.insert( line.split( "#" )[ 0 ].toUInt(), line.split( "#" \
)[ 1 ].split( "^" ) ); + m_weeklyArtistMap.insert( line.split( '#' )[ 0 \
].toUInt(), line.split( '#' )[ 1 ].split( '^' ) ); }
file.close();
}
diff --git a/src/widgets/MetaQueryWidget.cpp b/src/widgets/MetaQueryWidget.cpp
index 7ae9373..58601cc 100644
--- a/src/widgets/MetaQueryWidget.cpp
+++ b/src/widgets/MetaQueryWidget.cpp
@@ -874,7 +874,7 @@ MetaQueryWidget::makeGenericNumberSelection( qint64 field, const \
QString& unit ) spin->setMinimum( Filter::minimumValue( field ) );
spin->setMaximum( Filter::maximumValue( field ) );
if( !unit.isEmpty() )
- spin->setSuffix( " " + unit );
+ spin->setSuffix( ' ' + unit );
spin->setValue( m_filter.numValue );
connect( spin, SIGNAL(valueChanged(int)),
@@ -890,7 +890,7 @@ MetaQueryWidget::makeGenericNumberSelection( qint64 field, const \
QString& unit ) spin2->setMinimum( Filter::minimumValue( field ) );
spin2->setMaximum( Filter::maximumValue( field ) );
if( !unit.isEmpty() )
- spin2->setSuffix( " " + unit );
+ spin2->setSuffix( ' ' + unit );
spin2->setValue( m_filter.numValue2 );
connect( spin2, SIGNAL(valueChanged(int)),
diff --git a/src/widgets/ProgressWidget.cpp b/src/widgets/ProgressWidget.cpp
index 82ff9bf..94f216d 100644
--- a/src/widgets/ProgressWidget.cpp
+++ b/src/widgets/ProgressWidget.cpp
@@ -136,7 +136,7 @@ ProgressWidget::drawTimeDisplay( int ms ) //SLOT
int remainingSeconds = qMax(0, int((trackLength - ms) / 1000));
QString sSeconds = Meta::secToPrettyTime( seconds );
- QString sRemainingSeconds = "-" + Meta::secToPrettyTime( remainingSeconds );
+ QString sRemainingSeconds = '-' + Meta::secToPrettyTime( remainingSeconds );
if( AmarokConfig::leftTimeDisplayRemaining() )
{
diff --git a/tests/TestDebug.cpp b/tests/TestDebug.cpp
index c9ff0bb..f090661 100644
--- a/tests/TestDebug.cpp
+++ b/tests/TestDebug.cpp
@@ -142,7 +142,7 @@ TestDebug::expectBeginEnd( TestDebug::BeginOrEnd type, const \
QString &message, {
beginEnd = "END__:";
double duration = DEBUG_OVERRIDE_ELAPSED_TIME;
- took = " " + colorize( QString( "[Took: %1s]" ).arg( duration, 0, 'g', 2 ),
+ took = ' ' + colorize( QString( "[Took: %1s]" ).arg( duration, 0, 'g', 2 ),
colorStack.top(), colorEnabled );
m_indent.truncate( m_indent.length() - 2 );
}
diff --git a/tests/TestTrackOrganizer.cpp b/tests/TestTrackOrganizer.cpp
index ffcec68..1e0de6c 100644
--- a/tests/TestTrackOrganizer.cpp
+++ b/tests/TestTrackOrganizer.cpp
@@ -94,7 +94,7 @@ Meta::TrackPtr TestTrackOrganizer::makeMockTrack( const QString \
&trackName, cons Meta::TrackPtr trackPtr( track );
EXPECT_CALL( *track, name() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
EXPECT_CALL( *track, prettyName() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
- EXPECT_CALL( *track, uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName + "_" + artistName + "_" + albumName ) ); + EXPECT_CALL( *track, \
uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( trackName + '_' + artistName \
+ '_' + albumName ) );
EXPECT_CALL( *track, playableUrl() ).Times( AnyNumber() ).WillRepeatedly( \
Return( KUrl( '/' + track->uidUrl() ) ) );
EXPECT_CALL( *track, trackNumber() ).Times( AnyNumber() ).WillRepeatedly( \
Return( trackNumber ) );
EXPECT_CALL( *track, type() ).Times( AnyNumber() ).WillRepeatedly( Return( "mp3" \
) );
diff --git a/tests/browsers/TestSingleCollectionTreeItemModel.cpp \
b/tests/browsers/TestSingleCollectionTreeItemModel.cpp index dbd3ada..f741b31 100644
--- a/tests/browsers/TestSingleCollectionTreeItemModel.cpp
+++ b/tests/browsers/TestSingleCollectionTreeItemModel.cpp
@@ -50,7 +50,7 @@ void addMockTrack( Collections::CollectionTestImpl *coll, const \
QString &trackNa Meta::TrackPtr trackPtr( track );
EXPECT_CALL( *track, name() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
EXPECT_CALL( *track, prettyName() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
- EXPECT_CALL( *track, uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName + "_" + artistName + "_" + albumName ) ); + EXPECT_CALL( *track, \
uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( trackName + '_' + artistName \
+ '_' + albumName ) );
EXPECT_CALL( *track, playableUrl() ).Times( AnyNumber() ).WillRepeatedly( \
Return( KUrl( '/' + track->uidUrl() ) ) );
EXPECT_CALL( *track, composer() ).Times( AnyNumber() ).WillRepeatedly( Return( \
Meta::ComposerPtr() ) );
EXPECT_CALL( *track, genre() ).Times( AnyNumber() ).WillRepeatedly( Return( \
Meta::GenrePtr() ) );
diff --git a/tests/context/engines/TestDataEngineBlackBox.cpp \
b/tests/context/engines/TestDataEngineBlackBox.cpp index a9b83e9..b80cf70 100644
--- a/tests/context/engines/TestDataEngineBlackBox.cpp
+++ b/tests/context/engines/TestDataEngineBlackBox.cpp
@@ -21,7 +21,7 @@ TestDataEngineBlackBox::TestDataEngineBlackBox(QString identifier)
{
Plasma::DataEngine* engine = 0;
// load the engine, add it to the engines
- QString constraint = QString("[X-KDE-PluginInfo-Name] == '"+ identifier \
+"'").arg(identifier); + QString constraint = QString("[X-KDE-PluginInfo-Name] == \
'" + identifier + '\'').arg(identifier);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/DataEngine", \
constraint); QString error;
diff --git a/tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp \
b/tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp index \
c4522c8..ab41db3 100644
--- a/tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp
+++ b/tests/core-impl/collections/db/sql/TestSqlCollectionLocation.cpp
@@ -274,5 +274,5 @@ TestSqlCollectionLocation::setupFileInTempDir( const QString \
&relativeName ) }
QProcess::execute( "touch", QStringList() << absoluteName );
- return "." + absoluteName;
+ return '.' + absoluteName;
}
diff --git a/tests/core-impl/collections/db/sql/TestSqlScanManager.cpp \
b/tests/core-impl/collections/db/sql/TestSqlScanManager.cpp index 16c29ca..506285d \
100644
--- a/tests/core-impl/collections/db/sql/TestSqlScanManager.cpp
+++ b/tests/core-impl/collections/db/sql/TestSqlScanManager.cpp
@@ -783,7 +783,7 @@ TestSqlScanManager::testLargeInsert()
{
writer.writeStartElement( "directory" );
writer.writeTextElement( "path", QString::number(dirId) );
- writer.writeTextElement( "rpath", "/" + QString::number(dirId) );
+ writer.writeTextElement( "rpath", '/' + QString::number(dirId) );
writer.writeTextElement( "mtime", QString::number(aDate.toTime_t()) );
for( int trackId = 0; trackId < 20; trackId++ )
diff --git a/tests/synchronization/TestMasterSlaveSynchronizationJob.cpp \
b/tests/synchronization/TestMasterSlaveSynchronizationJob.cpp index 8d1ea51..b8b59c4 \
100644
--- a/tests/synchronization/TestMasterSlaveSynchronizationJob.cpp
+++ b/tests/synchronization/TestMasterSlaveSynchronizationJob.cpp
@@ -98,7 +98,7 @@ void addMockTrack( Collections::CollectionTestImpl *coll, const \
QString &trackNa ::testing::Mock::AllowLeak( track );
Meta::TrackPtr trackPtr( track );
EXPECT_CALL( *track, name() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
- EXPECT_CALL( *track, uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName + "_" + artistName + "_" + albumName ) ); + EXPECT_CALL( *track, \
uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( trackName + '_' + artistName \
+ '_' + albumName ) );
EXPECT_CALL( *track, playableUrl() ).Times( AnyNumber() ).WillRepeatedly( \
Return( KUrl( '/' + track->uidUrl() ) ) ); coll->mc->addTrack( trackPtr );
diff --git a/tests/synchronization/TestUnionJob.cpp \
b/tests/synchronization/TestUnionJob.cpp index 86f4159..2343577 100644
--- a/tests/synchronization/TestUnionJob.cpp
+++ b/tests/synchronization/TestUnionJob.cpp
@@ -92,7 +92,7 @@ void addMockTrack( Collections::CollectionTestImpl *coll, const \
QString &trackNa ::testing::Mock::AllowLeak( track );
Meta::TrackPtr trackPtr( track );
EXPECT_CALL( *track, name() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName ) );
- EXPECT_CALL( *track, uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( \
trackName + "_" + artistName + "_" + albumName ) ); + EXPECT_CALL( *track, \
uidUrl() ).Times( AnyNumber() ).WillRepeatedly( Return( trackName + '_' + artistName \
+ '_' + albumName ) );
EXPECT_CALL( *track, playableUrl() ).Times( AnyNumber() ).WillRepeatedly( \
Return( KUrl( '/' + track->uidUrl() ) ) ); coll->mc->addTrack( trackPtr );
diff --git a/utilities/amzdownloader/AmzDownloader.cpp \
b/utilities/amzdownloader/AmzDownloader.cpp index 54106f2..e6771de 100644
--- a/utilities/amzdownloader/AmzDownloader.cpp
+++ b/utilities/amzdownloader/AmzDownloader.cpp
@@ -161,7 +161,7 @@ AmzDownloader:: checkAmzList()
errorMsg = tr( "The following files do not exist: " );
for( int i = 0; i < errorList.size(); i++ )
- errorMsg += "\n" + errorList.at( i );
+ errorMsg += '\n' + errorList.at( i );
errorBox.warning( this, tr( "Some files are not available" ), errorMsg );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic