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

List:       kde-commits
Subject:    KDE/kdebindings/kalyptus
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2006-07-05 11:43:12
Message-ID: 1152099792.865154.14698.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 558420 by rdale:

* Added some fixes to get the Smoke library code generation
  working with Qt 4.2



 M  +5 -0      kalyptus  
 M  +2 -1      kalyptusCxxToSmoke.pm  


--- trunk/KDE/kdebindings/kalyptus/kalyptus #558419:558420
@@ -459,6 +459,8 @@
 			next;
 		}
 		# Hack, waiting for real handling of preprocessor defines
+		$p =~ s/Q_REQUIRED_RESULT//;
+		$p =~ s/QT_ASCII_CAST_WARN//;
 		$p =~ s/QT_BEGIN_HEADER//;
 		$p =~ s/QT_END_HEADER//;
 		$p =~ s/QT_MODULE\(\w+\)//;
@@ -523,6 +525,8 @@
 						|| $p =~ /^\s*Q_DECLARE_TYPEINFO/
 						|| $p =~ /^\s*Q_PRIVATE_SLOT/
 						|| $p =~ /^\s*Q_DECLARE_SHARED/
+						|| $p =~ /^\s*Q_DECLARE_INTERFACE/
+						|| $p =~ /^\s*Q_DECLARE_METATYPE/
 			);
 
 		push @includes_list, $1 if $p =~ /^#include\s+<?(.*?)>?\s*$/;
@@ -572,6 +576,7 @@
 				     $p =~ m/^#\s*if\s+defined\s*\(qdoc/ or
 				     $p =~ m/^#\s*ifndef\s+QT_NO_MEMBER_TEMPLATES/ or
 				     $p =~ m/^#if\s*!defined\(Q_NO_USING_KEYWORD\)/ or
+				     $p =~ m/^#if\s*defined\(Q_INTERNAL_QAPP_SRC\)/ or
 				     ($p =~ m/^#if\s*QT_VERSION\s*<\s*0x040000/ and $qt4) or
 				     &$match_qt_defines( $p ) or
 				     $p =~ m/^#\s*if\s+0\s+/ ) {
--- trunk/KDE/kdebindings/kalyptus/kalyptusCxxToSmoke.pm #558419:558420
@@ -771,6 +771,7 @@
 	elsif( $m->{NodeType} eq 'var' ) {
 		if (	($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4')
 				|| ($name eq 'd')
+				|| ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject')
 				|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData')
 				|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') ) 
 		{
@@ -958,7 +959,7 @@
 	    print $fh "#include <qregexp.h>\n";
 		delete $includes{"qregexp.h"};
 	}
-	if (defined $includes{"qmime.h"}) {
+	if (defined $includes{"qmime.h"} || defined $includes{"qmimedata.h"}) {
 	    print $fh "#include <qurl.h>\n";
 		delete $includes{"qurl.h"};
 	}
[prev in list] [next in list] [prev in thread] [next in thread]