[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [k3b] /: krazy2: Use QChar for single character instead of QString.
From: Francesco Cecconi <francesco.cecconi () gmail ! com>
Date: 2013-03-23 10:55:20
Message-ID: 20130323105520.25088A603F () git ! kde ! org
[Download RAW message or body]
Git commit 1e1ba8897abf3ff75dc960b554e26f1cf9175f5e by Francesco Cecconi.
Committed on 23/03/2013 at 11:53.
Pushed by cecconi into branch 'master'.
krazy2: Use QChar for single character instead of QString.
M +1 -1 kioslaves/videodvd/videodvd.cpp
M +2 -2 libk3b/core/k3bdefaultexternalprograms.cpp
M +1 -1 libk3b/core/k3bexternalbinmanager.cpp
M +1 -1 libk3b/core/k3bglobals.cpp
M +2 -2 libk3b/core/k3bversion.cpp
M +1 -1 libk3b/jobs/k3baudiocuefilewritingjob.cpp
M +2 -2 libk3b/jobs/k3bbinimagewritingjob.cpp
M +2 -2 libk3b/jobs/k3bcdcopyjob.cpp
M +2 -2 libk3b/jobs/k3bclonejob.cpp
M +2 -2 libk3b/jobs/k3bdvdcopyjob.cpp
M +1 -1 libk3b/jobs/k3bdvdformattingjob.cpp
M +2 -2 libk3b/jobs/k3biso9660imagewritingjob.cpp
M +1 -1 libk3b/jobs/k3bmetawriter.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiocdtrackreader.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiofile.cpp
M +2 -2 libk3b/projects/audiocd/k3baudiojob.cpp
M +1 -1 libk3b/projects/audiocd/k3baudiojobtempdata.cpp
M +3 -3 libk3b/projects/datacd/k3bdatadoc.cpp
M +3 -3 libk3b/projects/datacd/k3bdataitem.cpp
M +2 -2 libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
M +1 -1 libk3b/projects/datacd/k3bdiritem.cpp
M +7 -7 libk3b/projects/datacd/k3bisoimager.cpp
M +1 -1 libk3b/projects/datacd/k3bmsinfofetcher.cpp
M +1 -1 libk3b/projects/k3bcdrdaowriter.cpp
M +1 -1 libk3b/projects/k3bcuefileparser.cpp
M +1 -1 libk3b/projects/k3bgrowisofswriter.cpp
M +2 -2 libk3b/projects/mixedcd/k3bmixedjob.cpp
M +3 -3 libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
M +2 -2 libk3b/projects/videocd/k3bvcddoc.cpp
M +1 -1 libk3b/projects/videocd/k3bvcdjob.cpp
M +2 -2 libk3b/tools/k3bcddb.cpp
M +1 -1 libk3b/tools/k3bdevicehandler.cpp
M +1 -1 libk3b/tools/k3bintvalidator.cpp
M +5 -5 libk3b/tools/k3biso9660.cpp
M +1 -1 libk3b/tools/k3bprocess.cpp
M +2 -2 libk3bdevice/k3bdevicemanager.cpp
M +1 -1 plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp
M +2 -2 src/k3b.cpp
M +1 -1 src/k3bappdevicemanager.cpp
M +1 -1 src/k3bdebuggingoutputcache.cpp
M +1 -1 src/k3bdebuggingoutputfile.cpp
M +1 -1 src/k3bdiskinfoview.cpp
M +5 -5 src/k3bfileview.cpp
M +1 -1 src/k3bstatusbarmanager.cpp
M +1 -1 src/k3btempdirselectionwidget.cpp
M +1 -1 src/k3bthememanager.cpp
M +1 -1 src/k3bwriterselectionwidget.cpp
M +5 -5 src/misc/k3bimagewritingdialog.cpp
M +2 -2 src/option/k3badvancedoptiontab.cpp
M +1 -1 src/option/k3bdevicewidget.cpp
M +1 -1 src/option/k3bexternalbinpermissionmodel.cpp
M +6 -6 src/projects/k3bdatapropertiesdialog.cpp
M +1 -1 src/projects/k3bdataurladdingdialog.cpp
M +3 -3 src/projects/k3bfillstatusdisplay.cpp
M +1 -1 src/projects/k3bvcdburndialog.cpp
M +2 -2 src/projects/kostore/KoStore.cpp
M +1 -1 src/rip/k3baudiocdview.cpp
M +3 -3 src/rip/k3baudioprojectconvertingdialog.cpp
M +1 -1 src/rip/k3baudioripjob.cpp
M +2 -2 src/rip/k3baudiorippingdialog.cpp
M +3 -3 src/rip/k3bvideocdview.cpp
M +1 -1 src/rip/videodvd/k3bvideodvdrippingview.cpp
http://commits.kde.org/k3b/1e1ba8897abf3ff75dc960b554e26f1cf9175f5e
diff --git a/kioslaves/videodvd/videodvd.cpp b/kioslaves/videodvd/videodvd.cpp
index 22ea024..d918843 100644
--- a/kioslaves/videodvd/videodvd.cpp
+++ b/kioslaves/videodvd/videodvd.cpp
@@ -151,7 +151,7 @@ K3b::Iso9660* kio_videodvdProtocol::openIso( const KUrl& url, \
QString& plainIsoP K3b::Iso9660* iso = new K3b::Iso9660( dev );
iso->setPlainIso9660( true );
if( iso->open() /*&& iso->primaryDescriptor().volumeId == volumeId*/ ) {
- plainIsoPath = url.path().section( "/", 2, -1 ) + "/";
+ plainIsoPath = url.path().section( '/', 2, -1 ) + '/';
kDebug() << "(kio_videodvdProtocol) using iso path: " << \
plainIsoPath; return iso;
}
diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp \
b/libk3b/core/k3bdefaultexternalprograms.cpp index 25b84c4..f90ea1b 100644
--- a/libk3b/core/k3bdefaultexternalprograms.cpp
+++ b/libk3b/core/k3bdefaultexternalprograms.cpp
@@ -472,7 +472,7 @@ K3b::Version K3b::DvdformatProgram::parseVersion( const QString& \
output, const E {
QString version;
// extract fields
- QStringList outputList = output.split( " " );
+ QStringList outputList = output.split( ' ' );
for (int i = 0; i < outputList.size(); ++i) {
if ( outputList.at( i ) == "version" ) {
@@ -492,7 +492,7 @@ QString K3b::DvdformatProgram::parseCopyright( const QString& \
output, const Exte {
QString copyright = "Andy Polyakov ";
// extract fields
- QStringList outputList = output.split( " " );
+ QStringList outputList = output.split( ' ' );
for (int i = 0; i < outputList.size(); ++i) {
if ( outputList.at( i ) == "by" ) {
diff --git a/libk3b/core/k3bexternalbinmanager.cpp \
b/libk3b/core/k3bexternalbinmanager.cpp index 62238b4..272f6c9 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -589,7 +589,7 @@ void K3b::ExternalBinManager::search()
continue;
if( p[p.length()-1] == '/' )
p.truncate( p.length()-1 );
- if( !paths.contains( p ) && !paths.contains( p + "/" ) )
+ if( !paths.contains( p ) && !paths.contains( p + '/' ) )
paths.append(p);
}
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index dc54daf..e00f4a3 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -148,7 +148,7 @@ QString K3b::parentDir( const QString& path )
if( pos >= 0 )
parent.truncate( pos+1 );
else // relative path, do anything...
- parent = "/";
+ parent = '/';
return parent;
}
diff --git a/libk3b/core/k3bversion.cpp b/libk3b/core/k3bversion.cpp
index 6223265..c9b2495 100644
--- a/libk3b/core/k3bversion.cpp
+++ b/libk3b/core/k3bversion.cpp
@@ -117,7 +117,7 @@ void K3b::Version::setVersion( const QString& v )
QString suffix;
splitVersionString( v.trimmed(), d->m_majorVersion, suffix );
if( d->m_majorVersion >= 0 ) {
- if( suffix.startsWith(".") ) {
+ if( suffix.startsWith('.') ) {
suffix = suffix.mid( 1 );
splitVersionString( suffix, d->m_minorVersion, suffix );
if( d->m_minorVersion < 0 ) {
@@ -128,7 +128,7 @@ void K3b::Version::setVersion( const QString& v )
d->m_suffix = "";
}
else {
- if( suffix.startsWith(".") ) {
+ if( suffix.startsWith('.') ) {
suffix = suffix.mid( 1 );
splitVersionString( suffix, d->m_patchLevel, suffix );
if( d->m_patchLevel < 0 ) {
diff --git a/libk3b/jobs/k3baudiocuefilewritingjob.cpp \
b/libk3b/jobs/k3baudiocuefilewritingjob.cpp index 929aeae..bca1988 100644
--- a/libk3b/jobs/k3baudiocuefilewritingjob.cpp
+++ b/libk3b/jobs/k3baudiocuefilewritingjob.cpp
@@ -130,7 +130,7 @@ QString K3b::AudioCueFileWritingJob::jobSource() const
QString K3b::AudioCueFileWritingJob::jobTarget() const
{
if( Device::Device* device = writer() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return QString();
}
diff --git a/libk3b/jobs/k3bbinimagewritingjob.cpp \
b/libk3b/jobs/k3bbinimagewritingjob.cpp index df5a2d5..5cc8c34 100644
--- a/libk3b/jobs/k3bbinimagewritingjob.cpp
+++ b/libk3b/jobs/k3bbinimagewritingjob.cpp
@@ -217,7 +217,7 @@ QString K3b::BinImageWritingJob::jobDescription() const
QString K3b::BinImageWritingJob::jobDetails() const
{
- return m_tocFile.section("/", -1);
+ return m_tocFile.section('/', -1);
}
@@ -230,7 +230,7 @@ QString K3b::BinImageWritingJob::jobSource() const
QString K3b::BinImageWritingJob::jobTarget() const
{
if( Device::Device* device = writer() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return QString();
}
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp
index 87c7849..375e4c0 100644
--- a/libk3b/jobs/k3bcdcopyjob.cpp
+++ b/libk3b/jobs/k3bcdcopyjob.cpp
@@ -1237,7 +1237,7 @@ QString K3b::CdCopyJob::jobDetails() const
QString K3b::CdCopyJob::jobSource() const
{
if( Device::Device* device = reader() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return QString();
}
@@ -1246,7 +1246,7 @@ QString K3b::CdCopyJob::jobSource() const
QString K3b::CdCopyJob::jobTarget() const
{
if( Device::Device* device = writer() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return m_tempPath;
}
diff --git a/libk3b/jobs/k3bclonejob.cpp b/libk3b/jobs/k3bclonejob.cpp
index 6c1628b..56c2b1c 100644
--- a/libk3b/jobs/k3bclonejob.cpp
+++ b/libk3b/jobs/k3bclonejob.cpp
@@ -381,7 +381,7 @@ QString K3b::CloneJob::jobDetails() const
QString K3b::CloneJob::jobSource() const
{
if( m_readerDevice )
- return m_readerDevice->vendor() + " " + m_readerDevice->description();
+ return m_readerDevice->vendor() + ' ' + m_readerDevice->description();
else
return QString();
}
@@ -390,7 +390,7 @@ QString K3b::CloneJob::jobSource() const
QString K3b::CloneJob::jobTarget() const
{
if( m_writerDevice )
- return m_writerDevice->vendor() + " " + m_writerDevice->description();
+ return m_writerDevice->vendor() + ' ' + m_writerDevice->description();
else
return m_imagePath;
}
diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp
index a9877f8..782393d 100644
--- a/libk3b/jobs/k3bdvdcopyjob.cpp
+++ b/libk3b/jobs/k3bdvdcopyjob.cpp
@@ -970,7 +970,7 @@ QString K3b::DvdCopyJob::jobDetails() const
QString K3b::DvdCopyJob::jobSource() const
{
if( Device::Device* device = readingDevice() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return QString();
}
@@ -979,7 +979,7 @@ QString K3b::DvdCopyJob::jobSource() const
QString K3b::DvdCopyJob::jobTarget() const
{
if( Device::Device* device = writer() )
- return device->vendor() + " " + device->description();
+ return device->vendor() + ' ' + device->description();
else
return m_imagePath;
}
diff --git a/libk3b/jobs/k3bdvdformattingjob.cpp \
b/libk3b/jobs/k3bdvdformattingjob.cpp index 4bb05a7..a793499 100644
--- a/libk3b/jobs/k3bdvdformattingjob.cpp
+++ b/libk3b/jobs/k3bdvdformattingjob.cpp
@@ -227,7 +227,7 @@ void K3b::DvdFormattingJob::slotStderrLine( const QString& line )
pos = line.indexOf( QRegExp( "\\d" ), pos );
}
// parsing for \b\b... stuff
- else if( !line.startsWith("*") ) {
+ else if( !line.startsWith('*') ) {
pos = line.indexOf( QRegExp( "\\d" ) );
}
else if( line.startsWith( ":-(" ) ) {
diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp \
b/libk3b/jobs/k3biso9660imagewritingjob.cpp index 821a4c3..d47ac6a 100644
--- a/libk3b/jobs/k3biso9660imagewritingjob.cpp
+++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp
@@ -351,7 +351,7 @@ QString K3b::Iso9660ImageWritingJob::jobDescription() const
QString K3b::Iso9660ImageWritingJob::jobDetails() const
{
- return m_imagePath.section("/", -1) + QString( " (%1)" \
).arg(KIO::convertSize(K3b::filesize(m_imagePath))); + return \
m_imagePath.section('/', -1) + QString( " (%1)" \
).arg(KIO::convertSize(K3b::filesize(m_imagePath))); }
@@ -364,7 +364,7 @@ QString K3b::Iso9660ImageWritingJob::jobSource() const
QString K3b::Iso9660ImageWritingJob::jobTarget() const
{
if( m_device )
- return m_device->vendor() + " " + m_device->description();
+ return m_device->vendor() + ' ' + m_device->description();
else
return QString ();
}
diff --git a/libk3b/jobs/k3bmetawriter.cpp b/libk3b/jobs/k3bmetawriter.cpp
index 6a90b9b..3c22f70 100644
--- a/libk3b/jobs/k3bmetawriter.cpp
+++ b/libk3b/jobs/k3bmetawriter.cpp
@@ -79,7 +79,7 @@ public:
{
infFiles.clear();
- QString prefix = K3b::findUniqueFilePrefix( "k3b_tmp_", path ) + "_";
+ QString prefix = K3b::findUniqueFilePrefix( "k3b_tmp_", path ) + '_';
for( int i = 0; i < toc.count(); ++i ) {
infFiles.append( prefix + QString::number( i+1 ).rightJustified( 2, '0' \
) + ".inf" );
diff --git a/libk3b/projects/audiocd/k3baudiocdtrackreader.cpp \
b/libk3b/projects/audiocd/k3baudiocdtrackreader.cpp index b2a525b..22d009a 100644
--- a/libk3b/projects/audiocd/k3baudiocdtrackreader.cpp
+++ b/libk3b/projects/audiocd/k3baudiocdtrackreader.cpp
@@ -68,7 +68,7 @@ bool AudioCdTrackReader::Private::initParanoia()
,QString::number(source.discId()),
source.cdTitle().isEmpty() || \
source.cdArtist().isEmpty() ? QString()
- : " (" + source.cdArtist() + " - " + \
source.cdTitle() + ")"); + : " (" + source.cdArtist() \
+ " - " + source.cdTitle() + ')');
while( Device::Device* dev = ThreadWidget::selectDevice( \
source.track()->doc()->view(), s ) ) { if( dev->readToc().discId() == \
source.discId() ) {
diff --git a/libk3b/projects/audiocd/k3baudiofile.cpp \
b/libk3b/projects/audiocd/k3baudiofile.cpp index 0d702a6..420d23d 100644
--- a/libk3b/projects/audiocd/k3baudiofile.cpp
+++ b/libk3b/projects/audiocd/k3baudiofile.cpp
@@ -62,7 +62,7 @@ QString K3b::AudioFile::type() const
QString K3b::AudioFile::sourceComment() const
{
- return d->decoder->filename().section( "/", -1 );
+ return d->decoder->filename().section( '/', -1 );
}
diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp \
b/libk3b/projects/audiocd/k3baudiojob.cpp index f6f9f7f..8e4ac92 100644
--- a/libk3b/projects/audiocd/k3baudiojob.cpp
+++ b/libk3b/projects/audiocd/k3baudiojob.cpp
@@ -485,7 +485,7 @@ void K3b::AudioJob::slotAudioDecoderNextTrack( int t, int tt )
tt,
track->title().isEmpty() || track->artist().isEmpty()
? QString()
- : " (" + track->artist() + " - " + track->title() + \
")" ) ); + : " (" + track->artist() + " - " + \
track->title() + ')' ) ); }
}
@@ -593,7 +593,7 @@ void K3b::AudioJob::slotWriterNextTrack( int t, int tt )
tt,
track->title().isEmpty() || track->artist().isEmpty()
? QString()
- : " (" + track->artist() + " - " + track->title() + ")" ) \
); + : " (" + track->artist() + " - " + track->title() + ')' \
) ); }
diff --git a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp \
b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp index 904580c..37a86a4 100644
--- a/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
+++ b/libk3b/projects/audiocd/k3baudiojobtempdata.cpp
@@ -98,7 +98,7 @@ void K3b::AudioJobTempData::prepareTempFileNames( const QString& \
path ) d->bufferFiles.clear();
d->infFiles.clear();
- QString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + "_";
+ QString prefix = K3b::findUniqueFilePrefix( "k3b_audio_", path ) + '_';
for( int i = 0; i < d->doc->numOfTracks(); i++ ) {
d->bufferFiles.append( prefix + QString::number( i+1 ).rightJustified( 2, \
'0' ) + ".wav" );
diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp \
b/libk3b/projects/datacd/k3bdatadoc.cpp index f572247..cc4b052 100644
--- a/libk3b/projects/datacd/k3bdatadoc.cpp
+++ b/libk3b/projects/datacd/k3bdatadoc.cpp
@@ -210,7 +210,7 @@ void K3b::DataDoc::addUrlsToDir( const KUrl::List& l, \
K3b::DirItem* dir )
for( KUrl::List::ConstIterator it = urls.constBegin(); it != urls.constEnd(); \
++it ) { const KUrl& url = *it;
QFileInfo f( url.toLocalFile() );
- QString k3bname = f.absoluteFilePath().section( "/", -1 );
+ QString k3bname = f.absoluteFilePath().section( '/', -1 );
// filenames cannot end in backslashes (mkisofs problem. See comments in \
k3bisoimager.cpp (escapeGraftPoint())) while( k3bname[k3bname.length()-1] == '\\' )
@@ -218,7 +218,7 @@ void K3b::DataDoc::addUrlsToDir( const KUrl::List& l, \
K3b::DirItem* dir )
// backup dummy name
if( k3bname.isEmpty() )
- k3bname = "1";
+ k3bname = '1';
K3b::DirItem* newDirItem = 0;
@@ -261,7 +261,7 @@ void K3b::DataDoc::addUrlsToDir( const KUrl::List& l, \
K3b::DirItem* dir )
QStringList dlist = QDir( f.absoluteFilePath() ).entryList( \
QDir::AllEntries|QDir::System|QDir::Hidden|QDir::NoDotAndDotDot ); KUrl::List \
newUrls;
for( QStringList::ConstIterator it = dlist.constBegin(); it != \
dlist.constEnd(); ++it )
- newUrls.append( KUrl( f.absoluteFilePath() + "/" + *it ) );
+ newUrls.append( KUrl( f.absoluteFilePath() + '/' + *it ) );
addUrlsToDir( newUrls, newDirItem );
}
else if( f.isSymLink() || f.isFile() ) {
diff --git a/libk3b/projects/datacd/k3bdataitem.cpp \
b/libk3b/projects/datacd/k3bdataitem.cpp index 0c49971..dfb352a 100644
--- a/libk3b/projects/datacd/k3bdataitem.cpp
+++ b/libk3b/projects/datacd/k3bdataitem.cpp
@@ -196,7 +196,7 @@ QString K3b::DataItem::k3bPath() const
if( !parent() )
return QString(); // the root item is the only one not having a parent
else if( isDir() )
- return parent()->k3bPath() + k3bName() + "/";
+ return parent()->k3bPath() + k3bName() + '/';
else
return parent()->k3bPath() + k3bName();
}
@@ -207,7 +207,7 @@ QString K3b::DataItem::writtenPath() const
if( !parent() )
return QString(); // the root item is the only one not having a parent
else if( isDir() )
- return parent()->writtenPath() + writtenName() + "/";
+ return parent()->writtenPath() + writtenName() + '/';
else
return parent()->writtenPath() + writtenName();
}
@@ -218,7 +218,7 @@ QString K3b::DataItem::iso9660Path() const
if( !parent() )
return QString(); // the root item is the only one not having a parent
else if( isDir() )
- return parent()->iso9660Path() + iso9660Name() + "/";
+ return parent()->iso9660Path() + iso9660Name() + '/';
else
return parent()->iso9660Path() + iso9660Name();
}
diff --git a/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp \
b/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp index 32e1700..686fbbc \
100644
--- a/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
+++ b/libk3b/projects/datacd/k3bdatamultisessionparameterjob.cpp
@@ -225,7 +225,7 @@ bool \
K3b::DataMultiSessionParameterJob::setupMultiSessionParameters() if( toc.isEmpty() )
{
emit infoMessage( i18n("No medium inserted or an empty medium in %1. Cannot \
continue multisession disk.",
- d->doc->burner()->vendor() + " " + \
d->doc->burner()->description() ), K3b::Job::MessageError ); + \
d->doc->burner()->vendor() + ' ' + d->doc->burner()->description() ), \
K3b::Job::MessageError ); return false;
}
@@ -250,7 +250,7 @@ bool \
K3b::DataMultiSessionParameterJob::setupMultiSessionParameters() }
else {
emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.",
- d->doc->burner()->vendor() + " " + \
d->doc->burner()->description() ), K3b::Job::MessageError ); + \
d->doc->burner()->vendor() + ' ' + d->doc->burner()->description() ), \
K3b::Job::MessageError ); return false;
}
}
diff --git a/libk3b/projects/datacd/k3bdiritem.cpp \
b/libk3b/projects/datacd/k3bdiritem.cpp index 9c27b73..4c7e797 100644
--- a/libk3b/projects/datacd/k3bdiritem.cpp
+++ b/libk3b/projects/datacd/k3bdiritem.cpp
@@ -264,7 +264,7 @@ K3b::DataItem* K3b::DirItem::findByPath( const QString& p )
return this;
QString path = p;
- if( path.startsWith("/") )
+ if( path.startsWith('/') )
path = path.mid(1);
int pos = path.indexOf( "/" );
if( pos < 0 )
diff --git a/libk3b/projects/datacd/k3bisoimager.cpp \
b/libk3b/projects/datacd/k3bisoimager.cpp index 874a0f0..70c1e55 100644
--- a/libk3b/projects/datacd/k3bisoimager.cpp
+++ b/libk3b/projects/datacd/k3bisoimager.cpp
@@ -1035,7 +1035,7 @@ QString K3b::IsoImager::dummyDir( K3b::DirItem* dir )
// This might become important in case we will allow multiple instances of the \
isoimager // to run at the same time.
//
- QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber );
+ QString jobId = qApp->sessionId() + '_' + QString::number( m_sessionNumber );
if( !_appDir.cd( jobId ) ) {
_appDir.mkdir( jobId );
@@ -1050,13 +1050,13 @@ QString K3b::IsoImager::dummyDir( K3b::DirItem* dir )
if( !dir->localPath().isEmpty() ) {
// permissions
if( k3b_stat( QFile::encodeName(dir->localPath()), &statBuf ) == 0 ) {
- name += "_";
+ name += '_';
name += QString::number( statBuf.st_uid );
- name += "_";
+ name += '_';
name += QString::number( statBuf.st_gid );
- name += "_";
+ name += '_';
name += QString::number( statBuf.st_mode );
- name += "_";
+ name += '_';
name += QString::number( statBuf.st_mtime );
perm = true;
@@ -1080,13 +1080,13 @@ QString K3b::IsoImager::dummyDir( K3b::DirItem* dir )
}
}
- return _appDir.absolutePath() + "/";
+ return _appDir.absolutePath() + '/';
}
void K3b::IsoImager::clearDummyDirs()
{
- QString jobId = qApp->sessionId() + "_" + QString::number( m_sessionNumber );
+ QString jobId = qApp->sessionId() + '_' + QString::number( m_sessionNumber );
QDir appDir( KStandardDirs::locateLocal( "appdata", "temp/" ) );
if( appDir.cd( jobId ) ) {
QStringList dummyDirEntries = appDir.entryList( QStringList() << \
"dummydir*", QDir::Dirs );
diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp \
b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index 89fad60..d3fc191 100644
--- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp
+++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp
@@ -150,7 +150,7 @@ void K3b::MsInfoFetcher::slotMediaDetectionFinished( \
K3b::Device::DeviceHandler* }
else {
emit infoMessage( i18n("Could not open Iso9660 filesystem in %1.",
- m_device->vendor() + " " + \
m_device->description() ), MessageError ); + \
m_device->vendor() + ' ' + m_device->description() ), MessageError ); jobFinished( \
false ); }
}
diff --git a/libk3b/projects/k3bcdrdaowriter.cpp \
b/libk3b/projects/k3bcdrdaowriter.cpp index 3d2b26b..da252ef 100644
--- a/libk3b/projects/k3bcdrdaowriter.cpp
+++ b/libk3b/projects/k3bcdrdaowriter.cpp
@@ -641,7 +641,7 @@ bool K3b::CdrdaoWriter::cueSheet()
return false;
line = line.mid( pos, endPos-pos );
- QFileInfo fi( QFileInfo( m_tocFile ).path() + "/" + QFileInfo( line \
).fileName() ); + QFileInfo fi( QFileInfo( m_tocFile ).path() + '/' + \
QFileInfo( line ).fileName() ); QString binpath = fi.filePath();
kDebug() << QString("K3b::CdrdaoWriter::cueSheet() BinFilePath from \
CueFile: %1").arg( line );
kDebug() << QString("K3b::CdrdaoWriter::cueSheet() absolute BinFilePath: \
%1").arg( binpath );
diff --git a/libk3b/projects/k3bcuefileparser.cpp \
b/libk3b/projects/k3bcuefileparser.cpp index f255233..1071795 100644
--- a/libk3b/projects/k3bcuefileparser.cpp
+++ b/libk3b/projects/k3bcuefileparser.cpp
@@ -169,7 +169,7 @@ bool K3b::CueFileParser::parseLine( QString& line )
simplified( line );
// skip comments and empty lines
- if( line.startsWith("REM") || line.startsWith("#") || line.isEmpty() )
+ if( line.startsWith("REM") || line.startsWith('#') || line.isEmpty() )
return true;
diff --git a/libk3b/projects/k3bgrowisofswriter.cpp \
b/libk3b/projects/k3bgrowisofswriter.cpp index b036bf6..aa175d1 100644
--- a/libk3b/projects/k3bgrowisofswriter.cpp
+++ b/libk3b/projects/k3bgrowisofswriter.cpp
@@ -203,7 +203,7 @@ bool K3b::GrowisofsWriter::prepareProcess()
d->process << d->growisofsBin;
- QString s = burnDevice()->blockDeviceName() + "=";
+ QString s = burnDevice()->blockDeviceName() + '=';
if( d->image.isEmpty() ) {
// we always read from stdin
s += "/dev/fd/0";
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp \
b/libk3b/projects/mixedcd/k3bmixedjob.cpp index b16daf2..9564352 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.cpp
+++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp
@@ -620,7 +620,7 @@ void K3b::MixedJob::slotAudioDecoderNextTrack( int t, int tt )
tt,
( track->title().isEmpty() || \
track->artist().isEmpty() ? QString()
- : " (" + track->artist() + " - " + track->title() + \
")" ) ) ); + : " (" + track->artist() + " - " + \
track->title() + ')' ) ) ); }
}
@@ -883,7 +883,7 @@ void K3b::MixedJob::slotWriterNextTrack( int t, int )
,m_doc->numOfTracks()
, track->title().isEmpty() || \
track->artist().isEmpty() ? QString()
- : " (" + track->artist() + " - " + track->title() + \
")" ) ); + : " (" + track->artist() + " - " + \
track->title() + ')' ) ); else
emit newSubTask( i18n("Writing track %1 of %2 (%3)",
t,
diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp \
b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 7d68121..a59f32f 100644
--- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
+++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp
@@ -307,8 +307,8 @@ bool K3b::MovixDocPreparer::addMovixFiles()
for( QStringList::const_iterator it = helpFiles.constBegin();
it != helpFiles.constEnd(); ++it ) {
// some emovix installations include backup-files, no one's perfect ;)
- if( !(*it).endsWith( "~" ) )
- d->isolinuxDir->addDataItem( new K3b::FileItem( path + "/" + *it, \
*d->doc ) ); + if( !(*it).endsWith( '~' ) )
+ d->isolinuxDir->addDataItem( new K3b::FileItem( path + '/' + *it, \
*d->doc ) ); }
@@ -327,7 +327,7 @@ bool K3b::MovixDocPreparer::addMovixFiles()
QStringList fontFiles = dir.entryList( QDir::Files );
for( QStringList::const_iterator it = fontFiles.constBegin();
it != fontFiles.constEnd(); ++it ) {
- fontDir->addDataItem( new K3b::FileItem( fontPath + "/" + *it, \
*d->doc ) ); + fontDir->addDataItem( new K3b::FileItem( fontPath + '/' \
+ *it, *d->doc ) ); }
}
else {
diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp \
b/libk3b/projects/videocd/k3bvcddoc.cpp index f0485d6..2529750 100644
--- a/libk3b/projects/videocd/k3bvcddoc.cpp
+++ b/libk3b/projects/videocd/k3bvcddoc.cpp
@@ -239,7 +239,7 @@ K3b::VcdTrack* K3b::VcdDoc::createTrack( const KUrl& url )
if ( numOfTracks() > 0 && vcdOptions() ->mpegVersion() != mpegVersion ) \
{
- KMessageBox::error( kapp->activeWindow(), "(" + url.toLocalFile() + \
")\n" + + KMessageBox::error( kapp->activeWindow(), '(' + \
url.toLocalFile() + ")\n" + i18n( "You cannot mix MPEG1 and MPEG2 video \
files.\nPlease start a new Project for this filetype.\nResample not implemented in \
K3b yet." ),
i18n( "Wrong File Type for This Project" ) );
@@ -283,7 +283,7 @@ K3b::VcdTrack* K3b::VcdDoc::createTrack( const KUrl& url )
}
// error (unsupported files)
- KMessageBox::error( kapp->activeWindow(), "(" + url.toLocalFile() + ")\n" +
+ KMessageBox::error( kapp->activeWindow(), '(' + url.toLocalFile() + ")\n" +
i18n( "Only MPEG1 and MPEG2 video files are supported.\n" ) \
+ error_string , i18n( "Wrong File Format" ) );
diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp \
b/libk3b/projects/videocd/k3bvcdjob.cpp index 348b399..af84336 100644
--- a/libk3b/projects/videocd/k3bvcdjob.cpp
+++ b/libk3b/projects/videocd/k3bvcdjob.cpp
@@ -290,7 +290,7 @@ void K3b::VcdJob::slotParseVcdxBuildOutput( const QString& line )
if ( oper == "scan" ) {
// Scan Video Files
if ( m_stage == stageUnknown || pos < m_bytesFinished ) {
- const uint index = el.attribute( "id" ).replace( QRegExp( \
"sequence-" ), "" ).toUInt(); + const uint index = el.attribute( \
"id" ).remove( QRegExp( "sequence-" ) ).toUInt();
m_currentWrittenTrack = m_doc->at( m_currentWrittenTrackNumber \
);
emit newSubTask( i18n( "Scanning video file %1 of %2 (%3)" , \
index + 1 , doc() ->numOfTracks() , m_currentWrittenTrack->fileName() \
) );
diff --git a/libk3b/tools/k3bcddb.cpp b/libk3b/tools/k3bcddb.cpp
index 4a64d95..f624298 100644
--- a/libk3b/tools/k3bcddb.cpp
+++ b/libk3b/tools/k3bcddb.cpp
@@ -67,10 +67,10 @@ int K3b::CDDB::MultiEntriesDialog::selectCddbEntry( const \
KCDDB::CDInfoList& ent
int i = 1;
foreach( const KCDDB::CDInfo& info, entries ) {
- d.m_listBox->addItem( QString::number(i++) + " " +
+ d.m_listBox->addItem( QString::number(i++) + ' ' +
info.get( KCDDB::Artist ).toString() + " - " +
info.get( KCDDB::Title ).toString() + " (" +
- info.get( KCDDB::Category ).toString() + ")" );
+ info.get( KCDDB::Category ).toString() + ')' );
}
d.m_listBox->setCurrentRow( 0 );
diff --git a/libk3b/tools/k3bdevicehandler.cpp b/libk3b/tools/k3bdevicehandler.cpp
index 1ddc473..78680a8 100644
--- a/libk3b/tools/k3bdevicehandler.cpp
+++ b/libk3b/tools/k3bdevicehandler.cpp
@@ -325,7 +325,7 @@ QDebug operator<<( QDebug dbg, \
K3b::Device::DeviceHandler::Commands commands ) commandStrings << QLatin1String( \
"CommandBufferCapacity" );
if ( commands & K3b::Device::DeviceHandler::CommandNextWritableAddress )
commandStrings << QLatin1String( "CommandNextWritableAddress" );
- dbg.nospace() << "(" + commandStrings.join( "|" ) + ")";
+ dbg.nospace() << '(' + commandStrings.join( "|" ) + ')';
return dbg.space();
}
diff --git a/libk3b/tools/k3bintvalidator.cpp b/libk3b/tools/k3bintvalidator.cpp
index 9e399c8..28b7010 100644
--- a/libk3b/tools/k3bintvalidator.cpp
+++ b/libk3b/tools/k3bintvalidator.cpp
@@ -54,7 +54,7 @@ QValidator::State K3b::IntValidator::validate ( QString &str, int & \
) const
if( newStr.length() ) {
// check for < 0
- bool minus = newStr.startsWith( "-" );
+ bool minus = newStr.startsWith( '-' );
if( minus )
newStr.remove( 0, 1 );
diff --git a/libk3b/tools/k3biso9660.cpp b/libk3b/tools/k3biso9660.cpp
index 29db4cc..fcf14dd 100644
--- a/libk3b/tools/k3biso9660.cpp
+++ b/libk3b/tools/k3biso9660.cpp
@@ -116,7 +116,7 @@ int K3b::Iso9660::isofs_callback( struct iso_directory_record \
*idr, void *udata if( pos > 0 )
path.truncate( pos );
}
- if (path.endsWith(".")) path.truncate(path.length()-1);
+ if (path.endsWith('.')) path.truncate(path.length()-1);
}
}
@@ -572,7 +572,7 @@ void K3b::Iso9660::addBoot(struct el_torito_boot_descriptor* \
bootdesc)
isonum_721(((struct default_entry*) \
be->data)->seccount), this);
path="Default Image";
- if (i>1) path += " (" + QString::number(i) + ")";
+ if (i>1) path += " (" + QString::number(i) + ')';
entry=new K3b::Iso9660File( this, path, path, dirent->permissions() & \
~S_IFDIR,
dirent->date(), dirent->adate(), \
dirent->cdate(),
dirent->user(), dirent->group(), QString(),
@@ -669,7 +669,7 @@ bool K3b::Iso9660::open()
if( !memcmp( EL_TORITO_ID, bootdesc->system_id, ISODCL(8,39) ) ) {
path="El Torito Boot";
if( c_b > 1 )
- path += " (" + QString::number(c_b) + ")";
+ path += " (" + QString::number(c_b) + ')';
dirent = new K3b::Iso9660Directory( this, path, path, access | \
S_IFDIR,
buf.st_mtime, buf.st_atime, \
buf.st_ctime, uid, gid, QString() ); @@ -697,12 +697,12 @@ bool K3b::Iso9660::open()
if (m_joliet) {
path = "Joliet level " + QString::number(m_joliet);
if( c_j > 1 )
- path += " (" + QString::number(c_j) + ")";
+ path += " (" + QString::number(c_j) + ')';
}
else {
path = QString::fromLocal8Bit( primaryDesc->volume_id, 32 );
if( c_i > 1 )
- path += " (" + QString::number(c_i) + ")";
+ path += " (" + QString::number(c_i) + ')';
}
dirent = new K3b::Iso9660Directory( this, path, path, access | S_IFDIR,
diff --git a/libk3b/tools/k3bprocess.cpp b/libk3b/tools/k3bprocess.cpp
index fa6dc90..8109d21 100644
--- a/libk3b/tools/k3bprocess.cpp
+++ b/libk3b/tools/k3bprocess.cpp
@@ -47,7 +47,7 @@ namespace {
if( data[i] == '\r' )
buffer += '\n';
else if( data[i] == '\t' ) // replace tabs with a single space
- buffer += " ";
+ buffer += ' ';
else
buffer += data[i];
}
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index fad37f8..dabfc91 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -309,7 +309,7 @@ bool K3b::Device::DeviceManager::readConfig( const KConfigGroup& \
c )
for( QList<K3b::Device::Device*>::iterator it = d->allDevices.begin(); it != \
d->allDevices.end(); ++it ) { K3b::Device::Device* dev = *it;
- QString configEntryName = dev->vendor() + " " + dev->description();
+ QString configEntryName = dev->vendor() + ' ' + dev->description();
QStringList list = c.readEntry( configEntryName, QStringList() );
if( !list.isEmpty() ) {
kDebug() << "(K3b::Device::DeviceManager) found config entry for \
devicetype: " << configEntryName; @@ -341,7 +341,7 @@ bool \
K3b::Device::DeviceManager::saveConfig( KConfigGroup c ) Q_FOREACH( Device* dev, \
d->allDevices ) {
// save the device type settings
- QString configEntryName = dev->vendor() + " " + dev->description();
+ QString configEntryName = dev->vendor() + ' ' + dev->description();
QStringList list;
list << QString::number(dev->maxReadSpeed())
<< QString::number(dev->maxWriteSpeed());
diff --git a/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp \
b/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp index a1074a1..ccf8171 \
100644
--- a/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoderconfigwidget.cpp
@@ -108,7 +108,7 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget()
void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val )
{
- w->m_labelQualityLevel->setText( QString::number(val) + " "
+ w->m_labelQualityLevel->setText( QString::number(val) + ' '
+ i18n("(targeted VBR of \
%1)",s_rough_average_quality_level_bitrates[val+1]) ); }
diff --git a/src/k3b.cpp b/src/k3b.cpp
index f7affb4..7cb91f2 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -693,7 +693,7 @@ void K3b::MainWindow::saveProperties( KConfigGroup& grp )
// 3. save the url of the project (might be something like "AudioCD1") in the \
config // 4. save the status of every project (modified/saved)
- QString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + \
qApp->sessionId() + "/", true ); + QString saveDir = \
KGlobal::dirs()->saveLocation( "appdata", "sessions/" + qApp->sessionId() + '/', true \
);
// // FIXME: for some reason the config entries are not properly stored when \
using the default // // KMainWindow session config. Since I was not able \
to find the bug I use another config object @@ -744,7 +744,7 @@ void \
K3b::MainWindow::readProperties( const KConfigGroup& grp ) // 3. reset the saved \
urls and the modified state // 4. delete "~/.kde/share/apps/k3b/sessions/" + \
KApp->sessionId()
- QString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + \
qApp->sessionId() + "/", true ); + QString saveDir = \
KGlobal::dirs()->saveLocation( "appdata", "sessions/" + qApp->sessionId() + '/', true \
);
// // FIXME: for some reason the config entries are not properly stored when \
using the default // // KMainWindow session config. Since I was not able \
to find the bug I use another config object
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index ca13760..8bd8cc1 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -294,7 +294,7 @@ void K3b::AppDeviceManager::setReadSpeed()
"and the spinning noise is \
intrusive."
"<p>Be aware that this has no \
influence on K3b since it will "
"change the reading speed again when \
copying CDs or DVDs."
- ,currentDevice()->vendor() + " " + \
currentDevice()->description()), + \
,currentDevice()->vendor() + ' ' + currentDevice()->description()), 12,
1,
currentDevice()->maxReadSpeed(),
diff --git a/src/k3bdebuggingoutputcache.cpp b/src/k3bdebuggingoutputcache.cpp
index 42da898..43e7e4e 100644
--- a/src/k3bdebuggingoutputcache.cpp
+++ b/src/k3bdebuggingoutputcache.cpp
@@ -77,7 +77,7 @@ void K3b::DebuggingOutputCache::clear()
K3b::Device::Device* dev = *it;
addOutput( "Devices",
QString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .arg( dev->vendor() + " " + dev->description() + " " + \
dev->version() ) + .arg( dev->vendor() + ' ' + dev->description() + \
' ' + dev->version() )
.arg( dev->blockDeviceName() )
.arg( K3b::Device::deviceTypeString( dev->type() ) )
.arg( K3b::Device::mediaTypeString( dev->supportedProfiles() ) )
diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp
index 2a60c5c..49279a5 100644
--- a/src/k3bdebuggingoutputfile.cpp
+++ b/src/k3bdebuggingoutputfile.cpp
@@ -48,7 +48,7 @@ bool K3b::DebuggingOutputFile::open( OpenMode mode )
Q_FOREACH( K3b::Device::Device* dev, k3bcore->deviceManager()->allDevices() ) {
addOutput( "Devices",
QString( "%1 (%2, %3) [%5] [%6] [%7]" )
- .arg( dev->vendor() + " " + dev->description() + " " + \
dev->version() ) + .arg( dev->vendor() + ' ' + dev->description() + \
' ' + dev->version() )
.arg( dev->blockDeviceName() )
.arg( K3b::Device::deviceTypeString( dev->type() ) )
.arg( K3b::Device::mediaTypeString( dev->supportedProfiles() ) )
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index 0ea174a..9feb768 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -337,7 +337,7 @@ QString K3b::DiskInfoView::createMediaInfoItems( const \
K3b::Medium& medium ) if( info.mediaType() & K3b::Device::MEDIA_WRITABLE ) {
QString speedStr;
if( medium.writingSpeeds().isEmpty() ) {
- speedStr = "-";
+ speedStr = '-';
}
else {
foreach( int speed, medium.writingSpeeds() ) {
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index af626a4..1ce6be8 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -80,11 +80,11 @@ K3b::FileView::FileView(QWidget *parent )
d->filterWidget->setEditable( true );
QString filter = i18n("*|All Files");
- filter += "\n" + i18n("audio/x-mp3 audio/x-wav application/x-ogg |Sound Files");
- filter += "\n" + i18n("audio/x-wav |Wave Sound Files");
- filter += "\n" + i18n("audio/x-mp3 |MP3 Sound Files");
- filter += "\n" + i18n("application/x-ogg |Ogg Vorbis Sound Files");
- filter += "\n" + i18n("video/mpeg |MPEG Video Files");
+ filter += '\n' + i18n("audio/x-mp3 audio/x-wav application/x-ogg |Sound Files");
+ filter += '\n' + i18n("audio/x-wav |Wave Sound Files");
+ filter += '\n' + i18n("audio/x-mp3 |MP3 Sound Files");
+ filter += '\n' + i18n("application/x-ogg |Ogg Vorbis Sound Files");
+ filter += '\n' + i18n("video/mpeg |MPEG Video Files");
d->filterWidget->setFilter(filter);
d->actionShowBookmarks = new KAction( i18n("Show Bookmarks"), d->toolBox );
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 20a9461..7b7608e 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -108,7 +108,7 @@ void K3b::StatusBarManager::update()
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
- m_labelFreeTemp->setText(KIO::convertSizeFromKiB(avail) + "/" +
+ m_labelFreeTemp->setText(KIO::convertSizeFromKiB(avail) + '/' +
KIO::convertSizeFromKiB(size) );
// if we have less than 640 MB that is not good
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index c7d3da6..f3e5c46 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -173,7 +173,7 @@ QString K3b::TempDirSelectionWidget::tempDirectory() const
QFileInfo fi( td );
if( fi.exists() && fi.isDir() )
- return td + "/";
+ return td + '/';
// now we treat the last section as a filename and return the path
// in front of it
diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp
index 8923939..e987e28 100644
--- a/src/k3bthememanager.cpp
+++ b/src/k3bthememanager.cpp
@@ -278,7 +278,7 @@ void K3b::ThemeManager::loadThemes()
QStringList entries = dir.entryList( QDir::Dirs|QDir::NoDotAndDotDot );
// every theme dir needs to contain a k3b.theme file
for( QStringList::const_iterator entryIt = entries.constBegin(); entryIt != \
entries.constEnd(); ++entryIt ) {
- QString themeDir = *dirIt + *entryIt + "/";
+ QString themeDir = *dirIt + *entryIt + '/';
if( !themeNames.contains( *entryIt ) && QFile::exists( themeDir + \
"k3b.theme" ) ) { bool themeValid = true;
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index d7d2ecf..1e89d19 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -375,7 +375,7 @@ void K3b::WriterSelectionWidget::insertSpeedItem( int speed )
( speed%Device::SPEED_FACTOR_DVD > 0
? QString::number( \
float(speed)/float(Device::SPEED_FACTOR_DVD), 'f', 1 ) // example: \
DVD+R(W): 2.4x
: QString::number( \
speed/K3b::Device::SPEED_FACTOR_DVD ) )
- + "x",
+ + 'x',
QString(),
insertIndex );
}
diff --git a/src/misc/k3bimagewritingdialog.cpp b/src/misc/k3bimagewritingdialog.cpp
index 9cb9d61..436445b 100644
--- a/src/misc/k3bimagewritingdialog.cpp
+++ b/src/misc/k3bimagewritingdialog.cpp
@@ -324,7 +324,7 @@ void K3b::ImageWritingDialog::Private::createAudioCueItems( const \
K3b::CueFilePa foreach( const K3b::Device::Track& track, cp.toc() ) {
QTreeWidgetItem* trackItem = new QTreeWidgetItem( trackParent );
- trackItem->setText( 0, i18n("Track") + " " + \
QString::number(i).rightJustified( 2, '0' ) ); + trackItem->setText( 0, \
i18n("Track") + ' ' + QString::number(i).rightJustified( 2, '0' ) ); \
trackItem->setText( 1, " " + ( i < cp.toc().count() ? track.length().toString()
: QString("??:??:??") ) );
@@ -450,13 +450,13 @@ void K3b::ImageWritingDialog::setupGui()
d->editImagePath->setMode( KFile::File|KFile::ExistingOnly );
d->editImagePath->setWindowTitle( i18n("Choose Image File") );
d->editImagePath->setFilter( i18n("*.iso *.toc *.ISO *.TOC *.cue *.CUE|Image \
Files")
- + "\n"
+ + '\n'
+ i18n("*.iso *.ISO|ISO9660 Image Files")
- + "\n"
+ + '\n'
+ i18n("*.cue *.CUE|Cue Files")
- + "\n"
+ + '\n'
+ i18n("*.toc *.TOC|Cdrdao TOC Files and Cdrecord \
Clone Images")
- + "\n"
+ + '\n'
+ i18n("*|All Files") );
QHBoxLayout* groupImageUrlLayout = new QHBoxLayout( groupImageUrl );
groupImageUrlLayout->addWidget( d->editImagePath );
diff --git a/src/option/k3badvancedoptiontab.cpp \
b/src/option/k3badvancedoptiontab.cpp index fc8a898..ce43df1 100644
--- a/src/option/k3badvancedoptiontab.cpp
+++ b/src/option/k3badvancedoptiontab.cpp
@@ -62,9 +62,9 @@ void K3b::AdvancedOptionTab::setupGui()
m_checkBurnfree = K3b::StdGuiItems::burnproofCheckbox( groupWritingApp );
m_checkOverburn = new QCheckBox( i18n("Allow &overburning"), groupWritingApp );
m_checkForceUnsafeOperations = new QCheckBox( i18n("&Force unsafe operations"), \
groupWritingApp );
- m_checkManualWritingBufferSize = new QCheckBox( i18n("&Manual writing buffer \
size") + ":", groupWritingApp ); + m_checkManualWritingBufferSize = new QCheckBox( \
i18n("&Manual writing buffer size") + ':', groupWritingApp ); \
m_editWritingBufferSize = new KIntNumInput( 4, groupWritingApp );
- m_editWritingBufferSize->setSuffix( " " + i18n("MB") );
+ m_editWritingBufferSize->setSuffix( ' ' + i18n("MB") );
m_checkShowForceGuiElements = new QCheckBox( i18n("Show &advanced GUI \
elements"), groupWritingApp ); bufferLayout->addWidget( m_checkBurnfree, 0, 0, 1, 3 \
); bufferLayout->addWidget( m_checkOverburn, 1, 0, 1, 2 );
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index c5919ba..faf545f 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -136,7 +136,7 @@ void K3b::DeviceWidget::updateDeviceListViews()
foreach( Device::Device* dev, m_deviceManager->allDevices() ) {
// create the root device item
QTreeWidgetItem* devRoot = new QTreeWidgetItem( (dev->burner() ? \
m_writerParentViewItem : m_readerParentViewItem),
- QStringList() << ( \
dev->vendor() + " " + dev->description() ) ); + \
QStringList() << ( dev->vendor() + ' ' + dev->description() ) ); devRoot->setFont( \
0, fBold );
// create the read-only info items
diff --git a/src/option/k3bexternalbinpermissionmodel.cpp \
b/src/option/k3bexternalbinpermissionmodel.cpp index 803e162..a0e2378 100644
--- a/src/option/k3bexternalbinpermissionmodel.cpp
+++ b/src/option/k3bexternalbinpermissionmodel.cpp
@@ -230,7 +230,7 @@ QVariant ExternalBinPermissionModel::data( const QModelIndex& \
index, int role )
if( d->getProgramInfo( program, owner, group, wantedGroup, perm, \
wantedPerm ) ) {
if( index.column() == PermissionsColumn ) {
- return QString(QString::number( perm, 8 ).rightJustified( 4, \
'0' ) + " " + owner + "." + group); + return \
QString(QString::number( perm, 8 ).rightJustified( 4, '0' ) + ' ' + owner + '.' + \
group);
} else if ( index.column() == NewPermissionsColumn ) {
if( perm != wantedPerm || owner != "root" || group != \
wantedGroup )
return QString("%1 \
root.%2").arg(wantedPerm,0,8).arg(wantedGroup);
diff --git a/src/projects/k3bdatapropertiesdialog.cpp \
b/src/projects/k3bdatapropertiesdialog.cpp index cfe4cb9..3a0ae3f 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -228,8 +228,8 @@ void K3b::DataPropertiesDialog::loadItemProperties( \
K3b::DataItem* dataItem ) m_labelLocalLinkTarget->hide();
m_spacerLine->hide();
m_labelSize->setText( KIO::convertSize(dataItem->size()) + "\n(" +
- i18np("in one file", "in %1 files", \
dirItem->numFiles()) + " " +
- i18np("and one folder", "and %1 folders", \
dirItem->numDirs()) + ")" ); + i18np("in one file", "in \
%1 files", dirItem->numFiles()) + ' ' + + i18np("and one \
folder", "and %1 folders", dirItem->numDirs()) + ')' ); }
else {
m_labelIcon->setPixmap( DesktopIcon("unknown", KIconLoader::SizeLarge) );
@@ -247,12 +247,12 @@ void K3b::DataPropertiesDialog::loadItemProperties( \
K3b::DataItem* dataItem ) m_editName->setText( dataItem->k3bName() );
m_labelBlocks->setText( QString::number(dataItem->blocks().lba()) );
- QString location = "/" + dataItem->k3bPath();
+ QString location = '/' + dataItem->k3bPath();
if( location[location.length()-1] == '/' )
location.truncate( location.length()-1 );
location.truncate( location.lastIndexOf('/') );
if( location.isEmpty() )
- location = "/";
+ location = '/';
m_labelLocation->setText( location );
m_extraInfoLabel->setText( QString( "(%1)" ).arg(dataItem->extraInfo()) );
if( dataItem->extraInfo().isEmpty() )
@@ -316,12 +316,12 @@ void K3b::DataPropertiesDialog::loadListProperties( const \
QList<K3b::DataItem*>& // the location of all items are the same since it is not \
possible to // select items from different folders
// FIXME: maybe better use QString::section?
- QString location = "/" + items.first()->k3bPath();
+ QString location = '/' + items.first()->k3bPath();
if( location[location.length()-1] == '/' )
location.truncate( location.length()-1 );
location.truncate( location.lastIndexOf('/') );
if( location.isEmpty() )
- location = "/";
+ location = '/';
m_labelLocation->setText( location );
diff --git a/src/projects/k3bdataurladdingdialog.cpp \
b/src/projects/k3bdataurladdingdialog.cpp index 62e9ae0..91a643b 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -348,7 +348,7 @@ void K3b::DataUrlAddingDialog::slotAddUrls()
// backup dummy name
if( newName.isEmpty() )
- newName = "1";
+ newName = '1';
K3b::DirItem* newDirItem = 0;
diff --git a/src/projects/k3bfillstatusdisplay.cpp \
b/src/projects/k3bfillstatusdisplay.cpp index 881f647..4eb5f8b 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -594,7 +594,7 @@ void K3b::FillStatusDisplay::slotCustomSize()
defaultCustom = KGlobal::locale()->formatNumber(4.4,1) + gbS;
}
- QRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + \
"|" + mbS + "|" + minS + ")?" ); + QRegExp rx( "(\\d+\\" + \
KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + '|' + mbS + '|' + minS + ")?" \
); bool ok;
QString size = KInputDialog::getText( i18n("Custom Size"),
i18n("<p>Please specify the size of the \
medium. Use suffixes <b>GB</b>,<b>MB</b>, " @@ -609,7 +609,7 @@ void \
K3b::FillStatusDisplay::slotCustomSize() if( rx.exactMatch( size ) ) {
QString valStr = rx.cap(1);
if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) )
- valStr += "0";
+ valStr += '0';
double val = KGlobal::locale()->readNumber( valStr, &ok );
if( ok ) {
QString s = rx.cap(2);
@@ -847,7 +847,7 @@ bool K3b::FillStatusDisplay::event( QEvent* event )
KIO::convertSize( d->doc->size() ) +
" (" + KGlobal::locale()->formatNumber( d->doc->size(), \
0 ) + "), " +
i18n("%1 min", d->doc->length().toString(false)) +
- " (" + i18n("Right click for media sizes") + ")");
+ " (" + i18n("Right click for media sizes") + ')');
event->accept();
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index f9a7d50..366e0b3 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -570,7 +570,7 @@ void K3b::VcdBurnDialog::saveSettingsToProject()
doc() ->setOnTheFly( false );
// save image file & path (.bin)
- vcdDoc() ->setVcdImage( m_tempDirSelectionWidget->tempPath() + "/" + \
m_editVolumeId->text() + ".bin" ); + vcdDoc() ->setVcdImage( \
m_tempDirSelectionWidget->tempPath() + '/' + m_editVolumeId->text() + ".bin" );
vcdDoc() ->setVcdType( m_radioVcd11->group()->id( \
m_radioVcd11->group()->checkedButton() ) );
diff --git a/src/projects/kostore/KoStore.cpp b/src/projects/kostore/KoStore.cpp
index 405f1cf..922bc1c 100644
--- a/src/projects/kostore/KoStore.cpp
+++ b/src/projects/kostore/KoStore.cpp
@@ -547,8 +547,8 @@ bool KoStore::extractFile( const QString &srcName, QIODevice \
&buffer )
QStringList KoStore::addLocalDirectory( const QString &dirPath, const QString \
&destName ) {
- QString dot = ".";
- QString dotdot = "..";
+ QString dot(".");
+ QString dotdot("..");
QStringList content;
QDir dir(dirPath);
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 77da736..7f01c4d 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -199,7 +199,7 @@ void K3b::AudioCdView::updateTitle()
if( !title.isEmpty() ) {
QString s( title );
if( !artist.isEmpty() )
- s += " (" + artist + ")";
+ s += " (" + artist + ')';
setTitle( s );
}
else {
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp \
b/src/rip/k3baudioprojectconvertingdialog.cpp index de72438..8ce3a05 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -274,7 +274,7 @@ void K3b::AudioProjectConvertingDialog::refresh()
item->setText( 1, m_doc->length().toString() );
item->setText( 2, filesize < 0 ? i18n("unknown") : KIO::convertSize( \
filesize ) );
- d->filenames.append( K3b::fixupPath( baseDir + "/" + filename ) );
+ d->filenames.append( K3b::fixupPath( baseDir + '/' + filename ) );
if( m_optionWidget->createCueFile() ) {
QString cueFilename = K3b::PatternParser::parsePattern( cddbEntry, 1,
@@ -313,7 +313,7 @@ void K3b::AudioProjectConvertingDialog::refresh()
item->setText( 1, track->length().toString() );
item->setText( 2, filesize < 0 ? i18n("unknown") : KIO::convertSize( \
filesize ) );
- d->filenames[ track->trackNumber()-1 ] = K3b::fixupPath( baseDir + "/" + \
filename ); + d->filenames[ track->trackNumber()-1 ] = K3b::fixupPath( \
baseDir + '/' + filename ); }
}
@@ -330,7 +330,7 @@ void K3b::AudioProjectConvertingDialog::refresh()
item->setText( 1, "-" );
item->setText( 2, "-" );
- d->playlistFilename = K3b::fixupPath( baseDir + "/" + filename );
+ d->playlistFilename = K3b::fixupPath( baseDir + '/' + filename );
}
if( overallSize > 0 )
diff --git a/src/rip/k3baudioripjob.cpp b/src/rip/k3baudioripjob.cpp
index 3765eb2..133ae46 100644
--- a/src/rip/k3baudioripjob.cpp
+++ b/src/rip/k3baudioripjob.cpp
@@ -201,7 +201,7 @@ QString AudioRipJob::jobDescription() const
QString AudioRipJob::jobSource() const
{
if( d->device )
- return d->device->vendor() + " " + d->device->description();
+ return d->device->vendor() + ' ' + d->device->description();
else
return QString();
}
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 881461c..3565507 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -403,7 +403,7 @@ void K3b::AudioRippingDialog::refresh()
\
m_patternWidget->replaceBlanks(),
\
m_patternWidget->blankReplaceString() ); if ( filename.isEmpty() ){
- filename = i18n("Track%1", QString::number( trackIndex+1 \
).rightJustified( 2, '0' ) ) + "." + extension; + filename = \
i18n("Track%1", QString::number( trackIndex+1 ).rightJustified( 2, '0' ) ) + '.' + \
extension; }
filename = d->fsInfo.fixupPath( filename );
@@ -426,7 +426,7 @@ void K3b::AudioRippingDialog::refresh()
d->addTrack( filename, "-", "-", i18n("Playlist") );
- d->playlistFilename = d->fsInfo.fixupPath( baseDir + "/" + filename );
+ d->playlistFilename = d->fsInfo.fixupPath( baseDir + '/' + filename );
}
if( overallSize > 0 )
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 27a47bf..2213838 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -355,7 +355,7 @@ void K3b::VideoCdView::updateDisplay()
}
if ( !d->videocdinfoResult.volumeId.isEmpty() ) {
- QString description = d->videocdinfoResult.volumeId + " (" + \
d->videocdinfoResult.type + " " + d->videocdinfoResult.version + ")" ; + \
QString description = d->videocdinfoResult.volumeId + " (" + \
d->videocdinfoResult.type + ' ' + d->videocdinfoResult.version + ')' ; setTitle( \
description ); d->videooptions ->setVideoCdDescription( description );
}
@@ -532,10 +532,10 @@ void K3b::VideoCdView::buildTree( QTreeWidgetItem* parentItem, \
const QDomElement QString txt = node.firstChild().toElement().text();
thisItem->setText( 0, txt);
if ( node.nodeName() == "folder" ) {
- buildTree( thisItem, node.toElement(), pname + "_" + txt.toLower() \
); + buildTree( thisItem, node.toElement(), pname + '_' + \
txt.toLower() ); }
else {
- thisItem->setText( 1, pname + "_" + txt.toLower() );
+ thisItem->setText( 1, pname + '_' + txt.toLower() );
buildTree( thisItem, node.toElement(), pname );
}
} else if ( (node.isElement() && node.nodeName() == "segment-item") || \
node.nodeName() == "sequence-item" ) {
diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp \
b/src/rip/videodvd/k3bvideodvdrippingview.cpp index d4598c9..9a8294f 100644
--- a/src/rip/videodvd/k3bvideodvdrippingview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp
@@ -234,7 +234,7 @@ void K3b::VideoDVDRippingView::slotShowFiles()
QUrl url;
url.setScheme( "videodvd" );
if( d->dvd.valid() ) {
- url.setPath( "/" + d->dvd.volumeIdentifier() );
+ url.setPath( '/' + d->dvd.volumeIdentifier() );
}
QDesktopServices::openUrl( url );
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic