Rename check to checkEvent.
Avoids conflict with macro on Mac OS. Change-Id: I1b597205c32531e054832fcb396622b47b18040a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
8c72dc5907
commit
67f4893b71
@ -689,7 +689,7 @@ namespace
|
||||
: window(win), type(t) {}
|
||||
xcb_window_t window;
|
||||
int type;
|
||||
bool check(xcb_generic_event_t *event) const {
|
||||
bool checkEvent(xcb_generic_event_t *event) const {
|
||||
if (!event)
|
||||
return false;
|
||||
int t = event->response_type & 0x7f;
|
||||
@ -712,7 +712,7 @@ namespace
|
||||
ClipboardEvent(QXcbConnection *c)
|
||||
{ clipboard = c->internAtom("CLIPBOARD"); }
|
||||
xcb_atom_t clipboard;
|
||||
bool check(xcb_generic_event_t *e) const {
|
||||
bool checkEvent(xcb_generic_event_t *e) const {
|
||||
if (!e)
|
||||
return false;
|
||||
int type = e->response_type & 0x7f;
|
||||
|
@ -434,7 +434,7 @@ xcb_generic_event_t *QXcbConnection::checkEvent(T &checker)
|
||||
|
||||
for (int i = 0; i < eventqueue->size(); ++i) {
|
||||
xcb_generic_event_t *event = eventqueue->at(i);
|
||||
if (checker.check(event)) {
|
||||
if (checker.checkEvent(event)) {
|
||||
(*eventqueue)[i] = 0;
|
||||
m_reader->unlock();
|
||||
return event;
|
||||
|
@ -818,7 +818,7 @@ namespace
|
||||
public:
|
||||
ClientMessageScanner(xcb_atom_t a) : atom(a) {}
|
||||
xcb_atom_t atom;
|
||||
bool check(xcb_generic_event_t *event) const {
|
||||
bool checkEvent(xcb_generic_event_t *event) const {
|
||||
if (!event)
|
||||
return false;
|
||||
if ((event->response_type & 0x7f) != XCB_CLIENT_MESSAGE)
|
||||
|
@ -1033,7 +1033,7 @@ public:
|
||||
{
|
||||
}
|
||||
|
||||
bool check(xcb_generic_event_t *ev)
|
||||
bool checkEvent(xcb_generic_event_t *ev)
|
||||
{
|
||||
if (m_error || !ev)
|
||||
return false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user