[Kde-bindings] KDE/kdebindings/kalyptus

[Richard Dale]

SVN commit 848752 by rdale:

* Add some tweaks to get the Wt toolkit code generation working
* Fix bug in parsing default character arguments of single quotes, '\''

CCMAIL: kde-bindings at kde.org


 M  +5 -1      kalyptus  
 M  +62 -1     kalyptusCxxToSmoke.pm  


--- trunk/KDE/kdebindings/kalyptus/kalyptus #848751:848752
@@ -525,6 +525,10 @@
 		$p =~ s/KDOM_CAST/KJS::Value cast();/;
 		$p =~ s/Q_DECLARE_BUILTIN_METATYPE[^\)]*\)//;
 		$p =~ s/Q_[A-Z]+_EXPORT_INLINE//;
+		$p =~ s/WT_API//;
+		$p =~ s/WTCONNECTOR_API//;
+		$p =~ s/BOOST_SIGNALS_DECL//;
+		$p =~ s/BOOST_SIGNALS_NAMESPACE/signals/;
 		$p =~ s/(\s+)mutable\s+(\w+)/$1$2/;
 		$p =~ s/KLibFactory/KPluginFactory/;
 		if ( $p =~ m/KDOM_DEFINE_PROTOTYPE\((\w+)\)/ ) {
@@ -1705,7 +1709,7 @@
 
 		# The RE below reads as: = ( string constant or char or cast to numeric literal
 		# or some word/number, with optional bitwise shifts, OR'ed or +'ed flags, and/or function call ).
-		if ( $arg =~ s/\s*=\s*(("[^\"]*")|\([^)]*\)\s*[\+-]?\s*[0-9]+|(\'.\')|(([-\w:~]*)\s*((\*|[<>\|\+-])*\s*[\w:._]*\s*)*(\([^(]*\))?))// ) {
+		if ( $arg =~ s/\s*=\s*(("[^\"]*")|\([^)]*\)\s*[\+-]?\s*[0-9]+|(\'(\\\'|.)\')|(([-\w:~]*)\s*((\*|[<>\|\+-])*\s*[\w:._]*\s*)*(\([^(]*\))?))// ) {
 			$defaultparam = $1;
 		}
 		
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #848751:848752
@@ -64,6 +64,8 @@
 # Mapping for iterproto, when making up the munged method names
 %mungedTypeMap = (
      'QString' => '$',
+     'std::string' => '$',
+     'std::wstring' => '$',
      'QString*' => '$',
      'QString&' => '$',
      'QCString' => '$',
@@ -360,7 +362,6 @@
 {
 	my( $classNode ) = @_;
 	my $className = join( "::", kdocAstUtil::heritage($classNode) );
-print("$className\n");
 	if (	$classNode->{Deprecated} 
 			|| $classNode->{NodeType} eq 'union' 
 			|| $#{$classNode->{Kids}} < 0
@@ -447,6 +448,35 @@
 			|| $className eq 'QSemaphore'
 			|| $className eq 'QSharedData'
 			|| $className eq 'QString'
+
+			|| $className eq 'std'
+			|| $className eq 'std::string'
+			|| $className eq 'std::wstring'
+			|| $className eq 'std::ostream'
+			|| $className eq 'std::bad_exception'
+			|| $className eq 'std::exception'
+			|| $className eq 'std::__gnu_cxx'
+			|| $className eq 'boost::any'
+			|| $className eq 'boost::gregorian'
+			|| $className eq 'boost::regex'
+			|| $className eq 'boost::signals::connection'
+			|| $className eq 'boost::signals::detail'
+			|| $className eq 'boost::signals::detail::basic_connection'
+			|| $className eq 'boost::signals::detail::auto_disconnect_bound_object'
+			|| $className eq 'boost::signals::detail::bound_object'
+			|| $className eq 'boost::signals::detail::bound_objects_visitor'
+			|| $className eq 'boost::signals::detail::connection_slot_pair'
+			|| $className eq 'boost::signals::detail::is_callable'
+			|| $className eq 'boost::signals::detail::is_disconnected'
+			|| $className eq 'boost::signals::detail::connection_slot_pair'
+			|| $className eq 'boost::signals::scoped_connection'
+			|| $className eq 'Wt::WServer::Exception'
+			|| $className eq 'Wt::Impl::Grid'
+			|| $className eq 'Wt::Signal'
+			|| $className eq 'Wt::SignalBase'
+			|| $className eq 'Wt::WResource'
+			|| $className eq 'Wt::InvalidDateException' )
+
 			|| $className eq 'QStringList'
 			|| $className eq 'QStyleOptionQ3DockWindow'
 			|| $className eq 'QStyleOptionQ3ListView'
@@ -657,6 +687,26 @@
 			|| ($className eq 'KDevelop::UiController' and $name eq 'defaultArea')
 			|| ($className eq 'Sublime::ViewWidgetCreator' and $name eq 'createViewWidget')
 
+			|| ($className eq 'boost::signals::connection' and $name eq 'connectBase')
+			|| ($className eq 'Wt::SignalBase' and $name eq 'connectBase')
+			|| ($className eq 'Wt::WStatelessSlot' and $name eq 'implementsMethod')
+			|| ($className eq 'Wt' and $name eq 'WRun')
+			|| ($className eq 'Wt::WServer' and $name eq 'addEntryPoint')
+			|| ($className eq 'Wt' and $name eq 'RemoveExposedSignal')
+			|| ($className eq 'Wt' and $name eq 'AddExposedSignal')
+			|| ($className eq 'Wt::WDate' and $name eq 'isLeapYear')
+			|| ($className eq 'Wt::WDate' and $name eq 'isValid')
+			|| ($className eq 'Wt::WPainter' and $name eq 'drawImage'
+                && $m->{ParamList}[0]->{ArgType} =~ /double/)
+			|| ($className eq 'Wt::WPainterPath' and $name eq 'addEllipse'
+                && $m->{ParamList}[0]->{ArgType} =~ /WRectF/)
+			|| ($className eq 'Wt::WRectF' and $name eq 'WRectF'
+                && $#{$m->{ParamList}} > -1 && $m->{ParamList}[0]->{ArgType} =~ /WPointF/)
+			|| ($className eq 'Wt::WSlider' and $name eq 'setRange')
+			|| ($className eq 'Wt::WTextEdit' and $name eq 'setStyleSheet')
+			|| ($className eq 'Wt::WTextEdit' and $name eq 'setExtraPlugins')
+			|| ($className eq 'Wt::WTextEdit' and $name eq 'setToolBar')
+
 			|| ($className eq 'KTextEditor::Range' and $name =~ /operator/)
 			|| ($className eq 'KTextEditor::Range' and $name eq 'boundaryOnColumn')
 			|| ($className eq 'KTextEditor::Cursor' and $name =~ /operator/)
@@ -788,7 +838,18 @@
 				|| ($name eq 'd')
 				|| ($classNode->{astNodeName} eq 'Tab' and $name eq 'type')
 				|| ($name eq 'staticMetaObject')
+
+				|| ($className eq 'Wt::WImage' and $name eq 'noAreas_')
+				|| ($className eq 'Wt::WImage' and $name eq 'loaded')
+				|| ($className eq 'Wt::WText' and $name eq 'XHTMLFormatting')
+				|| ($className eq 'Wt::WText' and $name eq 'XHTMLUnsafeFormatting')
+				|| ($className eq 'Wt::WText' and $name eq 'PlainFormatting')
+				|| ($className eq 'Wt::WApplication' and $name eq 'requestTooLarge')
+				|| ($className eq 'Wt::WAbstractItemModel' and $name eq 'dataChanged')
+				|| ($className eq 'Wt::WInteractWidget')
+
 				|| ($className eq 'KDevelop::DocumentRangeObject' and $name eq 'm_mutex')
+				|| ($className eq 'KDevelop::DocumentRangeObject' and $name eq 'm_mutex')
 				|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData')
 				|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') ) 
 		{