OSDN Git Service

de-virtualize QApplication::x11ClientMessage()
authorIvailo Monev <xakepa10@laimg.moc>
Mon, 29 Jun 2020 13:09:22 +0000 (13:09 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Mon, 29 Jun 2020 13:09:22 +0000 (13:09 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_x11.cpp

index df1e466..f100719 100644 (file)
@@ -113,8 +113,6 @@ public:
     static void setWindowIcon(const QIcon &icon);
     static QIcon windowIcon();
 
-
-
     static QWidgetList allWidgets();
     static QWidgetList topLevelWidgets();
 
@@ -178,7 +176,7 @@ public:
 
 #if defined(Q_WS_X11)
     virtual bool x11EventFilter(XEvent *);
-    virtual int x11ClientMessage(QWidget*, XEvent*, bool passive_only);
+    int x11ClientMessage(QWidget*, XEvent*, bool passive_only);
     int x11ProcessEvent(XEvent*);
 #endif
 
index da376b8..ba5274e 100644 (file)
@@ -2498,7 +2498,7 @@ int QApplication::x11ProcessEvent(XEvent* event)
         break;
 
     case ClientMessage:                        // client message
-        return x11ClientMessage(widget,event,False);
+        return x11ClientMessage(widget, event, false);
 
     case ReparentNotify: {                      // window manager reparents
         // compress old reparent events to self