[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-07-26 16:02:59
Message-ID: 20040726160259.00BBC9986 () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 


* QMap and QPair template types such as 'QMap<QCString, DCOPRef>' with an 
  embedded comma, were not being correctly normalised. A space was left in 
  the smoke type.


  M +6 -0      ChangeLog   1.54
  M +6 -0      kalyptusCxxToSmoke.pm   1.99


--- kdebindings/kalyptus/ChangeLog  #1.53:1.54
@@ -1,2 +1,8 @@
+2004-07-26  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
+
+        * QMap and QPair template types such as 'QMap<QCString, DCOPRef>' with an 
+          embedded comma, were not being correctly normalised. A space was left in 
+          the smoke type.
+
 2004-07-25  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 

--- kdebindings/kalyptus/kalyptusCxxToSmoke.pm  #1.98:1.99
@@ -1594,4 +1594,7 @@
     $type =~ s/\s+const$//; # for 'char* const'
     $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*'
+        
+        $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template \
types, such as +                                                                      \
# 'QMap<QCString, DCOPRef>'  
     return if ( $type eq 'void' or $type eq '' or $type eq '~' );
@@ -1651,4 +1654,7 @@
     $type =~ s/\s+const\s*\*$/\*/; # for 'char* const*'
 
+        $type =~ s/(<[^>]*)\s+([^>]*>)/$1$2/; # Remove embedded space from template \
types, such as +                                                                      \
# 'QMap<QCString, DCOPRef>' +
     return undef if ( $type =~ '~' or $type eq 'void' or $type eq '' );
 


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