summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Martins <sergio.martins@kdab.com>2015-07-19 18:31:17 +0100
committerSérgio Martins <sergio.martins@kdab.com>2015-07-22 18:57:31 +0000
commit6d679c4d2e376728180e579fb084f216a84028eb (patch)
treed164fb370bcc4ca142dbef92c9f80aa0fa1b61c6
parent34acf65f27578e819356eda48e7c597850d06fd6 (diff)
downloadqtquickcontrols-6d679c4d2e376728180e579fb084f216a84028eb.tar.gz
Pass non-trivially-copyable or large types by const-ref
Change-Id: I38af4720b916731451cb28aee0d16eed097d3350 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp2
-rw-r--r--src/controls/Private/qquickcontrolsettings_p.h2
-rw-r--r--src/controls/qquickaction_p.h6
-rw-r--r--src/controls/qquickmenu.cpp4
-rw-r--r--src/controls/qquickmenu_p.h4
-rw-r--r--src/dialogs/plugin.cpp6
6 files changed, 12 insertions, 12 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp
index d683ddf0..faebdaaf 100644
--- a/src/controls/Private/qquickcontrolsettings.cpp
+++ b/src/controls/Private/qquickcontrolsettings.cpp
@@ -111,7 +111,7 @@ QString QQuickControlSettings::makeStyleComponentPath(const QString &controlStyl
return styleDirPath + QStringLiteral("/") + controlStyleName;
}
-QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleName, QString styleDirPath)
+QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath)
{
QString styleFilePath = makeStyleComponentPath(controlStyleName, styleDirPath);
diff --git a/src/controls/Private/qquickcontrolsettings_p.h b/src/controls/Private/qquickcontrolsettings_p.h
index 1b99fd3e..6a4e8c6a 100644
--- a/src/controls/Private/qquickcontrolsettings_p.h
+++ b/src/controls/Private/qquickcontrolsettings_p.h
@@ -90,7 +90,7 @@ private:
void findStyle(QQmlEngine *engine, const QString &styleName);
bool resolveCurrentStylePath();
QString makeStyleComponentPath(const QString &controlStyleName, const QString &styleDirPath);
- QUrl makeStyleComponentUrl(const QString &controlStyleName, QString styleDirPath);
+ QUrl makeStyleComponentUrl(const QString &controlStyleName, const QString &styleDirPath);
struct StyleData
{
diff --git a/src/controls/qquickaction_p.h b/src/controls/qquickaction_p.h
index 1828cc9e..e3b9c852 100644
--- a/src/controls/qquickaction_p.h
+++ b/src/controls/qquickaction_p.h
@@ -104,7 +104,7 @@ public:
QIcon icon() const { return m_icon; }
QVariant iconVariant() const { return QVariant(m_icon); }
- void setIcon(QIcon icon) { m_icon = icon; emit iconChanged(); }
+ void setIcon(const QIcon &icon) { m_icon = icon; emit iconChanged(); }
bool event(QEvent *e);
@@ -116,12 +116,12 @@ Q_SIGNALS:
void toggled(bool checked);
void textChanged();
- void shortcutChanged(QVariant shortcut);
+ void shortcutChanged(const QVariant &shortcut);
void iconChanged();
void iconNameChanged();
void iconSourceChanged();
- void tooltipChanged(QString arg);
+ void tooltipChanged(const QString &arg);
void enabledChanged();
void checkableChanged();
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp
index 617a3d03..4f66b711 100644
--- a/src/controls/qquickmenu.cpp
+++ b/src/controls/qquickmenu.cpp
@@ -648,12 +648,12 @@ int QQuickMenu::indexOfMenuItem(QQuickMenuBase *item) const
}
}
-QQuickMenuItem *QQuickMenu::addItem(QString title)
+QQuickMenuItem *QQuickMenu::addItem(const QString &title)
{
return insertItem(m_itemsCount, title);
}
-QQuickMenuItem *QQuickMenu::insertItem(int index, QString title)
+QQuickMenuItem *QQuickMenu::insertItem(int index, const QString &title)
{
QQuickMenuItem *item = new QQuickMenuItem(this);
item->setText(title);
diff --git a/src/controls/qquickmenu_p.h b/src/controls/qquickmenu_p.h
index a16e720a..bc16328e 100644
--- a/src/controls/qquickmenu_p.h
+++ b/src/controls/qquickmenu_p.h
@@ -77,8 +77,8 @@ public:
enum MenuType { DefaultMenu = 0, EditMenu };
Q_INVOKABLE void popup();
- Q_INVOKABLE QQuickMenuItem *addItem(QString);
- Q_INVOKABLE QQuickMenuItem *insertItem(int, QString);
+ Q_INVOKABLE QQuickMenuItem *addItem(const QString &);
+ Q_INVOKABLE QQuickMenuItem *insertItem(int, const QString &);
Q_INVOKABLE void addSeparator();
Q_INVOKABLE void insertSeparator(int);
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index 7fac166d..65740024 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -175,7 +175,7 @@ public:
protected:
template <class WrapperType>
- void registerWidgetOrQmlImplementation(QDir widgetsDir, QDir qmlDir,
+ void registerWidgetOrQmlImplementation(const QDir &widgetsDir, const QDir &qmlDir,
const char *qmlName, const char *uri, bool hasTopLevelWindows, int versionMajor, int versionMinor) {
qCDebug(lcRegistration) << qmlName << uri << ": QML in" << qmlDir.absolutePath()
<< "using resources?" << m_useResources << "; widgets in" << widgetsDir.absolutePath();
@@ -191,7 +191,7 @@ protected:
}
template <class WrapperType>
- bool registerWidgetImplementation(QDir widgetsDir, QDir qmlDir,
+ bool registerWidgetImplementation(const QDir &widgetsDir, const QDir &qmlDir,
const char *qmlName, const char *uri, bool hasTopLevelWindows, int versionMajor, int versionMinor)
{
@@ -223,7 +223,7 @@ protected:
}
template <class WrapperType>
- void registerQmlImplementation(QDir qmlDir, const char *qmlName, const char *uri , int versionMajor, int versionMinor)
+ void registerQmlImplementation(const QDir &qmlDir, const char *qmlName, const char *uri , int versionMajor, int versionMinor)
{
qCDebug(lcRegistration) << "Register QML version for" << qmlName << "with uri:" << uri;