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

List:       kde-commits
Subject:    KDE/kdebindings/kjsembed
From:       Jonathan Riddell <jr () jriddell ! org>
Date:       2005-05-22 14:03:07
Message-ID: 1116770587.336098.22616.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 416882 by jriddell:

Fix compile on 64 bit with GCC 4


 M  +1 -1      trunk/KDE/kdebindings/kjsembed/jseventmapper.cpp  
 M  +6 -6      trunk/KDE/kdebindings/kjsembed/jsfactory.cpp  


--- trunk/KDE/kdebindings/kjsembed/jseventmapper.cpp #416881:416882
@@ -88,7 +88,7 @@
 
 QEvent::Type JSEventMapper::findEventType( const KJS::Identifier &name ) const
 {
-    uint evt = (uint) handlerToEvent[ name.qstring() ];
+    uint evt = (uint)(long)handlerToEvent[ name.qstring() ];
     return static_cast<QEvent::Type>( evt );
 }
 
--- trunk/KDE/kdebindings/kjsembed/jsfactory.cpp #416881:416882
@@ -690,14 +690,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 " << ( long ) 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 " << ( long ) parent << endl;
 
         return createROPart( svc, con, parent, name, QStringList() );
     }
@@ -707,7 +707,7 @@
             const QStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createROPart svc " << svc << " constraint " \
                << con
-        << " parent " << ( uint ) parent
+        << " parent " << ( long ) parent
         << " args: " << args << endl;
 
         KTrader::OfferList offers = KTrader::self() ->query( svc, con );
@@ -737,14 +737,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 " << ( long ) 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 " << ( long ) parent << endl;
 
         return createRWPart( svc, con, parent, name, QStringList() );
     }
@@ -754,7 +754,7 @@
             const QStringList &args ) {
 #ifndef QT_ONLY
         kdDebug( 80001 ) << "JSFactory::createRWPart svc " << svc << " constraint " \
                << con
-        << " parent " << ( uint ) parent
+        << " parent " << ( long ) parent
         << " args: " << args << endl;
 
         KTrader::OfferList offers = KTrader::self() ->query( svc, con );


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