diff options
Diffstat (limited to 'src/kvirc/kvs/kvi_kvs_object.cpp')
| -rw-r--r-- | src/kvirc/kvs/kvi_kvs_object.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 9b98621..563e207 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -1120,7 +1120,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.local8Bit(),true); if(idx < 0) { c->warning(__tr2qs("No TQt property named \"%Q\" for object named \"%Q\" of class %Q"),&szName,&m_szName,&(m_pClass->name())); @@ -1133,7 +1133,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) return true; } - TQVariant vv = m_pObject->property(szName); + TQVariant vv = m_pObject->property(szName.local8Bit()); if(!vv.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1144,9 +1144,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { TQString szKey; v->asString(szKey); - int val = p->keyToValue(szKey); + int val = p->keyToValue(szKey.local8Bit()); TQVariant var(val); - m_pObject->setProperty(szName,var); + m_pObject->setProperty(szName.local8Bit(),var); return true; } @@ -1162,7 +1162,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("integer") - m_pObject->setProperty(szName,TQVariant((int)i)); + m_pObject->setProperty(szName.local8Bit(),TQVariant((int)i)); } break; case TQVariant::UInt: @@ -1170,24 +1170,24 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) kvs_int_t i; if(!v->asInteger(i))WRONG_TYPE("unsigned integer") if(i < 0)WRONG_TYPE("unsigned integer") - m_pObject->setProperty(szName,TQVariant((unsigned int)i)); + m_pObject->setProperty(szName.local8Bit(),TQVariant((unsigned int)i)); } break; case TQVariant::Bool: - m_pObject->setProperty(szName,TQVariant(v->asBoolean())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(v->asBoolean())); break; case TQVariant::String: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s)); + m_pObject->setProperty(szName.local8Bit(),TQVariant(s)); } break; case TQVariant::CString: { TQString s; v->asString(s); - m_pObject->setProperty(szName,TQVariant(s.utf8())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(s.utf8())); } break; case TQVariant::Point: @@ -1199,7 +1199,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y)WRONG_TYPE("array(integer,integer)") kvs_int_t iX,iY; if(!x->asInteger(iX) || !y->asInteger(iY))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQPoint(iX,iY))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQPoint(iX,iY))); } break; case TQVariant::Size: @@ -1211,7 +1211,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!w || !h)WRONG_TYPE("array(integer,integer)") kvs_int_t iW,iH; if(!w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQSize(iW,iH))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQSize(iW,iH))); } break; case TQVariant::Rect: @@ -1225,7 +1225,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!x || !y || !w || !h)WRONG_TYPE("array(integer,integer,integer,integer)") kvs_int_t iX,iY,iW,iH; if(!x->asInteger(iX) || !y->asInteger(iY) || !w->asInteger(iW) || !h->asInteger(iH))WRONG_TYPE("array(integer,integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQRect(iX,iY,iW,iH))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQRect(iX,iY,iW,iH))); } break; case TQVariant::Color: @@ -1238,7 +1238,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(!r || !g || !b)WRONG_TYPE("array(integer,integer,integer)") kvs_int_t iR,iG,iB; if(!r->asInteger(iR) || !g->asInteger(iG) || !b->asInteger(iB))WRONG_TYPE("array(integer,integer,integer)") - m_pObject->setProperty(szName,TQVariant(TQColor(iR,iG,iB))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQColor(iR,iG,iB))); } break; case TQVariant::Font: @@ -1263,7 +1263,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) if(szFl.find('o') != -1)fnt.setOverline(true); if(szFl.find('f') != -1)fnt.setFixedPitch(true); if(szFl.find('s') != -1)fnt.setStrikeOut(true); - m_pObject->setProperty(szName,TQVariant(fnt)); + m_pObject->setProperty(szName.local8Bit(),TQVariant(fnt)); } break; case TQVariant::Pixmap: @@ -1275,9 +1275,9 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) { // null pixmap if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(TQPixmap())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQPixmap())); else - m_pObject->setProperty(szName,TQVariant(TQIconSet())); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQIconSet())); } else { KviKvsObject * pix = KviKvsKernel::instance()->objectController()->lookupObject(v->hobject()); if(!pix->inherits("KviScriptPixmapObject")) @@ -1285,21 +1285,21 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c) else { TQVariant pixv = pix->property("pixmap"); if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,pixv); + m_pObject->setProperty(szName.local8Bit(),pixv); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(pixv.toPixmap()))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQIconSet(pixv.toPixmap()))); } } } else { TQString szStr; v->asString(szStr); - TQPixmap * pPix = g_pIconManager->getImage(szStr); + TQPixmap * pPix = g_pIconManager->getImage(szStr.local8Bit()); if(pPix) { if(vv.type() == TQVariant::Pixmap) - m_pObject->setProperty(szName,TQVariant(*pPix)); + m_pObject->setProperty(szName.local8Bit(),TQVariant(*pPix)); else - m_pObject->setProperty(szName,TQVariant(TQIconSet(*pPix))); + m_pObject->setProperty(szName.local8Bit(),TQVariant(TQIconSet(*pPix))); } else c->warning(__tr2qs("Can't find the requested image")); @@ -1335,7 +1335,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - int idx = m_pObject->metaObject()->findProperty(szName,true); + int idx = m_pObject->metaObject()->findProperty(szName.local8Bit(),true); if(idx < 0) { if (bNoerror) c->returnValue()->setString("No TQt properties"); @@ -1354,7 +1354,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c) return true; } - TQVariant v = m_pObject->property(szName); + TQVariant v = m_pObject->property(szName.local8Bit()); if(!v.isValid()) { c->warning(__tr2qs("Can't find property named \"%Q\" for object named \"%Q\" of class %Q: the property is indexed and defined but the returned variant is not valid"),&szName,&m_szName,&(m_pClass->name())); @@ -1675,4 +1675,4 @@ KviKvsObject * KviKvsObject::findChild(const TQString &szClass,const TQString &s return 0; } - +#include "kvi_kvs_object.moc" |
