[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/noatun
From: Thomas Häber <thomas () haeber ! de>
Date: 2006-09-23 3:14:26
Message-ID: 1158981266.044407.6745.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 587520 by haeber:
changed single chars from QString to QChar -> faster (with help of English Breakfast \
Network)
M +2 -2 library/engine.cpp
M +1 -1 library/titleproxy.cpp
M +1 -1 library/vequalizer.cpp
M +3 -3 modules/htmlexport/htmlexport.cpp
M +1 -1 modules/infrared/lirc.cpp
M +5 -5 modules/kjofol-skin/kjprefs.cpp
M +1 -1 modules/kjofol-skin/parser.cpp
M +1 -1 modules/metatag/edit.cpp
M +1 -1 modules/simple/userinterface.cpp
M +3 -3 modules/winskin/waSkin.cpp
M +1 -1 modules/winskin/waSkinManager.cpp
M +15 -15 modules/winskin/waSkinModel.cpp
--- trunk/KDE/kdemultimedia/noatun/library/engine.cpp #587519:587520
@@ -483,7 +483,7 @@
}
cmdline = QFile::encodeName(KStandardDirs::findExe(QString::fromLatin1("kdeinit_wrapper")));
- cmdline += " ";
+ cmdline += ' ';
if (rt)
cmdline += QFile::encodeName(KStandardDirs::findExe(
@@ -492,7 +492,7 @@
cmdline += QFile::encodeName(KStandardDirs::findExe(
QString::fromLatin1("artsd")));
- cmdline += " ";
+ cmdline += ' ';
cmdline += config.readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 \
-f").utf8();
int status=::system(cmdline);
--- trunk/KDE/kdemultimedia/noatun/library/titleproxy.cpp #587519:587520
@@ -148,7 +148,7 @@
QCString username = m_url.user().utf8();
QCString password = m_url.pass().utf8();
- QCString authString = KCodecs::base64Encode( username + ":" + password );
+ QCString authString = KCodecs::base64Encode( username + ':' + password );
bool auth = !( username.isEmpty() && password.isEmpty() );
QString request = QString( "GET %1 HTTP/1.0\r\n"
--- trunk/KDE/kdemultimedia/noatun/library/vequalizer.cpp #587519:587520
@@ -162,7 +162,7 @@
if (f<991)
format=QString::number(f);
else
- format=QString::number((int)((f+500)/1000.0))+"k";
+ format=QString::number((int)((f+500)/1000.0))+'k';
if (withHz)
format+="Hz";
--- trunk/KDE/kdemultimedia/noatun/modules/htmlexport/htmlexport.cpp #587519:587520
@@ -155,15 +155,15 @@
c = config->readColorEntry( s );
tmp = QString::number( c.red(), 16);
- if (tmp.length()==1) tmp="0"+tmp;
+ if (tmp.length()==1) tmp='0'+tmp;
res = tmp;
tmp = QString::number( c.green(), 16);
- if (tmp.length()==1) tmp="0"+tmp;
+ if (tmp.length()==1) tmp='0'+tmp;
res += tmp;
tmp = QString::number( c.blue(), 16);
- if (tmp.length()==1) tmp="0"+tmp;
+ if (tmp.length()==1) tmp='0'+tmp;
res += tmp;
return res;
--- trunk/KDE/kdemultimedia/noatun/modules/infrared/lirc.cpp #587519:587520
@@ -165,7 +165,7 @@
void Lirc::sendCommand(const QString &command)
{
- QString cmd = command + "\n";
+ QString cmd = command + '\n';
m_socket->writeBlock(cmd.latin1(), cmd.length());
}
--- trunk/KDE/kdemultimedia/noatun/modules/kjofol-skin/kjprefs.cpp #587519:587520
@@ -406,7 +406,7 @@
// create a dir with name of the skinarchive
// path to unpack to: pathToTmp/filename.ext/
- QString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+"/" );
+ QString tmpUnpackPath = locateLocal("tmp", srcFile.fileName()+'/' );
kDebug(66666) << "tmpUnpackPath: " << tmpUnpackPath.latin1() << endl;
// Our extract-process, TODO: wanna have kio_(un)zip instead :)
@@ -621,7 +621,7 @@
if ( rcFiles[j].left(rcFiles[j].length()-3) == s ) // found $s.rc :)
{
// kDebug(66666) << "expand() found: " << \
QString(skinLocations[i]+skinDirs[k]+"/"+rcFiles[j]).latin1() << \
endl;
- return (skinLocations[i]+skinDirs[k]+"/"+rcFiles[j]);
+ return (skinLocations[i]+skinDirs[k]+'/'+rcFiles[j]);
}
}
}
@@ -636,12 +636,12 @@
int number=(int)names.count();
for (QStringList::Iterator i=names.begin(); i!=names.end(); ++i)
{
- full+="/";
+ full+='/';
if (number<=badNodes)
{
QDir d(full);
QStringList files=d.entryList();
- files=files.grep(QRegExp("^"+ (*i) + "$", false));
+ files=files.grep(QRegExp('^'+ (*i) + '$', false));
if (!files.count())
return "";
*i=files.grep(*i, false)[0];
@@ -653,6 +653,6 @@
}
if (filename.right(1)=="/")
- full+="/";
+ full+='/';
return full;
}
--- trunk/KDE/kdemultimedia/noatun/modules/kjofol-skin/parser.cpp #587519:587520
@@ -56,7 +56,7 @@
if (first=="about")
{
if (!mSkinAbout.isEmpty())
- mSkinAbout+="\n";
+ mSkinAbout+='\n';
mSkinAbout += line.mid(6);
// kDebug(66666) << "found About-line, mSkinAbout is now '" << mSkinAbout << "'" \
<< endl;
--- trunk/KDE/kdemultimedia/noatun/modules/metatag/edit.cpp #587519:587520
@@ -261,7 +261,7 @@
mGrid->addMultiCellWidget(meta_widget->widget, mNextRow, mNextRow, 1, 2);
// Add our label. This is the easy part
- tmp_label = new QLabel(meta_widget->widget, label + ":", parent);
+ tmp_label = new QLabel(meta_widget->widget, label + ':', parent);
mGrid->addWidget(tmp_label, mNextRow, 0);
--- trunk/KDE/kdemultimedia/noatun/modules/simple/userinterface.cpp #587519:587520
@@ -343,7 +343,7 @@
void SimpleUI::slotVolumeChanged( int volume )
{
- volumeLabel->setText( QString::number( volume ) + "%" );
+ volumeLabel->setText( QString::number( volume ) + '%' );
volumeSlider->setValue( 100 - volume );
}
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/waSkin.cpp #587519:587520
@@ -462,8 +462,8 @@
if (!napp->playlist()->current()) {
title = "Noatun ";
- title += QString::number(NOATUN_MAJOR) + ".";
- title += QString::number(NOATUN_MINOR) + ".";
+ title += QString::number(NOATUN_MAJOR) + '.';
+ title += QString::number(NOATUN_MINOR) + '.';
title += QString::number(NOATUN_PATCHLEVEL);
}
else {
@@ -472,7 +472,7 @@
title = napp->playlist()->current().title();
if (length >= 0)
- title += " (" + getTimeString(length) + ")";
+ title += " (" + getTimeString(length) + ')';
if (title.length() > 30) {
// It's scrolling; provide the nice, friendly seperator.
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/waSkinManager.cpp #587519:587520
@@ -82,7 +82,7 @@
return false;
QString base_path;
- base_path = location + "/" + \
QFileInfo(url.path()).baseName().replace(QRegExp("_"), " "); + base_path = location \
+ '/' + QFileInfo(url.path()).baseName().replace(QRegExp("_"), " "); KIO::Job *job = \
KIO::copy("zip:" + url.path(), base_path); connect(job, SIGNAL(result(KIO::Job *)), \
this, SIGNAL(updateSkinList()));
--- trunk/KDE/kdemultimedia/noatun/modules/winskin/waSkinModel.cpp #587519:587520
@@ -118,7 +118,7 @@
continue;
if (fileInfo.filePath().lower() == filename)
- return dir.absPath() + "/" + QString(fileInfo.filePath());
+ return dir.absPath() + '/' + QString(fileInfo.filePath());
}
return "";
@@ -354,15 +354,15 @@
bitBlt(dest, x, y,pix,30*5,6,5,6);
return;
}
- if (('â' == text) || (' ' == text)) {
+ if (('� == text) || ('� == text)) {
bitBlt(dest, x, y,pix,0*5,12,5,6);
return;
}
- if (('ö' == text) || ('Ö' == text)) {
+ if (('� == text) || ('� == text)) {
bitBlt(dest, x, y,pix,1*5,12,5,6);
return;
}
- if (('ä' == text) || ('Ä' == text)) {
+ if (('� == text) || ('� == text)) {
bitBlt(dest, x, y,pix,2*5,12,5,6);
return;
}
@@ -419,37 +419,37 @@
QChar WaSkinModel::deaccent(QChar input) {
- if (QString("Á").contains(input))
+ if (QString("�).contains(input))
return 'A';
- if (QString("ÉË").contains(input))
+ if (QString("�").contains(input))
return 'E';
- if (QString("ÍÎ").contains(input))
+ if (QString("�").contains(input))
return 'I';
- if (QString("ÔÓ").contains(input))
+ if (QString("�").contains(input))
return 'O';
- if (QString("ÚÜ").contains(input))
+ if (QString("�").contains(input))
return 'U';
- if (input == 'Ý')
+ if (input == '�)
return 'Y';
- if (QString("áâ").contains(input))
+ if (QString("�").contains(input))
return 'a';
- if (QString("éë").contains(input))
+ if (QString("�").contains(input))
return 'e';
- if (QString("îí").contains(input))
+ if (QString("�").contains(input))
return 'i';
- if (QString("ôó").contains(input))
+ if (QString("�").contains(input))
return 'o';
- if (QString("úü").contains(input))
+ if (QString("").contains(input))
return 'u';
return input;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic