From 949476e1ff69d5f9e10aafea3d2c72096a8d120b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 6 Dec 2011 01:54:41 -0600 Subject: [PATCH] Fix marshall_Q --- dcoppython/shell/marshaller.h | 6 +- korundum/rubylib/korundum/kdehandlers.cpp | 14 ++-- qtruby/rubylib/qtruby/handlers.cpp | 96 +++++++++++------------ 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/dcoppython/shell/marshaller.h b/dcoppython/shell/marshaller.h index 6cb16d89..60e59679 100644 --- a/dcoppython/shell/marshaller.h +++ b/dcoppython/shell/marshaller.h @@ -61,9 +61,9 @@ namespace PythonDCOP { // bool marshall_int(PyObject *obj, TQDataStream *str); // bool marshall_uint(PyObject *obj, TQDataStream *str); // bool marshall_double(PyObject *obj, TQDataStream *str); -// bool marshall_QByteArray(PyObject *obj, TQDataStream *str); -// bool marshall_QString(PyObject *obj, TQDataStream *str); -// bool marshall_QCString(PyObject *obj, TQDataStream *str); +// bool marshall_TQByteArray(PyObject *obj, TQDataStream *str); +// bool marshall_TQString(PyObject *obj, TQDataStream *str); +// bool marshall_TQCString(PyObject *obj, TQDataStream *str); } diff --git a/korundum/rubylib/korundum/kdehandlers.cpp b/korundum/rubylib/korundum/kdehandlers.cpp index a2ee1862..70932d5c 100644 --- a/korundum/rubylib/korundum/kdehandlers.cpp +++ b/korundum/rubylib/korundum/kdehandlers.cpp @@ -112,7 +112,7 @@ kde_resolve_classname(Smoke * smoke, int classId, void * ptr) }; -void marshall_QCStringList(Marshall *m) { +void marshall_TQCStringList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1301,7 +1301,7 @@ void marshall_Map(Marshall *m) { DEF_MAP_MARSHALLER( TQMapKEntryKeyKEntry, KEntryKey, KEntry ) -void marshall_QMapTQCStringDCOPRef(Marshall *m) { +void marshall_TQMapTQCStringDCOPRef(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1377,7 +1377,7 @@ void marshall_QMapTQCStringDCOPRef(Marshall *m) { } TypeHandler KDE_handlers[] = { - { "QCStringList", marshall_QCStringList }, + { "QCStringList", marshall_TQCStringList }, { "KCmdLineOptions*", marshall_KCmdLineOptions }, { "KActionPtrList", marshall_KActionList }, { "TQPtrList", marshall_KActionList }, @@ -1418,10 +1418,10 @@ TypeHandler KDE_handlers[] = { { "KIO::UDSEntry&", marshall_UDSEntry }, { "KIO::UDSEntryList&", marshall_UDSEntryList }, { "KServiceTypeProfile::OfferList", marshall_KServiceOfferList }, - { "KEntryMap", marshall_QMapKEntryKeyKEntry }, - { "KEntryMap&", marshall_QMapKEntryKeyKEntry }, - { "KEntryMap*", marshall_QMapKEntryKeyKEntry }, - { "TQMap", marshall_QMapTQCStringDCOPRef }, + { "KEntryMap", marshall_TQMapKEntryKeyKEntry }, + { "KEntryMap&", marshall_TQMapKEntryKeyKEntry }, + { "KEntryMap*", marshall_TQMapKEntryKeyKEntry }, + { "TQMap", marshall_TQMapTQCStringDCOPRef }, { "TQValueList&", marshall_WIdList }, { "TQValueList", marshall_WIdList }, { 0, 0 } diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp index c3feee77..30341fd1 100644 --- a/qtruby/rubylib/qtruby/handlers.cpp +++ b/qtruby/rubylib/qtruby/handlers.cpp @@ -854,7 +854,7 @@ rstringFromTQString(TQString * s) { return rb_str_new2(s->local8Bit()); } -static void marshall_QString(Marshall *m) { +static void marshall_TQString(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -934,7 +934,7 @@ static const char *not_ascii(const char *s, uint &len) } #endif -static void marshall_QCString(Marshall *m) { +static void marshall_TQCString(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -998,7 +998,7 @@ static void marshall_QCString(Marshall *m) { } } -static void marshall_QCOORD_array(Marshall *m) { +static void marshall_TQCOORD_array(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1197,7 +1197,7 @@ static void marshall_charP_array(Marshall *m) { } } -void marshall_QStringList(Marshall *m) { +void marshall_TQStringList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1259,7 +1259,7 @@ void marshall_QStringList(Marshall *m) { } } -void marshall_QStrList(Marshall *m) { +void marshall_TQStrList(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1412,7 +1412,7 @@ void marshall_ItemList(Marshall *m) { } } -void marshall_QValueListInt(Marshall *m) { +void marshall_TQValueListInt(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1498,7 +1498,7 @@ void marshall_voidP(Marshall *m) { } } -void marshall_QMapTQStringTQString(Marshall *m) { +void marshall_TQMapTQStringTQString(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1554,7 +1554,7 @@ void marshall_QMapTQStringTQString(Marshall *m) { } } -void marshall_QMapTQStringTQVariant(Marshall *m) { +void marshall_TQMapTQStringTQVariant(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1637,7 +1637,7 @@ void marshall_QMapTQStringTQVariant(Marshall *m) { } } -void marshall_QUObject(Marshall *m) { +void marshall_TQUObject(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1664,7 +1664,7 @@ void marshall_QUObject(Marshall *m) { } } -void marshall_QRgb_array(Marshall *m) { +void marshall_TQRgb_array(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1697,7 +1697,7 @@ void marshall_QRgb_array(Marshall *m) { } } -void marshall_QPairintint(Marshall *m) { +void marshall_TQPairintint(Marshall *m) { switch(m->action()) { case Marshall::FromVALUE: { @@ -1880,18 +1880,18 @@ DEF_VALUELIST_MARSHALLER( TQTranslatorMessageList, TQValueList, TQHostAddress, TQValueList::Iterator ) TypeHandler Qt_handlers[] = { - { "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 }, + { "TQString", marshall_TQString }, + { "TQString&", marshall_TQString }, + { "TQString*", marshall_TQString }, + { "TQCString", marshall_TQCString }, + { "TQCString&", marshall_TQCString }, + { "TQCString*", marshall_TQCString }, + { "TQStringList", marshall_TQStringList }, + { "TQStringList&", marshall_TQStringList }, + { "TQStringList*", marshall_TQStringList }, + { "TQStrList", marshall_TQStrList }, + { "TQStrList&", marshall_TQStrList }, + { "TQStrList*", marshall_TQStrList }, { "long long int", marshall_longlong }, { "long long int&", marshall_longlong }, { "Q_INT64", marshall_longlong }, @@ -1914,39 +1914,39 @@ TypeHandler Qt_handlers[] = { { "char*", marshall_charP }, { "char**", marshall_charP_array }, { "uchar*", marshall_ucharP }, - { "TQRgb*", marshall_QRgb_array }, - { "TQPair&", marshall_QPairintint }, - { "TQUObject*", marshall_QUObject }, - { "const TQCOORD*", marshall_QCOORD_array }, + { "TQRgb*", marshall_TQRgb_array }, + { "TQPair&", marshall_TQPairintint }, + { "TQUObject*", marshall_TQUObject }, + { "const TQCOORD*", marshall_TQCOORD_array }, { "void", marshall_void }, - { "TQValueList", marshall_QValueListInt }, - { "TQValueList&", marshall_QValueListInt }, - { "TQValueList", marshall_QVariantList }, - { "TQValueList&", marshall_QVariantList }, - { "TQValueList", marshall_QPixmapList }, - { "TQValueList&", marshall_QIconDragItemList }, - { "TQValueList", marshall_QImageTextKeyLangList }, - { "TQValueList&", marshall_QUrlInfoList }, - { "TQValueList", marshall_QTranslatorMessageList }, - { "TQValueList", marshall_QHostAddressList }, + { "TQValueList", marshall_TQValueListInt }, + { "TQValueList&", marshall_TQValueListInt }, + { "TQValueList", marshall_TQVariantList }, + { "TQValueList&", marshall_TQVariantList }, + { "TQValueList", marshall_TQPixmapList }, + { "TQValueList&", marshall_TQIconDragItemList }, + { "TQValueList", marshall_TQImageTextKeyLangList }, + { "TQValueList&", marshall_TQUrlInfoList }, + { "TQValueList", marshall_TQTranslatorMessageList }, + { "TQValueList", marshall_TQHostAddressList }, { "TQCanvasItemList", marshall_TQCanvasItemList }, - { "TQMap", marshall_QMapTQStringTQString }, - { "TQMap&", marshall_QMapTQStringTQString }, - { "TQMap", marshall_QMapTQStringTQVariant }, - { "TQMap&", marshall_QMapTQStringTQVariant }, + { "TQMap", marshall_TQMapTQStringTQString }, + { "TQMap&", marshall_TQMapTQStringTQString }, + { "TQMap", marshall_TQMapTQStringTQVariant }, + { "TQMap&", marshall_TQMapTQStringTQVariant }, #if QT_VERSION >= 0x030200 { "TQWidgetList", marshall_TQWidgetList }, { "TQWidgetList*", marshall_TQWidgetList }, { "TQWidgetList&", marshall_TQWidgetList }, { "TQObjectList*", marshall_TQObjectList }, { "TQObjectList&", marshall_TQObjectList }, - { "TQFileInfoList*", marshall_QFileInfoList }, - { "TQPtrList", marshall_QPtrListTQToolBar }, - { "TQPtrList*", marshall_QPtrListTQTab }, - { "TQPtrList", marshall_QPtrListTQDockWindow }, - { "TQPtrList*", marshall_QPtrListTQDockWindow }, - { "TQPtrList", marshall_QPtrListTQNetworkOperation }, - { "TQPtrList&", marshall_QPtrListTQNetworkOperation }, + { "TQFileInfoList*", marshall_TQFileInfoList }, + { "TQPtrList", marshall_TQPtrListTQToolBar }, + { "TQPtrList*", marshall_TQPtrListTQTab }, + { "TQPtrList", marshall_TQPtrListTQDockWindow }, + { "TQPtrList*", marshall_TQPtrListTQDockWindow }, + { "TQPtrList", marshall_TQPtrListTQNetworkOperation }, + { "TQPtrList&", marshall_TQPtrListTQNetworkOperation }, #endif { 0, 0 } };