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

List:       kde-commits
Subject:    branches/KDE/4.0/kdebindings/kalyptus
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2008-03-24 17:31:51
Message-ID: 1206379911.970056.31142.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 789594 by rdale:

* Attempt to make the smoke lib build with both Qt 4.3.x and Qt 4.4.x



 M  +17 -4     kalyptusCxxToSmoke.pm  


--- branches/KDE/4.0/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #789593:789594
@@ -147,7 +147,7 @@
    'WState'  =>  'int',
 );
 
-$headerSubdirectories = \
"kio/|phonon/ui/|kmediaplayer/|dnssd/|solid/|solid/ifaces/|phonon/|sonnet/|kdevelop/|k \
interfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdeprint/|kdesu/|knewstuff/|dbus-1.0/dbus/|plasma/|plasma/widgets/|kresources/"
 +$headerSubdirectories = \
"kio/|phonon/ui/|kmediaplayer/|dnssd/|solid/|solid/ifaces/|phonon/|sonnet/|kdevelop/|k \
interfacedesigner/|kontact/|kate/|kparts/|dom/|kabc/|ksettings/|kjs/|ktexteditor/|kdep \
rint/|kdesu/|knewstuff/|dbus-1.0/dbus/|plasma/|plasma/widgets/|kresources|soprano/"  
 }
 
@@ -290,7 +290,6 @@
 			|| $className eq 'KIO::NetRC'
 			|| $className eq 'KMimeTypeChooserDialog'
 			|| $className eq 'KParts::ComponentFactory'
-			|| $className eq 'KParts::MainWindow'
 			|| $className eq 'KParts::Plugin::PluginInfo'
 			|| $className eq 'KProtocolInfo::ExtraField'
 			|| $className eq 'KServiceTypeProfile'
@@ -447,9 +446,12 @@
 			|| $name eq 'qFindStringBoyerMoore' 
             # qHash() gives problems with building the Qwt lib
 			|| $name eq 'qHash' 
+			|| ($#{$m->{ParamList}} > -1 && $m->{ParamList}[0]->{ArgType} =~ /Private/)
+			|| ($classNode->{astNodeName} eq 'QGraphicsLinearLayout' and $name eq 'dump')
 			|| ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data')
 			|| ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'groupImpl')
 			|| ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'setReadDefaults')
+			|| ($classNode->{astNodeName} eq 'KConfigGroup' and $name eq 'KConfigGroup' && \
$#{$m->{ParamList}} == 1 && $m->{ParamList}[0]->{ArgType} =~ /const KConfigBase/)  || \
($name eq 'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDebug/ )  || ($name eq \
'operator<<' and $m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and \
$m->{ParamList}[1]->{ArgType} =~ /KDateTime::Spec/ )  || ($name eq 'operator>>' and \
$m->{ParamList}[0]->{ArgType} =~ /QDataStream/ and $m->{ParamList}[1]->{ArgType} =~ \
/KDateTime::Spec/ ) @@ -460,11 +462,11 @@
 			|| ($classNode->{astNodeName} eq 'KIO' and $name eq 'buildHTMLErrorString')
 			|| ($classNode->{astNodeName} eq 'KJob' and $name eq 'description')
 			|| ($classNode->{astNodeName} eq 'KJob' and $name eq 'KJob')
+			|| ($className eq 'KParts::MainWindow' and $name eq 'MainWindow' && \
$#{$m->{ParamList}} == 2 && $m->{ParamList}[2]->{ArgType} =~ /Qt::WindowFlags/)  || \
($classNode->{astNodeName} eq 'KShortcutsEditor' and $name eq \
'checkGlobalShortcutsConflict')  || ($classNode->{astNodeName} eq 'KShortcutsEditor' \
and $name eq 'checkStandardShortcutsConflict')  || ($classNode->{astNodeName} eq \
'KStandardShortcut' and $name eq 'insert')  || ($classNode->{astNodeName} eq \
                'KTzfileTimeZoneSource' and $name eq 'location')
-			|| ($classNode->{astNodeName} eq 'KTextEdit' and $name eq 'enableFindReplace')
 			|| ($classNode->{astNodeName} eq 'Wallet' and $name eq 'Wallet')
 			|| ($classNode->{astNodeName} eq 'KMD5' and $name eq 'transform') ) 
 		{
@@ -495,7 +497,6 @@
 			}
 		}
 
-		
 	    my $argId = 0;
 	    my $firstDefaultParam;
 	    foreach my $arg ( @{$m->{ParamList}} ) {
@@ -522,6 +523,12 @@
 		}
 	    }
 	    $m->AddProp( "FirstDefaultParam", $firstDefaultParam );
+
+		if ($className eq 'KParts::MainWindow' and $name eq 'MainWindow' && \
$#{$m->{ParamList}} == 1) { +			$m->{ParamList}[1]->{DefaultValue} = undef;
+			$m->{FirstDefaultParam} = undef;
+        }
+		
 	    $m->{ReturnType} = kalyptusDataDict::resolveType($m->{ReturnType}, $classNode, \
$rootnode) if ($m->{ReturnType});  registerType( $m->{ReturnType} );
 	}
@@ -737,6 +744,12 @@
 	    print $fh "#include <qregexp.h>\n";
 		delete $includes{"qregexp.h"};
 	}
+
+    if (defined $includes{"qsslsocket.h"} && defined \
$includes{"qsslconfiguration.h"}) { +        print $fh "#include \
<qsslconfiguration.h>\n"; +		delete $includes{"qsslconfiguration.h"};
+    }
+
 	if (	defined $includes{"qmime.h"} 
 			|| defined $includes{"qmetatype.h"} 
 			|| defined $includes{"qvariant.h"}


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