diff options
| -rw-r--r-- | kalyptus/kalyptusCxxToJNI.pm | 24 | ||||
| -rw-r--r-- | kalyptus/kalyptusCxxToJava.pm | 24 | ||||
| -rw-r--r-- | qtjava/javalib/org/kde/qt/TQVariant.java | 4 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/handlers.cpp | 16 |
4 files changed, 34 insertions, 34 deletions
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm index 2e6ca6f5..088ae4de 100644 --- a/kalyptus/kalyptusCxxToJNI.pm +++ b/kalyptus/kalyptusCxxToJNI.pm @@ -145,18 +145,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'Q_INT16' => 'short', - 'Q_INT32' => 'int', - 'Q_INT64' => 'long', - 'Q_INT8' => 'char', - 'Q_LONG' => 'long', - 'Q_LLONG' => 'long', - 'Q_ULLONG' => 'long', - 'Q_UINT16' => 'ushort', - 'Q_UINT32' => 'uint', - 'Q_UINT64' => 'long', - 'Q_UINT8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT64' => 'long', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_LLONG' => 'long', + 'TQ_ULLONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT64' => 'long', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm index 641c8e11..fd4907d3 100644 --- a/kalyptus/kalyptusCxxToJava.pm +++ b/kalyptus/kalyptusCxxToJava.pm @@ -143,18 +143,18 @@ BEGIN 'TQEventLoop::ProcessEventsFlags' => 'uint', 'TQStyle::SCFlags' => 'int', 'TQStyle::SFlags' => 'int', - 'Q_INT16' => 'short', - 'Q_INT32' => 'int', - 'Q_INT64' => 'long', - 'Q_INT8' => 'char', - 'Q_LONG' => 'long', - 'Q_LLONG' => 'long', - 'Q_ULLONG' => 'long', - 'Q_UINT16' => 'ushort', - 'Q_UINT32' => 'uint', - 'Q_UINT64' => 'long', - 'Q_UINT8' => 'uchar', - 'Q_ULONG' => 'long', + 'TQ_INT16' => 'short', + 'TQ_INT32' => 'int', + 'TQ_INT64' => 'long', + 'TQ_INT8' => 'char', + 'TQ_LONG' => 'long', + 'TQ_LLONG' => 'long', + 'TQ_ULLONG' => 'long', + 'TQ_UINT16' => 'ushort', + 'TQ_UINT32' => 'uint', + 'TQ_UINT64' => 'long', + 'TQ_UINT8' => 'uchar', + 'TQ_ULONG' => 'long', 'pid_t' => 'int', 'size_t' => 'int', 'pid_t' => 'int', diff --git a/qtjava/javalib/org/kde/qt/TQVariant.java b/qtjava/javalib/org/kde/qt/TQVariant.java index 41a8ce67..2c11361d 100644 --- a/qtjava/javalib/org/kde/qt/TQVariant.java +++ b/qtjava/javalib/org/kde/qt/TQVariant.java @@ -252,8 +252,8 @@ public class TQVariant implements QtSupport { public native TQPen asPen(); public native int asInt(); public native int asUInt(); - // Q_LLONG& asLongLong(); >>>> NOT CONVERTED - // Q_ULLONG& asULongLong(); >>>> NOT CONVERTED + // TQ_LLONG& asLongLong(); >>>> NOT CONVERTED + // TQ_ULLONG& asULongLong(); >>>> NOT CONVERTED public native boolean asBool(); public native double asDouble(); // TQValueList<TQVariant>& asList(); >>>> NOT CONVERTED diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 5b86ed39..e85f47df 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1894,18 +1894,18 @@ TypeHandler Qt_handlers[] = { { "TQStrList*", marshall_TQStrList }, { "long long int", marshall_longlong }, { "long long int&", marshall_longlong }, - { "Q_INT64", marshall_longlong }, - { "Q_INT64&", marshall_longlong }, - { "Q_LLONG", marshall_longlong }, - { "Q_LLONG&", marshall_longlong }, + { "TQ_INT64", marshall_longlong }, + { "TQ_INT64&", marshall_longlong }, + { "TQ_LLONG", marshall_longlong }, + { "TQ_LLONG&", marshall_longlong }, { "KIO::filesize_t", marshall_longlong }, { "DOM::DOMTimeStamp", marshall_ulonglong }, { "unsigned long long int", marshall_ulonglong }, { "unsigned long long int&", marshall_ulonglong }, - { "Q_UINT64", marshall_ulonglong }, - { "Q_UINT64&", marshall_ulonglong }, - { "Q_ULLONG", marshall_ulonglong }, - { "Q_ULLONG&", marshall_ulonglong }, + { "TQ_UINT64", marshall_ulonglong }, + { "TQ_UINT64&", marshall_ulonglong }, + { "TQ_ULLONG", marshall_ulonglong }, + { "TQ_ULLONG&", marshall_ulonglong }, { "signed int&", marshall_intR }, { "int&", marshall_intR }, { "int*", marshall_intR }, |