diff options
Diffstat (limited to 'kalyptus/kalyptusCxxToJava.pm')
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 59a5444d..4df92568 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -234,7 +234,7 @@ EOF $qtExtras = <<EOF; /** This member allows a typecast of an instance which wraps a Qt instance, to a more specialized type. Invokes the private qtjava.dynamicCast() - via reflection, as that method isn't part of the public Qt api */ + via reflection, as that method isn't part of the public TQt api */ public static QtSupport dynamicCast(String type, QtSupport source) { Method method = null; @@ -242,7 +242,7 @@ EOF method = qtjava.class.getDeclaredMethod( "dynamicCast", new Class[] { String.class, QtSupport.class } ); } catch (NoSuchMethodException e1) { - Qt.tqWarning("No such method : qtjava.dynamicCast()"); + TQt.tqWarning("No such method : qtjava.dynamicCast()"); } try { @@ -250,10 +250,10 @@ EOF Object result = method.invoke(qtjava.class, new Object[] { type, source } ); return (QtSupport) result; } catch (InvocationTargetException e) { - Qt.tqWarning("Invocation failed : qtjava.dynamicCast()"); + TQt.tqWarning("Invocation failed : qtjava.dynamicCast()"); return null; } catch (IllegalAccessException e) { - Qt.tqWarning("Invocation failed : qtjava.dynamicCast()"); + TQt.tqWarning("Invocation failed : qtjava.dynamicCast()"); return null; } } @@ -331,12 +331,12 @@ EOF } /** Prepend a '2' to a signal string and remove any spaces */ - public static String SIGNAL(String signal) { + public static String TQ_SIGNAL(String signal) { return "2" + sqeezeOut(signal, ' '); } /** Prepend a '1' to a slot string and remove any spaces */ - public static String SLOT(String slot) { + public static String TQ_SLOT(String slot) { return "1" + sqeezeOut(slot, ' '); } @@ -903,7 +903,7 @@ sub preParseClass || ($name eq 'qt_property') || ($name eq 'staticMetaObject') || ($classNode->{astNodeName} eq 'KTar' and $name eq 'writeFile_impl') - # Assume only Qt classes have tr() and trUtf8() in their Q_OBJECT macro + # Assume only Qt classes have tr() and trUtf8() in their TQ_OBJECT macro || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'tr') || ($classNode->{astNodeName} !~ /^Q/ and $name eq 'trUtf8') || $m->{Deprecated} ) { @@ -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.trinitydesktop.qt.Qt;\n"; + print CLASS "import org.trinitydesktop.qt.TQt;\n"; } if ( kalyptusDataDict::interfacemap($javaClassName) ne () ) { @@ -1979,7 +1979,7 @@ sub generateMethod($$$$$$$) $javaReturnType = "byte[]"; } elsif ($javaSignature eq "at()" and $javaClassName eq 'KFilterDev') { $javaReturnType = "long"; - } elsif ($javaSignature =~ /copyTo/ and $javaClassName eq "KDesktopFile" ) { + } elsif ($javaSignature =~ /copyTo/ and $javaClassName eq "TDEDesktopFile" ) { $altReturnType = "TDEConfig"; } @@ -3315,9 +3315,9 @@ sub printJavadocComment($$$$) $line =~ s/const char/String/g; $line =~ s/const (\w+)\&/$1/g; $line =~ s/bool/boolean/g; - $line =~ s/SLOT\(\s*([^\)]*)\) ?\)/SLOT("$1)")/g; - $line =~ s/SIGNAL\(\s*([^\)]*)\) ?\)/SIGNAL("$1)")/g; - $line =~ s/Q_OBJECT\n//g; + $line =~ s/TQ_SLOT\(\s*([^\)]*)\) ?\)/TQ_SLOT("$1)")/g; + $line =~ s/TQ_SIGNAL\(\s*([^\)]*)\) ?\)/TQ_SIGNAL("$1)")/g; + $line =~ s/TQ_OBJECT\n//g; $line =~ s/class\s+([\w]+)\s*:\s*public/public class $1 implements/g; $line =~ s/public\s*(slots)?:\n/public /g; $line =~ s/([^0-9"]\s*)\*(\s*[^0-9"-])/$1$2/g; |