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

List:       kde-commits
Subject:    kdebindings/kalyptus
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2004-01-01 13:30:28
Message-ID: 20040101133028.C126693EA () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 

* Converted 'QString::null' to null in the javadoc comments
* Tidied up the conversion of @see tags slightly


  M +9 -7      kalyptusCxxToJNI.pm   1.6


--- kdebindings/kalyptus/kalyptusCxxToJNI.pm  #1.5:1.6
@@ -167,4 +167,5 @@
    'signed long int' => 'long',
    'unsigned long int' => 'ulong',
+   'int long' => 'long',
    'unsigned short int' => 'ushort',
 );
@@ -1782,5 +1783,5 @@
         $className =~ s/[*&]//;
         
-        if ( $cplusplusType =~ \
/void\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QCString>|QValueList<QVariant \
>|QValueList<QPixmap>|QValueListConstIterator<QString>|QMap|EditMode|QPtrList<QPixmap> \
> |QPtrList<QPoint>|QTextFormat|QTextCursor|QTextDocument|QNetworkProtocolFactoryBase| \
> QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldInfoList|QObjectUserData|QUObject|QTe \
> xtParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ \
> ) {
+        if ( $cplusplusType =~ \
/void\*|KHTMLPart::PageSecurity|QFileInfoList|QValueList<QIconDragItem>|QDomNodeList|Q \
ValueList<QCString>|QValueList<QVariant>|QValueList<QPixmap>|QValueListConstIterator<Q \
String>|QMap|EditMode|QPtrList<QPixmap>|QPtrList<QPoint>|QTextFormat|QTextCursor|QText \
Document|QNetworkProtocolFactoryBase|QDomNodePrivate|QSqlDriverCreatorBase|QSqlFieldIn \
foList|QObjectUserData|QUObject|QTextParag|QWidgetMapper|QMemArray<int>|QBitArray|QLayoutIterator|QAuBucket|QUnknownInterface|QConnectionList/ \
) {  return ""; # Unsupported type
         } elsif ( $cplusplusType =~ /bool/ && \
kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { @@ -3659,12 +3660,9 @@
         my $argName;
         
-        if (    ( cplusplusToJava($argType) eq "" 
-                        || $argType =~ /QValueList<QIconDragItem>|QDomNodeList/ )
-                        && $firstUnknownArgType > $argId ) 
-        {
+        if ( cplusplusToJava($argType) eq "" && $firstUnknownArgType > $argId ) {
                 $firstUnknownArgType = $argId;
         }
         
-        if ( $arg->{ArgName} =~ /^super$|^byte$|^short$|^env$|^cls$|^obj$/ ) {
+        if ( $arg->{ArgName} =~ /^super$|^byte$|^short$|^long$|^env$|^cls$|^obj$/ ) \
{  $arg->{ArgName} = "";
         }
@@ -5390,5 +5388,5 @@
                 $line =~ s/(const )?QC?String&?/String/g;
                 $line =~ s/QByteArray/byte[]/g;
-                $line =~ s/const KCmdLineOptions (\w+)\[\]/String[][] $1/;
+                $line =~ s/const KCmdLineOptions\s*(\w+)\[\]/String[][] $1/;
                 $line =~ s/KCmdLineLastOption//g;
                 $line =~ s/KCmdLineOptions/String[][]/;
@@ -5398,4 +5396,5 @@
                 $line =~ s/(\([^\)]*\))\s*:\s*\w+\([^\)]*\)/$1/g;
                 $line =~ s/\(void\)//g;
+                $line =~ s/QString::null/null/g;
                 $line =~ s/const char/String/g;
                 $line =~ s/const (\w+)\&/$1/g;
@@ -5457,4 +5456,5 @@
         if ( defined $docnode->{Returns} ) {
                 my $text = $docnode->{Returns};
+                $text =~ s/QString::null/null/g;
                 $text =~ s!\@p\s+([\w\._]*)!<code>$1</code>!g;
                 $text =~ s!\\c\s+([\w\@&\\?;-]+)!<code>$1</code>!g;
@@ -5464,6 +5464,8 @@
         if ( defined $docnode->{See} ) {
                 foreach my $text ( @{$docnode->{See}} ) {
+                        next if ($text =~ /QString|^\s*and\s*$|^\s*$|^[^\w]*$/);
                         $text =~ s/KIO:://g;
                         $text =~ s/KParts:://g;
+                        $text =~ s/bool/boolean/g;
                         $text =~ s/::/#/g;
                         $text =~ s/->/#/g;


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