From 3fda03faf1b67aa1221099f3a2153a0aa40811ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 14 Feb 2012 21:17:02 -0600 Subject: Update various qt function definitions and static methods for tqt3 --- qtjava/javalib/org/kde/qt/Qt.java | 8 ++++---- qtjava/javalib/qtjava/Qt.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'qtjava') diff --git a/qtjava/javalib/org/kde/qt/Qt.java b/qtjava/javalib/org/kde/qt/Qt.java index a1bc4a6a..24652c64 100644 --- a/qtjava/javalib/org/kde/qt/Qt.java +++ b/qtjava/javalib/org/kde/qt/Qt.java @@ -764,13 +764,13 @@ public class Qt implements QtSupport { */ public static native TQDataStream op_write(TQDataStream arg1, TQCursor arg2); public static native TQDataStream op_read(TQDataStream arg1, TQCursor arg2); - public static native String qAppName(); + public static native String tqAppName(); // void qAddPostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED // void qRemovePostRoutine(QtCleanUpFunction arg1); >>>> NOT CONVERTED public static native byte[] qCompress(char[] data, int nbytes); - public static native byte[] qUncompress(char[] data, int nbytes); + public static native byte[] tqUncompress(char[] data, int nbytes); public static native byte[] qCompress(byte[] data); - public static native byte[] qUncompress(byte[] data); + public static native byte[] tqUncompress(byte[] data); public static native TQTextStream op_write(TQTextStream arg1, TQDomNode arg2); public static native TQWMatrix op_mult(TQWMatrix arg1, TQWMatrix arg2); /** ************************************************** @@ -964,7 +964,7 @@ public class Qt implements QtSupport { public static native TQTextStream op_read(TQTextStream arg1, TQMainWindow arg2); // TQDataStream& op_read(TQDataStream& arg1,TQGVector& arg2); >>>> NOT CONVERTED // TQDataStream& op_write(TQDataStream& arg1,const TQGVector& arg2); >>>> NOT CONVERTED - public static native int qRound(double d); + public static native int tqRound(double d); public static native String qVersion(); public static native boolean qSysInfo(int[] wordSize, boolean[] bigEndian); public static native boolean qSharedBuild(); diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp index 6ee67238..5dca1c96 100644 --- a/qtjava/javalib/qtjava/Qt.cpp +++ b/qtjava/javalib/qtjava/Qt.cpp @@ -1005,7 +1005,7 @@ Java_org_kde_qt_Qt_qAppName(JNIEnv* env, jclass cls) { const char* _qstring; (void) cls; - _qstring = ::qAppName(); + _qstring = ::tqAppName(); return QtSupport::fromCharString(env, (char *) _qstring); } @@ -1631,7 +1631,7 @@ Java_org_kde_qt_Qt_qRound(JNIEnv* env, jclass cls, jdouble d) { (void) cls; (void) env; - jint xret = (jint) ::qRound((double) d); + jint xret = (jint) ::tqRound((double) d); return xret; } @@ -1698,7 +1698,7 @@ Java_org_kde_qt_Qt_qUncompress___3B(JNIEnv* env, jclass cls, jbyteArray data) TQByteArray _qbyteArray; (void) cls; static TQByteArray* _qbyteArray_data = 0; - _qbyteArray = ::qUncompress((const TQByteArray&)*(TQByteArray*) QtSupport::toTQByteArray(env, data, &_qbyteArray_data)); + _qbyteArray = ::tqUncompress((const TQByteArray&)*(TQByteArray*) QtSupport::toTQByteArray(env, data, &_qbyteArray_data)); return QtSupport::fromTQByteArray(env, &_qbyteArray); } @@ -1708,7 +1708,7 @@ Java_org_kde_qt_Qt_qUncompress___3CI(JNIEnv* env, jclass cls, jcharArray data, j TQByteArray _qbyteArray; (void) cls; static TQByteArray* _qbytearray_data = 0; - _qbyteArray = ::qUncompress((const uchar*) QtSupport::toUcharArray(env, data, &_qbytearray_data), (int) nbytes); + _qbyteArray = ::tqUncompress((const uchar*) QtSupport::toUcharArray(env, data, &_qbytearray_data), (int) nbytes); return QtSupport::fromTQByteArray(env, &_qbyteArray); } -- cgit v1.2.3