Index: kalyptus/kalyptusCxxToSmoke.pm
===================================================================
--- kalyptus/kalyptusCxxToSmoke.pm (revision 780995)
+++ kalyptus/kalyptusCxxToSmoke.pm (revision 780996)
@@ -443,6 +443,8 @@
|| $name eq 'qWarning'
|| $name eq 'qCritical'
|| $name eq 'qDebug'
+ || $name eq 'qFindString'
+ || $name eq 'qFindStringBoyerMoore'
# qHash() gives problems with building the Qwt lib
|| $name eq 'qHash'
|| ($classNode->{astNodeName} eq 'TextEvent' and $name eq 'data')
@@ -544,6 +546,7 @@
} elsif( $m->{NodeType} eq 'var' ) {
if ( ($classNode->{astNodeName} eq 'QUuid' and $name eq 'data4')
|| ($name eq 'd')
+ || ($classNode->{astNodeName} eq 'Tab' and $name eq 'type')
|| ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mIncomingMetaData')
|| ($classNode->{astNodeName} eq 'SlaveBase' and $name eq 'mOutgoingMetaData') )
Index: kalyptus/kalyptus
===================================================================
--- kalyptus/kalyptus (revision 780995)
+++ kalyptus/kalyptus (revision 780996)
@@ -446,7 +446,7 @@
}
}
- if ( $p =~ /^\s*Q_OBJECT/ ) {
+ if ( $p =~ /^\s*Q_OBJECT/ && $cNode->{astNodeName} ne 'Qt') {
if ($qt_embedded) {
push @inputqueue, @qte_codeqobject;
} elsif ($qt4) {
@@ -457,11 +457,14 @@
next;
}
# Hack, waiting for real handling of preprocessor defines
+ $p =~ s/Q_OBJECT//;
$p =~ s/Q_REQUIRED_RESULT//;
$p =~ s/QT_FASTCALL//;
$p =~ s/QT_ASCII_CAST_WARN//;
$p =~ s/QT_BEGIN_HEADER//;
$p =~ s/QT_END_HEADER//;
+ $p =~ s/QT_BEGIN_NAMESPACE//;
+ $p =~ s/QT_END_NAMESPACE//;
$p =~ s/QT_MODULE\(\w+\)//;
$p =~ s/QT_WEAK_SYMBOL//;
$p =~ s/QT_MOC_COMPAT//;
@@ -574,11 +577,14 @@
$p =~ m/^#\s*ifdef\s+QT_COMPAT/ or
$p =~ m/^#\s*if\s+defined\s*\(?QT_COMPAT/ or
$p =~ m/^#\s*ifdef\s+CONTAINER_CUSTOM_WIDGETS/ or
+ $p =~ m/^#\s*ifdef\s+Q_COMPILER_MANGLES_RETURN_TYPE/ or
+ $p =~ m/^#\s*ifdef\s+Q_MAC_COMPAT_GL_FUNCTIONS/ or
$p =~ m/^#\s*ifdef\s+QT3_SUPPORT/ or
$p =~ m/^#\s*ifdef\s+KDE3_SUPPORT/ or
$p =~ m/^#\s*ifdef\s+Q_WS_WIN/ or
$p =~ m/^#if\s*!?defined\(Q_WS_WIN\)/ or
$p =~ m/^#if\s*!?defined\(Q_OS_WIN32\)/ or
+ $p =~ m/^#\s*ifdef\s+Q_OS_WINCE/ or
$p =~ m/^#\s*ifdef\s+Q_OS_UNIX/ or
$p =~ m/^#\s*ifdef\s+Q_MOC_RUN/ or
$p =~ m/^#\s*if\s+defined\s*\(QT3_SUPPORT/ or