[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdecore
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-03-13 14:44:49
Message-ID: 20050313144449.E5B831487F () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Fix casting for 64-bit PPC.
BUG: 92824


  M +3 -1      kkeynative_x11.cpp   1.23
  M +3 -1      kkeyserver_x11.cpp   1.33


--- kdelibs/kdecore/kkeyserver_x11.cpp  #1.32:1.33
@@ -757,4 +757,5 @@ bool modXToMod( uint modX, uint& mod )
 bool codeXToSym( uchar codeX, uint modX, uint& sym )
 {
+        KeySym keySym;
         XKeyPressedEvent event;
 
@@ -764,5 +765,6 @@ bool codeXToSym( uchar codeX, uint modX,
         event.keycode = codeX;
 
-        XLookupString( &event, 0, 0, (KeySym*) &sym, 0 );
+        XLookupString( &event, 0, 0, &keySym, 0 );
+        sym = (uint) keySym;
         return true;
 }

--- kdelibs/kdecore/kkeynative_x11.cpp  #1.22:1.23
@@ -80,7 +80,9 @@ void KKeyNative::clear()
 bool KKeyNative::init( const XEvent* pEvent )
 {
+        KeySym keySym;
         m_code = pEvent->xkey.keycode;
         m_mod = pEvent->xkey.state;
-        XLookupString( (XKeyEvent*) pEvent, 0, 0, (KeySym*) &m_sym, 0 );
+        XLookupString( (XKeyEvent*) pEvent, 0, 0, &keySym, 0 );
+        m_sym = (uint) keySym;
         return true;
 }


[prev in list] [next in list] [prev in thread] [next in thread]