diff options
37 files changed, 257 insertions, 257 deletions
diff --git a/dcoppython/shell/marshal_funcs.data b/dcoppython/shell/marshal_funcs.data index fe22e414..6cf4d34f 100644 --- a/dcoppython/shell/marshal_funcs.data +++ b/dcoppython/shell/marshal_funcs.data @@ -53,13 +53,13 @@ type: bool if (str) { bool ok; bool b = fromPyObject_bool(obj,&ok); - (*str) << (Q_INT8)b; + (*str) << (TQ_INT8)b; } return true; } %% demarshal { - Q_INT8 i; + TQ_INT8 i; (*str) >> i; return toPyObject_bool(i!=0); } @@ -71,13 +71,13 @@ type:int { if (!PyInt_Check(obj)) return false; if (str) { - (*str) << (Q_INT32)PyInt_AsLong(obj); + (*str) << (TQ_INT32)PyInt_AsLong(obj); } return true; } %% demarshal { - Q_INT32 i; + TQ_INT32 i; (*str) >> i; return PyInt_FromLong( (long)i ); } @@ -89,13 +89,13 @@ type:uint { if (!PyInt_Check(obj)) return false; if (str) { - (*str) << (Q_INT32)PyInt_AsLong(obj); + (*str) << (TQ_INT32)PyInt_AsLong(obj); } return true; } %% demarshal { - Q_INT32 i; + TQ_INT32 i; (*str) >> i; return PyInt_FromLong( (long)i ); } @@ -135,7 +135,7 @@ type:uchar if (PyInt_Check(obj)) { if (str) { long l = PyInt_AsLong(obj); - Q_UINT8 c = (Q_UINT8)(l & 0xff); + TQ_UINT8 c = (TQ_UINT8)(l & 0xff); (*str) << c; } return true; @@ -145,7 +145,7 @@ type:uchar } %%demarshal { - Q_UINT8 c; + TQ_UINT8 c; (*str) >> c; return PyString_FromStringAndSize((const char *)(&c),1); } @@ -158,7 +158,7 @@ type:char if (PyInt_Check(obj)) { if (str) { long l = PyInt_AsLong(obj); - Q_INT8 c = (Q_INT8)(l & 0xff); + TQ_INT8 c = (TQ_INT8)(l & 0xff); (*str) << c; } return true; @@ -168,7 +168,7 @@ type:char } %%demarshal { - Q_INT8 c; + TQ_INT8 c; (*str) >> c; return PyInt_FromLong((long)c); } diff --git a/dcoppython/shell/marshaller.cpp b/dcoppython/shell/marshaller.cpp index 1aaebc38..5b15aded 100644 --- a/dcoppython/shell/marshaller.cpp +++ b/dcoppython/shell/marshaller.cpp @@ -101,7 +101,7 @@ namespace PythonDCOP { return false; if (str) { - (*str) << (Q_INT32)count; + (*str) << (TQ_INT32)count; for(int c=0; c<count; c++) list_type.marshal( PyList_GetItem(obj,c), *str ); } @@ -111,11 +111,11 @@ namespace PythonDCOP { PyObject *Marshaller::demarshalList(const PCOPType &list_type, TQDataStream *str) const { - Q_UINT32 count; + TQ_UINT32 count; (*str) >> count; PyObject *obj = PyList_New(count); - for(Q_UINT32 c=0;c<count;c++) { + for(TQ_UINT32 c=0;c<count;c++) { PyList_SetItem(obj, c, list_type.demarshal(*str)); } return obj; @@ -136,7 +136,7 @@ namespace PythonDCOP { return false; if (str) { - Q_INT32 count = (Q_INT32)PyDict_Size(obj); + TQ_INT32 count = (TQ_INT32)PyDict_Size(obj); (*str) << count; c=0; while (PyDict_Next(obj, &c, &key, &val)==1) { @@ -151,9 +151,9 @@ namespace PythonDCOP { const PCOPType &value_type, TQDataStream *str) const { PyObject *obj = PyDict_New(); - Q_INT32 count; + TQ_INT32 count; (*str) >> count; - for(Q_INT32 c=0;c<count;c++) { + for(TQ_INT32 c=0;c<count;c++) { PyObject *key = key_type.demarshal(*str); PyObject *value = value_type.demarshal(*str); PyDict_SetItem(obj,key,value); diff --git a/kalyptus/kalyptusCxxToDcopIDL.pm b/kalyptus/kalyptusCxxToDcopIDL.pm index ad7e3eee..5ff17c02 100644 --- a/kalyptus/kalyptusCxxToDcopIDL.pm +++ b/kalyptus/kalyptusCxxToDcopIDL.pm @@ -131,14 +131,14 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'Q_INT16' => 'short', - 'Q_INT32' => 'int', - 'Q_INT8' => 'char', - 'Q_LONG' => 'long', - 'Q_UINT16' => 'ushort', - 'Q_UINT32' => 'uint', - 'Q_UINT8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', ); } @@ -836,7 +836,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 088ae4de..ba5aa00e 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -145,18 +145,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'TQ_INT16' => 'short', - 'TQ_INT32' => 'int', - 'TQ_INT64' => 'long', - 'TQ_INT8' => 'char', - 'TQ_LONG' => 'long', - 'TQ_LLONG' => 'long', + 'TTQ_INT16' => 'short', + 'TTQ_INT32' => 'int', + 'TTQ_INT64' => 'long', + 'TTQ_INT8' => 'char', + 'TTQ_LONG' => 'long', + 'TTQ_LLONG' => 'long', 'TQ_ULLONG' => 'long', - 'TQ_UINT16' => 'ushort', - 'TQ_UINT32' => 'uint', - 'TQ_UINT64' => 'long', - 'TQ_UINT8' => 'uchar', - 'TQ_ULONG' => 'long', + 'TTQ_UINT16' => 'ushort', + 'TTQ_UINT32' => 'uint', + 'TTQ_UINT64' => 'long', + 'TTQ_UINT8' => 'uchar', + 'TTQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -4552,7 +4552,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index fd4907d3..4ba16825 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -143,18 +143,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'TQ_INT16' => 'short', - 'TQ_INT32' => 'int', - 'TQ_INT64' => 'long', - 'TQ_INT8' => 'char', - 'TQ_LONG' => 'long', - 'TQ_LLONG' => 'long', + 'TTQ_INT16' => 'short', + 'TTQ_INT32' => 'int', + 'TTQ_INT64' => 'long', + 'TTQ_INT8' => 'char', + 'TTQ_LONG' => 'long', + 'TTQ_LLONG' => 'long', 'TQ_ULLONG' => 'long', - 'TQ_UINT16' => 'ushort', - 'TQ_UINT32' => 'uint', - 'TQ_UINT64' => 'long', - 'TQ_UINT8' => 'uchar', - 'TQ_ULONG' => 'long', + 'TTQ_UINT16' => 'ushort', + 'TTQ_UINT32' => 'uint', + 'TTQ_UINT64' => 'long', + 'TTQ_UINT8' => 'uchar', + 'TTQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', @@ -2391,7 +2391,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm index 1cb5dbf5..a2a103fd 100644 --- a/kalyptus/kalyptusCxxToKimono.pm +++ b/kalyptus/kalyptusCxxToKimono.pm @@ -79,9 +79,9 @@ BEGIN 'char*' => '$', 'TQCOORD*' => '?', 'TQRgb*' => '?', - 'Q_UINT64' => '$', - 'Q_INT64' => '$', - 'Q_LLONG' => '$', + 'TQ_UINT64' => '$', + 'TQ_INT64' => '$', + 'TQ_LLONG' => '$', 'tquint64' => '$', 'qint64' => '$', 'long long' => '$', @@ -146,21 +146,21 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'Q_INT16' => 'short', + 'TQ_INT16' => 'short', 'qint16' => 'short', - 'Q_INT32' => 'int', + 'TQ_INT32' => 'int', 'qint32' => 'int', 'qint32&' => 'int&', - 'Q_INT8' => 'char', + 'TQ_INT8' => 'char', 'qint8' => 'char', - 'Q_LONG' => 'long', - 'Q_UINT16' => 'ushort', + 'TQ_LONG' => 'long', + 'TQ_UINT16' => 'ushort', 'tquint16' => 'ushort', - 'Q_UINT32' => 'uint', + 'TQ_UINT32' => 'uint', 'tquint32' => 'uint', - 'Q_UINT8' => 'uchar', + 'TQ_UINT8' => 'uchar', 'tquint8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_ULONG' => 'long', 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', @@ -2585,7 +2585,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm index 8aa6897f..4c81e93a 100644 --- a/kalyptus/kalyptusCxxToSmoke.pm +++ b/kalyptus/kalyptusCxxToSmoke.pm @@ -72,9 +72,9 @@ BEGIN 'char*' => '$', 'TQCOORD*' => '?', 'TQRgb*' => '?', - 'Q_UINT64' => '$', - 'Q_INT64' => '$', - 'Q_LLONG' => '$', + 'TQ_UINT64' => '$', + 'TQ_INT64' => '$', + 'TQ_LLONG' => '$', 'tquint64' => '$', 'qint64' => '$', 'long long' => '$', @@ -140,21 +140,21 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'Q_INT16' => 'short', + 'TQ_INT16' => 'short', 'qint16' => 'short', - 'Q_INT32' => 'int', + 'TQ_INT32' => 'int', 'qint32' => 'int', 'qint32&' => 'int&', - 'Q_INT8' => 'char', + 'TQ_INT8' => 'char', 'qint8' => 'char', - 'Q_LONG' => 'long', - 'Q_UINT16' => 'ushort', + 'TQ_LONG' => 'long', + 'TQ_UINT16' => 'ushort', 'tquint16' => 'ushort', - 'Q_UINT32' => 'uint', + 'TQ_UINT32' => 'uint', 'tquint32' => 'uint', - 'Q_UINT8' => 'uchar', + 'TQ_UINT8' => 'uchar', 'tquint8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_ULONG' => 'long', 'qreal' => 'double', 'pid_t' => 'int', 'size_t' => 'int', @@ -1893,7 +1893,7 @@ sub registerType($$) { } # Apply typedefs, and store the resulting type. - # For instance, if $type was Q_UINT16&, realType will be ushort + # For instance, if $type was TQ_UINT16&, realType will be ushort $allTypes{$type}{realType} = applyTypeDef( $realType ); # In the first phase we only create entries into allTypes. diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm index f25387e7..555cf30f 100644 --- a/kalyptus/kalyptusCxxToSwig.pm +++ b/kalyptus/kalyptusCxxToSwig.pm @@ -82,14 +82,14 @@ BEGIN 'TQStyle::SFlags' => 'int', 'TQStyleOption&' => 'int&', 'const TQStyleOption&' => 'const int&', - 'Q_INT16' => 'short', - 'Q_INT32' => 'int', - 'Q_INT8' => 'char', - 'Q_LONG' => 'long', - 'Q_UINT16' => 'ushort', - 'Q_UINT32' => 'uint', - 'Q_UINT8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', ); # Page footer diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index 7c3bffb3..df8c8890 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -2271,24 +2271,24 @@ BEGIN 'TQXmlSimpleReader*' => 'qt_QXmlSimpleReader*' , 'TQXtApplication*' => 'qt_QXtApplication*', 'TQXtWidget*' => 'qt_QXtWidget*', -'Q_INT16&' => 'short', -'Q_INT16' => 'short', -'Q_INT32&' => 'int', -'Q_INT32' => 'int', -'Q_INT8&' => 'char', -'Q_INT8' => 'char', -'Q_LONG&' => 'long', -'Q_LONG' => 'long', +'TQ_INT16&' => 'short', +'TQ_INT16' => 'short', +'TQ_INT32&' => 'int', +'TQ_INT32' => 'int', +'TQ_INT8&' => 'char', +'TQ_INT8' => 'char', +'TQ_LONG&' => 'long', +'TQ_LONG' => 'long', 'TQ_PACKED*' => 'void*', -'Q_UINT16&' => 'unsigned short', -'Q_UINT16' => 'unsigned short', -'Q_UINT32&' => 'unsigned int', -'Q_UINT32' => 'unsigned int', -'Q_UINT8&' => 'unsigned char', -'Q_UINT8' => 'unsigned char', -'Q_UINT8*' => 'unsigned char*' , -'Q_ULONG&' => 'long', -'Q_ULONG' => 'long', +'TQ_UINT16&' => 'unsigned short', +'TQ_UINT16' => 'unsigned short', +'TQ_UINT32&' => 'unsigned int', +'TQ_UINT32' => 'unsigned int', +'TQ_UINT8&' => 'unsigned char', +'TQ_UINT8' => 'unsigned char', +'TQ_UINT8*' => 'unsigned char*' , +'TQ_ULONG&' => 'long', +'TQ_ULONG' => 'long', 'Qt*' => 'qt_Qt*' , 'TQt::ArrowType' => 'int' , 'TQt::BackgroundMode' => 'int', 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; } diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp index 7f3d2b5b..1c79bb35 100644 --- a/kjsembed/builtins/qfile_imp.cpp +++ b/kjsembed/builtins/qfile_imp.cpp @@ -415,15 +415,15 @@ KJS::Value TQFileImp::readBlock_17( KJS::ExecState *exec, KJS::Object &obj, cons char * arg0; // Dummy - // Unsupported parameter Q_ULONG + // Unsupported parameter TQ_ULONG return KJS::Value(); - Q_ULONG arg1; // Dummy + TQ_ULONG arg1; // Dummy instance->readBlock( arg0, arg1 ); - return KJS::Value(); // Returns 'Q_LONG' + return KJS::Value(); // Returns 'TQ_LONG' } @@ -432,15 +432,15 @@ KJS::Value TQFileImp::writeBlock_18( KJS::ExecState *exec, KJS::Object &obj, con const char *arg0 = (args.size() >= 1) ? args[0].toString(exec).ascii() : 0; - // Unsupported parameter Q_ULONG + // Unsupported parameter TQ_ULONG return KJS::Value(); - Q_ULONG arg1; // Dummy + TQ_ULONG arg1; // Dummy instance->writeBlock( arg0, arg1 ); - return KJS::Value(); // Returns 'Q_LONG' + return KJS::Value(); // Returns 'TQ_LONG' } @@ -451,7 +451,7 @@ KJS::Value TQFileImp::writeBlock_19( KJS::ExecState *exec, KJS::Object &obj, con instance->writeBlock( arg0 ); - return KJS::Value(); // Returns 'Q_LONG' + return KJS::Value(); // Returns 'TQ_LONG' } @@ -463,15 +463,15 @@ KJS::Value TQFileImp::readLine_20( KJS::ExecState *exec, KJS::Object &obj, const char * arg0; // Dummy - // Unsupported parameter Q_ULONG + // Unsupported parameter TQ_ULONG return KJS::Value(); - Q_ULONG arg1; // Dummy + TQ_ULONG arg1; // Dummy instance->readLine( arg0, arg1 ); - return KJS::Value(); // Returns 'Q_LONG' + return KJS::Value(); // Returns 'TQ_LONG' } @@ -480,15 +480,15 @@ KJS::Value TQFileImp::readLine_21( KJS::ExecState *exec, KJS::Object &obj, const TQString arg0 = (args.size() >= 1) ? args[0].toString(exec).qstring() : TQString::null; - // Unsupported parameter Q_ULONG + // Unsupported parameter TQ_ULONG return KJS::Value(); - Q_ULONG arg1; // Dummy + TQ_ULONG arg1; // Dummy instance->readLine( arg0, arg1 ); - return KJS::Value(); // Returns 'Q_LONG' + return KJS::Value(); // Returns 'TQ_LONG' } diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index ef631a87..696b8f78 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -83,7 +83,7 @@ private: PenStyle style; uint width; TQColor color; - Q_UINT16 linest; + TQ_UINT16 linest; } *data; }; diff --git a/korundum/ChangeLog b/korundum/ChangeLog index dd2a98a6..701ec0a6 100644 --- a/korundum/ChangeLog +++ b/korundum/ChangeLog @@ -338,10 +338,10 @@ CCMAIL: kde-bindings@kde.org 2004-07-30 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Removed the various Q_INT32 etc types from the Smoke stack <--> TQDataStream + * Removed the various TQ_INT32 etc types from the Smoke stack <--> TQDataStream marshalling. This was because the code generated by the dcopidl2cpp tool doesn't have them. So if a machine has native 64 bit ints, then that width - will be used rather than Q_INT32. + will be used rather than TQ_INT32. 2004-07-28 Richard Dale <Richard_Dale@tipitina.demon.co.uk> @@ -396,12 +396,12 @@ CCMAIL: kde-bindings@kde.org 2004-07-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * TQDataStream temporary variables added for the Q_INT32 etc types when + * TQDataStream temporary variables added for the TQ_INT32 etc types when writing to a Smoke stack from a TQDataStream. 2004-07-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> - * Added casts to the various macros like 'Q_INT32' when writing a Smoke + * Added casts to the various macros like 'TQ_INT32' when writing a Smoke stack to a TQDataStream 2004-07-21 Richard Dale <Richard_Dale@tipitina.demon.co.uk> diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp index 63ccd8b9..a2f503ae 100644 --- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp +++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp @@ -593,8 +593,8 @@ TQString param( const TQString &type ) else if ( type == "Bool" ) return "bool"; else if ( type == "Double" ) return "double"; else if ( type == "DateTime" ) return "const TQDateTime &"; - else if ( type == "Int64" ) return "Q_INT64"; - else if ( type == "UInt64" ) return "Q_UINT64"; + else if ( type == "Int64" ) return "TQ_INT64"; + else if ( type == "UInt64" ) return "TQ_UINT64"; else if ( type == "IntList" ) return "const TQValueList<int> &"; else if ( type == "Enum" ) return "int"; else if ( type == "Path" ) return "const TQString &"; diff --git a/qtjava/javalib/org/kde/qt/TQDataStream.java b/qtjava/javalib/org/kde/qt/TQDataStream.java index e171c3e9..89d6725c 100644 --- a/qtjava/javalib/org/kde/qt/TQDataStream.java +++ b/qtjava/javalib/org/kde/qt/TQDataStream.java @@ -37,8 +37,8 @@ public class TQDataStream implements QtSupport { public native TQDataStream op_read(char i); public native TQDataStream op_read(short i); public native TQDataStream op_read(int i); - // TQDataStream& op_read(Q_INT64& arg1); >>>> NOT CONVERTED - // TQDataStream& op_read(Q_UINT64& arg1); >>>> NOT CONVERTED + // TQDataStream& op_read(TQ_INT64& arg1); >>>> NOT CONVERTED + // TQDataStream& op_read(TQ_UINT64& arg1); >>>> NOT CONVERTED public native TQDataStream op_read(long i); public native TQDataStream op_read(float f); public native TQDataStream op_read(double f); diff --git a/qtjava/javalib/org/kde/qt/TQVariant.java b/qtjava/javalib/org/kde/qt/TQVariant.java index 2c11361d..fb1fb83e 100644 --- a/qtjava/javalib/org/kde/qt/TQVariant.java +++ b/qtjava/javalib/org/kde/qt/TQVariant.java @@ -252,7 +252,7 @@ public class TQVariant implements QtSupport { public native TQPen asPen(); public native int asInt(); public native int asUInt(); - // TQ_LLONG& asLongLong(); >>>> NOT CONVERTED + // TTQ_LLONG& asLongLong(); >>>> NOT CONVERTED // TQ_ULLONG& asULongLong(); >>>> NOT CONVERTED public native boolean asBool(); public native double asDouble(); diff --git a/qtjava/javalib/qtjava/TQBuffer.cpp b/qtjava/javalib/qtjava/TQBuffer.cpp index 9dbb918d..766b31c8 100644 --- a/qtjava/javalib/qtjava/TQBuffer.cpp +++ b/qtjava/javalib/qtjava/TQBuffer.cpp @@ -122,7 +122,7 @@ Java_org_kde_qt_QBuffer_readBlock(JNIEnv* env, jobject obj, jobject p, jlong arg static TQCString* _qstring_p = 0; if (_qstring_p == 0) { _qstring_p = new TQCString(); } _qstring_p->resize((uint) arg2); - jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_p->data(), (Q_ULONG) arg2); + jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_p->data(), (TQ_ULONG) arg2); QtSupport::fromTQCStringToStringBuffer(env, _qstring_p, p); return xret; } @@ -131,7 +131,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QBuffer_readLine(JNIEnv* env, jobject obj, jstring p, jlong arg2) { static TQCString* _qstring_p = 0; - jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, p, &_qstring_p), (Q_ULONG) arg2); + jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, p, &_qstring_p), (TQ_ULONG) arg2); return xret; } @@ -161,7 +161,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QBuffer_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring p, jlong arg2) { static TQCString* _qstring_p = 0; - jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, p, &_qstring_p), (Q_ULONG) arg2); + jlong xret = (jlong) ((TQBuffer*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, p, &_qstring_p), (TQ_ULONG) arg2); return xret; } diff --git a/qtjava/javalib/qtjava/TQDataStream.cpp b/qtjava/javalib/qtjava/TQDataStream.cpp index ff875824..0cfda8cc 100644 --- a/qtjava/javalib/qtjava/TQDataStream.cpp +++ b/qtjava/javalib/qtjava/TQDataStream.cpp @@ -107,7 +107,7 @@ static TQByteArray* _qbyteArray_arg1 = 0; JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1read__C(JNIEnv* env, jobject obj, jchar i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT8&) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_INT8&) i), "org.kde.qt.TQDataStream"); return xret; } @@ -128,14 +128,14 @@ Java_org_kde_qt_QDataStream_op_1read__F(JNIEnv* env, jobject obj, jfloat f) JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1read__I(JNIEnv* env, jobject obj, jint i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_INT32&) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_INT32&) i), "org.kde.qt.TQDataStream"); return xret; } JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1read__J(JNIEnv* env, jobject obj, jlong i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_LONG&) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_LONG&) i), "org.kde.qt.TQDataStream"); return xret; } @@ -150,14 +150,14 @@ static TQCString* _qstring_str = 0; JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1read__S(JNIEnv* env, jobject obj, jshort i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((Q_UINT8&) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator>>((TQ_UINT8&) i), "org.kde.qt.TQDataStream"); return xret; } JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1write__C(JNIEnv* env, jobject obj, jchar i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT8) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT8) i), "org.kde.qt.TQDataStream"); return xret; } @@ -178,14 +178,14 @@ Java_org_kde_qt_QDataStream_op_1write__F(JNIEnv* env, jobject obj, jfloat f) JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1write__I(JNIEnv* env, jobject obj, jint i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT32) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT32) i), "org.kde.qt.TQDataStream"); return xret; } JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1write__J(JNIEnv* env, jobject obj, jlong i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_INT64) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_INT64) i), "org.kde.qt.TQDataStream"); return xret; } @@ -200,7 +200,7 @@ static TQCString* _qstring_str = 0; JNIEXPORT jobject JNICALL Java_org_kde_qt_QDataStream_op_1write__S(JNIEnv* env, jobject obj, jshort i) { - jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((Q_UINT8) i), "org.kde.qt.TQDataStream"); + jobject xret = QtSupport::objectForQtKey(env, (void*)(TQDataStream *) &((TQDataStream*) QtSupport::getQt(env, obj))->operator<<((TQ_UINT8) i), "org.kde.qt.TQDataStream"); return xret; } diff --git a/qtjava/javalib/qtjava/TQFile.cpp b/qtjava/javalib/qtjava/TQFile.cpp index b1197d90..eaff2f33 100644 --- a/qtjava/javalib/qtjava/TQFile.cpp +++ b/qtjava/javalib/qtjava/TQFile.cpp @@ -192,7 +192,7 @@ Java_org_kde_qt_QFile_readBlock(JNIEnv* env, jobject obj, jobject data, jlong le static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) len); - jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) len); + jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) len); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -201,7 +201,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QFile_readLine__Ljava_lang_StringBuffer_2J(JNIEnv* env, jobject obj, jobject arg1, jlong maxlen) { static TQString* _qstring_arg1 = 0; - jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((TQString&)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, arg1, &_qstring_arg1), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((TQString&)*(TQString*) QtSupport::toTQStringFromStringBuffer(env, arg1, &_qstring_arg1), (TQ_ULONG) maxlen); QtSupport::fromTQStringToStringBuffer(env, _qstring_arg1, arg1); return xret; } @@ -210,7 +210,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QFile_readLine__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong maxlen) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen); return xret; } @@ -264,7 +264,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QFile_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((TQFile*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } diff --git a/qtjava/javalib/qtjava/TQFtp.cpp b/qtjava/javalib/qtjava/TQFtp.cpp index 2837636e..6198f20e 100644 --- a/qtjava/javalib/qtjava/TQFtp.cpp +++ b/qtjava/javalib/qtjava/TQFtp.cpp @@ -217,7 +217,7 @@ JNIEXPORT jint JNICALL Java_org_kde_qt_QFtp_connectToHost__Ljava_lang_String_2S(JNIEnv* env, jobject obj, jstring host, jshort port) { static TQString* _qstring_host = 0; - jint xret = (jint) ((TQFtp*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (Q_UINT16) port); + jint xret = (jint) ((TQFtp*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (TQ_UINT16) port); return xret; } @@ -533,7 +533,7 @@ Java_org_kde_qt_QFtp_readBlock(JNIEnv* env, jobject obj, jobject data, jlong max static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((TQFtp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQFtp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } diff --git a/qtjava/javalib/qtjava/TQHostAddress.cpp b/qtjava/javalib/qtjava/TQHostAddress.cpp index 7608891e..61f4091b 100644 --- a/qtjava/javalib/qtjava/TQHostAddress.cpp +++ b/qtjava/javalib/qtjava/TQHostAddress.cpp @@ -10,8 +10,8 @@ class TQHostAddressJBridge : public TQHostAddress { public: TQHostAddressJBridge() : TQHostAddress() {}; - TQHostAddressJBridge(Q_UINT32 arg1) : TQHostAddress(arg1) {}; - TQHostAddressJBridge(Q_UINT8* arg1) : TQHostAddress(arg1) {}; + TQHostAddressJBridge(TQ_UINT32 arg1) : TQHostAddress(arg1) {}; + TQHostAddressJBridge(TQ_UINT8* arg1) : TQHostAddress(arg1) {}; TQHostAddressJBridge(const TQString& arg1) : TQHostAddress(arg1) {}; TQHostAddressJBridge(const TQHostAddress& arg1) : TQHostAddress(arg1) {}; ~TQHostAddressJBridge() {QtSupport::qtKeyDeleted(this);} @@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Java_org_kde_qt_QHostAddress_newTQHostAddress__I(JNIEnv* env, jobject obj, jint ip4Addr) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQHostAddressJBridge((Q_UINT32) ip4Addr)); + QtSupport::setQt(env, obj, new TQHostAddressJBridge((TQ_UINT32) ip4Addr)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -120,7 +120,7 @@ JNIEXPORT void JNICALL Java_org_kde_qt_QHostAddress_newTQHostAddress__S(JNIEnv* env, jobject obj, jshort ip6Addr) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQHostAddressJBridge((Q_UINT8*) ip6Addr)); + QtSupport::setQt(env, obj, new TQHostAddressJBridge((TQ_UINT8*) ip6Addr)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -136,7 +136,7 @@ Java_org_kde_qt_QHostAddress_op_1equals(JNIEnv* env, jobject obj, jobject arg1) JNIEXPORT void JNICALL Java_org_kde_qt_QHostAddress_setAddress__I(JNIEnv* env, jobject obj, jint ip4Addr) { - ((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((Q_UINT32) ip4Addr); + ((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((TQ_UINT32) ip4Addr); return; } @@ -151,7 +151,7 @@ static TQString* _qstring_address = 0; JNIEXPORT void JNICALL Java_org_kde_qt_QHostAddress_setAddress__S(JNIEnv* env, jobject obj, jshort ip6Addr) { - ((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((Q_UINT8*) ip6Addr); + ((TQHostAddress*) QtSupport::getQt(env, obj))->setAddress((TQ_UINT8*) ip6Addr); return; } diff --git a/qtjava/javalib/qtjava/TQHttp.cpp b/qtjava/javalib/qtjava/TQHttp.cpp index 4b0f00bb..111bfc54 100644 --- a/qtjava/javalib/qtjava/TQHttp.cpp +++ b/qtjava/javalib/qtjava/TQHttp.cpp @@ -13,9 +13,9 @@ public: TQHttpJBridge() : TQHttp() {}; TQHttpJBridge(TQObject* arg1,const char* arg2) : TQHttp(arg1,arg2) {}; TQHttpJBridge(TQObject* arg1) : TQHttp(arg1) {}; - TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2,TQObject* arg3,const char* arg4) : TQHttp(arg1,arg2,arg3,arg4) {}; - TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2,TQObject* arg3) : TQHttp(arg1,arg2,arg3) {}; - TQHttpJBridge(const TQString& arg1,Q_UINT16 arg2) : TQHttp(arg1,arg2) {}; + TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2,TQObject* arg3,const char* arg4) : TQHttp(arg1,arg2,arg3,arg4) {}; + TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2,TQObject* arg3) : TQHttp(arg1,arg2,arg3) {}; + TQHttpJBridge(const TQString& arg1,TQ_UINT16 arg2) : TQHttp(arg1,arg2) {}; TQHttpJBridge(const TQString& arg1) : TQHttp(arg1) {}; void protected_operationGet(TQNetworkOperation* arg1) { TQHttp::operationGet(arg1); @@ -295,7 +295,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2S(JNIEnv* env, jobject obj, { static TQString* _qstring_hostname = 0; if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port)); + QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -306,7 +306,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2SLorg_kde_qt_QObject_2(JNIEn { static TQString* _qstring_hostname = 0; if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port, (TQObject*) QtSupport::getQt(env, parent))); + QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port, (TQObject*) QtSupport::getQt(env, parent))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -318,7 +318,7 @@ Java_org_kde_qt_QHttp_newTQHttp__Ljava_lang_String_2SLorg_kde_qt_QObject_2Ljava_ static TQString* _qstring_hostname = 0; static TQCString* _qstring_name = 0; if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port, (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name))); + QtSupport::setQt(env, obj, new TQHttpJBridge((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port, (TQObject*) QtSupport::getQt(env, parent), (const char*) QtSupport::toCharString(env, name, &_qstring_name))); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; @@ -407,7 +407,7 @@ Java_org_kde_qt_QHttp_readBlock(JNIEnv* env, jobject obj, jobject data, jlong ma static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((TQHttp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQHttp*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -461,7 +461,7 @@ JNIEXPORT jint JNICALL Java_org_kde_qt_QHttp_setHost__Ljava_lang_String_2S(JNIEnv* env, jobject obj, jstring hostname, jshort port) { static TQString* _qstring_hostname = 0; - jint xret = (jint) ((TQHttp*) QtSupport::getQt(env, obj))->setHost((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (Q_UINT16) port); + jint xret = (jint) ((TQHttp*) QtSupport::getQt(env, obj))->setHost((const TQString&)*(TQString*) QtSupport::toTQString(env, hostname, &_qstring_hostname), (TQ_UINT16) port); return xret; } diff --git a/qtjava/javalib/qtjava/TQIODevice.cpp b/qtjava/javalib/qtjava/TQIODevice.cpp index d3e766b5..0524e775 100644 --- a/qtjava/javalib/qtjava/TQIODevice.cpp +++ b/qtjava/javalib/qtjava/TQIODevice.cpp @@ -181,7 +181,7 @@ Java_org_kde_qt_QIODevice_readBlock(JNIEnv* env, jobject obj, jobject data, jlon static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -190,7 +190,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QIODevice_readLine(JNIEnv* env, jobject obj, jstring data, jlong maxlen) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen); return xret; } @@ -240,7 +240,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QIODevice_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((TQIODevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } diff --git a/qtjava/javalib/qtjava/TQSocket.cpp b/qtjava/javalib/qtjava/TQSocket.cpp index 49b505bb..72a831f0 100644 --- a/qtjava/javalib/qtjava/TQSocket.cpp +++ b/qtjava/javalib/qtjava/TQSocket.cpp @@ -174,7 +174,7 @@ JNIEXPORT void JNICALL Java_org_kde_qt_QSocket_connectToHost(JNIEnv* env, jobject obj, jstring host, jshort port) { static TQString* _qstring_host = 0; - ((TQSocket*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (Q_UINT16) port); + ((TQSocket*) QtSupport::getQt(env, obj))->connectToHost((const TQString&)*(TQString*) QtSupport::toTQString(env, host, &_qstring_host), (TQ_UINT16) port); return; } @@ -415,7 +415,7 @@ Java_org_kde_qt_QSocket_readBlock(JNIEnv* env, jobject obj, jobject data, jlong static TQCString* _qstring_data = 0; if (_qstring_data == 0) { _qstring_data = new TQCString(); } _qstring_data->resize((uint) maxlen); - jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -439,7 +439,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QSocket_readLine__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong maxlen) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->readLine((char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) maxlen); return xret; } @@ -474,7 +474,7 @@ Java_org_kde_qt_QSocket_setMode(JNIEnv* env, jobject obj, jint arg1) JNIEXPORT void JNICALL Java_org_kde_qt_QSocket_setReadBufferSize(JNIEnv* env, jobject obj, jlong arg1) { - ((TQSocket*) QtSupport::getQt(env, obj))->setReadBufferSize((Q_ULONG) arg1); + ((TQSocket*) QtSupport::getQt(env, obj))->setReadBufferSize((TQ_ULONG) arg1); return; } @@ -617,7 +617,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QSocket_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((TQSocket*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } diff --git a/qtjava/javalib/qtjava/TQSocketDevice.cpp b/qtjava/javalib/qtjava/TQSocketDevice.cpp index 72fc9c25..915519e8 100644 --- a/qtjava/javalib/qtjava/TQSocketDevice.cpp +++ b/qtjava/javalib/qtjava/TQSocketDevice.cpp @@ -66,7 +66,7 @@ Java_org_kde_qt_QSocketDevice_at__J(JNIEnv* env, jobject obj, jlong arg1) JNIEXPORT jboolean JNICALL Java_org_kde_qt_QSocketDevice_bind(JNIEnv* env, jobject obj, jobject arg1, jshort arg2) { - jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->bind((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (Q_UINT16) arg2); + jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->bind((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (TQ_UINT16) arg2); return xret; } @@ -94,7 +94,7 @@ Java_org_kde_qt_QSocketDevice_close(JNIEnv* env, jobject obj) JNIEXPORT jboolean JNICALL Java_org_kde_qt_QSocketDevice_connect(JNIEnv* env, jobject obj, jobject arg1, jshort arg2) { - jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->connect((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (Q_UINT16) arg2); + jboolean xret = (jboolean) ((TQSocketDevice*) QtSupport::getQt(env, obj))->connect((const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, arg1), (TQ_UINT16) arg2); return xret; } @@ -244,7 +244,7 @@ Java_org_kde_qt_QSocketDevice_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) ((TQSocketDevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (Q_ULONG) maxlen); + jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->readBlock((char*) _qstring_data->data(), (TQ_ULONG) maxlen); QtSupport::fromTQCStringToStringBuffer(env, _qstring_data, data); return xret; } @@ -353,7 +353,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QSocketDevice_writeBlock__Ljava_lang_String_2J(JNIEnv* env, jobject obj, jstring data, jlong len) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len); + jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len); return xret; } @@ -361,7 +361,7 @@ JNIEXPORT jlong JNICALL Java_org_kde_qt_QSocketDevice_writeBlock__Ljava_lang_String_2JLorg_kde_qt_QHostAddress_2S(JNIEnv* env, jobject obj, jstring data, jlong len, jobject host, jshort port) { static TQCString* _qstring_data = 0; - jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (Q_ULONG) len, (const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, host), (Q_UINT16) port); + jlong xret = (jlong) ((TQSocketDevice*) QtSupport::getQt(env, obj))->writeBlock((const char*) QtSupport::toCharString(env, data, &_qstring_data), (TQ_ULONG) len, (const TQHostAddress&)*(const TQHostAddress*) QtSupport::getQt(env, host), (TQ_UINT16) port); return xret; } diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp index 4c713dc7..54506269 100644 --- a/qtjava/javalib/qtjava/TQVariant.cpp +++ b/qtjava/javalib/qtjava/TQVariant.cpp @@ -57,7 +57,7 @@ public: TQVariantJBridge(const TQKeySequence& arg1) : TQVariant(arg1) {}; TQVariantJBridge(const TQPen& arg1) : TQVariant(arg1) {}; TQVariantJBridge(int arg1) : TQVariant(arg1) {}; - TQVariantJBridge(Q_LLONG arg1) : TQVariant(arg1) {}; + TQVariantJBridge(TQ_LLONG arg1) : TQVariant(arg1) {}; TQVariantJBridge(bool arg1,int arg2) : TQVariant(arg1,arg2) {}; TQVariantJBridge(double arg1) : TQVariant(arg1) {}; TQVariantJBridge(TQSizePolicy arg1) : TQVariant(arg1) {}; @@ -382,7 +382,7 @@ JNIEXPORT void JNICALL Java_org_kde_qt_QVariant_newTQVariant__J(JNIEnv* env, jobject obj, jlong arg1) { if (QtSupport::getQt(env, obj) == 0) { - QtSupport::setQt(env, obj, new TQVariantJBridge((Q_LLONG) arg1)); + QtSupport::setQt(env, obj, new TQVariantJBridge((TQ_LLONG) arg1)); QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj)); } return; diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog index dfc0daa1..0acd866f 100644 --- a/qtruby/ChangeLog +++ b/qtruby/ChangeLog @@ -160,7 +160,7 @@ 2006-05-07 Richard Dale <rdale@foton.es> - * An an type of Q_UINT16 wasn't working with QtRuby. Fixes problem + * An an type of TQ_UINT16 wasn't working with QtRuby. Fixes problem reported by maelclerambault. 2006-05-03 Richard Dale <rdale@foton.es> diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index e85f47df..703c9d03 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1894,16 +1894,16 @@ TypeHandler Qt_handlers[] = { { "TQStrList*", marshall_TQStrList }, { "long long int", marshall_longlong }, { "long long int&", marshall_longlong }, - { "TQ_INT64", marshall_longlong }, - { "TQ_INT64&", marshall_longlong }, - { "TQ_LLONG", marshall_longlong }, - { "TQ_LLONG&", marshall_longlong }, + { "TTQ_INT64", marshall_longlong }, + { "TTQ_INT64&", marshall_longlong }, + { "TTQ_LLONG", marshall_longlong }, + { "TTQ_LLONG&", marshall_longlong }, { "KIO::filesize_t", marshall_longlong }, { "DOM::DOMTimeStamp", marshall_ulonglong }, { "unsigned long long int", marshall_ulonglong }, { "unsigned long long int&", marshall_ulonglong }, - { "TQ_UINT64", marshall_ulonglong }, - { "TQ_UINT64&", marshall_ulonglong }, + { "TTQ_UINT64", marshall_ulonglong }, + { "TTQ_UINT64&", marshall_ulonglong }, { "TQ_ULLONG", marshall_ulonglong }, { "TQ_ULLONG&", marshall_ulonglong }, { "signed int&", marshall_intR }, diff --git a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb index e6a1cc82..a8bb72a0 100644 --- a/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb +++ b/qtruby/rubylib/qtruby/lib/Qt/qtruby.rb @@ -1382,9 +1382,9 @@ module Qt def Internal.checkarg(argtype, typename) puts " #{typename} (#{argtype})" if debug_level >= DebugLevel::High if argtype == 'i' - if typename =~ /^int&?$|^signed int&?$|^signed$|^Q_INT32&?$/ + if typename =~ /^int&?$|^signed int&?$|^signed$|^TQ_INT32&?$/ return 1 - elsif typename =~ /^(?:short|ushort|unsigned short int|uchar|uint|long|ulong|unsigned long int|unsigned|float|double|Q_UINT32|Q_UINT16|Q_INT16)$/ + elsif typename =~ /^(?:short|ushort|unsigned short int|uchar|uint|long|ulong|unsigned long int|unsigned|float|double|TQ_UINT32|TQ_UINT16|TQ_INT16)$/ return 0 else t = typename.sub(/^const\s+/, '') @@ -1459,7 +1459,7 @@ module Qt elsif classIsa(argtype, t) return 0 elsif isEnum(argtype) and - (t =~ /int|Q_INT32|uint|Q_UINT32|long|ulong/ or isEnum(t)) + (t =~ /int|TQ_INT32|uint|TQ_UINT32|long|ulong/ or isEnum(t)) return 0 end end diff --git a/qtsharp/src/api/qt.xml b/qtsharp/src/api/qt.xml index d4f15ae1..e2e84dad 100644 --- a/qtsharp/src/api/qt.xml +++ b/qtsharp/src/api/qt.xml @@ -1127,20 +1127,20 @@ id="0"> <qmethod name="at" access="public" return="bool" id="1"> <qparam type="Offset" name="arg1"/> </qmethod> - <qmethod name="readBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="readBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="p"/> - <qparam type="Q_ULONG" name="arg1"/> + <qparam type="TQ_ULONG" name="arg1"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="p"/> - <qparam type="Q_ULONG" name="arg1"/> + <qparam type="TQ_ULONG" name="arg1"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="1"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1"> <qparam type="TQByteArrayamp" name="data"/> </qmethod> - <qmethod name="readLine" access="public" return="Q_LONG" id="0"> + <qmethod name="readLine" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="p"/> - <qparam type="Q_ULONG" name="arg1"/> + <qparam type="TQ_ULONG" name="arg1"/> </qmethod> <qmethod name="getch" access="public" return="int" id="0"/> <qmethod name="putch" access="public" return="int" id="0"> @@ -4238,14 +4238,14 @@ id="0"> </qtype> <qtype name="MailServer" access="public"> <qctor name="MailServer" access="public" id="0"> <qparam type="TQStringamp" name="n" default="TQString::null"/> - <qparam type="Q_UINT16" name="p" default="0"/> + <qparam type="TQ_UINT16" name="p" default="0"/> </qctor> </qtype> <qtype name="Server" access="public"> <qctor name="Server" access="public" id="0"> <qparam type="TQStringamp" name="n" default="TQString::null"/> - <qparam type="Q_UINT16" name="p" default="0"/> - <qparam type="Q_UINT16" name="w" default="0"/> - <qparam type="Q_UINT16" name="po" default="0"/> + <qparam type="TQ_UINT16" name="p" default="0"/> + <qparam type="TQ_UINT16" name="w" default="0"/> + <qparam type="TQ_UINT16" name="po" default="0"/> </qctor> </qtype> <qtype name="TQDockArea" access="public"> <qancestor name="TQWidget"/> @@ -5255,24 +5255,24 @@ id="0"/> <qparam type="Offset" name="arg1"/> </qmethod> <qmethod name="atEnd" access="public" return="bool" id="0"/> - <qmethod name="readBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="readBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="1"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1"> <qparam type="TQByteArrayamp" name="data"/> </qmethod> - <qmethod name="readLine" access="public" return="Q_LONG" id="0"> + <qmethod name="readLine" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> - <qmethod name="readLine" access="public" return="Q_LONG" id="1"> + <qmethod name="readLine" access="public" return="TQ_LONG" id="1"> <qparam type="TQStringamp" name="arg1"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> <qmethod name="getch" access="public" return="int" id="0"/> <qmethod name="putch" access="public" return="int" id="0"> @@ -7450,26 +7450,26 @@ id="0"> </qtype> <qtype name="TQHostAddress" access="public"> <qctor name="TQHostAddress" access="public" id="0"/> <qctor name="TQHostAddress" access="public" id="1"> - <qparam type="Q_UINT32" name="ip4Addr"/> + <qparam type="TQ_UINT32" name="ip4Addr"/> </qctor> <qctor name="TQHostAddress" access="public" id="2"> - <qparam type="Q_UINT8*" name="ip6Addr"/> + <qparam type="TQ_UINT8*" name="ip6Addr"/> </qctor> <qctor name="TQHostAddress" access="public" id="3"> <qparam type="TQHostAddressamp" name="arg1"/> </qctor> <qdctor name="TQHostAddress" access="public"/> <qmethod name="setAddress" access="public" return="void" id="0"> - <qparam type="Q_UINT32" name="ip4Addr"/> + <qparam type="TQ_UINT32" name="ip4Addr"/> </qmethod> <qmethod name="setAddress" access="public" return="void" id="1"> - <qparam type="Q_UINT8*" name="ip6Addr"/> + <qparam type="TQ_UINT8*" name="ip6Addr"/> </qmethod> <qmethod name="setAddress" access="public" return="bool" id="2"> <qparam type="TQStringamp" name="address"/> </qmethod> <qmethod name="isIp4Addr" access="public" return="bool" id="0"/> - <qmethod name="ip4Addr" access="public" return="Q_UINT32" id="0"/> + <qmethod name="ip4Addr" access="public" return="TQ_UINT32" id="0"/> <qmethod name="toString" access="public" return="TQString" id="0"/> </qtype> <qtype name="TQHttp" access="public"> <qancestor name="TQNetworkProtocol"/> @@ -7526,19 +7526,19 @@ id="0"> </qmethod> <qmethod name="atEnd" access="public" return="bool" id="0"/> <qmethod name="reset" access="public" return="bool" id="0"/> - <qmethod name="readBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="readBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> </qmethod> - <qmethod name="readLine" access="public" return="Q_LONG" id="0"> + <qmethod name="readLine" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="1"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1"> <qparam type="TQByteArrayamp" name="data"/> </qmethod> <qmethod name="readAll" access="public" return="TQByteArray" id="0"/> @@ -15206,7 +15206,7 @@ id="0"> <qancestor name="TQObject"/> <qdctor name="TQServerSocket" access="public"/> <qmethod name="ok" access="public" return="bool" id="0"/> - <qmethod name="port" access="public" return="Q_UINT16" id="0"/> + <qmethod name="port" access="public" return="TQ_UINT16" id="0"/> <qmethod name="socket" access="public" return="int" id="0"/> <qmethod name="setSocket" access="public" return="void" id="0"> <qparam type="int" name="socket"/> @@ -15701,7 +15701,7 @@ id="0"> </qmethod> <qmethod name="connectToHost" access="public" return="void" id="0"> <qparam type="TQStringamp" name="host"/> - <qparam type="Q_UINT16" name="port"/> + <qparam type="TQ_UINT16" name="port"/> </qmethod> <qmethod name="peerName" access="public" return="TQString" id="0"/> <qmethod name="open" access="public" return="bool" id="0"> @@ -15715,22 +15715,22 @@ id="0"> <qparam type="Offset" name="arg1"/> </qmethod> <qmethod name="atEnd" access="public" return="bool" id="0"/> - <qmethod name="bytesAvailable" access="public" return="Q_ULONG" id="0"/> - <qmethod name="waitForMore" access="public" return="Q_ULONG" id="0"> + <qmethod name="bytesAvailable" access="public" return="TQ_ULONG" id="0"/> + <qmethod name="waitForMore" access="public" return="TQ_ULONG" id="0"> <qparam type="int" name="msecs"/> </qmethod> - <qmethod name="bytesToWrite" access="public" return="Q_ULONG" id="0"/> - <qmethod name="readBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="bytesToWrite" access="public" return="TQ_ULONG" id="0"/> + <qmethod name="readBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> </qmethod> - <qmethod name="readLine" access="public" return="Q_LONG" id="0"> + <qmethod name="readLine" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> <qmethod name="getch" access="public" return="int" id="0"/> <qmethod name="putch" access="public" return="int" id="0"> @@ -15741,8 +15741,8 @@ id="0"> </qmethod> <qmethod name="canReadLine" access="public" return="bool" id="0"/> <qmethod name="readLine" access="public" return="TQString" id="1"/> - <qmethod name="port" access="public" return="Q_UINT16" id="0"/> - <qmethod name="peerPort" access="public" return="Q_UINT16" id="0"/> + <qmethod name="port" access="public" return="TQ_UINT16" id="0"/> + <qmethod name="peerPort" access="public" return="TQ_UINT16" id="0"/> <qmethod name="address" access="public" return="TQHostAddress" id="0"/> <qmethod name="peerAddress" access="public" return="TQHostAddress" id="0"/> <qmethod name="protected_sn_read" access="protected" return="void" id="0"> @@ -15811,34 +15811,34 @@ id="0"> </qmethod> <qmethod name="connect" access="public" return="bool" id="0"> <qparam type="TQHostAddressamp" name="arg1"/> - <qparam type="Q_UINT16" name="arg2"/> + <qparam type="TQ_UINT16" name="arg2"/> </qmethod> <qmethod name="bind" access="public" return="bool" id="0"> <qparam type="TQHostAddressamp" name="arg1"/> - <qparam type="Q_UINT16" name="arg2"/> + <qparam type="TQ_UINT16" name="arg2"/> </qmethod> <qmethod name="listen" access="public" return="bool" id="0"> <qparam type="int" name="backlog"/> </qmethod> <qmethod name="accept" access="public" return="int" id="0"/> - <qmethod name="bytesAvailable" access="public" return="Q_LONG" id="0"/> - <qmethod name="waitForMore" access="public" return="Q_LONG" id="0"> + <qmethod name="bytesAvailable" access="public" return="TQ_LONG" id="0"/> + <qmethod name="waitForMore" access="public" return="TQ_LONG" id="0"> <qparam type="int" name="msecs"/> <qparam type="bool*" name="timeout" default="0"/> </qmethod> - <qmethod name="readBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="readBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="maxlen"/> + <qparam type="TQ_ULONG" name="maxlen"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="0"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="0"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> </qmethod> - <qmethod name="writeBlock" access="public" return="Q_LONG" id="1"> + <qmethod name="writeBlock" access="public" return="TQ_LONG" id="1"> <qparam type="char*" name="data"/> - <qparam type="Q_ULONG" name="len"/> + <qparam type="TQ_ULONG" name="len"/> <qparam type="TQHostAddressamp" name="host"/> - <qparam type="Q_UINT16" name="port"/> + <qparam type="TQ_UINT16" name="port"/> </qmethod> <qmethod name="getch" access="public" return="int" id="0"/> <qmethod name="putch" access="public" return="int" id="0"> @@ -15847,8 +15847,8 @@ id="0"> <qmethod name="ungetch" access="public" return="int" id="0"> <qparam type="int" name="arg1"/> </qmethod> - <qmethod name="port" access="public" return="Q_UINT16" id="0"/> - <qmethod name="peerPort" access="public" return="Q_UINT16" id="0"/> + <qmethod name="port" access="public" return="TQ_UINT16" id="0"/> + <qmethod name="peerPort" access="public" return="TQ_UINT16" id="0"/> <qmethod name="address" access="public" return="TQHostAddress" id="0"/> <qmethod name="peerAddress" access="public" return="TQHostAddress" id="0"/> <qmethod name="error" access="public" return="Error" id="0"/> diff --git a/qtsharp/src/generator/TQTypeMap.cs b/qtsharp/src/generator/TQTypeMap.cs index e0e65f10..8318cca4 100644 --- a/qtsharp/src/generator/TQTypeMap.cs +++ b/qtsharp/src/generator/TQTypeMap.cs @@ -78,15 +78,15 @@ namespace QtCSharp { mastermap.Add ("array_data", "IntPtr"); mastermap.Add ("bitarr_data", "IntPtr"); mastermap.Add ("Offset", "int"); - mastermap.Add ("Q_INT16", "short"); - mastermap.Add ("Q_INT32", "int"); - mastermap.Add ("Q_INT8", "char"); - mastermap.Add ("Q_LONG", "long"); + mastermap.Add ("TQ_INT16", "short"); + mastermap.Add ("TQ_INT32", "int"); + mastermap.Add ("TQ_INT8", "char"); + mastermap.Add ("TQ_LONG", "long"); mastermap.Add ("TQ_PACKED", "uint"); - mastermap.Add ("Q_UINT16", "ushort"); - mastermap.Add ("Q_UINT32", "uint"); - mastermap.Add ("Q_UINT8", "char"); - mastermap.Add ("Q_ULONG", "long"); + mastermap.Add ("TQ_UINT16", "ushort"); + mastermap.Add ("TQ_UINT32", "uint"); + mastermap.Add ("TQ_UINT8", "char"); + mastermap.Add ("TQ_ULONG", "long"); mastermap.Add ("TQStyleHintReturn", "IntPtr"); mastermap.Add ("TQFileInfoList", "IntPtr"); mastermap.Add ("TQDomNodePrivate", "IntPtr"); diff --git a/xparts/src/gtk/gtkpart.c b/xparts/src/gtk/gtkpart.c index 2a214123..b47a191a 100644 --- a/xparts/src/gtk/gtkpart.c +++ b/xparts/src/gtk/gtkpart.c @@ -136,7 +136,7 @@ gboolean gtk_xpart_dcop_process( DcopObject *obj, const char *fun, dcop_data *da if ( strcmp( fun, "windowId()" ) == 0 ) { - *reply_type = strdup( "Q_UINT32" ); + *reply_type = strdup( "TQ_UINT32" ); *reply_data = dcop_data_ref( dcop_data_new() ); fprintf( stderr, "returning window id %ld\n", GDK_WINDOW_XWINDOW( d->widget->window ) ); diff --git a/xparts/src/interfaces/xpart.h b/xparts/src/interfaces/xpart.h index 1d323a5d..5c44cbbd 100644 --- a/xparts/src/interfaces/xpart.h +++ b/xparts/src/interfaces/xpart.h @@ -11,7 +11,7 @@ class XPart : public DCOPObject k_dcop: /** The XPartManager uses the windowId() to embed the part. */ - virtual Q_UINT32 windowId() = 0; + virtual TQ_UINT32 windowId() = 0; /** Called when the part should display itself */ virtual void show() = 0; diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp index 5dc7157c..ae8cc850 100644 --- a/xparts/xpart_notepad/xp_notepad.cpp +++ b/xparts/xpart_notepad/xp_notepad.cpp @@ -23,7 +23,7 @@ public: } /** needed by XPartManager to embed the part */ - Q_UINT32 windowId() + TQ_UINT32 windowId() { return winId(); } /** used by XPartManager to show the part */ |