diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:17:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-14 21:17:02 -0600 |
| commit | 3fda03faf1b67aa1221099f3a2153a0aa40811ef (patch) | |
| tree | 99c8ff09fb5c748c0e2fbb19e56f102476c2eb49 /qtruby/rubylib/qtruby | |
| parent | 7e7a6b6965f6463062bf5b60feca8b50d4434b96 (diff) | |
| download | tdebindings-3fda03faf1b67aa1221099f3a2153a0aa40811ef.tar.gz tdebindings-3fda03faf1b67aa1221099f3a2153a0aa40811ef.zip | |
Update various qt function definitions and static methods for tqt3
Diffstat (limited to 'qtruby/rubylib/qtruby')
| -rw-r--r-- | qtruby/rubylib/qtruby/Qt.cpp | 10 | ||||
| -rw-r--r-- | qtruby/rubylib/qtruby/handlers.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp index c45eeb64..edb151af 100644 --- a/qtruby/rubylib/qtruby/Qt.cpp +++ b/qtruby/rubylib/qtruby/Qt.cpp @@ -48,8 +48,8 @@ #include <ruby.h> -#ifndef QT_VERSION_STR -#define QT_VERSION_STR "Unknown" +#ifndef TQT_VERSION_STR +#define TQT_VERSION_STR "Unknown" #endif #undef free @@ -2507,7 +2507,7 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator!=") != 0 \ && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator--") != 0 \ && qstrcmp(qt_Smoke->methodNames[methodRef.name], "operator++") != 0 \ - && qstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \ + && tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator ", strlen("operator ")) != 0 \ && ( (flags == 0 && (methodRef.flags & (Smoke::mf_static|Smoke::mf_enum|Smoke::mf_protected)) == 0) \ || ( flags == Smoke::mf_static \ && (methodRef.flags & Smoke::mf_enum) == 0 \ @@ -2516,7 +2516,7 @@ findAllMethods(int argc, VALUE * argv, VALUE /*self*/) || ( flags == Smoke::mf_protected \ && (methodRef.flags & Smoke::mf_static) == 0 \ && (methodRef.flags & Smoke::mf_protected) == Smoke::mf_protected ) ) ) { \ - if (qstrncmp(qt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \ + if (tqstrncmp(qt_Smoke->methodNames[methodRef.name], "operator", strlen("operator")) == 0) { \ if (op_re.search(qt_Smoke->methodNames[methodRef.name]) != -1) { \ rb_ary_push(result, rb_str_new2(op_re.cap(1) + op_re.cap(2))); \ } else { \ @@ -2797,7 +2797,7 @@ create_qt_class(VALUE /*self*/, VALUE package_value) static VALUE version(VALUE /*self*/) { - return rb_str_new2(QT_VERSION_STR); + return rb_str_new2(TQT_VERSION_STR); } static VALUE diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 30341fd1..ae952c0e 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -1748,7 +1748,7 @@ void marshall_TQPairintint(Marshall *m) { #include <tqtoolbar.h> #include <tqtabbar.h> -#if QT_VERSION >= 0x030200 +#if TQT_VERSION >= 0x030200 DEF_LIST_MARSHALLER( TQPtrListTQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, TQPtrListStdIterator<TQNetworkOperation> ) DEF_LIST_MARSHALLER( TQPtrListTQToolBar, TQPtrList<TQToolBar>, TQToolBar, TQPtrListStdIterator<TQToolBar> ) DEF_LIST_MARSHALLER( TQPtrListTQTab, TQPtrList<TQTab>, TQTab, TQPtrListStdIterator<TQTab> ) @@ -1934,7 +1934,7 @@ TypeHandler Qt_handlers[] = { { "TQMap<TQString,TQString>&", marshall_TQMapTQStringTQString }, { "TQMap<TQString,TQVariant>", marshall_TQMapTQStringTQVariant }, { "TQMap<TQString,TQVariant>&", marshall_TQMapTQStringTQVariant }, -#if QT_VERSION >= 0x030200 +#if TQT_VERSION >= 0x030200 { "TQWidgetList", marshall_TQWidgetList }, { "TQWidgetList*", marshall_TQWidgetList }, { "TQWidgetList&", marshall_TQWidgetList }, |