diff options
Diffstat (limited to 'qtruby/rubylib/qtruby/handlers.cpp')
| -rw-r--r-- | qtruby/rubylib/qtruby/handlers.cpp | 440 |
1 files changed, 220 insertions, 220 deletions
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index 6bddf50c..e6cf263c 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -7,21 +7,21 @@ * * ***************************************************************************/ -#include <qstring.h> -#include <qregexp.h> -#include <qapplication.h> -#include <qcanvas.h> -#include <qlistview.h> -#include <qiconview.h> -#include <qtable.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qmetaobject.h> -#include <qvaluelist.h> -#include <qobjectlist.h> -#include <qtextcodec.h> -#include <qhostaddress.h> -#include <qpair.h> +#include <tqstring.h> +#include <tqregexp.h> +#include <tqapplication.h> +#include <tqcanvas.h> +#include <tqlistview.h> +#include <tqiconview.h> +#include <tqtable.h> +#include <tqpopupmenu.h> +#include <tqlayout.h> +#include <tqmetaobject.h> +#include <tqvaluelist.h> +#include <tqobjectlist.h> +#include <tqtextcodec.h> +#include <tqhostaddress.h> +#include <tqpair.h> #include <private/qucomextra_p.h> @@ -70,16 +70,16 @@ set_kde_resolve_classname(const char * (*kde_resolve_classname) (Smoke*, int, vo }; void -mark_qobject_children(QObject * qobject) +mark_qobject_children(TQObject * qobject) { VALUE obj; - const QObjectList *l = qobject->children(); + const TQObjectList *l = qobject->children(); if (l == 0) { return; } - QObjectListIt it( *l ); // iterate over the children - QObject *child; + TQObjectListIt it( *l ); // iterate over the children + TQObject *child; while ( (child = it.current()) != 0 ) { ++it; @@ -103,10 +103,10 @@ smokeruby_mark(void * p) if(do_debug & qtdb_gc) qWarning("Checking for mark (%s*)%p\n", className, o->ptr); if(o->ptr && o->allocated) { - if (isDerivedFromByName(o->smoke, className, "QListView")) { - QListView * listview = (QListView *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QListView")); - QListViewItemIterator it(listview); - QListViewItem *item; + if (isDerivedFromByName(o->smoke, className, "TQListView")) { + TQListView * listview = (TQListView *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQListView")); + TQListViewItemIterator it(listview); + TQListViewItem *item; while ( (item = it.current()) != 0 ) { ++it; @@ -119,9 +119,9 @@ smokeruby_mark(void * p) return; } - if (isDerivedFromByName(o->smoke, className, "QTable")) { - QTable * table = (QTable *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTable")); - QTableItem *item; + if (isDerivedFromByName(o->smoke, className, "TQTable")) { + TQTable * table = (TQTable *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQTable")); + TQTableItem *item; for ( int row = 0; row < table->numRows(); row++ ) { for ( int col = 0; col < table->numCols(); col++ ) { @@ -136,10 +136,10 @@ smokeruby_mark(void * p) return; } - if (isDerivedFromByName(o->smoke, className, "QCanvas")) { - QCanvas * canvas = (QCanvas *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QCanvas")); - QCanvasItemList list = canvas->allItems(); - for ( QCanvasItemList::iterator it = list.begin(); it != list.end(); ++it ) { + if (isDerivedFromByName(o->smoke, className, "TQCanvas")) { + TQCanvas * canvas = (TQCanvas *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQCanvas")); + TQCanvasItemList list = canvas->allItems(); + for ( TQCanvasItemList::iterator it = list.begin(); it != list.end(); ++it ) { obj = getPointerObject(*it); if (obj != Qnil) { if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", className, *it, (void*)obj); @@ -149,19 +149,19 @@ smokeruby_mark(void * p) return; } - if (isDerivedFromByName(o->smoke, className, "QCanvasItem")) { - QCanvasItem * item = (QCanvasItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QCanvasItem")); - QCanvas * canvas = item->canvas(); + if (isDerivedFromByName(o->smoke, className, "TQCanvasItem")) { + TQCanvasItem * item = (TQCanvasItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQCanvasItem")); + TQCanvas * canvas = item->canvas(); obj = getPointerObject(canvas); if (obj != Qnil) { - if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", "QCanvas", canvas, (void*)obj); + if(do_debug & qtdb_gc) qWarning("Marking (%s*)%p -> %p\n", "TQCanvas", canvas, (void*)obj); rb_gc_mark(obj); } return; } - if (isDerivedFromByName(o->smoke, className, "QObject")) { - QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject")); + if (isDerivedFromByName(o->smoke, className, "TQObject")) { + TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject")); mark_qobject_children(qobject); return; } @@ -184,63 +184,63 @@ smokeruby_free(void * p) unmapPointer(o, o->classId, 0); object_count --; - if ( qstrcmp(className, "QObject") == 0 - || qstrcmp(className, "QListBoxItem") == 0 - || qstrcmp(className, "QStyleSheetItem") == 0 + if ( qstrcmp(className, "TQObject") == 0 + || qstrcmp(className, "TQListBoxItem") == 0 + || qstrcmp(className, "TQStyleSheetItem") == 0 || qstrcmp(className, "KCommand") == 0 || qstrcmp(className, "KNamedCommand") == 0 || qstrcmp(className, "KMacroCommand") == 0 || qstrcmp(className, "KAboutData") == 0 || qstrcmp(className, "KCmdLineArgs") == 0 - || qstrcmp(className, "QSqlCursor") == 0 ) + || qstrcmp(className, "TQSqlCursor") == 0 ) { // Don't delete instances of these classes for now free(o); return; - } else if (isDerivedFromByName(o->smoke, className, "QLayoutItem")) { - QLayoutItem * item = (QLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QLayoutItem")); + } else if (isDerivedFromByName(o->smoke, className, "TQLayoutItem")) { + TQLayoutItem * item = (TQLayoutItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQLayoutItem")); if (item->layout() != 0 || item->widget() != 0 || item->spacerItem() != 0) { free(o); return; } - } else if (qstrcmp(className, "QIconViewItem") == 0) { - QIconViewItem * item = (QIconViewItem *) o->ptr; + } else if (qstrcmp(className, "TQIconViewItem") == 0) { + TQIconViewItem * item = (TQIconViewItem *) o->ptr; if (item->iconView() != 0) { free(o); return; } - } else if (qstrcmp(className, "QCheckListItem") == 0) { - QCheckListItem * item = (QCheckListItem *) o->ptr; + } else if (qstrcmp(className, "TQCheckListItem") == 0) { + TQCheckListItem * item = (TQCheckListItem *) o->ptr; if (item->parent() != 0 || item->listView() != 0) { free(o); return; } - } else if (qstrcmp(className, "QListViewItem") == 0) { - QListViewItem * item = (QListViewItem *) o->ptr; + } else if (qstrcmp(className, "TQListViewItem") == 0) { + TQListViewItem * item = (TQListViewItem *) o->ptr; if (item->parent() != 0 || item->listView() != 0) { free(o); return; } - } else if (isDerivedFromByName(o->smoke, className, "QTableItem")) { - QTableItem * item = (QTableItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QTableItem")); + } else if (isDerivedFromByName(o->smoke, className, "TQTableItem")) { + TQTableItem * item = (TQTableItem *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQTableItem")); if (item->table() != 0) { free(o); return; } - } else if (qstrcmp(className, "QPopupMenu") == 0) { - QPopupMenu * item = (QPopupMenu *) o->ptr; + } else if (qstrcmp(className, "TQPopupMenu") == 0) { + TQPopupMenu * item = (TQPopupMenu *) o->ptr; if (item->parentWidget(false) != 0) { free(o); return; } - } else if (isDerivedFromByName(o->smoke, className, "QWidget")) { - QWidget * qwidget = (QWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QWidget")); + } else if (isDerivedFromByName(o->smoke, className, "TQWidget")) { + TQWidget * qwidget = (TQWidget *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQWidget")); if (qwidget->parentWidget(true) != 0) { free(o); return; } - } else if (isDerivedFromByName(o->smoke, className, "QObject")) { - QObject * qobject = (QObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("QObject")); + } else if (isDerivedFromByName(o->smoke, className, "TQObject")) { + TQObject * qobject = (TQObject *) o->smoke->cast(o->ptr, o->classId, o->smoke->idClass("TQObject")); if (qobject->parent() != 0) { free(o); return; @@ -273,65 +273,65 @@ smokeruby_free(void * p) static const char * resolve_classname(Smoke* smoke, int classId, void * ptr) { - if (isDerivedFromByName(smoke, smoke->classes[classId].className, "QEvent")) { - QEvent * qevent = (QEvent *) smoke->cast(ptr, classId, smoke->idClass("QEvent")); + if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQEvent")) { + TQEvent * qevent = (TQEvent *) smoke->cast(ptr, classId, smoke->idClass("TQEvent")); switch (qevent->type()) { - case QEvent::ChildInserted: - case QEvent::ChildRemoved: + case TQEvent::ChildInserted: + case TQEvent::ChildRemoved: return "Qt::ChildEvent"; - case QEvent::Close: + case TQEvent::Close: return "Qt::CloseEvent"; - case QEvent::ContextMenu: + case TQEvent::ContextMenu: return "Qt::ContextMenuEvent"; -// case QEvent::User: +// case TQEvent::User: // return "Qt::CustomEvent"; - case QEvent::DragEnter: + case TQEvent::DragEnter: return "Qt::DragEnterEvent"; - case QEvent::DragLeave: + case TQEvent::DragLeave: return "Qt::DragLeaveEvent"; - case QEvent::DragMove: + case TQEvent::DragMove: return "Qt::DragMoveEvent"; - case QEvent::DragResponse: + case TQEvent::DragResponse: return "Qt::DragResponseEvent"; - case QEvent::Drop: + case TQEvent::Drop: return "Qt::DropEvent"; - case QEvent::FocusIn: - case QEvent::FocusOut: + case TQEvent::FocusIn: + case TQEvent::FocusOut: return "Qt::FocusEvent"; - case QEvent::Hide: + case TQEvent::Hide: return "Qt::HideEvent"; - case QEvent::KeyPress: - case QEvent::KeyRelease: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: return "Qt::KeyEvent"; - case QEvent::IMStart: - case QEvent::IMCompose: - case QEvent::IMEnd: + case TQEvent::IMStart: + case TQEvent::IMCompose: + case TQEvent::IMEnd: return "Qt::IMEvent"; - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: return "Qt::MouseEvent"; - case QEvent::Move: + case TQEvent::Move: return "Qt::MoveEvent"; - case QEvent::Paint: + case TQEvent::Paint: return "Qt::PaintEvent"; - case QEvent::Resize: + case TQEvent::Resize: return "Qt::ResizeEvent"; - case QEvent::Show: + case TQEvent::Show: return "Qt::ShowEvent"; - // case QEvent::Tablet: + // case TQEvent::Tablet: // return "Qt::TabletEvent"; - case QEvent::Timer: + case TQEvent::Timer: return "Qt::TimerEvent"; - case QEvent::Wheel: + case TQEvent::Wheel: return "Qt::WheelEvent"; default: break; } - } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "QObject")) { - QObject * qobject = (QObject *) smoke->cast(ptr, classId, smoke->idClass("QObject")); - QMetaObject * meta = qobject->metaObject(); + } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQObject")) { + TQObject * qobject = (TQObject *) smoke->cast(ptr, classId, smoke->idClass("TQObject")); + TQMetaObject * meta = qobject->metaObject(); while (meta != 0) { Smoke::Index classId = smoke->idClass(meta->className()); @@ -341,30 +341,30 @@ resolve_classname(Smoke* smoke, int classId, void * ptr) meta = meta->superClass(); } - } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "QCanvasItem")) { - QCanvasItem * qcanvasitem = (QCanvasItem *) smoke->cast(ptr, classId, smoke->idClass("QCanvasItem")); + } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQCanvasItem")) { + TQCanvasItem * qcanvasitem = (TQCanvasItem *) smoke->cast(ptr, classId, smoke->idClass("TQCanvasItem")); switch (qcanvasitem->rtti()) { - case QCanvasItem::Rtti_Sprite: + case TQCanvasItem::Rtti_Sprite: return "Qt::CanvasSprite"; - case QCanvasItem::Rtti_PolygonalItem: + case TQCanvasItem::Rtti_PolygonalItem: return "Qt::CanvasPolygonalItem"; - case QCanvasItem::Rtti_Text: + case TQCanvasItem::Rtti_Text: return "Qt::CanvasText"; - case QCanvasItem::Rtti_Polygon: + case TQCanvasItem::Rtti_Polygon: return "Qt::CanvasPolygon"; - case QCanvasItem::Rtti_Rectangle: + case TQCanvasItem::Rtti_Rectangle: return "Qt::CanvasRectangle"; - case QCanvasItem::Rtti_Ellipse: + case TQCanvasItem::Rtti_Ellipse: return "Qt::CanvasEllipse"; - case QCanvasItem::Rtti_Line: + case TQCanvasItem::Rtti_Line: return "Qt::CanvasLine"; - case QCanvasItem::Rtti_Spline: + case TQCanvasItem::Rtti_Spline: return "Qt::CanvasSpline"; default: break; } - } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "QListViewItem")) { - QListViewItem * item = (QListViewItem *) smoke->cast(ptr, classId, smoke->idClass("QListViewItem")); + } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQListViewItem")) { + TQListViewItem * item = (TQListViewItem *) smoke->cast(ptr, classId, smoke->idClass("TQListViewItem")); switch (item->rtti()) { case 0: return "Qt::ListViewItem"; @@ -374,8 +374,8 @@ resolve_classname(Smoke* smoke, int classId, void * ptr) return "Qt::ListViewItem"; break; } - } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "QTableItem")) { - QTableItem * item = (QTableItem *) smoke->cast(ptr, classId, smoke->idClass("QTableItem")); + } else if (isDerivedFromByName(smoke, smoke->classes[classId].className, "TQTableItem")) { + TQTableItem * item = (TQTableItem *) smoke->cast(ptr, classId, smoke->idClass("TQTableItem")); switch (item->rtti()) { case 0: return "Qt::TableItem"; @@ -803,41 +803,41 @@ void marshall_ucharP(Marshall *m) { } static const char * KCODE = 0; -static QTextCodec *codec = 0; +static TQTextCodec *codec = 0; static void init_codec() { VALUE temp = rb_gv_get("$KCODE"); KCODE = StringValuePtr(temp); if (qstrcmp(KCODE, "EUC") == 0) { - codec = QTextCodec::codecForName("eucJP"); + codec = TQTextCodec::codecForName("eucJP"); } else if (qstrcmp(KCODE, "SJIS") == 0) { - codec = QTextCodec::codecForName("Shift-JIS"); + codec = TQTextCodec::codecForName("Shift-JIS"); } } -QString* +TQString* qstringFromRString(VALUE rstring) { if (KCODE == 0) { init_codec(); } - QString * s; + TQString * s; if (qstrcmp(KCODE, "UTF8") == 0) - s = new QString(QString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len)); + s = new TQString(TQString::fromUtf8(StringValuePtr(rstring), RSTRING(rstring)->len)); else if (qstrcmp(KCODE, "EUC") == 0) - s = new QString(codec->toUnicode(StringValuePtr(rstring))); + s = new TQString(codec->toUnicode(StringValuePtr(rstring))); else if (qstrcmp(KCODE, "SJIS") == 0) - s = new QString(codec->toUnicode(StringValuePtr(rstring))); + s = new TQString(codec->toUnicode(StringValuePtr(rstring))); else if(qstrcmp(KCODE, "NONE") == 0) - s = new QString(QString::fromLatin1(StringValuePtr(rstring))); + s = new TQString(TQString::fromLatin1(StringValuePtr(rstring))); else - s = new QString(QString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len)); + s = new TQString(TQString::fromLocal8Bit(StringValuePtr(rstring), RSTRING(rstring)->len)); return s; } VALUE -rstringFromQString(QString * s) { +rstringFromQString(TQString * s) { if (KCODE == 0) { init_codec(); } @@ -858,11 +858,11 @@ static void marshall_QString(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { - QString* s = 0; + TQString* s = 0; if ( *(m->var()) != Qnil) { s = qstringFromRString(*(m->var())); } else { - s = new QString(QString::null); + s = new TQString(TQString::null); } m->item().s_voidp = s; @@ -881,7 +881,7 @@ static void marshall_QString(Marshall *m) { break; case Marshall::ToVALUE: { - QString *s = (QString*)m->item().s_voidp; + TQString *s = (TQString*)m->item().s_voidp; if (s != 0) { if (s->isNull()) { *(m->var()) = Qnil; @@ -902,8 +902,8 @@ static void marshall_QString(Marshall *m) { } } -// The only way to convert a QChar to a QString is to -// pass a QChar to a QString constructor. However, +// The only way to convert a TQChar to a TQString is to +// pass a TQChar to a TQString constructor. However, // QStrings aren't in the QtRuby api, so add this // convenience method 'Qt::Char.to_s' to get a ruby // string from a Qt::Char. @@ -915,8 +915,8 @@ qchar_to_s(VALUE self) return Qnil; } - QChar * qchar = (QChar*) o->ptr; - QString s(*qchar); + TQChar * qchar = (TQChar*) o->ptr; + TQString s(*qchar); return rstringFromQString(&s); } @@ -938,13 +938,13 @@ static void marshall_QCString(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { - QCString *s = 0; + TQCString *s = 0; VALUE rv = *(m->var()); if (rv == Qnil) { - s = new QCString(); + s = new TQCString(); } else { - // Add 1 to the ruby string length to allow for a QCString '\0' terminator - s = new QCString(StringValuePtr(*(m->var())), RSTRING(*(m->var()))->len + 1); + // Add 1 to the ruby string length to allow for a TQCString '\0' terminator + s = new TQCString(StringValuePtr(*(m->var())), RSTRING(*(m->var()))->len + 1); } m->item().s_voidp = s; @@ -960,7 +960,7 @@ static void marshall_QCString(Marshall *m) { break; case Marshall::ToVALUE: { - QCString *s = (QCString*)m->item().s_voidp; + TQCString *s = (TQCString*)m->item().s_voidp; if(s && (const char *) *s != 0) { *(m->var()) = rb_str_new2((const char *)*s); // const char * p = (const char *)*s; @@ -968,7 +968,7 @@ static void marshall_QCString(Marshall *m) { // if(not_ascii(p,len)) // { // #if PERL_VERSION == 6 && PERL_SUBVERSION == 0 -// QTextCodec* c = QTextCodec::codecForMib(106); // utf8 +// TQTextCodec* c = TQTextCodec::codecForMib(106); // utf8 // if(c->heuristicContentMatch(p,len) >= 0) // #else // if(is_utf8_string((U8 *)p,len)) @@ -1208,12 +1208,12 @@ void marshall_QStringList(Marshall *m) { } int count = RARRAY(list)->len; - QStringList *stringlist = new QStringList; + TQStringList *stringlist = new QStringList; for(long i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); if(TYPE(item) != T_STRING) { - stringlist->append(QString()); + stringlist->append(TQString()); continue; } stringlist->append(*(qstringFromRString(item))); @@ -1225,7 +1225,7 @@ void marshall_QStringList(Marshall *m) { if (stringlist != 0 && !m->type().isConst()) { rb_ary_clear(list); - for(QStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) rb_ary_push(list, rstringFromQString(&(*it))); } @@ -1235,14 +1235,14 @@ void marshall_QStringList(Marshall *m) { } case Marshall::ToVALUE: { - QStringList *stringlist = static_cast<QStringList *>(m->item().s_voidp); + TQStringList *stringlist = static_cast<TQStringList *>(m->item().s_voidp); if(!stringlist) { *(m->var()) = Qnil; break; } VALUE av = rb_ary_new(); - for(QStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { + for(TQStringList::Iterator it = stringlist->begin(); it != stringlist->end(); ++it) { VALUE rv = rstringFromQString(&(*it)); rb_ary_push(av, rv); } @@ -1270,15 +1270,15 @@ void marshall_QStrList(Marshall *m) { } int count = RARRAY(list)->len; - QStrList *stringlist = new QStrList; + TQStrList *stringlist = new QStrList; for(long i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); if(TYPE(item) != T_STRING) { - stringlist->append(QString()); + stringlist->append(TQString()); continue; } - stringlist->append(QString::fromUtf8(StringValuePtr(item), RSTRING(item)->len)); + stringlist->append(TQString::fromUtf8(StringValuePtr(item), RSTRING(item)->len)); } m->item().s_voidp = stringlist; @@ -1297,7 +1297,7 @@ void marshall_QStrList(Marshall *m) { } case Marshall::ToVALUE: { - QStrList *stringlist = static_cast<QStrList *>(m->item().s_voidp); + TQStrList *stringlist = static_cast<TQStrList *>(m->item().s_voidp); if(!stringlist) { *(m->var()) = Qnil; break; @@ -1422,7 +1422,7 @@ void marshall_QValueListInt(Marshall *m) { break; } int count = RARRAY(list)->len; - QValueList<int> *valuelist = new QValueList<int>; + TQValueList<int> *valuelist = new TQValueList<int>; long i; for(i = 0; i < count; i++) { VALUE item = rb_ary_entry(list, i); @@ -1438,7 +1438,7 @@ void marshall_QValueListInt(Marshall *m) { if (!m->type().isConst()) { rb_ary_clear(list); - for(QValueListIterator<int> it = valuelist->begin(); + for(TQValueListIterator<int> it = valuelist->begin(); it != valuelist->end(); ++it) rb_ary_push(list, INT2NUM((int)*it)); @@ -1451,7 +1451,7 @@ void marshall_QValueListInt(Marshall *m) { break; case Marshall::ToVALUE: { - QValueList<int> *valuelist = (QValueList<int>*)m->item().s_voidp; + TQValueList<int> *valuelist = (TQValueList<int>*)m->item().s_voidp; if(!valuelist) { *(m->var()) = Qnil; break; @@ -1459,7 +1459,7 @@ void marshall_QValueListInt(Marshall *m) { VALUE av = rb_ary_new(); - for(QValueListIterator<int> it = valuelist->begin(); + for(TQValueListIterator<int> it = valuelist->begin(); it != valuelist->end(); ++it) rb_ary_push(av, INT2NUM(*it)); @@ -1508,7 +1508,7 @@ void marshall_QMapQStringQString(Marshall *m) { break; } - QMap<QString,QString> * map = new QMap<QString,QString>; + TQMap<TQString,TQString> * map = new TQMap<TQString,TQString>; // Convert the ruby hash to an array of key/value arrays VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0); @@ -1516,7 +1516,7 @@ void marshall_QMapQStringQString(Marshall *m) { for (long i = 0; i < RARRAY(temp)->len; i++) { VALUE key = rb_ary_entry(rb_ary_entry(temp, i), 0); VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1); - (*map)[QString(StringValuePtr(key))] = QString(StringValuePtr(value)); + (*map)[TQString(StringValuePtr(key))] = TQString(StringValuePtr(value)); } m->item().s_voidp = map; @@ -1528,7 +1528,7 @@ void marshall_QMapQStringQString(Marshall *m) { break; case Marshall::ToVALUE: { - QMap<QString,QString> *map = (QMap<QString,QString>*)m->item().s_voidp; + TQMap<TQString,TQString> *map = (TQMap<TQString,TQString>*)m->item().s_voidp; if(!map) { *(m->var()) = Qnil; break; @@ -1536,9 +1536,9 @@ void marshall_QMapQStringQString(Marshall *m) { VALUE hv = rb_hash_new(); - QMap<QString,QString>::Iterator it; + TQMap<TQString,TQString>::Iterator it; for (it = map->begin(); it != map->end(); ++it) { - rb_hash_aset(hv, rstringFromQString((QString*)&(it.key())), rstringFromQString((QString*) &(it.data()))); + rb_hash_aset(hv, rstringFromQString((TQString*)&(it.key())), rstringFromQString((TQString*) &(it.data()))); } *(m->var()) = hv; @@ -1564,7 +1564,7 @@ void marshall_QMapQStringQVariant(Marshall *m) { break; } - QMap<QString,QVariant> * map = new QMap<QString,QVariant>; + TQMap<TQString,TQVariant> * map = new TQMap<TQString,TQVariant>; // Convert the ruby hash to an array of key/value arrays VALUE temp = rb_funcall(hash, rb_intern("to_a"), 0); @@ -1574,7 +1574,7 @@ void marshall_QMapQStringQVariant(Marshall *m) { VALUE value = rb_ary_entry(rb_ary_entry(temp, i), 1); smokeruby_object *o = value_obj_info(value); - if (!o || !o->ptr || o->classId != o->smoke->idClass("QVariant")) { + if (!o || !o->ptr || o->classId != o->smoke->idClass("TQVariant")) { // If the value isn't a Qt::Variant, then try and construct // a Qt::Variant from it value = rb_funcall(qvariant_class, rb_intern("new"), 1, value); @@ -1585,9 +1585,9 @@ void marshall_QMapQStringQVariant(Marshall *m) { } void * ptr = o->ptr; - ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("QVariant")); + ptr = o->smoke->cast(ptr, o->classId, o->smoke->idClass("TQVariant")); - (*map)[QString(StringValuePtr(key))] = (QVariant)*(QVariant*)ptr; + (*map)[TQString(StringValuePtr(key))] = (TQVariant)*(TQVariant*)ptr; } m->item().s_voidp = map; @@ -1599,7 +1599,7 @@ void marshall_QMapQStringQVariant(Marshall *m) { break; case Marshall::ToVALUE: { - QMap<QString,QVariant> *map = (QMap<QString,QVariant>*)m->item().s_voidp; + TQMap<TQString,TQVariant> *map = (TQMap<TQString,TQVariant>*)m->item().s_voidp; if(!map) { *(m->var()) = Qnil; break; @@ -1607,21 +1607,21 @@ void marshall_QMapQStringQVariant(Marshall *m) { VALUE hv = rb_hash_new(); - QMap<QString,QVariant>::Iterator it; + TQMap<TQString,TQVariant>::Iterator it; for (it = map->begin(); it != map->end(); ++it) { - void *p = new QVariant(it.data()); + void *p = new TQVariant(it.data()); VALUE obj = getPointerObject(p); if (obj == Qnil) { smokeruby_object * o = ALLOC(smokeruby_object); - o->classId = m->smoke()->idClass("QVariant"); + o->classId = m->smoke()->idClass("TQVariant"); o->smoke = m->smoke(); o->ptr = p; o->allocated = true; obj = set_obj_info("Qt::Variant", o); } - rb_hash_aset(hv, rstringFromQString((QString*)&(it.key())), obj); + rb_hash_aset(hv, rstringFromQString((TQString*)&(it.key())), obj); } *(m->var()) = hv; @@ -1739,26 +1739,26 @@ void marshall_QPairintint(Marshall *m) { #define DEF_LIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace { char ListIdent##STR[] = #Item; }; \ Marshall::HandlerFn marshall_##ListIdent = marshall_ItemList<Item,ItemList,Itr,ListIdent##STR>; -#include <qcanvas.h> -#include <qdir.h> -#include <qobjectlist.h> -#include <qwidgetlist.h> -#include <qdockwindow.h> -#include <qnetworkprotocol.h> -#include <qtoolbar.h> -#include <qtabbar.h> +#include <tqcanvas.h> +#include <tqdir.h> +#include <tqobjectlist.h> +#include <tqwidgetlist.h> +#include <tqdockwindow.h> +#include <tqnetworkprotocol.h> +#include <tqtoolbar.h> +#include <tqtabbar.h> #if QT_VERSION >= 0x030200 -DEF_LIST_MARSHALLER( QPtrListQNetworkOperation, QPtrList<QNetworkOperation>, QNetworkOperation, QPtrListStdIterator<QNetworkOperation> ) -DEF_LIST_MARSHALLER( QPtrListQToolBar, QPtrList<QToolBar>, QToolBar, QPtrListStdIterator<QToolBar> ) -DEF_LIST_MARSHALLER( QPtrListQTab, QPtrList<QTab>, QTab, QPtrListStdIterator<QTab> ) -DEF_LIST_MARSHALLER( QPtrListQDockWindow, QPtrList<QDockWindow>, QDockWindow, QPtrListStdIterator<QDockWindow> ) -DEF_LIST_MARSHALLER( QFileInfoList, QFileInfoList, QFileInfo, QFileInfoList::Iterator ) -DEF_LIST_MARSHALLER( QObjectList, QObjectList, QObject, QPtrListStdIterator<QObject> ) -DEF_LIST_MARSHALLER( QWidgetList, QWidgetList, QWidget, QPtrListStdIterator<QWidget> ) +DEF_LIST_MARSHALLER( QPtrListQNetworkOperation, TQPtrList<TQNetworkOperation>, TQNetworkOperation, TQPtrListStdIterator<TQNetworkOperation> ) +DEF_LIST_MARSHALLER( QPtrListQToolBar, TQPtrList<TQToolBar>, TQToolBar, TQPtrListStdIterator<TQToolBar> ) +DEF_LIST_MARSHALLER( QPtrListQTab, TQPtrList<TQTab>, TQTab, TQPtrListStdIterator<TQTab> ) +DEF_LIST_MARSHALLER( QPtrListQDockWindow, TQPtrList<TQDockWindow>, TQDockWindow, TQPtrListStdIterator<TQDockWindow> ) +DEF_LIST_MARSHALLER( QFileInfoList, QFileInfoList, TQFileInfo, QFileInfoList::Iterator ) +DEF_LIST_MARSHALLER( TQObjectList, TQObjectList, TQObject, TQPtrListStdIterator<TQObject> ) +DEF_LIST_MARSHALLER( TQWidgetList, TQWidgetList, TQWidget, TQPtrListStdIterator<TQWidget> ) #endif -DEF_LIST_MARSHALLER( QCanvasItemList, QCanvasItemList, QCanvasItem, QValueListIterator<QCanvasItem*> ) +DEF_LIST_MARSHALLER( TQCanvasItemList, TQCanvasItemList, TQCanvasItem, TQValueListIterator<TQCanvasItem*> ) template <class Item, class ItemList, class ItemListIterator, const char *ItemSTR > void marshall_ValueItemList(Marshall *m) { @@ -1778,9 +1778,9 @@ void marshall_ValueItemList(Marshall *m) { // TODO do type checking! smokeruby_object *o = value_obj_info(item); - // Special case for the QValueList<QVariant> type - if ( qstrcmp(ItemSTR, "QVariant") == 0 - && (!o || !o->ptr || o->classId != o->smoke->idClass("QVariant")) ) + // Special case for the TQValueList<TQVariant> type + if ( qstrcmp(ItemSTR, "TQVariant") == 0 + && (!o || !o->ptr || o->classId != o->smoke->idClass("TQVariant")) ) { // If the value isn't a Qt::Variant, then try and construct // a Qt::Variant from it @@ -1871,27 +1871,27 @@ void marshall_ValueItemList(Marshall *m) { #define DEF_VALUELIST_MARSHALLER(ListIdent,ItemList,Item,Itr) namespace dummy { char ListIdent##STR[] = #Item; }; \ Marshall::HandlerFn marshall_##ListIdent = marshall_ValueItemList<Item,ItemList,Itr,dummy::ListIdent##STR>; -DEF_VALUELIST_MARSHALLER( QVariantList, QValueList<QVariant>, QVariant, QValueList<QVariant>::Iterator ) -DEF_VALUELIST_MARSHALLER( QPixmapList, QValueList<QPixmap>, QPixmap, QValueList<QPixmap>::Iterator ) -DEF_VALUELIST_MARSHALLER( QIconDragItemList, QValueList<QIconDragItem>, QIconDragItem, QValueList<QIconDragItem>::Iterator ) -DEF_VALUELIST_MARSHALLER( QImageTextKeyLangList, QValueList<QImageTextKeyLang>, QImageTextKeyLang, QValueList<QImageTextKeyLang>::Iterator ) -DEF_VALUELIST_MARSHALLER( QUrlInfoList, QValueList<QUrlInfo>, QUrlInfo, QValueList<QUrlInfo>::Iterator ) -DEF_VALUELIST_MARSHALLER( QTranslatorMessageList, QValueList<QTranslatorMessage>, QTranslatorMessage, QValueList<QTranslatorMessage>::Iterator ) -DEF_VALUELIST_MARSHALLER( QHostAddressList, QValueList<QHostAddress>, QHostAddress, QValueList<QHostAddress>::Iterator ) +DEF_VALUELIST_MARSHALLER( QVariantList, TQValueList<TQVariant>, TQVariant, TQValueList<TQVariant>::Iterator ) +DEF_VALUELIST_MARSHALLER( QPixmapList, TQValueList<TQPixmap>, TQPixmap, TQValueList<TQPixmap>::Iterator ) +DEF_VALUELIST_MARSHALLER( QIconDragItemList, TQValueList<TQIconDragItem>, TQIconDragItem, TQValueList<TQIconDragItem>::Iterator ) +DEF_VALUELIST_MARSHALLER( QImageTextKeyLangList, TQValueList<TQImageTextKeyLang>, TQImageTextKeyLang, TQValueList<TQImageTextKeyLang>::Iterator ) +DEF_VALUELIST_MARSHALLER( QUrlInfoList, TQValueList<TQUrlInfo>, TQUrlInfo, TQValueList<TQUrlInfo>::Iterator ) +DEF_VALUELIST_MARSHALLER( QTranslatorMessageList, TQValueList<QTranslatorMessage>, QTranslatorMessage, TQValueList<QTranslatorMessage>::Iterator ) +DEF_VALUELIST_MARSHALLER( QHostAddressList, TQValueList<TQHostAddress>, TQHostAddress, TQValueList<TQHostAddress>::Iterator ) TypeHandler Qt_handlers[] = { - { "QString", marshall_QString }, - { "QString&", marshall_QString }, - { "QString*", marshall_QString }, - { "QCString", marshall_QCString }, - { "QCString&", marshall_QCString }, - { "QCString*", marshall_QCString }, - { "QStringList", marshall_QStringList }, - { "QStringList&", marshall_QStringList }, - { "QStringList*", marshall_QStringList }, - { "QStrList", marshall_QStrList }, - { "QStrList&", marshall_QStrList }, - { "QStrList*", marshall_QStrList }, + { "TQString", marshall_QString }, + { "TQString&", marshall_QString }, + { "TQString*", marshall_QString }, + { "TQCString", marshall_QCString }, + { "TQCString&", marshall_QCString }, + { "TQCString*", marshall_QCString }, + { "TQStringList", marshall_QStringList }, + { "TQStringList&", marshall_QStringList }, + { "TQStringList*", marshall_QStringList }, + { "TQStrList", marshall_QStrList }, + { "TQStrList&", marshall_QStrList }, + { "TQStrList*", marshall_QStrList }, { "long long int", marshall_longlong }, { "long long int&", marshall_longlong }, { "Q_INT64", marshall_longlong }, @@ -1919,39 +1919,39 @@ TypeHandler Qt_handlers[] = { { "QUObject*", marshall_QUObject }, { "const QCOORD*", marshall_QCOORD_array }, { "void", marshall_void }, - { "QValueList<int>", marshall_QValueListInt }, - { "QValueList<int>&", marshall_QValueListInt }, - { "QValueList<QVariant>", marshall_QVariantList }, - { "QValueList<QVariant>&", marshall_QVariantList }, - { "QValueList<QPixmap>", marshall_QPixmapList }, - { "QValueList<QIconDragItem>&", marshall_QIconDragItemList }, - { "QValueList<QImageTextKeyLang>", marshall_QImageTextKeyLangList }, - { "QValueList<QUrlInfo>&", marshall_QUrlInfoList }, - { "QValueList<QTranslatorMessage>", marshall_QTranslatorMessageList }, - { "QValueList<QHostAddress>", marshall_QHostAddressList }, - { "QCanvasItemList", marshall_QCanvasItemList }, - { "QMap<QString,QString>", marshall_QMapQStringQString }, - { "QMap<QString,QString>&", marshall_QMapQStringQString }, - { "QMap<QString,QVariant>", marshall_QMapQStringQVariant }, - { "QMap<QString,QVariant>&", marshall_QMapQStringQVariant }, + { "TQValueList<int>", marshall_QValueListInt }, + { "TQValueList<int>&", marshall_QValueListInt }, + { "TQValueList<TQVariant>", marshall_QVariantList }, + { "TQValueList<TQVariant>&", marshall_QVariantList }, + { "TQValueList<TQPixmap>", marshall_QPixmapList }, + { "TQValueList<TQIconDragItem>&", marshall_QIconDragItemList }, + { "TQValueList<TQImageTextKeyLang>", marshall_QImageTextKeyLangList }, + { "TQValueList<TQUrlInfo>&", marshall_QUrlInfoList }, + { "TQValueList<QTranslatorMessage>", marshall_QTranslatorMessageList }, + { "TQValueList<TQHostAddress>", marshall_QHostAddressList }, + { "TQCanvasItemList", marshall_TQCanvasItemList }, + { "TQMap<TQString,TQString>", marshall_QMapQStringQString }, + { "TQMap<TQString,TQString>&", marshall_QMapQStringQString }, + { "TQMap<TQString,TQVariant>", marshall_QMapQStringQVariant }, + { "TQMap<TQString,TQVariant>&", marshall_QMapQStringQVariant }, #if QT_VERSION >= 0x030200 - { "QWidgetList", marshall_QWidgetList }, - { "QWidgetList*", marshall_QWidgetList }, - { "QWidgetList&", marshall_QWidgetList }, - { "QObjectList*", marshall_QObjectList }, - { "QObjectList&", marshall_QObjectList }, + { "TQWidgetList", marshall_TQWidgetList }, + { "TQWidgetList*", marshall_TQWidgetList }, + { "TQWidgetList&", marshall_TQWidgetList }, + { "TQObjectList*", marshall_TQObjectList }, + { "TQObjectList&", marshall_TQObjectList }, { "QFileInfoList*", marshall_QFileInfoList }, - { "QPtrList<QToolBar>", marshall_QPtrListQToolBar }, - { "QPtrList<QTab>*", marshall_QPtrListQTab }, - { "QPtrList<QDockWindow>", marshall_QPtrListQDockWindow }, - { "QPtrList<QDockWindow>*", marshall_QPtrListQDockWindow }, - { "QPtrList<QNetworkOperation>", marshall_QPtrListQNetworkOperation }, - { "QPtrList<QNetworkOperation>&", marshall_QPtrListQNetworkOperation }, + { "TQPtrList<TQToolBar>", marshall_QPtrListQToolBar }, + { "TQPtrList<TQTab>*", marshall_QPtrListQTab }, + { "TQPtrList<TQDockWindow>", marshall_QPtrListQDockWindow }, + { "TQPtrList<TQDockWindow>*", marshall_QPtrListQDockWindow }, + { "TQPtrList<TQNetworkOperation>", marshall_QPtrListQNetworkOperation }, + { "TQPtrList<TQNetworkOperation>&", marshall_QPtrListQNetworkOperation }, #endif { 0, 0 } }; -QAsciiDict<TypeHandler> type_handlers(199); +TQAsciiDict<TypeHandler> type_handlers(199); void install_handlers(TypeHandler *h) { while(h->name) { |