Changeset 846 for trunk/src/gui/kernel/qt_x11_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qt_x11_p.h (modified) (7 diffs)

trunk/src/gui/kernel/qt_x11_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -332 +332 @@
 
 struct QX11Data;
-extern QX11Data *qt_x11Data;
+extern QX11Data *qt_x11Data;
 
 enum DesktopEnvironment {
@@ -339 +339 @@
     DE_GNOME,
     DE_CDE,
+
     DE_4DWM
 };
@@ -351 +352 @@
     bool clipboardWaitForEvent(Window win, int type, XEvent *event, int timeout);
     bool clipboardReadProperty(Window win, Atom property, bool deleteProperty,
-                            QByteArray *buffer, int *size, Atom *type, int *format, bool nullterm);
+                            QByteArray *buffer, int *size, Atom *type, int *format);
     QByteArray clipboardReadIncrementalProperty(Window win, Atom property, int nbytes, bool nullterm);
 
@@ -439 +440 @@
     int xinput_eventbase;
     int xinput_errorbase;
+
+
+
+
+
+
 
     QList<QWidget *> deferred_map;
@@ -565 +572 @@
 
         DTWM_IS_RUNNING,
-        KDE_FULL_SESSION,
-        KWIN_RUNNING,
-        KWM_RUNNING,
-        GNOME_BACKGROUND_PROPERTIES,
         ENLIGHTENMENT_DESKTOP,
+
         _SGI_DESKS_MANAGER,
 
@@ -629 +633 @@
 
         _NET_SYSTEM_TRAY_VISUAL,
+
+
 
         // Property formats