summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-01-23 13:05:12 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-02-13 16:29:16 +0000
commit9b67d89c24666d405dd00e63bb56c924738aa002 (patch)
treebf0c0197b68097e9aace8ac3708dcbf0e3fe0c7c /src/tools
parent22b5c39e8e0f4d8cb8a2b2d661e0451e01b75929 (diff)
Pass params of shareable type by const-ref rather than by value
...where passing them by value was not intentional. Change-Id: Ifd5036d57b41fddeeacfbd3f5890881605b80647 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/moc/moc.cpp4
-rw-r--r--src/tools/qdoc/doc.h2
-rw-r--r--src/tools/qdoc/doc/examples/mainwindow.cpp2
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp6
-rw-r--r--src/tools/qdoc/htmlgenerator.h2
-rw-r--r--src/tools/qdoc/node.cpp2
-rw-r--r--src/tools/qdoc/node.h2
-rw-r--r--src/tools/qdoc/qdocdatabase.cpp2
-rw-r--r--src/tools/qdoc/qdocindexfiles.cpp2
-rw-r--r--src/tools/qlalr/main.cpp3
-rw-r--r--src/tools/uic/cpp/cppwriteicondata.cpp4
11 files changed, 15 insertions, 16 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 4486d4c54e..a9e33da01d 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -818,7 +818,7 @@ static void findRequiredContainers(ClassDef *cdef, QSet<QByteArray> *requiredQtC
for (int i = 0; i < cdef->propertyList.count(); ++i) {
const PropertyDef &p = cdef->propertyList.at(i);
- foreach (const QByteArray candidate, candidates) {
+ foreach (const QByteArray &candidate, candidates) {
if (p.type.contains(candidate + "<"))
requiredQtContainers->insert(candidate);
}
@@ -829,7 +829,7 @@ static void findRequiredContainers(ClassDef *cdef, QSet<QByteArray> *requiredQtC
for (int i = 0; i < allFunctions.count(); ++i) {
const FunctionDef &f = allFunctions.at(i);
foreach (const ArgumentDef &arg, f.arguments) {
- foreach (const QByteArray candidate, candidates) {
+ foreach (const QByteArray &candidate, candidates) {
if (arg.normalizedType.contains(candidate + "<"))
requiredQtContainers->insert(candidate);
}
diff --git a/src/tools/qdoc/doc.h b/src/tools/qdoc/doc.h
index 2c007b9de9..80d47287bb 100644
--- a/src/tools/qdoc/doc.h
+++ b/src/tools/qdoc/doc.h
@@ -64,7 +64,7 @@ struct Topic
QString topic;
QString args;
Topic() { }
- Topic(QString& t, QString a) : topic(t), args(a) { }
+ Topic(QString& t, const QString &a) : topic(t), args(a) { }
bool isEmpty() const { return topic.isEmpty(); }
void clear() { topic.clear(); args.clear(); }
};
diff --git a/src/tools/qdoc/doc/examples/mainwindow.cpp b/src/tools/qdoc/doc/examples/mainwindow.cpp
index 6a03a8e8f2..68b878c07e 100644
--- a/src/tools/qdoc/doc/examples/mainwindow.cpp
+++ b/src/tools/qdoc/doc/examples/mainwindow.cpp
@@ -136,7 +136,7 @@ void MainWindow::createActions()
openAct->setShortcuts(QKeySequence::Open);
connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
- foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+ foreach (const QByteArray &format, QImageWriter::supportedImageFormats()) {
QString text = tr("%1...").arg(QString(format).toUpper());
QAction *action = new QAction(text, this);
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index d422356822..f4ada7132f 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -3190,7 +3190,7 @@ void HtmlGenerator::generateList(const Node* relative, CodeMarker* marker, const
#if 0
QStringList keys = groups.uniqueKeys();
- foreach (QString key, keys) {
+ foreach (const QString &key, keys) {
GroupNode* gn = static_cast<GroupNode*>(groups.value(key));
if (gn) {
out() << QString("<h3><a href=\"%1\">%2</a></h3>\n").arg(
@@ -3217,7 +3217,7 @@ void HtmlGenerator::generateList(const Node* relative, CodeMarker* marker, const
out() << "<ul>\n";
QStringList titles = nm.keys();
- foreach (QString t, titles) {
+ foreach (const QString &t, titles) {
Node* member = nm.value(t);
QString title = member->fullTitle();
if (title.startsWith("The "))
@@ -4484,7 +4484,7 @@ void HtmlGenerator::generateManifestFiles()
for each manifest file to be generated. \a manifest is the
type of manifest file.
*/
-void HtmlGenerator::generateManifestFile(QString manifest, QString element)
+void HtmlGenerator::generateManifestFile(const QString &manifest, const QString &element)
{
ExampleNodeMap& exampleNodeMap = qdb_->exampleNodeMap();
if (exampleNodeMap.isEmpty())
diff --git a/src/tools/qdoc/htmlgenerator.h b/src/tools/qdoc/htmlgenerator.h
index 9645219933..44408c0eb2 100644
--- a/src/tools/qdoc/htmlgenerator.h
+++ b/src/tools/qdoc/htmlgenerator.h
@@ -104,7 +104,7 @@ protected:
virtual QString refForNode(const Node *node);
virtual QString linkForNode(const Node *node, const Node *relative);
- void generateManifestFile(QString manifest, QString element);
+ void generateManifestFile(const QString &manifest, const QString &element);
void readManifestMetaContent(const Config &config);
void generateKeywordAnchors(const Node* node);
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index 2d38720a36..b00276a58c 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -2474,7 +2474,7 @@ QString Node::fullDocumentName() const
be used as the value of an \e id attribute. Search for NCName
on the internet for details of what can be an NCName.
*/
-QString Node::cleanId(QString str)
+QString Node::cleanId(const QString &str)
{
QString clean;
QString name = str.simplified();
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index df41aa00ff..610ab0875e 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -305,7 +305,7 @@ public:
const QString& outputSubdirectory() const { return outSubDir_; }
void setOutputSubdirectory(const QString& t) { outSubDir_ = t; }
QString fullDocumentName() const;
- static QString cleanId(QString str);
+ static QString cleanId(const QString &str);
QString idForNode() const;
static FlagValue toFlagValue(bool b);
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index cad213df90..4f1a38d189 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -1549,7 +1549,7 @@ void QDocDatabase::mergeCollections(Node::Type nt, CNMap& cnm, const Node* relat
if (cnmm.isEmpty())
return;
QStringList keys = cnmm.uniqueKeys();
- foreach (QString key, keys) {
+ foreach (const QString &key, keys) {
QList<CollectionNode*> values = cnmm.values(key);
CollectionNode* n = 0;
foreach (CollectionNode* v, values) {
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp
index 240704e1f9..efc0eb1e0f 100644
--- a/src/tools/qdoc/qdocindexfiles.cpp
+++ b/src/tools/qdoc/qdocindexfiles.cpp
@@ -542,7 +542,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element,
QString groupsAttr = element.attribute("groups");
if (!groupsAttr.isEmpty()) {
QStringList groupNames = groupsAttr.split(",");
- foreach (QString name, groupNames) {
+ foreach (const QString &name, groupNames) {
qdb_->addToGroup(name, node);
}
}
diff --git a/src/tools/qlalr/main.cpp b/src/tools/qlalr/main.cpp
index 56d69c012b..44523fc05f 100644
--- a/src/tools/qlalr/main.cpp
+++ b/src/tools/qlalr/main.cpp
@@ -75,8 +75,7 @@ int main (int argc, char *argv[])
QStringList args = app.arguments ();
args.removeFirst ();
- foreach (QString arg, args)
- {
+ foreach (const QString &arg, args) {
if (arg == QLatin1String ("-h") || arg == QLatin1String ("--help"))
help_me ();
diff --git a/src/tools/uic/cpp/cppwriteicondata.cpp b/src/tools/uic/cpp/cppwriteicondata.cpp
index 51b37b191f..ee80ee1643 100644
--- a/src/tools/uic/cpp/cppwriteicondata.cpp
+++ b/src/tools/uic/cpp/cppwriteicondata.cpp
@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
namespace CPP {
-static QByteArray transformImageData(QString data)
+static QByteArray transformImageData(const QString &data)
{
int baSize = data.length() / 2;
uchar *ba = new uchar[baSize];
@@ -66,7 +66,7 @@ static QByteArray transformImageData(QString data)
return ret;
}
-static QByteArray unzipXPM(QString data, ulong& length)
+static QByteArray unzipXPM(const QString &data, ulong &length)
{
#ifndef QT_NO_COMPRESS
const int lengthOffset = 4;