From kde-devel  Tue Jul 23 18:24:05 2002
From: Pavel Troller <patrol () sinus ! cz>
Date: Tue, 23 Jul 2002 18:24:05 +0000
To: kde-devel
Subject: [PATCH] kdebase/kpersonalizer compile problem with --enable-final
X-MARC-Message: https://marc.info/?l=kde-devel&m=102744883227825
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--X1bOJ3K7DJ5YkBrT"


--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi!
  There is a name clash in stylepreview.ui.h, because
  QEvent::KeyPress and QEvent::KeyRelease are damaged by replacing KeyPress and
KeyRelease by numbers 2 and 3. It comes evidently from X.h, included by Xlib.h
from ksysinfo.cpp.
  Attached is a patch to the later to #undef these constants immediately, which
doesn't make any harm and solves this problem. Could somebody commit it, please ?

                                   With regards, Pavel Troller

--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="diff.out"

? blabol
? diff.out
Index: ksysinfo.cpp
===================================================================
RCS file: /home/kde/kdebase/kpersonalizer/ksysinfo.cpp,v
retrieving revision 1.2
diff -u -3 -p -r1.2 ksysinfo.cpp
--- ksysinfo.cpp	23 Jul 2002 16:26:06 -0000	1.2
+++ ksysinfo.cpp	23 Jul 2002 18:12:17 -0000
@@ -20,6 +20,9 @@
  */
 
 #include <X11/Xlib.h>
+// These two are making troubles later.
+#undef KeyPress
+#undef KeyRelease
 
 #include <qstring.h>
 

--X1bOJ3K7DJ5YkBrT--
 
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<