From a5ebcd697325e8e6ac9756cc96857d9298d2c114 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 20 Jun 2012 01:09:59 -0500 Subject: Update for recent TQ changes. --- kdejava/koala/kdejava/KAsyncIO.cpp | 6 +++--- kdejava/koala/kdejava/KConfigBase.cpp | 4 ++-- kdejava/koala/kdejava/KFilterDev.cpp | 4 ++-- kdejava/koala/kdejava/KZipFileEntry.cpp | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kdejava') diff --git a/kdejava/koala/kdejava/KAsyncIO.cpp b/kdejava/koala/kdejava/KAsyncIO.cpp index de5a4d62..fa76c8b9 100644 --- a/kdejava/koala/kdejava/KAsyncIO.cpp +++ b/kdejava/koala/kdejava/KAsyncIO.cpp @@ -212,7 +212,7 @@ Java_org_kde_koala_KAsyncIO_readBlock(JNIEnv* env, jobject obj, jobject data, jl static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -221,7 +221,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_koala_KAsyncIO_readLine(JNIEnv* env, jobject obj, jstring data, jlong maxlen) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen); return xret; } @@ -271,7 +271,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_koala_KAsyncIO_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((TQIODevice*)(KAsyncIO*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } diff --git a/kdejava/koala/kdejava/KConfigBase.cpp b/kdejava/koala/kdejava/KConfigBase.cpp index f659e227..b63fabaf 100644 --- a/kdejava/koala/kdejava/KConfigBase.cpp +++ b/kdejava/koala/kdejava/KConfigBase.cpp @@ -389,7 +389,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_koala_KConfigBase_readNum64Entry__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring pKey, jlong nDefault) { static TQString* _qstring_pKey = 0; - jlong xret = (jlong) ((KConfigBase*) QtSupport::getQt(env, obj))->readNum64Entry((const TQString&)*(TQString*) QtSupport::toTQString(env, pKey, &_qstring_pKey), (Q_INT64) nDefault); + jlong xret = (jlong) ((KConfigBase*) QtSupport::getQt(env, obj))->readNum64Entry((const TQString&)*(TQString*) QtSupport::toTQString(env, pKey, &_qstring_pKey), (TQ_INT64) nDefault); return xret; } @@ -530,7 +530,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_koala_KConfigBase_readUnsignedNum64Entry__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring pKey, jlong nDefault) { static TQString* _qstring_pKey = 0; - jlong xret = (jlong) ((KConfigBase*) QtSupport::getQt(env, obj))->readUnsignedNum64Entry((const TQString&)*(TQString*) QtSupport::toTQString(env, pKey, &_qstring_pKey), (Q_UINT64) nDefault); + jlong xret = (jlong) ((KConfigBase*) QtSupport::getQt(env, obj))->readUnsignedNum64Entry((const TQString&)*(TQString*) QtSupport::toTQString(env, pKey, &_qstring_pKey), (TQ_UINT64) nDefault); return xret; } diff --git a/kdejava/koala/kdejava/KFilterDev.cpp b/kdejava/koala/kdejava/KFilterDev.cpp index b654b7ee..21c9ac03 100644 --- a/kdejava/koala/kdejava/KFilterDev.cpp +++ b/kdejava/koala/kdejava/KFilterDev.cpp @@ -177,7 +177,7 @@ Java_org_kde_koala_KFilterDev_readBlock(JNIEnv* env, jobject obj, jobject data, static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((KFilterDev*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((KFilterDev*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -215,7 +215,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_koala_KFilterDev_writeBlock(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((KFilterDev*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((KFilterDev*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } diff --git a/kdejava/koala/kdejava/KZipFileEntry.cpp b/kdejava/koala/kdejava/KZipFileEntry.cpp index 654ac309..13e98dc8 100644 --- a/kdejava/koala/kdejava/KZipFileEntry.cpp +++ b/kdejava/koala/kdejava/KZipFileEntry.cpp @@ -11,7 +11,7 @@ class KZipFileEntryJBridge : public KZipFileEntry { public: - KZipFileEntryJBridge(KZip* arg1,const TQString& arg2,int arg3,int arg4,const TQString& arg5,const TQString& arg6,const TQString& arg7,const TQString& arg8,Q_LONG arg9,Q_LONG arg10,int arg11,Q_LONG arg12) : KZipFileEntry(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12) {}; + KZipFileEntryJBridge(KZip* arg1,const TQString& arg2,int arg3,int arg4,const TQString& arg5,const TQString& arg6,const TQString& arg7,const TQString& arg8,TQ_LONG arg9,TQ_LONG arg10,int arg11,TQ_LONG arg12) : KZipFileEntry(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11,arg12) {}; ~KZipFileEntryJBridge() {QtSupport::qtKeyDeleted(this);} }; @@ -90,7 +90,7 @@ static TQString* _qstring_group = 0; static TQString* _qstring_symlink = 0; static TQString* _qstring_path = 0; if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new KZipFileEntryJBridge((KZip*) QtSupport::getQt(env, zip), (const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) access, (int) date, (const TQString&)*(TQString*) QtSupport::toTQString(env, user, &_qstring_user), (const TQString&)*(TQString*) QtSupport::toTQString(env, group, &_qstring_group), (const TQString&)*(TQString*) QtSupport::toTQString(env, symlink, &_qstring_symlink), (const TQString&)*(TQString*) QtSupport::toTQString(env, path, &_qstring_path), (Q_LONG) start, (Q_LONG) uncompressedSize, (int) encoding, (Q_LONG) compressedSize)); + QtSupport::setQt(env, obj, new KZipFileEntryJBridge((KZip*) QtSupport::getQt(env, zip), (const TQString&)*(TQString*) QtSupport::toTQString(env, name, &_qstring_name), (int) access, (int) date, (const TQString&)*(TQString*) QtSupport::toTQString(env, user, &_qstring_user), (const TQString&)*(TQString*) QtSupport::toTQString(env, group, &_qstring_group), (const TQString&)*(TQString*) QtSupport::toTQString(env, symlink, &_qstring_symlink), (const TQString&)*(TQString*) QtSupport::toTQString(env, path, &_qstring_path), (TQ_LONG) start, (TQ_LONG) uncompressedSize, (int) encoding, (TQ_LONG) compressedSize)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -114,14 +114,14 @@ Java_org_kde_koala_KZipFileEntry_setCRC32(JNIEnv* env, jobject obj, jlong crc32) JNIEXPORT void JNICALL Java_org_kde_koala_KZipFileEntry_setCompressedSize(JNIEnv* env, jobject obj, jlong compressedSize) { - ((KZipFileEntry*) QtSupport::getQt(env, obj))->setCompressedSize((Q_LONG) compressedSize); + ((KZipFileEntry*) QtSupport::getQt(env, obj))->setCompressedSize((TQ_LONG) compressedSize); return; } JNIEXPORT void JNICALL Java_org_kde_koala_KZipFileEntry_setHeaderStart(JNIEnv* env, jobject obj, jlong headerstart) { - ((KZipFileEntry*) QtSupport::getQt(env, obj))->setHeaderStart((Q_LONG) headerstart); + ((KZipFileEntry*) QtSupport::getQt(env, obj))->setHeaderStart((TQ_LONG) headerstart); return; } -- cgit v1.2.3