diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-09-03 16:20:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 16:47:11 +0200 |
| commit | 62533768c8babff37ba20a86f2c5602ed2c24085 (patch) | |
| tree | 51dd84d57466ec9adf2991b95d6757fcb515c178 /src/plugins/platforms | |
| parent | f0295646071ee6f60f2381d7b6c63d25b1ebc887 (diff) | |
Change QXcbConnection::atom() to be inline.
Change-Id: I88b5b2527808f7c603c5a041df9c8c9e8031a608
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.h | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index e594f1fedc..39750c1462 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -1419,11 +1419,6 @@ static const char * xcb_atomnames = { "_XSETTINGS_SETTINGS\0" // \0\0 terminates loop. }; -xcb_atom_t QXcbConnection::atom(QXcbAtom::Atom atom) const -{ - return m_allAtoms[atom]; -} - QXcbAtom::Atom QXcbConnection::qatom(xcb_atom_t xatom) const { return static_cast<QXcbAtom::Atom>(qFind(m_allAtoms, m_allAtoms + QXcbAtom::NAtoms, xatom) - m_allAtoms); diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h index aa0e070061..7cabe67a68 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.h +++ b/src/plugins/platforms/xcb/qxcbconnection.h @@ -352,7 +352,7 @@ public: const QList<QXcbScreen *> &screens() const { return m_screens; } int primaryScreen() const { return m_primaryScreen; } - xcb_atom_t atom(QXcbAtom::Atom atom) const; + inline xcb_atom_t atom(QXcbAtom::Atom atom) const { return m_allAtoms[atom]; } QXcbAtom::Atom qatom(xcb_atom_t atom) const; xcb_atom_t internAtom(const char *name); QByteArray atomName(xcb_atom_t atom); |