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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebindings/kalyptus
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2005-10-05 14:15:24
Message-ID: 1128521724.011886.9835.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467532 by rdale:

* Added the QByteArray class to the Smoke runtime



 M  +9 -0      kalyptus  
 M  +13 -13    kalyptusCxxToSmoke.pm  


--- branches/KDE/3.5/kdebindings/kalyptus/kalyptus #467531:467532
@@ -889,6 +889,14 @@
 
 		$newNode = newClass( $tmpl, $ntype, 
 			$name, $endtag, $isDeprecated, @inherits );
+
+		if ($decl =~ /};/) {
+			# If the declaration was all on one line ending with a '};', 
+			# then pop the new node
+			$cNode = pop @classStack;
+			print "end decl: popped $cNode->{astNodeName}\n" 
+				if $debug;
+		}
 	}
 	# IDL compound node
 	elsif( $decl =~ /^\s*(module|interface|exception) # struct type
@@ -1601,6 +1609,7 @@
 	$parent->AddProp( "Pure", 1 ) if $pure;
 
 	kdocAstUtil::attachChild( $parent, $node );
+
 	return $node;
 }
 
--- branches/KDE/3.5/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #467531:467532
@@ -69,12 +69,16 @@
      'QCString' => '$',
      'QCString*' => '$',
      'QCString&' => '$',
-     'QByteArray' => '$',
-     'QByteArray&' => '$',
-     'QByteArray*' => '$',
      'char*' => '$',
      'QCOORD*' => '?',
      'QRgb*' => '?',
+     'Q_UINT64' => '$',
+     'Q_INT64' => '$',
+     'Q_LLONG' => '$',
+     'quint64' => '$',
+     'qint64' => '$',
+     'long long' => '$',
+     'qulonglong' => '$',
 );
 
 # Yes some of this is in kalyptusDataDict's ctypemap
@@ -138,33 +142,25 @@
    'QStyle::SFlags' => 'int',
    'Q_INT16' => 'short',
    'qint16' => 'short',
-   'Q_INT64' => 'long long',
-   'qint64' => 'long long',
    'Q_INT32' => 'int',
    'qint32' => 'int',
+   'qint32&' => 'int&',
    'Q_INT8' => 'char',
    'qint8' => 'char',
    'Q_LONG' => 'long',
-   'Q_LLONG' => 'long long',
-   'qlonglong' => 'long long',
    'Q_UINT16' => 'ushort',
    'quint16' => 'ushort',
    'Q_UINT32' => 'uint',
    'quint32' => 'uint',
-   'quint64' => 'unsigned long long',
    'Q_UINT8' => 'uchar',
    'quint8' => 'uchar',
    'Q_ULONG' => 'long',
-   'Q_ULLONG' => 'unsigned long long',
-   'qulonglong' => 'unsigned long long',
    'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
    'time_t' => 'int',
-   'unsigned long long int' => 'unsigned long long',
    'short int' => 'short',
-   'long long int' => 'long long',
    'signed long int' => 'long',
    'unsigned long int' => 'ulong',
    'unsigned short int' => 'ushort',
@@ -229,6 +225,9 @@
    'QDir::SortFlags' => 'int',
    'QStyle::State' => 'int',
    'QValidator::State' => 'int',
+   'QAbstractSpinBox::StepEnabled' => 'int',
+   'QDockWidget::DockWidgetFeatures' => 'int',
+   'QStyle::SubControls' => 'int',
 );
 
 $headerSubdirectories = \
"kio/|kdevelop/|kinterfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff/"
 @@ -315,6 +314,7 @@
 	    # Don't generate standard bindings for QString, this class is handled as a \
native type  $className eq 'QString' ||
 	    $className eq 'QStringData' ||
+	    $className eq 'QLatin1String' ||
 	    $className eq 'QTLWExtra' ||
 	    $className eq 'QWExtra' ||
 	    $className eq 'QBig5Codec' ||
@@ -338,7 +338,6 @@
 	    $className eq 'QGVector' ||
 	    $className eq 'QStrIList' ||
 	    $className eq 'QStrIVec' ||
-	    $className eq 'QByteArray' ||
 	    $className eq 'QBitArray' ||
 	    $className eq 'QMapData' ||
 	    $className eq 'QMetaEnum::Item' ||
@@ -641,6 +640,7 @@
 				|| ($classNode->{astNodeName} eq 'QUrl' and $name eq 'QUrl'
 					and $#{$m->{ParamList}} == 0 && $m->{ParamList}[0]->{ArgType} eq \
                'QUrlPrivate&')
 				|| ($classNode->{astNodeName} eq 'QGlobalSpace' and $name eq 'operator<<' and \
$m->{ParamList}[0]->{ArgType} =~ /QDebug/) +				|| ($classNode->{astNodeName} eq \
'QGlobalSpace' and $#{$m->{ParamList}} > 0 and $name =~ /operator/ and \
                $m->{ParamList}[1]->{ArgType} =~ /QVariant::Type/)
 				|| ($#{$m->{ParamList}} > 0 and $m->{ParamList}[0]->{ArgType} =~ /Private/)
 				|| ($m->{ReturnType} =~ /QT3_SUPPORT/) ) )
 


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