[Kst] extragear/graphics/kst/kst/extensions/js/kjsembed

[Ted Kisner]

SVN commit 442751 by tskisner:

fix compile errors on 64bit platforms where pointer size != sizeof(uint).  Also fix a typecast in jseventmapper.cpp - is this the intended behaviour?

 M  +7 -1      jseventmapper.cpp  
 M  +6 -6      jsfactory.cpp  


--- trunk/extragear/graphics/kst/kst/extensions/js/kjsembed/jseventmapper.cpp #442750:442751
@@ -88,7 +88,13 @@
 
 QEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
 {
-    uint evt = (uint) handlerToEvent[ name.qstring() ];
+    uint *evtp = handlerToEvent[ name.qstring() ];
+    uint evt;
+    if (evtp) {
+	evt = (*evtp);
+    } else {
+	evt = 0;
+    }
     return static_cast<QEvent::Type>( evt );
 }
 
--- trunk/extragear/graphics/kst/kst/extensions/js/kjsembed/jsfactory.cpp #442750:442751
@@ -607,14 +607,14 @@
     }
 
     KParts::ReadOnlyPart *JSFactory::createROPart( const QString &svc, QObject *parent, const char *name ) {
-        kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " parent " << ( uint ) parent << endl;
+        kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " parent " << ( ulong ) parent << endl;
         return createROPart( svc, "'KParts/ReadOnlyPart' in ServiceTypes", parent, name );
     }
 
     KParts::ReadOnlyPart *JSFactory::createROPart( const QString &svc, const QString &con,
             QObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
-        << " parent " << ( uint ) parent << endl;
+        << " parent " << ( ulong ) parent << endl;
 
         return createROPart( svc, con, parent, name, QStringList() );
     }
@@ -624,7 +624,7 @@
             const QStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " << con
-        << " parent " << ( uint ) parent
+        << " parent " << ( ulong ) parent
         << " args: " << args << endl;
 
         KTrader::OfferList offers = KTrader::self() ->query( svc, con );
@@ -654,14 +654,14 @@
     }
 
     KParts::ReadWritePart *JSFactory::createRWPart( const QString &svc, QObject *parent, const char *name ) {
-        kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " parent " << ( uint ) parent << endl;
+        kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " parent " << ( ulong ) parent << endl;
         return createRWPart( svc, "'KParts/ReadWritePart' in ServiceTypes", parent, name );
     }
 
     KParts::ReadWritePart *JSFactory::createRWPart( const QString &svc, const QString &con,
             QObject *parent, const char *name ) {
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
-        << " parent " << ( uint ) parent << endl;
+        << " parent " << ( ulong ) parent << endl;
 
         return createRWPart( svc, con, parent, name, QStringList() );
     }
@@ -671,7 +671,7 @@
             const QStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " << con
-        << " parent " << ( uint ) parent
+        << " parent " << ( ulong ) parent
         << " args: " << args << endl;
 
         KTrader::OfferList offers = KTrader::self() ->query( svc, con );