Browse Source

Update for recent TQ changes.

bug/266/move-to-usr
Darrell Anderson 10 years ago
parent
commit
a5ebcd6973
  1. 20
      dcoppython/shell/marshal_funcs.data
  2. 12
      dcoppython/shell/marshaller.cpp
  3. 18
      kalyptus/kalyptusCxxToDcopIDL.pm
  4. 24
      kalyptus/kalyptusCxxToJNI.pm
  5. 24
      kalyptus/kalyptusCxxToJava.pm
  6. 24
      kalyptus/kalyptusCxxToKimono.pm
  7. 24
      kalyptus/kalyptusCxxToSmoke.pm
  8. 16
      kalyptus/kalyptusCxxToSwig.pm
  9. 34
      kalyptus/kalyptusDataDict.pm
  10. 6
      kdejava/koala/kdejava/KAsyncIO.cpp
  11. 4
      kdejava/koala/kdejava/KConfigBase.cpp
  12. 4
      kdejava/koala/kdejava/KFilterDev.cpp
  13. 8
      kdejava/koala/kdejava/KZipFileEntry.cpp
  14. 26
      kjsembed/builtins/qfile_imp.cpp
  15. 2
      kjsembed/tools/headers/qpen.h
  16. 8
      korundum/ChangeLog
  17. 4
      korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
  18. 4
      qtjava/javalib/org/kde/qt/TQDataStream.java
  19. 2
      qtjava/javalib/org/kde/qt/TQVariant.java
  20. 6
      qtjava/javalib/qtjava/TQBuffer.cpp
  21. 16
      qtjava/javalib/qtjava/TQDataStream.cpp
  22. 8
      qtjava/javalib/qtjava/TQFile.cpp
  23. 4
      qtjava/javalib/qtjava/TQFtp.cpp
  24. 12
      qtjava/javalib/qtjava/TQHostAddress.cpp
  25. 16
      qtjava/javalib/qtjava/TQHttp.cpp
  26. 6
      qtjava/javalib/qtjava/TQIODevice.cpp
  27. 10
      qtjava/javalib/qtjava/TQSocket.cpp
  28. 10
      qtjava/javalib/qtjava/TQSocketDevice.cpp
  29. 4
      qtjava/javalib/qtjava/TQVariant.cpp
  30. 2
      qtruby/ChangeLog
  31. 12
      qtruby/rubylib/qtruby/handlers.cpp
  32. 6
      qtruby/rubylib/qtruby/lib/Qt/qtruby.rb
  33. 116
      qtsharp/src/api/qt.xml
  34. 16
      qtsharp/src/generator/TQTypeMap.cs
  35. 2
      xparts/src/gtk/gtkpart.c
  36. 2
      xparts/src/interfaces/xpart.h
  37. 2
      xparts/xpart_notepad/xp_notepad.cpp

20
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);
}

12
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);

18
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.

24
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.

24
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.

24
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.

24
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.

16
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

34
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',

6
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;
}

4
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;
}

4
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;
}

8
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;
}

26
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'
}

2
kjsembed/tools/headers/qpen.h

@ -83,7 +83,7 @@ private:
PenStyle style;
uint width;
TQColor color;
Q_UINT16 linest;
TQ_UINT16 linest;
} *data;
};

8
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>

4
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 &";

4
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);

2
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();

6
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;
}

16
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;
}

8
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;
}

4
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;
}

12
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;
}

16
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;
}

6
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;
}

10
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;
}

10
qtjava/javalib/qtjava/TQSocketDevice.cpp

@ -66,7 +66,7 @@ Java_org_kde_qt_QSocketDevice_at__J(JNIEnv* env, jobject obj, jlong arg1)
JNIEXPORT jboolean