SVN commit 590798 by adridg: EBN: Fix a bunch of single-QChar issues, patch from Robert Scott. M +1 -1 cups/cupsaddsmb2.cpp M +1 -1 cups/kmwbanners.cpp M +7 -7 lpr/apshandler.cpp M +1 -1 lpr/klprprinterimpl.cpp M +3 -3 lpr/lprhandler.cpp M +3 -3 lpr/lprngtoolhandler.cpp M +7 -7 lpr/matichandler.cpp M +3 -3 lpr/printcapentry.cpp M +2 -2 management/kmiconview.cpp M +1 -1 management/kmjobviewer.cpp M +1 -1 management/kmwname.cpp M +1 -1 management/kmwsocketutil.cpp M +1 -1 management/kxmlcommanddlg.cpp M +1 -1 management/networkscanner.cpp --- trunk/KDE/kdelibs/kdeprint/cups/cupsaddsmb2.cpp #590797:590798 @@ -475,7 +475,7 @@ if (m_passwded->text().isEmpty()) m_proc << m_logined->text(); else - m_proc << m_logined->text()+"%"+m_passwded->text(); + m_proc << m_logined->text()+'%'+m_passwded->text(); m_state = Start; m_actionindex = 0; m_buffer.clear(); --- trunk/KDE/kdelibs/kdeprint/cups/kmwbanners.cpp #590797:590798 @@ -146,6 +146,6 @@ { if (m_start->count() > 0) { - p->setOption("kde-banners",m_bans[m_start->currentIndex()]+","+m_bans[m_end->currentIndex()]); + p->setOption("kde-banners",m_bans[m_start->currentIndex()]+','+m_bans[m_end->currentIndex()]); } } --- trunk/KDE/kdelibs/kdeprint/lpr/apshandler.cpp #590797:590798 @@ -72,8 +72,8 @@ if (prt->device().isEmpty()) { QString prot; - QString smbname(sysconfDir() + "/" + prt->printerName() + "/smbclient.conf"); - QString ncpname(sysconfDir() + "/" + prt->printerName() + "/netware.conf"); + QString smbname(sysconfDir() + '/' + prt->printerName() + "/smbclient.conf"); + QString ncpname(sysconfDir() + '/' + prt->printerName() + "/netware.conf"); if (QFile::exists(smbname)) { QMap opts = loadVarFile(smbname); @@ -133,7 +133,7 @@ QMap ApsHandler::loadResources(PrintcapEntry *entry) { - return loadVarFile(sysconfDir() + "/" + (entry ? entry->name : QString()) + "/apsfilterrc"); + return loadVarFile(sysconfDir() + '/' + (entry ? entry->name : QString()) + "/apsfilterrc"); } QMap ApsHandler::loadVarFile(const QString& filename) @@ -215,7 +215,7 @@ manager()->setErrorMsg(i18n("Unsupported backend: %1.", prot)); return NULL; } - QString path = sysconfDir() + "/" + prt->printerName(); + QString path = sysconfDir() + '/' + prt->printerName(); if (!KStandardDirs::makeDir(path, 0755)) { manager()->setErrorMsg(i18n("Unable to create directory %1.", path)); @@ -305,7 +305,7 @@ entry = new PrintcapEntry; entry->addField("lp", Field::String, "/dev/null"); } - QString sd = LprSettings::self()->baseSpoolDir() + "/" + prt->printerName(); + QString sd = LprSettings::self()->baseSpoolDir() + '/' + prt->printerName(); entry->addField("af", Field::String, sd + "/acct"); entry->addField("lf", Field::String, sd + "/log"); entry->addField("if", Field::String, sysconfDir() + "/basedir/bin/apsfilter"); @@ -322,7 +322,7 @@ manager()->setErrorMsg(i18n("The APS driver is not defined.")); return false; } - QFile f(sysconfDir() + "/" + prt->printerName() + "/apsfilterrc"); + QFile f(sysconfDir() + '/' + prt->printerName() + "/apsfilterrc"); if (f.open(QIODevice::WriteOnly)) { QTextStream t(&f); @@ -369,7 +369,7 @@ bool ApsHandler::removePrinter(KMPrinter*, PrintcapEntry *entry) { - QString path(sysconfDir() + "/" + entry->name); + QString path(sysconfDir() + '/' + entry->name); QFile::remove(path + "/smbclient.conf"); QFile::remove(path + "/netware.conf"); QFile::remove(path + "/apsfilterrc"); --- trunk/KDE/kdelibs/kdeprint/lpr/klprprinterimpl.cpp #590797:590798 @@ -44,7 +44,7 @@ cmd = QString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); QString opts = static_cast(KMManager::self())->printOptions(printer); if (!opts.isEmpty()) - cmd += (" " + opts); + cmd += (' ' + opts); return true; } --- trunk/KDE/kdelibs/kdeprint/lpr/lprhandler.cpp #590797:590798 @@ -67,7 +67,7 @@ prt->setLocation(i18n("Remote queue (%1) on %2", val.left(p), val.mid(p+1))); uri.setProtocol("lpd"); uri.setHost(val.mid(p+1)); - uri.setPath("/" + val.left(p)); + uri.setPath('/' + val.left(p)); } else if ((p = val.indexOf('%')) != -1) { @@ -91,7 +91,7 @@ prt->setLocation(i18n("Remote queue (%1) on %2", val, rm)); uri.setProtocol("lpd"); uri.setHost(rm); - uri.setPath("/" + val); + uri.setPath('/' + val); } else prt->setLocation(i18n("Unknown (unrecognized entry)")); @@ -259,7 +259,7 @@ QStringList pathlist = paths.split(':', QString::SkipEmptyParts); for (QStringList::ConstIterator it=pathlist.begin(); it!=pathlist.end(); ++it) { - QString testpath = *it + "/" + dirname; + QString testpath = *it + '/' + dirname; if (::access(QFile::encodeName(testpath), F_OK) == 0) return testpath; } --- trunk/KDE/kdelibs/kdeprint/lpr/lprngtoolhandler.cpp #590797:590798 @@ -61,7 +61,7 @@ { QMap opts = parseXferOptions(entry->field("xfer_options")); QString user, pass; - loadAuthFile(LprSettings::self()->baseSpoolDir() + "/" + entry->name + "/" + opts["authfile"], user, pass); + loadAuthFile(LprSettings::self()->baseSpoolDir() + '/' + entry->name + '/' + opts["authfile"], user, pass); QString uri = buildSmbURI( opts[ "workgroup" ], opts[ "host" ], @@ -296,7 +296,7 @@ { comment.append("QUEUE "); KUrl url( prt->device() ); - lp = url.path().mid(1) + "@" + url.host(); + lp = url.path().mid(1) + '@' + url.host(); } else if (prot == "smb") { @@ -306,7 +306,7 @@ if ( splitSmbURI( prt->device(), work, server, printer, user, passwd ) ) { entry->addField("xfer_options", Field::String, QString::fromLatin1("authfile=\"auth\" crlf=\"0\" hostip=\"\" host=\"%1\" printer=\"%2\" remote_mode=\"SMB\" share=\"//%3/%4\" workgroup=\"%5\"").arg(server).arg(printer).arg(server).arg(printer).arg(work)); - QFile authfile(LprSettings::self()->baseSpoolDir() + "/" + prt->printerName() + "/auth"); + QFile authfile(LprSettings::self()->baseSpoolDir() + '/' + prt->printerName() + "/auth"); if (authfile.open(QIODevice::WriteOnly)) { QTextStream t(&authfile); --- trunk/KDE/kdelibs/kdeprint/lpr/matichandler.cpp #590797:590798 @@ -137,7 +137,7 @@ { url = "socket://" + args[ 1 ]; if ( args.count() > 2 ) - url += ":" + args[ 2 ]; + url += ':' + args[ 2 ]; else url += ":9100"; } @@ -190,9 +190,9 @@ if (prot == "socket") { str += ("| " + m_ncpath); - str += (" " + url.host()); + str += (' ' + url.host()); if (url.port() > 0) - str += (" " + QString::number(url.port())); + str += (' ' + QString::number(url.port())); } else if (prot == "lpd") { @@ -208,7 +208,7 @@ str += ("| (\\n echo \\\"print -\\\"\\n cat \\n) | " + m_smbpath); str += (" \\\"//" + server + "/" + printer + "\\\""); if (!passwd.isEmpty()) - str += (" " + passwd); + str += (' ' + passwd); if (!user.isEmpty()) str += (" -U " + user); if (!work.isEmpty()) @@ -330,7 +330,7 @@ inFile.close(); tmpFile.close(); - QString cmd = "mv " + KProcess::quote(tmpFile.fileName()) + " " + KProcess::quote(outFile); + QString cmd = "mv " + KProcess::quote(tmpFile.fileName()) + ' ' + KProcess::quote(outFile); int status = ::system(QFile::encodeName(cmd).data()); QFile::remove(tmpFile.fileName()); result = (status != -1 && WEXITSTATUS(status) == 0); @@ -378,7 +378,7 @@ DrBase *opt = (optname.isEmpty() ? NULL : driver->findOption(optname)); if (opt) { - line.replace(foo2, "'"+opt->valueText()+"',"); + line.replace(foo2, '\''+opt->valueText()+"',"); } } else if (foo.indexIn(line) != -1) @@ -469,7 +469,7 @@ { if (it.key().startsWith("kde-") || it.key().startsWith("_kde-") || it.key().startsWith( "app-" )) continue; - str += (" " + it.key() + "=" + (*it)); + str += (' ' + it.key() + '=' + (*it)); } if (!str.isEmpty()) str.prepend("-J '").append("'"); --- trunk/KDE/kdelibs/kdeprint/lpr/printcapentry.cpp #590797:590798 @@ -25,14 +25,14 @@ switch (type) { case String: - s += ("=" + value); + s += ('=' + value); break; case Integer: - s += ("#" + value); + s += ('#' + value); break; case Boolean: if (!value.toInt()) - s += "@"; + s += '@'; break; } return s; --- trunk/KDE/kdelibs/kdeprint/management/kmiconview.cpp #590797:590798 @@ -60,9 +60,9 @@ if (m_state & 0x2) f.setItalic(true); QFontMetrics fm(f); if (m_mode == Qt::DockBottom) - tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, Qt::AlignHCenter|Qt::AlignTop|Qt::TextWordWrap|Qt::TextWrapAnywhere, text()+"X"); + tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, Qt::AlignHCenter|Qt::AlignTop|Qt::TextWordWrap|Qt::TextWrapAnywhere, text()+'X'); else - tr = fm.boundingRect(0, 0, 0xFFFFFF, 0xFFFFFF, Qt::AlignLeft|Qt::AlignTop, text()+"X"); + tr = fm.boundingRect(0, 0, 0xFFFFFF, 0xFFFFFF, Qt::AlignLeft|Qt::AlignTop, text()+'X'); // item rect if (m_mode == Qt::DockBottom) --- trunk/KDE/kdelibs/kdeprint/management/kmjobviewer.cpp #590797:590798 @@ -352,7 +352,7 @@ KStatusBar *statusbar = statusBar(); m_stickybox = new QCheckBox( i18n( "Keep window permanent" ), statusbar ); statusbar->addWidget( m_stickybox, 1 ); - statusbar->insertItem(" " + i18n("Max.: %1", i18n("Unlimited"))+ " ", 0, 0); + statusbar->insertItem(' ' + i18n("Max.: %1", i18n("Unlimited"))+ ' ', 0, 0); statusbar->setItemFixed(0); updateStatusBar(); --- trunk/KDE/kdelibs/kdeprint/management/kmwname.cpp #590797:590798 @@ -82,7 +82,7 @@ if (p->option("kde-driver") == "raw") setText(2,i18n("Raw printer")); else - setText(2,p->manufacturer() + " " + p->model()); + setText(2,p->manufacturer() + ' ' + p->model()); setCurrent(0); } --- trunk/KDE/kdelibs/kdeprint/management/kmwsocketutil.cpp #590797:590798 @@ -183,7 +183,7 @@ bar->setRange(0, n); for (int i=0; isetName("_kde-"+m_xmlcmd->name()+"-"+opt->name()); + opt->setName("_kde-"+m_xmlcmd->name()+'-'+opt->name()); grp->addOption(opt); } m_opts.remove(child->text(1)); --- trunk/KDE/kdelibs/kdeprint/management/networkscanner.cpp #590797:590798 @@ -195,7 +195,7 @@ return; d->timer->stop(); - d->socket->connect( d->prefixaddress + "." + QString::number( d->currentaddress ), QString::number(d->port) ); + d->socket->connect( d->prefixaddress + '.' + QString::number( d->currentaddress ), QString::number(d->port) ); kDebug() << "Address: " << d->socket->peerAddress().toString() << endl; d->timer->setSingleShot(true); d->timer->start( d->timeout );