AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change QXcbConnection::atom() to be inline.

Browse Source 
Change-Id: I88b5b2527808f7c603c5a041df9c8c9e8031a608
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Friedemann Kleint 2013-09-03 16:20:35 +02:00 committed by The Qt Project
parent f029564607
commit 62533768c8
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1419,11 +1419,6 @@ static const char * xcb_atomnames = {
"_XSETTINGS_SETTINGS\0" // \0\0 terminates loop. "_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 QXcbAtom::Atom QXcbConnection::qatom(xcb_atom_t xatom) const
{ {
return static_cast<QXcbAtom::Atom>(qFind(m_allAtoms, m_allAtoms + QXcbAtom::NAtoms, xatom) - m_allAtoms); return static_cast<QXcbAtom::Atom>(qFind(m_allAtoms, m_allAtoms + QXcbAtom::NAtoms, xatom) - m_allAtoms);

2
src/plugins/platforms/xcb/qxcbconnection.h
View File

@ -352,7 +352,7 @@ public:
const QList<QXcbScreen *> &screens() const { return m_screens; } const QList<QXcbScreen *> &screens() const { return m_screens; }
int primaryScreen() const { return m_primaryScreen; } 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; QXcbAtom::Atom qatom(xcb_atom_t atom) const;
xcb_atom_t internAtom(const char *name); xcb_atom_t internAtom(const char *name);
QByteArray atomName(xcb_atom_t atom); QByteArray atomName(xcb_atom_t atom);