summaryrefslogtreecommitdiffstats
path: root/kalyptus/kalyptusCxxToJNI.pm
diff options
context:
space:
mode:
Diffstat (limited to 'kalyptus/kalyptusCxxToJNI.pm')
-rw-r--r--kalyptus/kalyptusCxxToJNI.pm38
1 files changed, 19 insertions, 19 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 1b2ba385..6653fae0 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -439,7 +439,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;
@@ -447,7 +447,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 {
@@ -455,10 +455,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;
}
}
@@ -536,12 +536,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, ' ');
}
@@ -1326,7 +1326,7 @@ JNIEXPORT jobject JNICALL
Java_org_trinitydesktop_qt_QPointArray_at(JNIEnv * env, jobject obj, jint index)
{
TQPoint _p= ((TQPointArrayJBridge*) QtSupport::getQt(env, obj))->at((uint) index);
- return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.trinitydesktop.qt.TQPoint", TRUE);
+ return (jobject) QtSupport::objectForQtKey(env, (void *)new TQPoint(_p.x(),_p.y()), "org.trinitydesktop.qt.TQPoint", true);
}
EOF
@@ -1698,7 +1698,7 @@ static TQCString* _qstring__version = 0;
}
JNIEXPORT void JNICALL
-Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noKApp)
+Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Ljava_lang_String_2Z(JNIEnv* env, jclass cls, jobjectArray args, jstring _appname, jstring programName, jstring _description, jstring _version, jboolean noTDEApp)
{
(void) cls;
static TQCString* _qstring__appname = 0;
@@ -1706,7 +1706,7 @@ static TQCString* _qstring_programName = 0;
static TQCString* _qstring__description = 0;
static TQCString* _qstring__version = 0;
int argc = (int) env->GetArrayLength(args);
- TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noKApp);
+ TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const char*) QtSupport::toCharString(env, _appname, &_qstring__appname), (const char*) QtSupport::toCharString(env, programName, &_qstring_programName), (const char*) QtSupport::toCharString(env, _description, &_qstring__description), (const char*) QtSupport::toCharString(env, _version, &_qstring__version), (bool) noTDEApp);
return;
}
@@ -1720,11 +1720,11 @@ Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_tri
}
JNIEXPORT void JNICALL
-Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noKApp)
+Java_org_trinitydesktop_koala_TDECmdLineArgs_init___3Ljava_lang_String_2Lorg_trinitydesktop_koala_TDEAboutData_2Z(JNIEnv* env, jclass cls, jobjectArray args, jobject about, jboolean noTDEApp)
{
(void) cls;
int argc = (int) env->GetArrayLength(args);
- TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noKApp);
+ TDECmdLineArgsJBridge::init(argc+1, (char**) QtSupport::toArgv(env, args), (const TDEAboutData*) QtSupport::getQt(env, about), (bool) noTDEApp);
return;
}
@@ -2625,7 +2625,7 @@ sub preParseClass
|| ($name eq 'qt_cast')
|| ($name eq 'qt_property')
|| ($name eq 'staticMetaObject')
- # 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')
|| $name eq 'trUtf8'
@@ -2886,7 +2886,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 () ) {
@@ -3914,7 +3914,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";
}
@@ -4254,7 +4254,7 @@ sub generateAllMethods($$$$$$$$)
if ($main::qt_embedded) {
$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n";
} else {
- $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(FALSE) == 0) {\n";
+ $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQPopupMenu*)($className*)QtSupport::getQt(env, obj))->parentWidget(false) == 0) {\n";
}
} elsif ( is_kindof($classNode, 'TQListViewItem') ) {
$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->parent() == 0 && ((TQListViewItem*)($className*)QtSupport::getQt(env, obj))->listView() == 0) {\n";
@@ -4268,7 +4268,7 @@ sub generateAllMethods($$$$$$$$)
if ($main::qt_embedded) {
$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget() == 0) {\n";
} else {
- $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(TRUE) == 0) {\n";
+ $jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && ((TQWidget*)($className*)QtSupport::getQt(env, obj))->parentWidget(true) == 0) {\n";
}
} elsif ( $classNode->{astNodeName} =~ /^TQObject$/ || defined kdocAstUtil::findOverride( $rootnode, $classNode, "parent" ) ) {
$jniCode .= "\n\tif (QtSupport::allocatedInJavaWorld(env, obj) && (($className*)QtSupport::getQt(env, obj))->parent() == 0) {\n";
@@ -5473,9 +5473,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;