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

List:       kde-commits
Subject:    KDE/kdelibs/dcop
From:       David Faure <faure () kde ! org>
Date:       2005-12-21 13:15:42
Message-ID: 1135170942.589287.24464.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 490301 by dfaure:

Fix the QCString vs DCOPCString issue for arguments too.
The logic is: when a dcop method says it uses DCOPCString (like in konqueror/preloader/),
write QCString in the .kidl and use that in the function signatures (like in kde3),
but use DCOPCString in the generated skel code.


 M  +4 -1      dcopidl2cpp/skel.cpp  
 M  +4 -4      dcopidlng/kalyptusCxxToDcopIDL.pm  


--- trunk/KDE/kdelibs/dcop/dcopidl2cpp/skel.cpp #490300:490301
@@ -277,7 +277,10 @@
 		QStringList::Iterator ittypes = argtypes.begin();
 		QStringList::Iterator args_count;
 		for( args_count = args.begin(); args_count != args.end(); ++args_count ){
-		    str << '\t'<< *ittypes << " " << *args_count << ";" <<  endl;
+                    QString argType = *ittypes;
+                    if ( argType == QLatin1String( "QCString" ) )
+                        argType = QLatin1String( "DCOPCString" );
+		    str << '\t'<< argType << " " << *args_count << ";" <<  endl;
 		    ++ittypes;
 		}
 		str << "\tQDataStream arg( data );" << endl;
--- trunk/KDE/kdelibs/dcop/dcopidlng/kalyptusCxxToDcopIDL.pm #490300:490301
@@ -40,7 +40,10 @@
   'unsigned short' => 'unsigned short int',
   'unsigned long' => 'unsigned long int',
   'long' => 'long int',
-  'short' => 'short int'
+  'short' => 'short int',
+  # For compat with KDE3, we call QCString the type holding a DCOPCString;
+  # this matches the dcopTypeName(DCOPCString) being equal to "QCString"
+  'DCOPCString' => 'QCString'
 );
 
 BEGIN
@@ -139,9 +142,6 @@
 
     my $returnType = $m->{ReturnType};
     $returnType = undef if ($returnType eq 'void');
-    # For compat with KDE3, we call QCString the type holding a DCOPCString;
-    # this matches the dcopTypeName(DCOPCString) being equal to "QCString"
-    $returnType = 'QCString' if ($returnType eq 'DCOPCString');
 
     # Don't use $className here, it's never the fully qualified (A::B) name for a ctor.
     my $isConstructor = ($name eq $classNode->{astNodeName} );
[prev in list] [next in list] [prev in thread] [next in thread]