From 9b67d89c24666d405dd00e63bb56c924738aa002 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 23 Jan 2015 13:05:12 +0400 Subject: 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 Reviewed-by: Thiago Macieira --- .../bearer/android/src/wrappers/androidconnectivitymanager.cpp | 2 +- .../platforminputcontexts/compose/generator/qtablegenerator.cpp | 2 +- src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h | 2 +- src/plugins/platforms/cocoa/qcocoaintegration.h | 2 +- src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm | 2 +- src/plugins/platforms/kms/qkmsintegration.cpp | 2 +- src/plugins/platforms/qnx/qqnxscreen.cpp | 4 ++-- src/plugins/platforms/winrt/qwinrtfileengine.cpp | 2 +- src/plugins/platforms/xcb/qxcbcursor.cpp | 2 +- src/plugins/platforms/xcb/qxcbkeyboard.cpp | 4 ++-- src/plugins/platforms/xcb/qxcbkeyboard.h | 2 +- src/plugins/platforms/xcb/qxcbscreen.cpp | 2 +- src/plugins/platforms/xcb/qxcbscreen.h | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp index 971c694ce1..8b10c17bb5 100644 --- a/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp +++ b/src/plugins/bearer/android/src/wrappers/androidconnectivitymanager.cpp @@ -116,7 +116,7 @@ bool AndroidTrafficStats::isTrafficStatsSupported() && AndroidTrafficStats::getTotalRxBytes() != -1); } -static AndroidNetworkInfo::NetworkState stateForName(const QString stateName) +static AndroidNetworkInfo::NetworkState stateForName(const QString &stateName) { if (stateName == QLatin1String("CONNECTED")) return AndroidNetworkInfo::Connected; diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 4697613833..4784a6e828 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -259,7 +259,7 @@ QByteArray TableGenerator::readLocaleAliases(const QByteArray &locale) return fullLocaleName; } -bool TableGenerator::processFile(QString composeFileName) +bool TableGenerator::processFile(const QString &composeFileName) { QFile composeFile(composeFileName); if (composeFile.open(QIODevice::ReadOnly)) { diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h index 4ce23f4576..468da4cad1 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.h @@ -103,7 +103,7 @@ public: TableState tableState() const { return m_state; } protected: - bool processFile(QString composeFileName); + bool processFile(const QString &composeFileName); void parseKeySequence(char *line); void parseIncludeInstruction(QString line); diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index 12270b954f..3b79717472 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -77,7 +77,7 @@ public: // ---------------------------------------------------- // Additional methods - void setVirtualSiblings(QList siblings) { m_siblings = siblings; } + void setVirtualSiblings(const QList &siblings) { m_siblings = siblings; } NSScreen *osScreen() const; void updateGeometry(); diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm index a2be0c9f72..1904a43276 100755 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm @@ -180,7 +180,7 @@ void QCocoaSystemTrayIcon::cleanup() } static bool heightCompareFunction (QSize a, QSize b) { return (a.height() < b.height()); } -static QList sortByHeight(const QList sizes) +static QList sortByHeight(const QList &sizes) { QList sorted = sizes; std::sort(sorted.begin(), sorted.end(), heightCompareFunction); diff --git a/src/plugins/platforms/kms/qkmsintegration.cpp b/src/plugins/platforms/kms/qkmsintegration.cpp index ff4dd59dbf..f48c868ae5 100644 --- a/src/plugins/platforms/kms/qkmsintegration.cpp +++ b/src/plugins/platforms/kms/qkmsintegration.cpp @@ -88,7 +88,7 @@ void QKmsIntegration::initialize() m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_DRM | QDeviceDiscovery::Device_DRM_PrimaryGPU, 0); if (m_deviceDiscovery) { QStringList devices = m_deviceDiscovery->scanConnectedDevices(); - foreach (QString device, devices) + foreach (const QString &device, devices) addDevice(device); connect(m_deviceDiscovery, SIGNAL(deviceDetected(QString)), this, SLOT(addDevice(QString))); diff --git a/src/plugins/platforms/qnx/qqnxscreen.cpp b/src/plugins/platforms/qnx/qqnxscreen.cpp index e0ef6a0b8f..7b7de01c82 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.cpp +++ b/src/plugins/platforms/qnx/qqnxscreen.cpp @@ -112,7 +112,7 @@ static QSize determineScreenSize(screen_display_t display, bool primaryScreen) { #endif } -static QQnxWindow *findMultimediaWindow(const QList windows, +static QQnxWindow *findMultimediaWindow(const QList &windows, const QByteArray &mmWindowId) { Q_FOREACH (QQnxWindow *sibling, windows) { @@ -128,7 +128,7 @@ static QQnxWindow *findMultimediaWindow(const QList windows, return 0; } -static QQnxWindow *findMultimediaWindow(const QList windows, +static QQnxWindow *findMultimediaWindow(const QList &windows, screen_window_t mmWindowId) { Q_FOREACH (QQnxWindow *sibling, windows) { diff --git a/src/plugins/platforms/winrt/qwinrtfileengine.cpp b/src/plugins/platforms/winrt/qwinrtfileengine.cpp index 38608d5e6c..664002a085 100644 --- a/src/plugins/platforms/winrt/qwinrtfileengine.cpp +++ b/src/plugins/platforms/winrt/qwinrtfileengine.cpp @@ -140,7 +140,7 @@ QAbstractFileEngine *QWinRTFileEngineHandler::create(const QString &fileName) co return Q_NULLPTR; } -static HRESULT getDestinationFolder(const QString &fileName, const QString newFileName, +static HRESULT getDestinationFolder(const QString &fileName, const QString &newFileName, IStorageItem *file, IStorageFolder **folder) { HRESULT hr; diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp index 3df84fe767..e3a04c1d7b 100644 --- a/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp @@ -484,7 +484,7 @@ xcb_cursor_t QXcbCursor::createNonStandardCursor(int cshape) } #ifdef XCB_USE_XLIB -bool updateCursorTheme(void *dpy, const QByteArray theme) { +bool updateCursorTheme(void *dpy, const QByteArray &theme) { if (!ptrXcursorLibraryGetTheme || !ptrXcursorLibrarySetTheme) return false; diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.cpp b/src/plugins/platforms/xcb/qxcbkeyboard.cpp index ad2b9023e7..376599578f 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp +++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp @@ -680,7 +680,7 @@ void QXcbKeyboard::updateKeymap() if (qEnvironmentVariableIsSet("QT_XKB_CONFIG_ROOT")) { xkb_context = xkb_context_new((xkb_context_flags)XKB_CONTEXT_NO_DEFAULT_INCLUDES); QList xkbRootList = QByteArray(qgetenv("QT_XKB_CONFIG_ROOT")).split(':'); - foreach (QByteArray xkbRoot, xkbRootList) + foreach (const QByteArray &xkbRoot, xkbRootList) xkb_context_include_path_append(xkb_context, xkbRoot.constData()); } else { xkb_context = xkb_context_new((xkb_context_flags)0); @@ -1045,7 +1045,7 @@ int QXcbKeyboard::keysymToQtKey(xcb_keysym_t key) const return code; } -int QXcbKeyboard::keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, QString text) const +int QXcbKeyboard::keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, const QString &text) const { int code = 0; #ifndef QT_NO_TEXTCODEC diff --git a/src/plugins/platforms/xcb/qxcbkeyboard.h b/src/plugins/platforms/xcb/qxcbkeyboard.h index 28c1c66433..2281674e2f 100644 --- a/src/plugins/platforms/xcb/qxcbkeyboard.h +++ b/src/plugins/platforms/xcb/qxcbkeyboard.h @@ -80,7 +80,7 @@ protected: void resolveMaskConflicts(); QString lookupString(struct xkb_state *state, xcb_keycode_t code) const; int keysymToQtKey(xcb_keysym_t keysym) const; - int keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, QString text) const; + int keysymToQtKey(xcb_keysym_t keysym, Qt::KeyboardModifiers &modifiers, const QString &text) const; void printKeymapError(const char *error) const; void readXKBConfig(); diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 09acbaa648..e43652ab37 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE QXcbScreen::QXcbScreen(QXcbConnection *connection, xcb_screen_t *scr, - xcb_randr_get_output_info_reply_t *output, QString outputName, int number) + xcb_randr_get_output_info_reply_t *output, const QString &outputName, int number) : QXcbObject(connection) , m_screen(scr) , m_crtc(output ? output->crtc : 0) diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h index efc16bf67c..f327eb31b0 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.h +++ b/src/plugins/platforms/xcb/qxcbscreen.h @@ -55,7 +55,7 @@ class Q_XCB_EXPORT QXcbScreen : public QXcbObject, public QPlatformScreen { public: QXcbScreen(QXcbConnection *connection, xcb_screen_t *screen, - xcb_randr_get_output_info_reply_t *output, QString outputName, int number); + xcb_randr_get_output_info_reply_t *output, const QString &outputName, int number); ~QXcbScreen(); QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; -- cgit v1.2.3