1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QXcbConnection: add some qAsConst()

Browse Source 
... to prevent hidden detach(es| attempts).

Saves ~160b in text size on optimized GCC 6.0
Linux AMD64 builds.

Change-Id: I74e1f1304c522b9a4349918e99f562853ec8684e
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Marc Mutz 2016-04-25 11:04:20 +02:00
parent 80fd691340
commit ee2e441018
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,7 +287,7 @@ void QXcbConnection::updateScreens(const xcb_randr_notify_event_t *event)
} }
} }
qCDebug(lcQpaScreen) << "primary output is" << m_screens.first()->name(); qCDebug(lcQpaScreen) << "primary output is" << qAsConst(m_screens).first()->name();
} }
} }
@ -322,7 +322,7 @@ void QXcbConnection::updateScreen(QXcbScreen *screen, const xcb_randr_output_cha
// If the screen became primary, reshuffle the order in QGuiApplicationPrivate // If the screen became primary, reshuffle the order in QGuiApplicationPrivate
const int idx = m_screens.indexOf(screen); const int idx = m_screens.indexOf(screen);
if (idx > 0) { if (idx > 0) {
m_screens.first()->setPrimary(false); qAsConst(m_screens).first()->setPrimary(false);
m_screens.swap(0, idx); m_screens.swap(0, idx);
} }
screen->virtualDesktop()->setPrimaryScreen(screen); screen->virtualDesktop()->setPrimaryScreen(screen);
@ -342,7 +342,7 @@ QXcbScreen *QXcbConnection::createScreen(QXcbVirtualDesktop *virtualDesktop,
if (screen->isPrimary()) { if (screen->isPrimary()) {
if (!m_screens.isEmpty()) if (!m_screens.isEmpty())
m_screens.first()->setPrimary(false); qAsConst(m_screens).first()->setPrimary(false);
m_screens.prepend(screen); m_screens.prepend(screen);
} else { } else {
@ -529,7 +529,7 @@ void QXcbConnection::initializeScreens()
} else { } else {
// Ensure the primary screen is first on the list // Ensure the primary screen is first on the list
if (primaryScreen) { if (primaryScreen) {
if (m_screens.first() != primaryScreen) { if (qAsConst(m_screens).first() != primaryScreen) {
m_screens.removeOne(primaryScreen); m_screens.removeOne(primaryScreen);
m_screens.prepend(primaryScreen); m_screens.prepend(primaryScreen);
} }
@ -541,7 +541,7 @@ void QXcbConnection::initializeScreens()
QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary()); QXcbIntegration::instance()->screenAdded(screen, screen->isPrimary());
} }
qCDebug(lcQpaScreen) << "primary output is" << m_screens.first()->name(); qCDebug(lcQpaScreen) << "primary output is" << qAsConst(m_screens).first()->name();
} }
} }
@ -1013,8 +1013,8 @@ void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
} }
} }
if (i == m_callLog.size() && !m_callLog.isEmpty()) if (i == m_callLog.size() && !m_callLog.isEmpty())
qDebug("Caused some time after: %s:%d", m_callLog.first().file.constData(), qDebug("Caused some time after: %s:%d", qAsConst(m_callLog).first().file.constData(),
m_callLog.first().line); qAsConst(m_callLog).first().line);
#endif #endif
} }