[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/krita
From: Boudewijn Rempt <boud () valdyas ! org>
Date: 2010-08-31 19:41:58
Message-ID: 20100831194158.2E6B6AC876 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1170410 by rempt:
fix krazy issue: Check single-char QString operations for efficiency \
[doublequote_chars].
M +6 -6 image/metadata/kis_meta_data_value.cc
M +4 -4 image/recorder/kis_node_query_path.cc
M +1 -1 image/tests/kis_node_facade_test.cpp
M +1 -1 image/tests/kis_painter_test.cpp
M +9 -9 image/tests/kis_walkers_test.cpp
M +1 -1 plugins/extensions/dockers/colorselectorng/kis_minimal_shade_selector.cpp \
M +2 -2 plugins/extensions/dockers/colorselectorng/kis_shade_selector_lines_settings.cpp \
M +2 -2 plugins/extensions/metadataeditor/metadataeditor.cc
M +1 -1 plugins/extensions/painterlyframework/tests/kis_ks_colorspace_test.cpp \
M +3 -3 plugins/formats/exr/exr_converter.cc
M +3 -3 plugins/paintops/hairy/hairy_brush.cpp
M +3 -3 plugins/paintops/libbrush/abrStructv2.cpp
M +5 -5 plugins/paintops/libbrush/abr_struct_parser.cpp
M +3 -3 plugins/paintops/libbrush/kis_abr_translator.cpp
M +3 -3 plugins/paintops/mypaint/mypaint_brush_resource.cpp
M +1 -1 ui/dialogs/kis_dlg_preferences.cc
--- trunk/koffice/krita/image/metadata/kis_meta_data_value.cc #1170409:1170410
@@ -433,11 +433,11 @@
const Value& val = d->value.array->at(i);
r += val.toString();
if (i != d->value.array->size() - 1) {
- r += ",";
+ r += ',';
}
- r += " ";
+ r += ' ';
}
- r += "}";
+ r += '}';
return r;
}
case Value::Structure: {
@@ -448,11 +448,11 @@
const Value& val = d->value.structure->value(field);
r += field + " => " + val.toString();
if (i != d->value.array->size() - 1) {
- r += ",";
+ r += ',';
}
- r += " ";
+ r += ' ';
}
- r += "}";
+ r += '}';
return r;
}
break;
--- trunk/koffice/krita/image/recorder/kis_node_query_path.cc #1170409:1170410
@@ -144,9 +144,9 @@
{
QString str = "";
if (!d->relative) {
- str = "/";
+ str = '/';
} else if (d->elements.count() == 0) {
- return ".";
+ return QString('.');
}
for (int i = 0; i < d->elements.count(); ++i) {
PathElement pe = d->elements[i];
@@ -162,7 +162,7 @@
break;
}
if (i != d->elements.count() - 1) {
- str += "/";
+ str += '/';
}
}
return str;
@@ -180,7 +180,7 @@
return path;
}
path.d->relative = !(_path.at(0) == '/');
- QStringList indexes = _path.split("/");
+ QStringList indexes = _path.split('/');
if (!path.d->relative) {
indexes.pop_front(); // In case of an absolute path "/1/2", the list is "", \
"1", "2" which is not good }
--- trunk/koffice/krita/image/tests/kis_node_facade_test.cpp #1170409:1170410
@@ -107,7 +107,7 @@
dbgImage << prefix << "\t" << node->at(i) << "node at" << i << " has \
index from parent:" << node->index(node->at(i));
if (node->at(i)->childCount() > 0) {
- dumpNodeStack(node->at(i), prefix + "\t");
+ dumpNodeStack(node->at(i), prefix + '\t');
}
}
--- trunk/koffice/krita/image/tests/kis_painter_test.cpp #1170409:1170410
@@ -47,7 +47,7 @@
// ALL THESE COLORSPACES ARE BROKEN: WE NEED UNITTESTS FOR COLORSPACES!
if (csId.startsWith("KS")) continue;
if (csId.startsWith("Xyz")) continue;
- if (csId.startsWith("Y")) continue;
+ if (csId.startsWith('Y')) continue;
if (csId.contains("AF")) continue;
if (csId == "GRAYU16") continue; // No point in testing bounds with a cs \
without alpha
--- trunk/koffice/krita/image/tests/kis_walkers_test.cpp #1170409:1170410
@@ -124,25 +124,25 @@
QString nodeTypePostfix(KisMergeWalker::NodePosition position)
{
- QString string="_";
+ QString string('_');
if(position & KisMergeWalker::N_TOPMOST)
- string+="T";
+ string += 'T';
else if(position & KisMergeWalker::N_BOTTOMMOST)
- string+="B";
+ string += 'B';
else
- string+="N";
+ string += 'N';
if(position & KisMergeWalker::N_ABOVE_FILTHY)
- string+="A";
+ string += 'A';
else if(position & KisMergeWalker::N_FILTHY)
- string+="F";
+ string += 'F';
else if(position & KisMergeWalker::N_FILTHY_PROJECTION)
- string+="P";
+ string += 'P';
else if(position & KisMergeWalker::N_FILTHY_ORIGINAL)
- string+="O";
+ string += 'O';
else if(position & KisMergeWalker::N_BELOW_FILTHY)
- string+="B";
+ string += 'B';
else
qFatal("Impossible happened");
--- trunk/koffice/krita/plugins/extensions/dockers/colorselectorng/kis_minimal_shade_selector.cpp \
#1170409:1170410 @@ -61,7 +61,7 @@
KConfigGroup cfg = KGlobal::config()->group("advancedColorSelector");
QString stri = cfg.readEntry("minimalShadeSelectorLineConfig", "0|0.2|0|0");
- QStringList strili = stri.split(";", QString::SkipEmptyParts);
+ QStringList strili = stri.split(';', QString::SkipEmptyParts);
int lineCount = strili.size();
while(lineCount-m_shadingLines.size() > 0) {
--- trunk/koffice/krita/plugins/extensions/dockers/colorselectorng/kis_shade_selector_lines_settings.cpp \
#1170409:1170410 @@ -39,7 +39,7 @@
QString result;
for(int i=0; i<m_lineList.size(); i++) {
result.append(m_lineList.at(i)->configuration());
- result.append(";");
+ result.append(';');
}
return result;
@@ -47,7 +47,7 @@
void KisShadeSelectorLinesSettings::fromString(const QString &stri)
{
- QStringList strili = stri.split(";", QString::SkipEmptyParts);
+ QStringList strili = stri.split(';', QString::SkipEmptyParts);
setLineCount(strili.size());
for(int i=0; i<strili.size(); i++) {
m_lineList.at(i)->setConfiguration(strili.at(i));
--- trunk/koffice/krita/plugins/extensions/metadataeditor/metadataeditor.cc \
#1170409:1170410 @@ -64,8 +64,8 @@
actionCollection()->addAction("EditLayerMetaData", action);
connect(action, SIGNAL(triggered()), this, SLOT(slotEditLayerMetaData()));
- QStringList runtimeVersion = QString(qVersion()).split(".");
- QStringList compileVersion = QString(QT_VERSION_STR).split(".");
+ QStringList runtimeVersion = QString(qVersion()).split('.');
+ QStringList compileVersion = QString(QT_VERSION_STR).split('.');
action->setEnabled(runtimeVersion[1] == compileVersion[1]);
}
--- trunk/koffice/krita/plugins/extensions/painterlyframework/tests/kis_ks_colorspace_test.cpp \
#1170409:1170410 @@ -44,7 +44,7 @@
QString vstr;
qDebug() << text;
for (int i = 0; i < n; i++)
- vstr += QString::number(reinterpret_cast<const type*>(v)[i]) + " ";
+ vstr += QString::number(reinterpret_cast<const type*>(v)[i]) + ' ';
qDebug() << vstr;
}
--- trunk/koffice/krita/plugins/formats/exr/exr_converter.cc #1170409:1170410
@@ -340,7 +340,7 @@
info.updateImageType(imfTypeToKisType(channel.type));
QString qname = j.name();
- QStringList list = qname.split(".");
+ QStringList list = qname.split('.');
QString layersuffix = list.last();
if (list.size() > 1) {
@@ -754,7 +754,7 @@
}
}
ExrPaintLayerSaveInfo info;
- info.name = name + paintLayer->name() + ".";
+ info.name = name + paintLayer->name() + '.';
info.layer = paintLayer;
if (paintLayer->colorSpace()->colorModelId() == RGBAColorModelID) {
info.channels.push_back(info.name + remap(current2original, "B"));
@@ -781,7 +781,7 @@
}
informationObjects.push_back(info);
} else if (KisGroupLayerSP groupLayer = \
dynamic_cast<KisGroupLayer*>(node.data())) {
- recBuildPaintLayerSaveInfo(informationObjects, name + groupLayer->name() \
+ ".", groupLayer); + recBuildPaintLayerSaveInfo(informationObjects, name \
+ groupLayer->name() + '.', groupLayer); }
}
}
--- trunk/koffice/krita/plugins/paintops/hairy/hairy_brush.cpp #1170409:1170410
@@ -37,9 +37,9 @@
const float radToDeg = 57.29578f;
-const QString HUE = "h";
-const QString SATURATION = "s";
-const QString VALUE = "v";
+const QString HUE('h');
+const QString SATURATION('s');
+const QString VALUE('v');
#if defined(_WIN32) || defined(_WIN64)
#define srand48 srand
--- trunk/koffice/krita/plugins/paintops/libbrush/abrStructv2.cpp #1170409:1170410
@@ -103,7 +103,7 @@
quint32 value;
buf >> value;
- return QString::fromLatin1( name ) + " " + QString::number(value);
+ return QString::fromLatin1( name ) + ' ' + QString::number(value);
}
static QString p_untf(QDataStream &buf){
@@ -112,7 +112,7 @@
type[4] = '\0';
double value;
buf >> value;
- return QString::fromLatin1(type) + " " + QString::number(value);
+ return QString::fromLatin1(type) + ' ' + QString::number(value);
}
static QString p_bool(QDataStream &buf){
@@ -150,7 +150,7 @@
buf.readRawData(name2,size2);
name2[size2] = '\0';
- return QString::fromLatin1(name1) + " " + QString::fromLatin1(name2);
+ return QString::fromLatin1(name1) + ' ' + QString::fromLatin1(name2);
}
// static QString p_unkn(QDataStream &buf, QHash<QString, enumFuncNames> & types){
--- trunk/koffice/krita/plugins/paintops/libbrush/abr_struct_parser.cpp \
#1170409:1170410 @@ -63,7 +63,7 @@
buf >> text[i];
}
- return "(tdta:" + QString::number(size) +")" + QString::fromUtf16(text,size);
+ return "(tdta:" + QString::number(size) + ')' + QString::fromUtf16(text,size);
}
QString AbrStructParser::p_desc(QDataStream &buf){
@@ -123,8 +123,8 @@
quint32 value;
buf >> value;
- //return QString::fromLatin1( objname ) + " " + QString::fromLatin1(typeName) + \
" " + QString::number(value);
- return QString::fromLatin1(typeName) + " " + QString::number(value);
+ //return QString::fromLatin1( objname ) + ' ' + QString::fromLatin1(typeName) + \
' ' + QString::number(value); + return QString::fromLatin1(typeName) + ' ' + \
QString::number(value); }
QString AbrStructParser::p_untf(QDataStream &buf){
@@ -133,7 +133,7 @@
type[4] = '\0';
double value;
buf >> value;
- return QString::fromLatin1(type) + " " + QString::number(value);
+ return QString::fromLatin1(type) + ' ' + QString::number(value);
}
QString AbrStructParser::p_bool(QDataStream &buf){
@@ -171,7 +171,7 @@
buf.readRawData(name2,size2);
name2[size2] = '\0';
- return QString::fromLatin1(name1) + " " + QString::fromLatin1(name2);
+ return QString::fromLatin1(name1) + ' ' + QString::fromLatin1(name2);
}
quint32 AbrStructParser::parseEntry(QDataStream &buf){
--- trunk/koffice/krita/plugins/paintops/libbrush/kis_abr_translator.cpp \
#1170409:1170410 @@ -118,7 +118,7 @@
attributeName == ABR_BRUSH_SPACING ||
attributeName == OBJECT_NAME_BRUSH)
{
- list = value.split(" ");
+ list = value.split(' ');
//e.g. "#Pxl 10" -> ['#Pxl','10']
Q_ASSERT(list.count() == 2);
bool ok;
@@ -206,7 +206,7 @@
attributeName == ABR_TIP_DYNAMICS_TILT_SCALE
)
{
- list = value.split(" ");
+ list = value.split(' ');
//e.g. "#Pxl 10" -> ['#Pxl','10']
Q_ASSERT(list.count() == 2);
bool ok;
@@ -275,7 +275,7 @@
double valueDbl = 0.0;
QStringList list;
if (attributeName == ABR_DYNAMICS_JITTER) {
- list = value.split(" ");
+ list = value.split(' ');
//e.g. "#Pxl 10" -> ['#Pxl','10']
Q_ASSERT(list.count() == 2);
bool ok;
--- trunk/koffice/krita/plugins/paintops/mypaint/mypaint_brush_resource.cpp \
#1170409:1170410 @@ -299,7 +299,7 @@
pointsPerInput << vPoints();
}
- QStringList parts = s.split("|");
+ QStringList parts = s.split('|');
Q_ASSERT(parts.size() > 0);
set_base_value(parts.takeFirst().toFloat());
@@ -313,7 +313,7 @@
//dbgKrita << "parts" << parts;
QString command = parts.takeFirst().trimmed();
- parts = parts.join(" ").split(",");
+ parts = parts.join(QString(' ')).split(',');
//dbgKrita << "command" << command << "parts" << parts;
@@ -362,7 +362,7 @@
//dbgKrita << filename();
QFileInfo iconFile(filename());
- m_icon.load(iconFile.path() + "/" + iconFile.baseName() + "_prev.png");
+ m_icon.load(iconFile.path() + '/' + iconFile.baseName() + "_prev.png");
int version = -1;
--- trunk/koffice/krita/ui/dialogs/kis_dlg_preferences.cc #1170409:1170410
@@ -350,7 +350,7 @@
cbUseOpenGLShaders->setEnabled(false);
#endif
- QStringList qtVersion = QString(qVersion()).split(".");
+ QStringList qtVersion = QString(qVersion()).split('.');
int versionNumber = qtVersion.at(0).toInt()*10000
+ qtVersion.at(1).toInt()*100
+ qtVersion.at(2).toInt();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic