[Kde-bindings] KDE/kdebindings/kalyptus

[Richard Dale]

SVN commit 655767 by rdale:

* Fix the code generation so that the libsmokekde lib links, and skip problem
  classes
* Fix parsing problem with Q_DISABLE_COPY macros

CCMAIL: kde-bindings at kde.org



 M  +1 -1      kalyptus  
 M  +5 -0      kalyptusCxxToKimono.pm  
 M  +13 -1     kalyptusCxxToSmoke.pm  


--- trunk/KDE/kdebindings/kalyptus/kalyptus #655766:655767
@@ -471,7 +471,7 @@
 		$p =~ s/QT_STATIC_CONST_IMPL/const/;
 		$p =~ s/QT_STATIC_CONST/static const/;
 		$p =~ s/QT_COMPAT / /;
-		$p =~ s/Q_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
+		$p =~ s/Q_DISABLE_COPY\(\s*(\w+)\s*\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
 		$p =~ s/QWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck!
 		$p =~ s/Q_SIGNALS/signals/;
 		$p =~ s/Q_SLOTS/slots/;
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToKimono.pm #655766:655767
@@ -268,11 +268,16 @@
 (
    'QAbstractItemModel' => '1',
    'QApplication' => '1',
+   'QBrush' => '1',
+   'QColor' => '1',
    'QCoreApplication' => '1',
    'QDBusConnectionInterface' => '1',
    'QIconEngineV2' => '1',
+   'QKeySequence' => '1',
    'QModelIndex' => '1',
    'QObject' => '1',
+   'QPen' => '1',
+   'QRegion' => '1',
    'QSqlQueryModel' => '1',
    'QStringListModel' => '1',
    'Qt' => '1',
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #655766:655767
@@ -513,7 +513,18 @@
 	    $className eq 'KImportedBookmarkMenu' || # KDE4
 	    $className eq 'KUndoRedoAction' || # KDE4
 	    $className eq 'KTzfileTimeZoneData' || # KDE4
-	    $className eq 'KUndoRedoAction' # KDE4
+	    $className eq 'KUndoRedoAction' || # KDE4
+	    $className eq 'KCombiView' || # KDE4
+	    $className eq 'KDirOperator' || # KDE4
+	    $className eq 'KDirSelectDialog' || # KDE4
+	    $className eq 'KFileFilterCombo' || # KDE4
+	    $className eq 'KFileMetaInfo' || # KDE4
+	    $className eq 'KFileMetaInfoGroup' || # KDE4
+	    $className eq 'KFilePreview' || # KDE4
+	    $className eq 'KFileTreeBranch' || # KDE4
+	    $className eq 'KFileView' || # KDE4
+	    $className eq 'KFileViewSignaler' || # KDE4
+	    $className eq 'KServiceTypeProfile' # KDE4
 	  ) {
 	    print STDERR "Skipping $className\n" if ($debug);
 	    print STDERR "Skipping union $className\n" if ( $classNode->{NodeType} eq 'union');
@@ -617,6 +628,7 @@
 			# end KDE4
 			|| ($classNode->{astNodeName} eq 'KAnimWidget' and $name eq 'KAnimWidget' and @{$m->{ParamList}} == 2)
 			|| ($classNode->{astNodeName} eq 'KCModuleLoader' and $name eq 'errorModule')
+			|| ($classNode->{astNodeName} eq 'KConfigBase' && @{$m->{ParamList}} >= 1 && $m->{ParamList}[0]->{ArgType} =~ /Q3/)
 			|| ($classNode->{astNodeName} eq 'KDCOPActionProxy' and $name eq 'actions')
 			|| ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'insertActive')
 			|| ($classNode->{astNodeName} eq 'KEditToolbarWidget' and $name eq 'removeActive')