Changeset 62156 in vbox for trunk/src

Timestamp:

Jul 11, 2016 11:56:22 AM (9 years ago)

Author:

vboxsync

Message:

use RT_GCC_NO_DEPRECATED_BEGIN / RT_GCC_NO_DEPRECATED_END

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp

@@ -686 +686 @@
 
 # elif defined(VBOX_WS_X11)
-//#  pragma GCC diagnostic push
-//#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
     /* Make sure it's generic XCB event: */
@@ -705 +703 @@
             /* Parse key-event: */
             xcb_key_press_event_t *pKeyEvent = static_cast<xcb_key_press_event_t*>(pMessage);
+            RT_GCC_NO_DEPRECATED_BEGIN
             const KeySym ks = ::XKeycodeToKeysym(QX11Info::display(), pKeyEvent->detail, 0);
+            RT_GCC_NO_DEPRECATED_END
             const int iKeySym = static_cast<const int>(ks);
 
@@ -715 +715 @@
     }
 
-//#  pragma GCC diagnostic pop
 # else
 
@@ -831 +830 @@
 
 # elif defined(VBOX_WS_X11)
-#  if RT_GNUC_PREREQ(4, 6)
-#   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#  endif
 
 bool UIHostComboEditorPrivate::x11Event(XEvent *pEvent)
@@ -845 +840 @@
             /* Get key-code: */
             XKeyEvent *pKeyEvent = (XKeyEvent*)pEvent;
+            RT_GCC_NO_DEPRECATED_BEGIN
             KeySym ks = ::XKeycodeToKeysym(pKeyEvent->display, pKeyEvent->keycode, 0);
+            RT_GCC_NO_DEPRECATED_END
 
             int iKeySym = (int)ks;
@@ -859 +856 @@
 }
 
-#  if RT_GNUC_PREREQ(4, 6)
-#   pragma GCC diagnostic pop
-#  endif
 # endif /* VBOX_WS_X11 */