whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Plugins: use QStringBuilder more 

Change-Id: I6f026b81fdc403d99d37dfa22ea6a27a95ead347
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
bb10
Anton Kudryavtsev 2016-10-19 12:49:52 +03:00 committed by Anton Kudryavtsev
parent 101449a4cf
commit 87fefbc08e
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp
View File

@ -108,14 +108,10 @@ static const char * const connector_type_names[] = { // must match DRM_MODE_CONN
static QByteArray nameForConnector(const drmModeConnectorPtr connector)
{
QByteArray connectorName("UNKNOWN");
const QByteArray id = QByteArray::number(connector->connector_type_id);
if (connector->connector_type < ARRAY_LENGTH(connector_type_names))
connectorName = connector_type_names[connector->connector_type];
connectorName += QByteArray::number(connector->connector_type_id);
return connectorName;
return connector_type_names[connector->connector_type] + id;
return "UNKNOWN" + id;
}
static bool parseModeline(const QByteArray &text, drmModeModeInfoPtr mode)

2
src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp
View File

@ -890,7 +890,7 @@ HRESULT STDMETHODCALLTYPE QWindowsMsaaAccessible::get_accName(VARIANT varID, BST
QString shortcut = accessible->text(QAccessible::Accelerator);
if (!shortcut.isEmpty())
name.append(QLatin1Char(' ') + shortcut);
name += QLatin1Char(' ') + shortcut;
if (name.size()) {
*pszName = QStringToBSTR(name);

3
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -1996,8 +1996,7 @@ void QXcbConnection::initializeAllAtoms() {
Q_ASSERT(i == QXcbAtom::NPredefinedAtoms);
QByteArray settings_atom_name("_QT_SETTINGS_TIMESTAMP_");
settings_atom_name += m_displayName;
const QByteArray settings_atom_name = "_QT_SETTINGS_TIMESTAMP_" + m_displayName;
names[i++] = settings_atom_name;
xcb_intern_atom_cookie_t cookies[QXcbAtom::NAtoms];

8
src/plugins/platforms/xcb/qxcbintegration.cpp
View File

@ -447,12 +447,8 @@ QByteArray QXcbIntegration::wmClass() const
className[0] = className.at(0).toUpper();
}
if (!name.isEmpty() && !className.isEmpty()) {
m_wmClass = name.toLocal8Bit();
m_wmClass.append('\0');
m_wmClass.append(className.toLocal8Bit());
m_wmClass.append('\0');
}
if (!name.isEmpty() && !className.isEmpty())
m_wmClass = name.toLocal8Bit() + '\0' + className.toLocal8Bit() + '\0';
}
return m_wmClass;
}