[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-09-05 3:13:07
Message-ID: 20040905031307.F369124FF () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 


* Added kontact to the expected KDE header subdirectory names 
* Fixed a bug in the code generation for this method: 

virtual QValueList<Kontact::Plugin*> pluginList() const = 0; 

It was being incorrectly treated as a pointer type, because it contained as asterisk. 


  M +9 -0      ChangeLog   1.56
  M +8 -6      kalyptusCxxToSmoke.pm   1.101


--- kdebindings/kalyptus/ChangeLog  #1.55:1.56
@@ -1,2 +1,11 @@
+2004-09-05  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
+
+ * Added kontact to the expected KDE header subdirectory names
+ * Fixed a bug in the code generation for this method:
+
+     virtual QValueList<Kontact::Plugin*> pluginList() const = 0;
+
+   It was being incorrectly treated as a pointer type, because it contained as asterisk.
+
 2004-08-19  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 

--- kdebindings/kalyptus/kalyptusCxxToSmoke.pm  #1.100:1.101
@@ -36,5 +36,5 @@
 use vars qw/
         $libname $rootnode $outputdir $opt $debug
-        $methodNumber
+        $methodNumber $headerSubdirectories
         %builtins %typeunion %allMethods %allTypes %enumValueToType %typedeflist %mungedTypeMap
         %skippedClasses /;
@@ -159,4 +159,6 @@
 );
 
+$headerSubdirectories = "kio/|kontact/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/"
+
 }
 
@@ -902,5 +904,5 @@
     my ( $node, $addInclude, $debugMe ) = @_;
     my $sourcename = $node->{Source}->{astNodeName};
-    if ( $sourcename !~ \
s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) { +    if ( \
$sourcename !~ s!.*($headerSubdirectories)(.*)!$1$2!m ) {  $sourcename =~ s!.*/(.*)!$1!m;
         }
@@ -1015,5 +1017,5 @@
                 $cast = "*($arg *)";
                 $methodCode .= "${indent}return $cast$v;\n";
-            } elsif($arg !~ /\*/) {
+            } elsif($arg !~ /\*$/) {
                 unless($flags =~ "p") {
                     $indent = "\t    ";
@@ -1380,5 +1382,5 @@
     my $sourcename = $classNode->{Source}->{astNodeName};
    
-    if ( $sourcename !~ \
s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) { +    if ( \
$sourcename !~ s!.*($headerSubdirectories)(.*)!$1$2!m ) {  $sourcename =~ s!.*/(.*)!$1!m;
         }
@@ -1393,5 +1395,5 @@
                 my $s;
                 for my $sn( @{$classNode->{Sources}} ) {
-                if ( ($s = $sn->{astNodeName}) !~ \
s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) { +              \
if ( ($s = $sn->{astNodeName}) !~ s!.*($headerSubdirectories)(.*)!$1$2!m ) {  $s =~ s!.*/(.*)!$1!m;
                         }
@@ -1411,5 +1413,5 @@
         my $s;
         for my $sn( @{$classNode->{Sources}} ) {
-        if ( ($s = $sn->{astNodeName}) !~ \
s!.*(kio/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/)(.*)!$1$2!m ) { +        if ( \
($s = $sn->{astNodeName}) !~ s!.*($headerSubdirectories)(.*)!$1$2!m ) {  $s =~ s!.*/(.*)!$1!m;
                 }


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