diff options
Diffstat (limited to 'kalyptus/kalyptusCxxToJava.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 7f612022..41e33ef6 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -517,9 +517,9 @@ sub javaImport($) } elsif ( cplusplusToJava($classname_ptr) =~ /^[a-z]/ ) { return ""; } elsif ( $classname =~ /^Q/ ) { - return "org.kde.qt." . $classname; + return "org.trinitydesktop.qt." . $classname; } else { - return "org.kde.koala." . $classname; + return "org.trinitydesktop.koala." . $classname; } } @@ -557,18 +557,18 @@ sub cplusplusToJava || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QVariantValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QIconDragItemValueList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QPixmapValueList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_QCStringList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_QCStringList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QObjectList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QDomNodeList\s*\*/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QWidgetList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KURLList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_TDEMainWindow\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileItemList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_KFileViewItemList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_DOMNodeList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_StyleSheetList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_MediaList\s*\*/ - || kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_OfferList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KURLList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_TDEMainWindow\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileItemList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_KFileViewItemList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_DOMNodeList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_StyleSheetList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_MediaList\s*\*/ + || kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_OfferList\s*\*/ || $cplusplusType =~ /TQMemArray<TQRect>/ || kalyptusDataDict::ctypemap($cplusplusType) =~ /qt_QCanvasItemList\s*\*/ ) { return "ArrayList" @@ -594,7 +594,7 @@ sub cplusplusToJava } else { return $1; } - } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /kde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { + } elsif ( kalyptusDataDict::ctypemap($cplusplusType) =~ /tde_([^\*\s]*)(.*)$/ and !$skippedClasses{$className}) { if ( kalyptusDataDict::interfacemap($1) ne () ) { return $1."Interface"; } else { @@ -1101,8 +1101,8 @@ sub writeClassDoc # my $fileName = join( "__", kdocAstUtil::heritage($node) ); print "Enter: $className\n" if $debug; - my $typeprefix = ($className =~ /^Q/ ? "qt_" : "kde_"); - my $packagename = ($typeprefix eq 'qt_' ? "org.kde.qt" : "org.kde.koala"); + my $typeprefix = ($className =~ /^Q/ ? "qt_" : "tde_"); + my $packagename = ($typeprefix eq 'qt_' ? "org.trinitydesktop.qt" : "org.trinitydesktop.koala"); # Write out the *.java file my $classFile = "$outputdir/$fileName.java"; @@ -1114,7 +1114,7 @@ sub writeClassDoc print CLASS "package $packagename;\n\n"; print CLASS "import java.lang.reflect.Proxy;\n"; - print CLASS "import org.kde.qt.SmokeInvocation;\n"; + print CLASS "import org.trinitydesktop.qt.SmokeInvocation;\n"; my %javaMethods = (); my %addImport = (); @@ -1175,7 +1175,7 @@ sub writeClassDoc # Special case these two classes as they have methods that use ArrayList added as 'extras' print CLASS "import java.util.ArrayList;\n"; } - print CLASS "import org.kde.qt.Qt;\n"; + print CLASS "import org.trinitydesktop.qt.Qt;\n"; } if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) { @@ -1221,7 +1221,7 @@ sub writeClassDoc $ancestor =~ s/^.*:://; $classdec .= "$ancestor "; if ( $typeprefix ne 'qt_' and $ancestor =~ /^Q/ ) { - print CLASS "import org.kde.qt.$ancestor;\n"; + print CLASS "import org.trinitydesktop.qt.$ancestor;\n"; } last; } @@ -2155,7 +2155,7 @@ sub generateAllMethods($$$$$$) # } } - $addImport->{"org.kde.qt.QtSupport"} = 1; + $addImport->{"org.trinitydesktop.qt.QtSupport"} = 1; # Do all enums first, anonymous ones and then named enums Iter::MembersByType ( $classNode, undef, @@ -3397,8 +3397,8 @@ sub printJavadocComment($$$$) $text =~ s/\./#/g; $text =~ s/\(\)//g; $text =~ s/^\s*([a-z].*)/#$1/g; - $text =~ s/^\s*Q/org.kde.qt.Q/g; -# $text =~ s/^\s*K/org.kde.koala.K/g; + $text =~ s/^\s*Q/org.trinitydesktop.qt.Q/g; +# $text =~ s/^\s*K/org.trinitydesktop.koala.K/g; $returntext .= "\t\t\@see $text\n"; } } |