diff options
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| m--------- | cmake | 0 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 4 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToKimono.pm | 2 | ||||
| -rw-r--r-- | kalyptus/kalyptusDataDict.pm | 8 |
7 files changed, 12 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 750adff..766a919 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1966,7 +1966,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") @@ -1981,7 +1981,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") @@ -1978,7 +1978,7 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") @@ -1993,7 +1993,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_TDEHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_KDEPRINT, "-lkdeprint") diff --git a/cmake b/cmake -Subproject 9a217903f9fa35ca12213a6e9ee3d2cb87d1131 +Subproject 274366fb8b90704586d7beef216b765cc0688b0 diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 29a5dd2..16b2a7d 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -1796,7 +1796,7 @@ sub cplusplusToJava my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|TQGfx|^Display\s*\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { + if ( $cplusplusType =~ /void\*|DCOPArg|DCOPRef|^MSG\s*\*|TQGfx|^Display\s*\*|TDEHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type } elsif ( $cplusplusType =~ /TQSignal\s*\*|TQMenuItem|TQWSEvent|TQWSDisplay|TQWSSocket|TQPaintDeviceX11Data|TQWindowsMime|TQDirectPainter|TQMember|TQDiskFont|TQGCache|TQRichText|TQWSDecoration/ && $main::qt_embedded ) { return ""; # Unsupported Qt/E type @@ -2576,7 +2576,7 @@ sub preParseClass || ($classNode->{astNodeName} eq 'KKeySequence' and $name eq 'setTriggerOnRelease') || ($classNode->{astNodeName} eq 'KEMailSettings' and $name eq 'getExtendedSetting') || ($classNode->{astNodeName} eq 'KEMailSettings' and $name eq 'setExtendedSetting') - || ($classNode->{astNodeName} eq 'KHTMLSettings' and $name eq 'fallbackAccessKeysAssignments') + || ($classNode->{astNodeName} eq 'TDEHTMLSettings' and $name eq 'fallbackAccessKeysAssignments') || ($classNode->{astNodeName} eq 'KProtocolManager' and $name eq 'defaultConnectTimeout') || ($classNode->{astNodeName} eq 'KMD5' and $name eq 'transform') || ($classNode->{astNodeName} eq 'KSSLCertificate' and $name eq 'operator!=') diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 94f9a62..0f0b207 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -532,7 +532,7 @@ sub cplusplusToJava my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { + if ( $cplusplusType =~ /void\*|TDEHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "boolean"; diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 8fec0b4..420aa56 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -526,7 +526,7 @@ sub cplusplusToCSharp my $className = $cplusplusType; $className =~ s/[*&]//; - if ( $cplusplusType =~ /void\*|KHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { + if ( $cplusplusType =~ /void\*|TDEHTMLPart::PageSecurity|TQFileInfoList|TQValueList<TQIconDragItem>|TQValueList<TQCString>|TQValueList<TQVariant>|TQValueList<TQPixmap>|TQValueListConstIterator<TQString>|TQMap|EditMode|TQPtrList<TQPixmap>|TQPtrList<TQPoint>|TQTextFormat|TQTextCursor|TQTextDocument|TQNetworkProtocolFactoryBase|TQDomNodePrivate|TQSqlDriverCreatorBase|TQSqlFieldInfoList|TQObjectUserData|TQUObject|TQTextParag|TQWidgetMapper|TQMemArray<int>|TQBitArray|TQLayoutIterator|TQAuBucket|TQUnknownInterface|TQConnectionList/ ) { return ""; # Unsupported type } elsif ( $cplusplusType =~ /bool/ && kalyptusDataDict::ctypemap($cplusplusType) eq "int" ) { return "bool"; diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 1fbb921..3b1b852 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -922,10 +922,10 @@ BEGIN 'KGuiItem' => 'kde_KGuiItem*', 'KGuiItem*' => 'kde_KGuiItem*', 'KHSSelector*' => 'kde_KHSSelector*', -'KHTMLPart*' => 'kde_KHTMLPart*' , -'KHTMLSettings&' => 'kde_KHTMLSettings*', -'KHTMLSettings*' => 'kde_KHTMLSettings*' , -'KHTMLView*' => 'kde_KHTMLView*' , +'TDEHTMLPart*' => 'kde_TDEHTMLPart*' , +'TDEHTMLSettings&' => 'kde_TDEHTMLSettings*', +'TDEHTMLSettings*' => 'kde_TDEHTMLSettings*' , +'TDEHTMLView*' => 'kde_TDEHTMLView*' , 'KHelpMenu*' => 'kde_KHelpMenu*', 'KHistoryCombo*' => 'kde_KHistoryCombo*', 'KIO*' => 'kde_KIO*', |