From 9e0effdc52a48f6ffe9ee04451b762c639fff688 Mon Sep 17 00:00:00 2001 From: Noldor Date: Thu, 16 Oct 2008 12:28:36 +0000 Subject: more works on objects module (locale stuff+some fixes+code clean) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2742 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_file.cpp | 4 +- src/modules/objects/class_file.h | 1 + src/modules/objects/class_ftp.cpp | 23 +++--- src/modules/objects/class_groupbox.cpp | 11 +-- src/modules/objects/class_hbox.cpp | 13 ++-- src/modules/objects/class_http.cpp | 45 ++++++------ src/modules/objects/class_label.cpp | 80 ++++++++++----------- src/modules/objects/class_layout.cpp | 73 ++++++++++--------- src/modules/objects/class_lcd.cpp | 26 ++++--- src/modules/objects/class_lineedit.cpp | 82 ++++++++++----------- src/modules/objects/class_listwidget.cpp | 12 ++-- src/modules/objects/class_mainwindow.cpp | 6 +- src/modules/objects/class_memorybuffer.cpp | 4 +- src/modules/objects/class_pixmap.cpp | 94 ++++++++++++------------ src/modules/objects/class_pixmap.h | 18 ++--- src/modules/objects/class_popupmenu.cpp | 52 +++++++------- src/modules/objects/class_popupmenu.h | 20 +++--- src/modules/objects/class_process.cpp | 70 +++++++++--------- src/modules/objects/class_process.h | 26 +++---- src/modules/objects/class_progressbar.cpp | 44 ++++++------ src/modules/objects/class_progressbar.h | 12 ++-- src/modules/objects/class_radiobutton.cpp | 32 +++++---- src/modules/objects/class_radiobutton.h | 10 +-- src/modules/objects/class_slider.cpp | 108 +++++++++++++++------------- src/modules/objects/class_slider.h | 30 ++++---- src/modules/objects/class_socket.cpp | 54 +++++++------- src/modules/objects/object_macros.h | 2 +- src/modules/objects/objects_QT4_vc05.vcproj | 4 +- 28 files changed, 500 insertions(+), 456 deletions(-) (limited to 'src/modules/objects') diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 5f039ea7d..d31ae5b4a 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -187,7 +187,6 @@ KVSO_END_REGISTERCLASS(KviKvsObject_file) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_file,KviKvsObject_widget) - m_pFile = new KviFile(); KVSO_END_CONSTRUCTOR(KviKvsObject_file) @@ -614,3 +613,6 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock) return true; } +#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES +#include "m_class_file.moc" +#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES \ No newline at end of file diff --git a/src/modules/objects/class_file.h b/src/modules/objects/class_file.h index 2f1f047b8..89bdb0ca9 100644 --- a/src/modules/objects/class_file.h +++ b/src/modules/objects/class_file.h @@ -33,6 +33,7 @@ class KviKvsObject_file : public KviKvsObject_widget { + Q_OBJECT public: KVSO_DECLARE_OBJECT(KviKvsObject_file) protected: diff --git a/src/modules/objects/class_ftp.cpp b/src/modules/objects/class_ftp.cpp index 023dae845..c7adb10cf 100644 --- a/src/modules/objects/class_ftp.cpp +++ b/src/modules/objects/class_ftp.cpp @@ -25,6 +25,7 @@ #include "kvi_debug.h" #include "kvi_error.h" #include "class_ftp.h" +#include "kvi_locale.h" #include @@ -96,6 +97,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_ftp) KVSO_CLASS_FUNCTION(ftp,functionConnect) { + CHECK_INTERNAL_POINTER(m_pFtp) QString szHost; kvs_uint_t uRemotePort; KVSO_PARAMETERS_BEGIN(c) @@ -104,61 +106,64 @@ KVSO_CLASS_FUNCTION(ftp,functionConnect) KVSO_PARAMETERS_END(c) if (!uRemotePort) uRemotePort=21; kvs_uint_t id=0; - if (m_pFtp) id=m_pFtp->connectToHost(szHost, uRemotePort); + id=m_pFtp->connectToHost(szHost, uRemotePort); c->returnValue()->setInteger(id); return true; } KVSO_CLASS_FUNCTION(ftp,login) { + CHECK_INTERNAL_POINTER(m_pFtp) QString szUser,szPass; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("user",KVS_PT_STRING,0,szUser) KVSO_PARAMETER("password",KVS_PT_STRING,0,szPass) KVSO_PARAMETERS_END(c) - int id=0; - if (m_pFtp) id=m_pFtp->login(szUser, szPass); + int id=m_pFtp->login(szUser, szPass); c->returnValue()->setInteger(id); return true; } KVSO_CLASS_FUNCTION(ftp,get) { + CHECK_INTERNAL_POINTER(m_pFtp) QString szFile,szDest; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_filename",KVS_PT_STRING,0,szFile) KVSO_PARAMETER("local_filename",KVS_PT_STRING,0,szDest) KVSO_PARAMETERS_END(c) + if (m_pFile) delete m_pFile; m_pFile=new QFile(szDest); m_pFile->open(QIODevice::WriteOnly); int id=0; - if (m_pFtp) id=m_pFtp->get(szFile,m_pFile); + id=m_pFtp->get(szFile,m_pFile); c->returnValue()->setInteger(id); return true; } KVSO_CLASS_FUNCTION(ftp,cd) { + CHECK_INTERNAL_POINTER(m_pFtp) QString szPath; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_filename",KVS_PT_STRING,0,szPath) KVSO_PARAMETERS_END(c) - int id=0; - if (m_pFtp) id=m_pFtp->cd(szPath); + int id=m_pFtp->cd(szPath); c->returnValue()->setInteger(id); return true; } KVSO_CLASS_FUNCTION(ftp,list) { + CHECK_INTERNAL_POINTER(m_pFtp) QString szPath; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_dir",KVS_PT_STRING,0,szPath) KVSO_PARAMETERS_END(c) - int id=0; - if (m_pFtp) id=m_pFtp->list(szPath); + int id=m_pFtp->list(szPath); c->returnValue()->setInteger(id); return true; } KVSO_CLASS_FUNCTION(ftp,abort) { - if (m_pFtp) m_pFtp->abort(); + CHECK_INTERNAL_POINTER(m_pFtp) + m_pFtp->abort(); return true; } //signals & slots diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp index 50c3a86e0..f9be717d4 100644 --- a/src/modules/objects/class_groupbox.cpp +++ b/src/modules/objects/class_groupbox.cpp @@ -189,17 +189,18 @@ bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi KVSO_CLASS_FUNCTION(groupbox,setTitle) { + CHECK_INTERNAL_POINTER(widget()) QString szTitle; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("title",KVS_PT_STRING,0,szTitle) KVSO_PARAMETERS_END(c) - if (widget()) - ((KviTalGroupBox *)widget())->setTitle(szTitle); + ((KviTalGroupBox *)widget())->setTitle(szTitle); return true; } KVSO_CLASS_FUNCTION(groupbox,title) { - if (widget()) c->returnValue()->setString(((KviTalGroupBox *)widget())->title()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setString(((KviTalGroupBox *)widget())->title()); return true; } KVSO_CLASS_FUNCTION(groupbox,setFlat) @@ -309,7 +310,7 @@ KVSO_CLASS_FUNCTION(groupbox,setAlignment) return true; } } - c->warning(__tr2qs("Unknown alignment")); + c->warning(__tr2qs_ctx("Unknown alignment: 'Q'","objets"),&szAlign); return true; } @@ -342,7 +343,7 @@ KVSO_CLASS_FUNCTION(groupbox,setOrientation) else if(KviQString::equalCI(szMode, "Vertical")) ((KviTalGroupBox *)widget())->setOrientation(Qt::Horizontal); - else c->warning( __tr2qs("Unknown orientation: ")); + else c->warning( __tr2qs_ctx("Unknown orientation: 'Q'","objects"),&szMode); return true; } diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp index 340cfa8f7..3dcf15f7c 100644 --- a/src/modules/objects/class_hbox.cpp +++ b/src/modules/objects/class_hbox.cpp @@ -109,26 +109,29 @@ bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * KVSO_CLASS_FUNCTION(hbox,setMargin) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uMargin; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin) KVSO_PARAMETERS_END(c) - if (widget()) ((KviTalHBox *)widget())->setMargin(uMargin); + ((KviTalHBox *)widget())->setMargin(uMargin); return true; } KVSO_CLASS_FUNCTION(hbox,setSpacing) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) ((KviTalHBox *)widget())->setSpacing(uSpacing); + ((KviTalHBox *)widget())->setSpacing(uSpacing); return true; } KVSO_CLASS_FUNCTION(hbox,setStretchFactor) { + CHECK_INTERNAL_POINTER(widget()) KviKvsObject * pObject; kvs_hobject_t hObject; kvs_uint_t uStretch; @@ -137,7 +140,6 @@ KVSO_CLASS_FUNCTION(hbox,setStretchFactor) KVSO_PARAMETER("stretch",KVS_PT_UNSIGNEDINTEGER,0,uStretch) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if (!pObject) { c->warning(__tr2qs("Widget parameter is not an object")); @@ -163,15 +165,17 @@ KVSO_CLASS_FUNCTION(hbox,setStretchFactor) } KVSO_CLASS_FUNCTION(hbox,addStretch) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iStretch; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("stretch",KVS_PT_INT,0,iStretch) KVSO_PARAMETERS_END(c) - if (widget()) ((KviTalHBox *)widget())->addStretch(iStretch); + ((KviTalHBox *)widget())->addStretch(iStretch); return true; } KVSO_CLASS_FUNCTION(hbox,setAlignment) { + CHECK_INTERNAL_POINTER(widget()) QStringList alignment; KviKvsObject * pObject; kvs_hobject_t hObject; @@ -180,7 +184,6 @@ KVSO_CLASS_FUNCTION(hbox,setAlignment) KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if (!pObject) { c->warning(__tr2qs("Widget parameter is not an object")); diff --git a/src/modules/objects/class_http.cpp b/src/modules/objects/class_http.cpp index 036a0d27d..299f8baea 100644 --- a/src/modules/objects/class_http.cpp +++ b/src/modules/objects/class_http.cpp @@ -167,6 +167,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_http) bool KviKvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) QString szHost; QString szConnectionType; kvs_uint_t uRemotePort; @@ -177,7 +178,7 @@ bool KviKvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c) QUrl url(szHost); if (!url.isValid()) { - c->warning(__tr2qs("Host '%Q' is not a valid url"),&szHost); + c->warning(__tr2qs_ctx("Host '%Q' is not a valid url","objects"),&szHost); return true; } if (!szHost.isEmpty() && url.host().isEmpty()) url.setHost(szHost); @@ -187,17 +188,19 @@ bool KviKvsObject_http::functionSetHost(KviKvsObjectFunctionCall *c) if(url.scheme().toLower()=="https") mode=QHttp::ConnectionModeHttps; else {mode=QHttp::ConnectionModeHttp;url.setScheme("http");} if (mode==QHttp::ConnectionModeHttps) uRemotePort=443; - if (m_pHttp) id=m_pHttp->setHost(url.host(), mode, uRemotePort); + id=m_pHttp->setHost(url.host(), mode, uRemotePort); c->returnValue()->setInteger(id); return true; } bool KviKvsObject_http::functionCurrentId(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) c->returnValue()->setInteger(m_pHttp->currentId()); return true; } bool KviKvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) QString szUser; QString szPass; KVSO_PARAMETERS_BEGIN(c) @@ -205,11 +208,12 @@ bool KviKvsObject_http::functionSetUser(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("password",KVS_PT_STRING,0,szPass) KVSO_PARAMETERS_END(c) kvs_int_t id; - if (m_pHttp) id=m_pHttp->setUser(szUser,szPass); + id=m_pHttp->setUser(szUser,szPass); return true; } bool KviKvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) QString szHost; QString szUser,szPass; kvs_uint_t uRemotePort; @@ -219,11 +223,12 @@ bool KviKvsObject_http::functionSetProxy(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("user",KVS_PT_STRING,KVS_PF_OPTIONAL,szUser) KVSO_PARAMETER("pass",KVS_PT_STRING,KVS_PF_OPTIONAL,szPass) KVSO_PARAMETERS_END(c) - if (m_pHttp) m_pHttp->setProxy(szHost,uRemotePort,szUser,szPass); + m_pHttp->setProxy(szHost,uRemotePort,szUser,szPass); return true; } bool KviKvsObject_http::functionGet(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) QString szPath,szDest; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath) @@ -239,24 +244,21 @@ bool KviKvsObject_http::functionGet(KviKvsObjectFunctionCall *c) } else { - c->warning(__tr2qs("'%Q' is not a valid file path"),&szDest); + c->warning(__tr2qs_ctx("'%Q' is not a valid file path","objects"),&szDest); c->returnValue()->setInteger(-1); return true; } } - int id=0; if (szPath.isEmpty()) szPath="/"; - if (m_pHttp) - { - id=m_pHttp->get(szPath,pFile); - if (pFile) getDict[id]=pFile; - c->returnValue()->setInteger(id); - } + int id=m_pHttp->get(szPath,pFile); + if (pFile) getDict[id]=pFile; + c->returnValue()->setInteger(id); return true; } bool KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) QString szPath,szDest,szData; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("remote_path",KVS_PT_STRING,0,szPath) @@ -270,30 +272,29 @@ bool KviKvsObject_http::functionPost(KviKvsObjectFunctionCall *c) pFile->open(QIODevice::WriteOnly); } } - int id=0; if (szPath.isEmpty()) szPath="/"; - if (m_pHttp) - { - id=m_pHttp->post(szPath,szDest.toAscii(),pFile); - if (pFile) getDict[id]=pFile; - c->returnValue()->setInteger(id); - } + int id=m_pHttp->post(szPath,szDest.toAscii(),pFile); + if (pFile) getDict[id]=pFile; + c->returnValue()->setInteger(id); return true; } bool KviKvsObject_http::functionAbort(KviKvsObjectFunctionCall *c) { + CHECK_INTERNAL_POINTER(m_pHttp) m_bAbort=true; - if (m_pHttp) m_pHttp->abort(); + m_pHttp->abort(); return true; } bool KviKvsObject_http::functionReadAll(KviKvsObjectFunctionCall *c) { - if (m_pHttp) c->returnValue()->setString(m_pHttp->readAll()); + CHECK_INTERNAL_POINTER(m_pHttp) + c->returnValue()->setString(m_pHttp->readAll()); return true; } bool KviKvsObject_http::functionErrorString(KviKvsObjectFunctionCall *c) { - if (m_pHttp) c->returnValue()->setString(m_pHttp->errorString()); + CHECK_INTERNAL_POINTER(m_pHttp) + c->returnValue()->setString(m_pHttp->errorString()); return true; } bool KviKvsObject_http::functionFollowRedirect(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp index 74332236e..ba0238c34 100644 --- a/src/modules/objects/class_label.cpp +++ b/src/modules/objects/class_label.cpp @@ -215,32 +215,35 @@ bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList KVSO_CLASS_FUNCTION(label,setText) { + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLabel *)widget())->setText(szText); + ((QLabel *)widget())->setText(szText); return true; } KVSO_CLASS_FUNCTION(label,text) { - if (widget()) c->returnValue()->setString(((QLabel *)widget())->text()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setString(((QLabel *)widget())->text()); return true; } KVSO_CLASS_FUNCTION(label,setMargin) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iMargin; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,iMargin) KVSO_PARAMETERS_END(c) - if (widget()) ((QLabel *)widget())->setMargin(iMargin); + ((QLabel *)widget())->setMargin(iMargin); return true; } KVSO_CLASS_FUNCTION(label,margin) { - if (widget()) c->returnValue()->setInteger(((QLabel *)widget())->margin()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QLabel *)widget())->margin()); return true; } /* @@ -265,35 +268,36 @@ bool KviKvsObject_label::functionAutoResize(KviKvsObjectFunctionCall *c) KVSO_CLASS_FUNCTION(label,setAlignment) { + CHECK_INTERNAL_POINTER(widget()) QStringList alignment; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment) KVSO_PARAMETERS_END(c) - if (!widget()) return true; int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) + { + + align = 0; + for(unsigned int j = 0; j < align_num; j++) { - - align = 0; - for(unsigned int j = 0; j < align_num; j++) + if(KviQString::equalCI((*it), align_tbl[j])) { - if(KviQString::equalCI((*it), align_tbl[j])) - { - align=align_cod[j]; - break; - } + align=align_cod[j]; + break; } - if(align) - sum = sum | align; - else - c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it)); - } + if(align) + sum = sum | align; + else + c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); + + } ((QLabel *)widget())->setAlignment((Qt::Alignment)sum); return true; } KVSO_CLASS_FUNCTION(label,alignment) { + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLabel *)widget())->alignment(); QString szAlignment=""; for(unsigned int i = 0; i < align_num; i++) @@ -309,15 +313,14 @@ KVSO_CLASS_FUNCTION(label,alignment) } KVSO_CLASS_FUNCTION(label,clear) { - if(widget()) - ((QLabel *)widget())->clear(); + CHECK_INTERNAL_POINTER(widget()) + ((QLabel *)widget())->clear(); return true; } - KVSO_CLASS_FUNCTION(label,setFrameStyle) { - + CHECK_INTERNAL_POINTER(widget()) QStringList style; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("style",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,style) @@ -325,31 +328,29 @@ KVSO_CLASS_FUNCTION(label,setFrameStyle) if (!widget()) return true; int framestyle,sum=0; for ( QStringList::Iterator it = style.begin(); it != style.end(); ++it ) + { + framestyle = 0; + for(unsigned int j = 0; j < align_num; j++) { - framestyle = 0; - for(unsigned int j = 0; j < align_num; j++) + if(KviQString::equalCI((*it), frame_tbl[j])) { - if(KviQString::equalCI((*it), frame_tbl[j])) - { - framestyle=frame_cod[j]; - break; - } + framestyle=frame_cod[j]; + break; } - if(framestyle) - sum = sum | framestyle; - else - c->warning(__tr2qs("Unknown style: '%Q'"),&(*it)); - } + if(framestyle) + sum = sum | framestyle; + else + c->warning(__tr2qs_ctx("Unknown style: '%Q'","objects"),&(*it)); + + } ((QLabel *)widget())->setFrameStyle(sum); return true; - - - } KVSO_CLASS_FUNCTION(label,frameStyle) { + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLabel *)widget())->frameStyle(); QString szStyle=""; for(unsigned int i = 0; i < frame_num; i++) @@ -365,12 +366,11 @@ KVSO_CLASS_FUNCTION(label,frameStyle) } KVSO_CLASS_FUNCTION(label,setImage) { - + CHECK_INTERNAL_POINTER(widget()) QString icon; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("icon",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) - if(!widget())return true; QPixmap * pix = g_pIconManager->getImage(icon); if(pix) ((QLabel *)widget())->setPixmap(*pix); return true; diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp index cf867ccaa..0507212bc 100644 --- a/src/modules/objects/class_layout.cpp +++ b/src/modules/objects/class_layout.cpp @@ -146,6 +146,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList KVSO_CLASS_FUNCTION(layout,addWidget) { + CHECK_INTERNAL_POINTER(widget()) KviKvsObject * pObject; kvs_hobject_t hObject; kvs_uint_t uCol,uRow; @@ -155,20 +156,19 @@ KVSO_CLASS_FUNCTION(layout,addWidget) KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","objets")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects")); return true; } if(!pObject->object()->isWidgetType()) { - c->warning(__tr2qs("Can't add a non-widget object")); + c->warning(__tr2qs_ctx("Can't add a non-widget object","objects")); return true; } ((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uRow,uCol); @@ -177,6 +177,7 @@ KVSO_CLASS_FUNCTION(layout,addWidget) KVSO_CLASS_FUNCTION(layout,addMultiCellWidget) { + CHECK_INTERNAL_POINTER(widget()) KviKvsObject * pObject; kvs_hobject_t hObject; kvs_uint_t uStartCol,uStartRow,uEndCol,uEndRow; @@ -188,20 +189,19 @@ KVSO_CLASS_FUNCTION(layout,addMultiCellWidget) KVSO_PARAMETER("end_column",KVS_PT_UNSIGNEDINTEGER,0,uEndCol) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","objects")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects")); return true; } if(!pObject->object()->isWidgetType()) { - c->warning(__tr2qs("Can't add a non-widget object")); + c->warning(__tr2qs_ctx("Can't add a non-widget object","objects")); return true; } // { addWidget(w, fromRow, fromCol, (toRow < 0) ? -1 : toRow - fromRow + 1, (toCol < 0) ? -1 : toCol - fromCol + 1, _align); } @@ -211,83 +211,87 @@ KVSO_CLASS_FUNCTION(layout,addMultiCellWidget) KVSO_CLASS_FUNCTION(layout,setRowStretch) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uRow,uStretch; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow) KVSO_PARAMETER("stretch",KVS_PT_UNSIGNEDINTEGER,0,uStretch) KVSO_PARAMETERS_END(c) - if(!widget())return true; ((QGridLayout *)object())->setRowStretch(uRow,uStretch); return true; } KVSO_CLASS_FUNCTION(layout,setColumnStretch) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uCol,uStretch; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) KVSO_PARAMETER("stretch",KVS_PT_UNSIGNEDINTEGER,0,uStretch) KVSO_PARAMETERS_END(c) - if(!widget())return true; ((QGridLayout *)object())->setColumnStretch(uCol,uStretch); return true; } KVSO_CLASS_FUNCTION(layout,setMargin) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uMargin; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin) KVSO_PARAMETERS_END(c) - if (widget()) ((QGridLayout *)object())->setMargin(uMargin); + ((QGridLayout *)object())->setMargin(uMargin); return true; } KVSO_CLASS_FUNCTION(layout,setSpacing) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) ((QGridLayout *)object())->setSpacing(uSpacing); + ((QGridLayout *)object())->setSpacing(uSpacing); return true; } KVSO_CLASS_FUNCTION(layout,addRowSpacing) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing,uRow; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) //((QGridLayout *)object())->addRowSpacing(uRow,uSpacing); - ((QGridLayout *)object())->addItem(new QSpacerItem(0, uSpacing), uRow, 0); + //((QGridLayout *)object())->addRowSpacing(uRow,uSpacing); + ((QGridLayout *)object())->addItem(new QSpacerItem(0, uSpacing), uRow, 0); return true; } KVSO_CLASS_FUNCTION(layout,addColSpacing) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uSpacing,uCol; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol) KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing) KVSO_PARAMETERS_END(c) - if (widget()) ((QGridLayout *)object())->addItem(new QSpacerItem(uSpacing,0), 0, uCol); + ((QGridLayout *)object())->addItem(new QSpacerItem(uSpacing,0), 0, uCol); return true; } KVSO_CLASS_FUNCTION(layout,setResizeMode) { + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("resize_mode",KVS_PT_STRING,0,szMode) KVSO_PARAMETERS_END(c) - if(!widget())return true; QLayout::SizeConstraint r = QLayout::SetDefaultConstraint; if(KviQString::equalCI(szMode,"FreeResize")) r = QLayout::SetNoConstraint; else if(KviQString::equalCI(szMode,"Minimum")) r = QLayout::SetMinimumSize; else if(KviQString::equalCI(szMode,"Fixed"))r = QLayout::SetFixedSize; - else c->warning(__tr2qs("Invalid resize mode defaulting to Auto")); + else c->warning(__tr2qs_ctx("Invalid resize mode defaulting to Auto","objects")); ((QGridLayout *)object())->setSizeConstraint(r); return true; @@ -295,6 +299,7 @@ KVSO_CLASS_FUNCTION(layout,setResizeMode) KVSO_CLASS_FUNCTION(layout,setAlignment) { + CHECK_INTERNAL_POINTER(widget()) QStringList alignment; KviKvsObject * pObject; kvs_hobject_t hObject; @@ -303,48 +308,46 @@ KVSO_CLASS_FUNCTION(layout,setAlignment) KVSO_PARAMETER("alignment",KVS_PT_STRINGLIST,KVS_PF_OPTIONAL,alignment) KVSO_PARAMETERS_END(c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","objects")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects")); return true; } if(!pObject->object()->isWidgetType()) { - c->warning(__tr2qs("Can't add a non-widget object")); + c->warning(__tr2qs_ctx("Can't add a non-widget object","objects")); return true; } int index=((QGridLayout *)widget())->indexOf(((QWidget *)(pObject->object()))); if(index ==-1) { - c->warning(__tr2qs("The widget must be a child of this hbox")); + c->warning(__tr2qs_ctx("The widget must be a child of this layout","objects")); return true; } int align,sum=0; for ( QStringList::Iterator it = alignment.begin(); it != alignment.end(); ++it ) + { + align = 0; + for(unsigned int j = 0; j < align_num; j++) { - - align = 0; - for(unsigned int j = 0; j < align_num; j++) + if(KviQString::equalCI((*it), align_tbl[j])) { - if(KviQString::equalCI((*it), align_tbl[j])) - { - align=align_cod[j]; - break; - } + align=align_cod[j]; + break; } - if(align) - sum = sum | align; - else - c->warning(__tr2qs("Unknown alignment: '%Q'"),&(*it)); - } + if(align) + sum = sum | align; + else + c->warning(__tr2qs_ctx("Unknown alignment: '%Q'","objects"),&(*it)); + + } if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum); return true; } diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 2ee34b6f0..8610b2ba0 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -96,85 +96,91 @@ bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *p } KVSO_CLASS_FUNCTION(lcd,displayInt) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_INT,0,iDigit) KVSO_PARAMETERS_END(c) - if(widget())((QLCDNumber *)widget())->display((int)iDigit); + ((QLCDNumber *)widget())->display((int)iDigit); return true; } KVSO_CLASS_FUNCTION(lcd,displayStr) { + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if(widget()) ((QLCDNumber *)widget())->display(szText); + ((QLCDNumber *)widget())->display(szText); return true; } KVSO_CLASS_FUNCTION(lcd,displayDouble) { + CHECK_INTERNAL_POINTER(widget()) kvs_real_t dDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("number",KVS_PT_DOUBLE,0,dDigit) KVSO_PARAMETERS_END(c) - if(widget()) ((QLCDNumber *)widget())->display(dDigit); + ((QLCDNumber *)widget())->display(dDigit); return true; } KVSO_CLASS_FUNCTION(lcd,setMode) { + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,0,szMode) KVSO_PARAMETERS_END(c) - if(!widget())return true; if(KviQString::equalCI(szMode, "HEX")) ((QLCDNumber *)widget())->setHexMode(); else if(KviQString::equalCI(szMode, "DEC")) ((QLCDNumber *)widget())->setDecMode(); else if(KviQString::equalCI(szMode, "BIN")) ((QLCDNumber *)widget())->setBinMode(); else if(KviQString::equalCI(szMode, "OCT")) ((QLCDNumber *)widget())->setOctMode(); - else c->warning( __tr2qs("Unknown mode ")); + else c->warning( __tr2qs_ctx("Unknown mode: 'Q'","objects"),&szMode); return true; } KVSO_CLASS_FUNCTION(lcd,setSegmentStyle) { + CHECK_INTERNAL_POINTER(widget()) QString szStyle; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("style",KVS_PT_STRING,0,szStyle) KVSO_PARAMETERS_END(c) - if(!widget())return true; if(KviQString::equalCI(szStyle, "Outline")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Outline); else if(KviQString::equalCI(szStyle, "Filled")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Filled); else if(KviQString::equalCI(szStyle, "Flat")) ((QLCDNumber *)widget())->setSegmentStyle(QLCDNumber::Flat); - else c->warning( __tr2qs("Unknown segment style ")); + else c->warning( __tr2qs_ctx("Unknown segment style: 'Q'","objects"),&szStyle); return true; } KVSO_CLASS_FUNCTION(lcd,setNumDigits) { + CHECK_INTERNAL_POINTER(widget()) kvs_real_t digit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit) KVSO_PARAMETERS_END(c) - if(widget()) ((QLCDNumber *)widget())->setNumDigits(digit); + ((QLCDNumber *)widget())->setNumDigits(digit); return true; } KVSO_CLASS_FUNCTION(lcd,setSmallDecimalPoint) { + CHECK_INTERNAL_POINTER(widget()) bool bFlag; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bflag",KVS_PT_BOOLEAN,0,bFlag) KVSO_PARAMETERS_END(c) - if(widget()) ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag); + ((QLCDNumber *)widget())->setSmallDecimalPoint(bFlag); return true; } KVSO_CLASS_FUNCTION(lcd,checkOverflow) { + CHECK_INTERNAL_POINTER(widget()) kvs_real_t iDigit; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,iDigit) KVSO_PARAMETERS_END(c) - if(widget())c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit)); + c->returnValue()->setBoolean(((QLCDNumber *)widget())->checkOverflow(iDigit)); return true; } diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 30f96d5b6..607e7b9ae 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -228,127 +228,128 @@ bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi KVSO_CLASS_FUNCTION(lineedit,text) { - if(widget()) - c->returnValue()->setString(((QLineEdit *)widget())->text()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setString(((QLineEdit *)widget())->text()); return true; } KVSO_CLASS_FUNCTION(lineedit,setText) { + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setText(szText); + ((QLineEdit *)widget())->setText(szText); return true; } KVSO_CLASS_FUNCTION(lineedit,setInputValidator) { + CHECK_INTERNAL_POINTER(widget()) QString szReg; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("reg_expression",KVS_PT_STRING,0,szReg) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setValidator(new QRegExpValidator(QRegExp(szReg),((QLineEdit *)widget()))); + ((QLineEdit *)widget())->setValidator(new QRegExpValidator(QRegExp(szReg),((QLineEdit *)widget()))); return true; } KVSO_CLASS_FUNCTION(lineedit,maxLength) { - if(widget()) - c->returnValue()->setInteger(((QLineEdit *)widget())->maxLength()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QLineEdit *)widget())->maxLength()); return true; } KVSO_CLASS_FUNCTION(lineedit,setMaxLength) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iMaxlen; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("maxlen",KVS_PT_UNSIGNEDINTEGER,0,iMaxlen) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setMaxLength(iMaxlen); + ((QLineEdit *)widget())->setMaxLength(iMaxlen); return true; } KVSO_CLASS_FUNCTION(lineedit,frame) { - if(widget()) - c->returnValue()->setBoolean(((QLineEdit *)widget())->hasFrame()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setBoolean(((QLineEdit *)widget())->hasFrame()); return true; } KVSO_CLASS_FUNCTION(lineedit,setFrame) { + CHECK_INTERNAL_POINTER(widget()) bool bFrame; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bframe",KVS_PT_BOOL,0,bFrame) KVSO_PARAMETERS_END(c) - if(widget()) - ((QLineEdit *)widget())->setFrame(bFrame); + ((QLineEdit *)widget())->setFrame(bFrame); return true; } KVSO_CLASS_FUNCTION(lineedit,cursorPosition) { - if(widget()) - c->returnValue()->setInteger(((QLineEdit *)widget())->cursorPosition()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QLineEdit *)widget())->cursorPosition()); return true; } KVSO_CLASS_FUNCTION(lineedit,setCursorPosition) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iPos; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("position",KVS_PT_UNSIGNEDINTEGER,0,iPos) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setCursorPosition(iPos); + ((QLineEdit *)widget())->setCursorPosition(iPos); return true; } KVSO_CLASS_FUNCTION(lineedit,selectAll) { - if(widget()) - ((QLineEdit *)widget())->selectAll(); + CHECK_INTERNAL_POINTER(widget()) + ((QLineEdit *)widget())->selectAll(); return true; } KVSO_CLASS_FUNCTION(lineedit,setSelection) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uStart,uLen; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("start",KVS_PT_UNSIGNEDINTEGER,0,uStart) KVSO_PARAMETER("len",KVS_PT_UNSIGNEDINTEGER,0,uLen) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setSelection(uStart, uLen); + ((QLineEdit *)widget())->setSelection(uStart, uLen); return true; } KVSO_CLASS_FUNCTION(lineedit,copy) { - if(widget()) - ((QLineEdit *)widget())->copy(); + CHECK_INTERNAL_POINTER(widget()) + ((QLineEdit *)widget())->copy(); return true; } KVSO_CLASS_FUNCTION(lineedit,cut) { - if(widget()) - ((QLineEdit *)widget())->cut(); + CHECK_INTERNAL_POINTER(widget()) + ((QLineEdit *)widget())->cut(); return true; } KVSO_CLASS_FUNCTION(lineedit,paste) { - if(widget()) - ((QLineEdit *)widget())->paste(); + CHECK_INTERNAL_POINTER(widget()) + ((QLineEdit *)widget())->paste(); return true; } KVSO_CLASS_FUNCTION(lineedit,echoMode) { + CHECK_INTERNAL_POINTER(widget()) int mode = ((QLineEdit *)widget())->echoMode(); QString szEchomode=""; for(unsigned int i = 0; i < mode_num; i++) @@ -365,11 +366,11 @@ KVSO_CLASS_FUNCTION(lineedit,echoMode) KVSO_CLASS_FUNCTION(lineedit,setEchoMode) { + CHECK_INTERNAL_POINTER(widget()) QString szMode; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mode",KVS_PT_STRING,0,szMode) KVSO_PARAMETERS_END(c) - if (!widget()) return true; for(unsigned int i = 0; i < mode_num; i++) { if(KviQString::equalCI(szMode, mode_tbl[i])) @@ -379,57 +380,55 @@ KVSO_CLASS_FUNCTION(lineedit,setEchoMode) return true; } } - c->warning(__tr2qs("Unknown echo mode %Q"),&szMode); + c->warning(__tr2qs_ctx("Unknown echo mode '%Q'","objects"),&szMode); return true; } KVSO_CLASS_FUNCTION(lineedit,clear) { - if(widget()) - ((QLineEdit *)widget())->clear(); + CHECK_INTERNAL_POINTER(widget()) + ((QLineEdit *)widget())->clear(); return true; } //-| Grifisx & Noldor |-Start: KVSO_CLASS_FUNCTION(lineedit,dragAndDrop) { + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if(widget()) - ((QLineEdit *)widget())->setDragEnabled(bEnabled); + ((QLineEdit *)widget())->setDragEnabled(bEnabled); return true; } KVSO_CLASS_FUNCTION(lineedit,setReadOnly) { + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bReadonly",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if(widget()) - ((QLineEdit *)widget())->setReadOnly(bEnabled); + ((QLineEdit *)widget())->setReadOnly(bEnabled); return true; } KVSO_CLASS_FUNCTION(lineedit,setInputMask) { + CHECK_INTERNAL_POINTER(widget()) QString szMask; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask) KVSO_PARAMETERS_END(c) - if (widget()) - ((QLineEdit *)widget())->setInputMask(szMask); + ((QLineEdit *)widget())->setInputMask(szMask); return true; } KVSO_CLASS_FUNCTION(lineedit,returnPressedEvent) { - emitSignal("returnPressed",c); return true; - } void KviKvsObject_lineedit::slotreturnPressed() @@ -441,11 +440,8 @@ void KviKvsObject_lineedit::slotreturnPressed() // FIND ME KVSO_CLASS_FUNCTION(lineedit,lostFocusEvent) { - - emitSignal("lostFocus",c); return true; - } void KviKvsObject_lineedit::slotlostFocus() diff --git a/src/modules/objects/class_listwidget.cpp b/src/modules/objects/class_listwidget.cpp index 4e40b5f6a..ab4a6aad0 100644 --- a/src/modules/objects/class_listwidget.cpp +++ b/src/modules/objects/class_listwidget.cpp @@ -185,7 +185,7 @@ KVSO_CLASS_FUNCTION(listwidget,changeItem) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex) KVSO_PARAMETERS_END(c) - if (szText.isEmpty()) c->warning(__tr2qs("No string parameter given - using empty string")); + if (szText.isEmpty()) c->warning(__tr2qs_ctx("No string parameter given - using empty string","objects")); if(iIndex >= (cnt = ((QListWidget *)widget())->count())) { c->warning(__tr2qs("Item index [%d] is too big - defaulting to " @@ -206,8 +206,8 @@ KVSO_CLASS_FUNCTION(listwidget,removeItem) KVSO_PARAMETERS_END(c) if(iIndex >= (cnt = ((QListWidget *)widget())->count())) { - c->warning(__tr2qs("Item index [%d] is too big - defaulting to " \ - "$count() - 1 [%d]"), iIndex, cnt); + c->warning(__tr2qs_ctx("Item index [%d] is too big - defaulting to " \ + "$count() - 1 [%d]","objects"), iIndex, cnt); iIndex = cnt - 1; } delete ((QListWidget *)widget())->takeItem(iIndex); @@ -269,7 +269,7 @@ KVSO_CLASS_FUNCTION(listwidget,setSelectionMode) else if(KviQString::equalCI(szMode,"multi")) iMode = QAbstractItemView::MultiSelection; else if(KviQString::equalCI(szMode,"extended")) iMode = QAbstractItemView::ExtendedSelection; else if(KviQString::equalCI(szMode,"none")) iMode = QAbstractItemView::NoSelection; - else c->warning(__tr2qs("Invalid selection mode '%Q' assuming single"),&szMode); + else c->warning(__tr2qs_ctx("Invalid selection mode '%Q' assuming single","objects"),&szMode); ((QListWidget *)widget())->setSelectionMode(iMode); return true; } @@ -300,12 +300,12 @@ KVSO_CLASS_FUNCTION(listwidget,insertWidgetItem) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hWid); if(pObject==this) { - c->warning(__tr2qs("Can't insert the listwidget itelf!")); + c->warning(__tr2qs_ctx("Can't insert the listwidget itelf!","objects")); return true; } if(!pObject->object()->isWidgetType()) { - c->warning(__tr2qs("Can't insert a non-widget object")); + c->warning(__tr2qs_ctx("Can't insert a non-widget object","objects")); return true; } QWidget *wi=((QWidget *)(pObject->object())); diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp index 6e102f78b..01fe8421c 100644 --- a/src/modules/objects/class_mainwindow.cpp +++ b/src/modules/objects/class_mainwindow.cpp @@ -84,17 +84,17 @@ KVSO_CLASS_FUNCTION(mainwindow,setCentralWidget) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","objects")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects")); return true; } if(!pObject->inheritsClass("widget")) { - c->warning(__tr2qs("Widget object required")); + c->warning(__tr2qs_ctx("Widget object required","objects")); return TRUE; } ((KviTalMainWindow *)widget())->setCentralWidget(((QWidget *)(pObject->object()))); diff --git a/src/modules/objects/class_memorybuffer.cpp b/src/modules/objects/class_memorybuffer.cpp index 66dbcec4b..9413ced2c 100644 --- a/src/modules/objects/class_memorybuffer.cpp +++ b/src/modules/objects/class_memorybuffer.cpp @@ -87,7 +87,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,loadFromFile) f.load(*m_pBuffer); f.close(); } - else c->warning(__tr2qs("The file '%Q' does not exists"),&szFileName); + else c->warning(__tr2qs_ctx("The file '%Q' does not exists","objects"),&szFileName); return true; } KVSO_CLASS_FUNCTION(memorybuffer,saveToFile) @@ -105,7 +105,7 @@ KVSO_CLASS_FUNCTION(memorybuffer,saveToFile) } else { - c->warning(__tr2qs("Cannot open file '%Q' for writing"),&szFileName); + c->warning(__tr2qs_ctx("Cannot open file '%Q' for writing","objects"),&szFileName); } return true; } diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 1f897f270..fda7a5bb8 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -75,17 +75,17 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_pixmap,"pixmap","object") - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"fill",functionfill) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"resize",functionresize) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"load",functionload) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"loadFromMemoryBuffer",functionloadFromMemoryBuffer) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,fill) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,resize) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,load) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,loadFromMemoryBuffer) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"height",functionheight) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,height) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"width",functionwidth) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"setOpacity",functionsetOpacity) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"scale",functionscale) - KVSO_REGISTER_HANDLER(KviKvsObject_pixmap,"rotate",functionrotate) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,width) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,setOpacity) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,scale) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_pixmap,rotate) KVSO_END_REGISTERCLASS(KviKvsObject_pixmap) @@ -107,8 +107,9 @@ KVSO_BEGIN_DESTRUCTOR(KviKvsObject_pixmap) KVSO_END_CONSTRUCTOR(KviKvsObject_pixmap) -bool KviKvsObject_pixmap::functionfill(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,fill) { + CHECK_INTERNAL_POINTER(m_pPixmap) KviKvsObject *ob; kvs_int_t iXoffset,iYoffset; kvs_hobject_t hObject; @@ -134,8 +135,9 @@ bool KviKvsObject_pixmap::functionfill(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_pixmap::functionscale(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,scale) { + CHECK_INTERNAL_POINTER(m_pPixmap) kvs_int_t iScaleW,iScaleH; QString szAspectRatio, szTransformation; KVSO_PARAMETERS_BEGIN(c) @@ -159,8 +161,9 @@ bool KviKvsObject_pixmap::functionscale(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_pixmap::functionrotate(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,rotate) { + CHECK_INTERNAL_POINTER(m_pPixmap) kvs_real_t uDegrees; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("a",KVS_PT_REAL,0,uDegrees) @@ -172,41 +175,40 @@ bool KviKvsObject_pixmap::functionrotate(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_pixmap::functionresize(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,resize) { + CHECK_INTERNAL_POINTER(m_pPixmap) kvs_int_t uWidth,uHeight; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,0,uWidth) KVSO_PARAMETER("height",KVS_PT_UNSIGNEDINTEGER,0,uHeight) KVSO_PARAMETERS_END(c) - if (m_pPixmap) - { - delete m_pPixmap; - m_pPixmap=new QPixmap(uWidth,uHeight); - } + delete m_pPixmap; + m_pPixmap=new QPixmap(uWidth,uHeight); bPixmapModified=true; return true; } -bool KviKvsObject_pixmap::functionload(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,load) { + CHECK_INTERNAL_POINTER(m_pPixmap) QString szFile; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("file",KVS_PT_STRING,0,szFile) KVSO_PARAMETERS_END(c) - if(!QFile::exists(szFile)) { - c->warning(__tr2qs("I can't find the specified file %Q."),&szFile); + c->warning(__tr2qs_ctx("I can't find the specified file '%Q'.","objects"),&szFile); return true; } m_pPixmap->load(szFile); bPixmapModified=true; return true; } -bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,loadFromMemoryBuffer) { + CHECK_INTERNAL_POINTER(m_pPixmap) KviKvsObject * pObject; kvs_hobject_t hObject; KVSO_PARAMETERS_BEGIN(c) @@ -215,12 +217,12 @@ bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Buffer parameter is not an object")); + c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects")); return true; } if (!pObject->inheritsClass("memorybuffer")) { - c->warning(__tr2qs("Buffer parameter is not a memorybuffer object")); + c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects")); return true; } @@ -231,20 +233,22 @@ bool KviKvsObject_pixmap::functionloadFromMemoryBuffer(KviKvsObjectFunctionCall return true; } -bool KviKvsObject_pixmap::functionheight(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,height) { + CHECK_INTERNAL_POINTER(m_pPixmap) c->returnValue()->setInteger(m_pPixmap->height()); return true; } -bool KviKvsObject_pixmap::functionwidth(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,width) { + CHECK_INTERNAL_POINTER(m_pPixmap) c->returnValue()->setInteger(m_pPixmap->width()); return true; } // maybe DEPRECATED? -bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(pixmap,setOpacity) { - if(!m_pPixmap)return true; + CHECK_INTERNAL_POINTER(m_pPixmap) kvs_real_t dOpacity; kvs_uint_t uXoffset,uYoffset; kvs_uint_t uWidth,uHeight; @@ -253,24 +257,24 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) kvs_hobject_t hObject; KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) - KVSO_PARAMETER("destination",KVS_PT_HOBJECT,0,hObject) - KVSO_PARAMETER("x_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uXoffset) - KVSO_PARAMETER("y_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uYoffset) - KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uWidth) - KVSO_PARAMETER("height",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uHeight) + KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) + KVSO_PARAMETER("destination",KVS_PT_HOBJECT,0,hObject) + KVSO_PARAMETER("x_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uXoffset) + KVSO_PARAMETER("y_offset",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uYoffset) + KVSO_PARAMETER("width",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uWidth) + KVSO_PARAMETER("height",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uHeight) KVSO_PARAMETERS_END(c) pObDest=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObDest) { - c->warning(__tr2qs("Destination parameter is not an object")); + c->warning(__tr2qs_ctx("Destination parameter is not an object","objects")); return true; } if(!pObDest->inheritsClass("pixmap")) { - c->warning(__tr2qs("Destination must be a pixmap object")); + c->warning(__tr2qs_ctx("Destination must be a pixmap object","objects")); return true; } QImage *buffer=((KviKvsObject_pixmap *)pObDest)->getImage(); @@ -280,13 +284,13 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) } if (uWidth>buffer->width() || uHeight>buffer->height()) { - c->warning(__tr2qs("Area dimensions are out of destination size ")); + c->warning(__tr2qs_ctx("Area dimensions are out of destination size ","objects")); return true; } if (!uWidth){ if(m_pImage->width()>buffer->width()) { - c->warning(__tr2qs("Pixmap dimensions are out of destination size ")); + c->warning(__tr2qs_ctx("Pixmap dimensions are out of destination size ","objects")); return true; } } @@ -295,7 +299,7 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) { if(m_pImage->height()>buffer->height()) { - c->warning(__tr2qs("Pixmap dimensions are out of destination size ")); + c->warning(__tr2qs_ctx("Pixmap dimensions are out of destination size ","objects")); return true; } } @@ -303,12 +307,12 @@ bool KviKvsObject_pixmap::functionsetOpacity(KviKvsObjectFunctionCall *c) if(uXoffset+uWidth>m_pImage->width()) { - c->warning(__tr2qs("Offset width area is out of pixmap size ")); + c->warning(__tr2qs_ctx("Offset width area is out of pixmap size ","objects")); return true; } if( uYoffset+uHeight>m_pImage->height()) { - c->warning(__tr2qs("Offset height area is out of pixmap size ")); + c->warning(__tr2qs_ctx("Offset height area is out of pixmap size ","objects")); return true; } @@ -341,7 +345,8 @@ if(uXoffset+uWidth>m_pImage->width()) QPixmap * KviKvsObject_pixmap::getPixmap() { - if (bImageModified) { + if (bImageModified) + { m_pPixmap->fromImage(*m_pImage); bImageModified=false; } @@ -349,10 +354,9 @@ QPixmap * KviKvsObject_pixmap::getPixmap() } QImage * KviKvsObject_pixmap::getImage() { - if (bPixmapModified) { + if (bPixmapModified) + { *m_pImage=m_pPixmap->toImage(); - //debug ("image info2 %d and %d",test.width(),test.height()); - bPixmapModified=false; } diff --git a/src/modules/objects/class_pixmap.h b/src/modules/objects/class_pixmap.h index 1591ff394..4a00f7cd3 100644 --- a/src/modules/objects/class_pixmap.h +++ b/src/modules/objects/class_pixmap.h @@ -57,15 +57,15 @@ signals: void aboutToDie(); protected: - bool functionfill(KviKvsObjectFunctionCall *c); - bool functionresize(KviKvsObjectFunctionCall *c); - bool functionscale(KviKvsObjectFunctionCall *c); - bool functionrotate(KviKvsObjectFunctionCall *c); - bool functionload(KviKvsObjectFunctionCall *c); - bool functionheight(KviKvsObjectFunctionCall *c); - bool functionwidth(KviKvsObjectFunctionCall *c); - bool functionsetOpacity(KviKvsObjectFunctionCall *c); - bool functionloadFromMemoryBuffer(KviKvsObjectFunctionCall *c); + bool fill(KviKvsObjectFunctionCall *c); + bool resize(KviKvsObjectFunctionCall *c); + bool scale(KviKvsObjectFunctionCall *c); + bool rotate(KviKvsObjectFunctionCall *c); + bool load(KviKvsObjectFunctionCall *c); + bool height(KviKvsObjectFunctionCall *c); + bool width(KviKvsObjectFunctionCall *c); + bool setOpacity(KviKvsObjectFunctionCall *c); + bool loadFromMemoryBuffer(KviKvsObjectFunctionCall *c); }; diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index fbe94a292..a540645f5 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -166,16 +166,16 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_popupmenu,"popupmenu","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"insertItem", functioninsertItem) - //KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"insertWidget", functioninsertWidget) -// KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"setTitle", functionsetTitle) - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"exec", functionexec) - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"insertSeparator", functioninsertSeparator) - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"removeItem", functionremoveItem) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,insertItem) + //KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,"insertWidget", functioninsertWidget) +// KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,"setTitle", functionsetTitle) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,exec) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,insertSeparator) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,removeItem) // events - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"highlightedEvent", functionhighlightedEvent) - KVSO_REGISTER_HANDLER(KviKvsObject_popupmenu,"activatedEvent", functionactivatedEvent) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,highlightedEvent) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_popupmenu,activatedEvent) KVSO_END_REGISTERCLASS(KviKvsObject_popupmenu) @@ -197,14 +197,14 @@ bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantL return true; } -bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,insertItem) { + CHECK_INTERNAL_POINTER(widget()) QString szItem,szIcon; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szItem) KVSO_PARAMETER("icon_id",KVS_PT_STRING,KVS_PF_OPTIONAL,szIcon) KVSO_PARAMETERS_END(c) - if(!widget())return true; QPixmap *pix = 0; int id=0; QAction * action; @@ -212,7 +212,7 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c) { pix = g_pIconManager->getImage(szIcon); if (pix) action=((QMenu *)widget())->addAction(*pix,szItem); - else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon); + else c->warning(__tr2qs_ctx("pix '%Q' doesn't exists","objects"),&szIcon); } else action=((QMenu *)widget())->addAction(szItem); @@ -222,7 +222,7 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c) return true; } /* -bool KviKvsObject_popupmenu::functionsetTitle(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,setTitle) { QString szTitle; KVSO_PARAMETERS_BEGIN(c) @@ -234,7 +234,7 @@ bool KviKvsObject_popupmenu::functionsetTitle(KviKvsObjectFunctionCall *c) return true; } /* -bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,insertWidget) { KviKvsObject *pObject; kvs_hobject_t hObject; @@ -262,7 +262,7 @@ bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c) } -bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,insertHandle) { KviKvsObject *ob; QString szLabel,szIcon; @@ -293,8 +293,9 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c) return true; } */ -bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,exec) { + CHECK_INTERNAL_POINTER(widget()) if(!c->params()->count()) { ((QMenu *)widget())->exec(QCursor::pos()); @@ -313,17 +314,17 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Widget parameter is not an object")); + c->warning(__tr2qs_ctx("Widget parameter is not an object","objects")); return true; } if (!pObject->object()) { - c->warning(__tr2qs("Widget parameter is not a valid object")); + c->warning(__tr2qs_ctx("Widget parameter is not a valid object","objects")); return true; } if(!pObject->object()->isWidgetType()) { - c->warning(__tr2qs("Widget parameter is not a widget object")); + c->warning(__tr2qs_ctx("Widget parameter is not a widget object","objects")); return true; } @@ -332,28 +333,31 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_popupmenu::functionremoveItem(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,removeItem) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t uItem; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("item_id",KVS_PT_UNSIGNEDINTEGER,0,uItem) KVSO_PARAMETERS_END(c) QAction * action=actionsDict.value(uItem); - if(widget() && action){ + if(action) + { ((QMenu *)widget())->removeAction(action); identifier--; } return true; } -bool KviKvsObject_popupmenu::functioninsertSeparator(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,insertSeparator) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iIndex; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,iIndex) KVSO_PARAMETERS_END(c) QAction * action=actionsDict.value(iIndex); - if(widget()&& action)((QMenu *)widget())->insertSeparator(action); + if(action)((QMenu *)widget())->insertSeparator(action); return true; } @@ -363,7 +367,7 @@ void KviKvsObject_popupmenu::slothighlighted(int i) callFunction(this,"highlightedEvent",¶ms); } -bool KviKvsObject_popupmenu::functionhighlightedEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,highlightedEvent) { emitSignal("highlighted",c,c->params()); return true; @@ -384,7 +388,7 @@ void KviKvsObject_popupmenu::slottriggered(QAction *a) callFunction(this,"activatedEvent",¶ms); } -bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(popupmenu,activatedEvent) { emitSignal("activated",c,c->params()); return true; diff --git a/src/modules/objects/class_popupmenu.h b/src/modules/objects/class_popupmenu.h index 2f6d02519..ce547abaa 100644 --- a/src/modules/objects/class_popupmenu.h +++ b/src/modules/objects/class_popupmenu.h @@ -41,16 +41,16 @@ protected: QHash actionsDict; int identifier; - bool functioninsertItem(KviKvsObjectFunctionCall *c); - //bool functionsetTitle(KviKvsObjectFunctionCall *c); - //bool functioninsertWidget(KviKvsObjectFunctionCall *c); - //bool functioninsertHandle(KviKvsObjectFunctionCall *c); - bool functionexec(KviKvsObjectFunctionCall *c); - bool functionremoveItem(KviKvsObjectFunctionCall *c); - bool functionremoveItemAt(KviKvsObjectFunctionCall *c); - bool functioninsertSeparator(KviKvsObjectFunctionCall *c); - bool functionactivatedEvent(KviKvsObjectFunctionCall *c); - bool functionhighlightedEvent(KviKvsObjectFunctionCall *c); + bool insertItem(KviKvsObjectFunctionCall *c); + //bool setTitle(KviKvsObjectFunctionCall *c); + //bool insertWidget(KviKvsObjectFunctionCall *c); + //bool insertHandle(KviKvsObjectFunctionCall *c); + bool exec(KviKvsObjectFunctionCall *c); + bool removeItem(KviKvsObjectFunctionCall *c); + bool removeItemAt(KviKvsObjectFunctionCall *c); + bool insertSeparator(KviKvsObjectFunctionCall *c); + bool activatedEvent(KviKvsObjectFunctionCall *c); + bool highlightedEvent(KviKvsObjectFunctionCall *c); protected slots: void slottriggered(QAction *); diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 049a0867e..14cd63b08 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -161,21 +161,21 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object") - KVSO_REGISTER_HANDLER(KviKvsObject_process,"addArg", functionaddArgument); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"start", functionstartProcess); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"readStdout", functionreadStdout); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"readStderr", functionreadStderr); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"writeToStdin", functionwriteToStdin); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"closekill", functionclosekill); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"kill", functionkill); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"tryTerminate", functiontryTerminate); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"closeStdin", functioncloseStdin); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"isRunning",functionisRunning); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"normalExit",functionnormalExit); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,addArgument); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,startProcess); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readStdout); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readStderr); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,writeToStdin); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,closekill); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,kill); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,tryTerminate); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,closeStdin); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,isRunning); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,normalExit); // Events - KVSO_REGISTER_HANDLER(KviKvsObject_process,"readyReadStdoutEvent",functionreadyReadStdoutEvent); - KVSO_REGISTER_HANDLER(KviKvsObject_process,"readyReadStderrEvent",functionreadyReadStderrEvent); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readyReadStdoutEvent); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_process,readyReadStderrEvent); KVSO_END_REGISTERCLASS(KviKvsObject_process) @@ -196,7 +196,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_process) -bool KviKvsObject_process::functionaddArgument(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,addArgument) { QString szArgument; @@ -208,8 +208,9 @@ bool KviKvsObject_process::functionaddArgument(KviKvsObjectFunctionCall *c) } //->Start the process. -bool KviKvsObject_process::functionstartProcess(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,startProcess) { + CHECK_INTERNAL_POINTER(m_pProcess) QString szcmd; szcmd = args.takeFirst(); @@ -217,44 +218,42 @@ bool KviKvsObject_process::functionstartProcess(KviKvsObjectFunctionCall *c) if(m_pProcess->state()==KviProcess::NotRunning) { - c->warning( __tr2qs("Process could not be starded.")); + c->warning( __tr2qs_ctx("Process could not be starded.","objects")); } return true; } //-->Read the standard output. -bool KviKvsObject_process::functionreadStderr(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,readStderr) { + CHECK_INTERNAL_POINTER(m_pProcess) QString ng_Process = m_pProcess->readAllStandardError(); c->returnValue()->setString(ng_Process); return true; } //-->Read the standard error. -bool KviKvsObject_process::functionreadStdout(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,readStdout) { + CHECK_INTERNAL_POINTER(m_pProcess) QString ng_Process =m_pProcess->readAllStandardOutput(); c->returnValue()->setString(ng_Process); return true; } //-->Signals and slot to manage reading output and error from the process. -bool KviKvsObject_process::functionreadyReadStdoutEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,readyReadStdoutEvent) { - emitSignal("readyReadStdout",c); return true; - } -bool KviKvsObject_process::functionreadyReadStderrEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,readyReadStderrEvent) { - emitSignal("readyReadStderr",c); return true; - } -bool KviKvsObject_process::functionwriteToStdin(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,writeToStdin) { - + CHECK_INTERNAL_POINTER(m_pProcess) QString szCommand; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("command",KVS_PT_STRING,0,szCommand) @@ -263,40 +262,45 @@ bool KviKvsObject_process::functionwriteToStdin(KviKvsObjectFunctionCall *c) return true; } //-->The 3 Closing process functions -bool KviKvsObject_process::functionclosekill(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,closekill) { + CHECK_INTERNAL_POINTER(m_pProcess) //I try to to terminate the process the nice way.... m_pProcess->terminate(); //If the process is still running after 5 seconds, I'll terminate the process in the hard way. QTimer::singleShot( 5000, m_pProcess, SLOT( kill() ) ); return true; } -bool KviKvsObject_process::functionkill(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,kill) { + CHECK_INTERNAL_POINTER(m_pProcess) m_pProcess->kill(); return true; } -bool KviKvsObject_process::functiontryTerminate(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,tryTerminate) { + CHECK_INTERNAL_POINTER(m_pProcess) m_pProcess->terminate(); return true; } //-->Close the standard input. -bool KviKvsObject_process::functioncloseStdin(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,closeStdin) { - + CHECK_INTERNAL_POINTER(m_pProcess) m_pProcess->closeReadChannel(KviProcess::StandardOutput); return true; } //->Returns if the process still runnig -bool KviKvsObject_process::functionisRunning(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,isRunning) { + CHECK_INTERNAL_POINTER(m_pProcess) c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::Running); return true; } //->Returns if the process exited. -bool KviKvsObject_process::functionnormalExit(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(process,normalExit) { + CHECK_INTERNAL_POINTER(m_pProcess) c->returnValue()->setBoolean(m_pProcess->state()==KviProcess::NotRunning && m_pProcess->exitStatus()==KviProcess::NormalExit); return true; } diff --git a/src/modules/objects/class_process.h b/src/modules/objects/class_process.h index f9133a943..9ace08789 100644 --- a/src/modules/objects/class_process.h +++ b/src/modules/objects/class_process.h @@ -45,20 +45,20 @@ private: QStringList args; public: - bool functionaddArgument(KviKvsObjectFunctionCall *c); - bool functionstartProcess(KviKvsObjectFunctionCall *c); - bool functionreadStdout(KviKvsObjectFunctionCall *c); - bool functionreadStderr(KviKvsObjectFunctionCall *c); - bool functionwriteToStdin(KviKvsObjectFunctionCall *c); - bool functionclosekill(KviKvsObjectFunctionCall *c); - bool functioncloseStdin(KviKvsObjectFunctionCall *c); - bool functionkill(KviKvsObjectFunctionCall *c); - bool functiontryTerminate(KviKvsObjectFunctionCall *c); - bool functionnormalExit(KviKvsObjectFunctionCall *c); - bool functionisRunning(KviKvsObjectFunctionCall *c); + bool addArgument(KviKvsObjectFunctionCall *c); + bool startProcess(KviKvsObjectFunctionCall *c); + bool readStdout(KviKvsObjectFunctionCall *c); + bool readStderr(KviKvsObjectFunctionCall *c); + bool writeToStdin(KviKvsObjectFunctionCall *c); + bool closekill(KviKvsObjectFunctionCall *c); + bool closeStdin(KviKvsObjectFunctionCall *c); + bool kill(KviKvsObjectFunctionCall *c); + bool tryTerminate(KviKvsObjectFunctionCall *c); + bool normalExit(KviKvsObjectFunctionCall *c); + bool isRunning(KviKvsObjectFunctionCall *c); - bool functionreadyReadStdoutEvent(KviKvsObjectFunctionCall *c); - bool functionreadyReadStderrEvent(KviKvsObjectFunctionCall *c); + bool readyReadStdoutEvent(KviKvsObjectFunctionCall *c); + bool readyReadStderrEvent(KviKvsObjectFunctionCall *c); protected slots: void slotReadStdout(); diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp index f4624d788..8ad81c559 100644 --- a/src/modules/objects/class_progressbar.cpp +++ b/src/modules/objects/class_progressbar.cpp @@ -68,12 +68,12 @@ */ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_progressbar,"progressbar","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"setProgress", functionSetProgress) - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"setFormat", functionSetFormat) - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"setTotalSteps", functionSetTotalSteps) - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"reset", functionReset) - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"setPercentageVisible", functionSetPercentageVisible) - KVSO_REGISTER_HANDLER(KviKvsObject_progressbar,"isPercentageVisible", functionPercentageVisible) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setProgress) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setFormat) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setTotalSteps) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,reset) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,setPercentageVisible) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_progressbar,percentageVisible) KVSO_END_REGISTERCLASS(KviKvsObject_progressbar) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_progressbar,KviKvsObject_widget) @@ -90,56 +90,60 @@ bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVarian SET_OBJECT (QProgressBar) return true; } -bool KviKvsObject_progressbar::functionSetProgress(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,setProgress) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iValue; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("step_value",KVS_PT_UNSIGNEDINTEGER,0,iValue) KVSO_PARAMETERS_END(c) - if (widget()) ((QProgressBar *)widget())->setValue(iValue); + ((QProgressBar *)widget())->setValue(iValue); return true; } -bool KviKvsObject_progressbar::functionSetTotalSteps(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,setTotalSteps) { + CHECK_INTERNAL_POINTER(widget()) kvs_uint_t iMax; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("total_steps",KVS_PT_UNSIGNEDINTEGER,0,iMax) KVSO_PARAMETERS_END(c) - if (widget()) ((QProgressBar *)widget())->setMaximum(iMax); + ((QProgressBar *)widget())->setMaximum(iMax); return true; } -bool KviKvsObject_progressbar::functionReset(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,reset) { - if (widget()) ((QProgressBar *)widget())->reset(); + CHECK_INTERNAL_POINTER(widget()) + ((QProgressBar *)widget())->reset(); return true; } -bool KviKvsObject_progressbar::functionSetPercentageVisible(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,setPercentageVisible) { + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if(widget()) - ((QProgressBar *)widget())->setTextVisible(bEnabled); + ((QProgressBar *)widget())->setTextVisible(bEnabled); return true; } -bool KviKvsObject_progressbar::functionSetFormat(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,setFormat) { + CHECK_INTERNAL_POINTER(widget()) QString szFormat; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_STRING,0,szFormat) KVSO_PARAMETERS_END(c) - if(widget()) - ((QProgressBar *)widget())->setFormat(szFormat); + ((QProgressBar *)widget())->setFormat(szFormat); return true; } -bool KviKvsObject_progressbar::functionPercentageVisible(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(progressbar,percentageVisible) { - if (widget()) c->returnValue()->setBoolean(((QProgressBar *)widget())->isTextVisible()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setBoolean(((QProgressBar *)widget())->isTextVisible()); return true; } diff --git a/src/modules/objects/class_progressbar.h b/src/modules/objects/class_progressbar.h index deb06527f..eae21c716 100644 --- a/src/modules/objects/class_progressbar.h +++ b/src/modules/objects/class_progressbar.h @@ -38,12 +38,12 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool functionSetProgress(KviKvsObjectFunctionCall *c); - bool functionSetTotalSteps(KviKvsObjectFunctionCall *c); - bool functionReset(KviKvsObjectFunctionCall *c); - bool functionSetPercentageVisible(KviKvsObjectFunctionCall *c); - bool functionPercentageVisible(KviKvsObjectFunctionCall *c); - bool functionSetFormat(KviKvsObjectFunctionCall *c); + bool setProgress(KviKvsObjectFunctionCall *c); + bool setTotalSteps(KviKvsObjectFunctionCall *c); + bool reset(KviKvsObjectFunctionCall *c); + bool setPercentageVisible(KviKvsObjectFunctionCall *c); + bool percentageVisible(KviKvsObjectFunctionCall *c); + bool setFormat(KviKvsObjectFunctionCall *c); }; diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 0acc49806..9131bd4f0 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -66,11 +66,11 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_radiobutton,"radiobutton","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_radiobutton,"setText", functionSetText) - KVSO_REGISTER_HANDLER(KviKvsObject_radiobutton,"setChecked", functionSetChecked) - KVSO_REGISTER_HANDLER(KviKvsObject_radiobutton,"isChecked", functionIsChecked) - KVSO_REGISTER_HANDLER(KviKvsObject_radiobutton,"setImage", functionSetImage) - KVSO_REGISTER_HANDLER(KviKvsObject_radiobutton,"toggleEvent",function_toggleEvent) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setText) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setChecked) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,isChecked) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,setImage) + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_radiobutton,toggleEvent) KVSO_END_REGISTERCLASS(KviKvsObject_radiobutton) @@ -89,43 +89,45 @@ bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVarian connect(widget(),SIGNAL(toggled(bool)),this,SLOT(toggled(bool))); return true; } -bool KviKvsObject_radiobutton::functionSetText(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(radiobutton,setText) { + CHECK_INTERNAL_POINTER(widget()) QString szText; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) - if (widget()) - ((QRadioButton *)widget())->setText(szText); + ((QRadioButton *)widget())->setText(szText); return true; } -bool KviKvsObject_radiobutton::functionIsChecked(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(radiobutton,isChecked) { - if(widget()) c->returnValue()->setBoolean(((QRadioButton *)widget())->isChecked()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setBoolean(((QRadioButton *)widget())->isChecked()); return true; } -bool KviKvsObject_radiobutton::functionSetChecked(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(radiobutton,setChecked) { + CHECK_INTERNAL_POINTER(widget()) bool bChecked; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bChecked",KVS_PT_BOOL,0,bChecked) KVSO_PARAMETERS_END(c) - if(widget()) ((QRadioButton *)widget())->setChecked(bChecked); + ((QRadioButton *)widget())->setChecked(bChecked); return true; } -bool KviKvsObject_radiobutton::functionSetImage(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(radiobutton,setImage) { + CHECK_INTERNAL_POINTER(widget()) QString icon; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("icon_id",KVS_PT_STRING,0,icon) KVSO_PARAMETERS_END(c) - if (!widget()) return true; QPixmap * pix = g_pIconManager->getImage(icon); if(pix)((QRadioButton *)widget())->setIcon(*pix); return true; } -bool KviKvsObject_radiobutton::function_toggleEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(radiobutton,toggleEvent) { emitSignal("toggled",c,c->params()); return true; diff --git a/src/modules/objects/class_radiobutton.h b/src/modules/objects/class_radiobutton.h index aec0eb692..fa4b09d1b 100644 --- a/src/modules/objects/class_radiobutton.h +++ b/src/modules/objects/class_radiobutton.h @@ -38,11 +38,11 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool functionSetText(KviKvsObjectFunctionCall *c); - bool functionIsChecked(KviKvsObjectFunctionCall *c); - bool functionSetChecked(KviKvsObjectFunctionCall *c); - bool functionSetImage(KviKvsObjectFunctionCall *c); - bool function_toggleEvent(KviKvsObjectFunctionCall *c); + bool setText(KviKvsObjectFunctionCall *c); + bool isChecked(KviKvsObjectFunctionCall *c); + bool setChecked(KviKvsObjectFunctionCall *c); + bool setImage(KviKvsObjectFunctionCall *c); + bool toggleEvent(KviKvsObjectFunctionCall *c); protected slots: void toggled(bool b); diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 4bf3722fc..bfad2424e 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -103,23 +103,23 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_slider,"slider","widget") - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setTracking", functionsetTracking); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setValue", functionsetValue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setMinValue", functionsetMinValue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setMaxValue", functionsetMaxValue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setLineStep", functionsetLineStep); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setPageStep", functionsetPageStep); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setTickInterval", functionsetTickInterval); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"value",functionvalue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"minValue", functionminValue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"maxValue", functionmaxValue); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"lineStep", functionlineStep); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"pageStep", functionpageStep); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setTickmarks", functionsetTickmarks); - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"setOrientation", functionsetOrientation); - - - KVSO_REGISTER_HANDLER(KviKvsObject_slider,"valueChangedEvent", functionvalueChangedEvent); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTracking); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setValue); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setMinValue); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setMaxValue); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setLineStep); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setPageStep); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTickInterval); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,value); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,minValue); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,maxValue); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,lineStep); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,pageStep); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setTickmarks); + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,setOrientation); + + + KVSO_REGISTER_HANDLER_NEW(KviKvsObject_slider,valueChangedEvent); KVSO_END_REGISTERCLASS(KviKvsObject_slider) KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_slider,KviKvsObject_widget) @@ -138,57 +138,62 @@ bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList return true; } -bool KviKvsObject_slider::functionsetTracking(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setTracking) { + CHECK_INTERNAL_POINTER(widget()) bool bEnabled; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) - if(widget()) - ((QSlider *)widget())->setTracking(bEnabled); + ((QSlider *)widget())->setTracking(bEnabled); return true; } -bool KviKvsObject_slider::functionsetValue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setValue) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iValue; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("value",KVS_PT_INT,0,iValue) KVSO_PARAMETERS_END(c) - if (widget()) ((QSlider *)widget())->setValue(iValue); + ((QSlider *)widget())->setValue(iValue); return true; } -bool KviKvsObject_slider::functionsetMinValue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setMinValue) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iMinvalue; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("minimum_value",KVS_PT_INT,0,iMinvalue) KVSO_PARAMETERS_END(c) - if (widget()) ((QSlider *)widget())->setMinimum(iMinvalue); + ((QSlider *)widget())->setMinimum(iMinvalue); return true; } -bool KviKvsObject_slider::functionsetMaxValue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setMaxValue) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iMaxvalue; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("max_value",KVS_PT_INT,0,iMaxvalue) KVSO_PARAMETERS_END(c) - if (widget()) ((QSlider *)widget())->setMaximum(iMaxvalue); + ((QSlider *)widget())->setMaximum(iMaxvalue); return true; } -bool KviKvsObject_slider::functionsetLineStep(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setLineStep) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iLinestep; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("line_step",KVS_PT_INT,0,iLinestep) KVSO_PARAMETERS_END(c) - if (widget()) ((QSlider *)widget())->setSingleStep(iLinestep); + ((QSlider *)widget())->setSingleStep(iLinestep); return true; } -bool KviKvsObject_slider::functionsetPageStep(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setPageStep) { + CHECK_INTERNAL_POINTER(widget()) kvs_int_t iPagestep; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("page_step",KVS_PT_INT,0,iPagestep) @@ -197,53 +202,57 @@ bool KviKvsObject_slider::functionsetPageStep(KviKvsObjectFunctionCall *c) return true; } -bool KviKvsObject_slider::functionsetTickInterval(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setTickInterval) { kvs_int_t iInterval; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("tick_interval",KVS_PT_INT,0,iInterval) KVSO_PARAMETERS_END(c) - if (widget()) ((QSlider *)widget())->setTickInterval(iInterval); + ((QSlider *)widget())->setTickInterval(iInterval); return true; } -bool KviKvsObject_slider::functionvalue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,value) { - if (widget()) c->returnValue()->setInteger(((QSlider *)widget())->value()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QSlider *)widget())->value()); return true; } -bool KviKvsObject_slider::functionminValue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,minValue) { - if (widget()) c->returnValue()->setInteger(((QSlider *)widget())->minimum()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QSlider *)widget())->minimum()); return true; } -bool KviKvsObject_slider::functionmaxValue(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,maxValue) { - if (widget()) c->returnValue()->setInteger(((QSlider *)widget())->maximum()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QSlider *)widget())->maximum()); return true; } -bool KviKvsObject_slider::functionlineStep(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,lineStep) { - if (widget()) c->returnValue()->setInteger(((QSlider *)widget())->singleStep()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QSlider *)widget())->singleStep()); return true; } -bool KviKvsObject_slider::functionpageStep(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,pageStep) { - if (widget()) c->returnValue()->setInteger(((QSlider *)widget())->pageStep()); + CHECK_INTERNAL_POINTER(widget()) + c->returnValue()->setInteger(((QSlider *)widget())->pageStep()); return true; } -bool KviKvsObject_slider::functionsetTickmarks(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setTickmarks) { - + CHECK_INTERNAL_POINTER(widget()) QString szTick; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("tick_marks",KVS_PT_STRING,0,szTick) KVSO_PARAMETERS_END(c) - if(!widget())return true; if(KviQString::equalCI(szTick,"NoMarks")) ((QSlider *)widget())->setTickPosition(QSlider::NoTicks); else if(KviQString::equalCI(szTick,"Both")) @@ -256,25 +265,24 @@ bool KviKvsObject_slider::functionsetTickmarks(KviKvsObjectFunctionCall *c) ((QSlider *)widget())->setTickPosition(QSlider::TicksLeft); else if(KviQString::equalCI(szTick,"Right")) ((QSlider *)widget())->setTickPosition(QSlider::TicksRight); - else c->warning( __tr2qs("Unknown tickmark '%Q'"),&szTick); + else c->warning( __tr2qs_ctx("Unknown tickmark '%Q'","objects"),&szTick); return true; } -bool KviKvsObject_slider::functionsetOrientation(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,setOrientation) { - + CHECK_INTERNAL_POINTER(widget()) QString szOrientation; KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("orientation",KVS_PT_STRING,0,szOrientation) KVSO_PARAMETERS_END(c) - if(!widget())return true; if(KviQString::equalCI(szOrientation,"Horizontal")) ((QSlider *)widget())->setOrientation(Qt::Horizontal); else if(KviQString::equalCI(szOrientation,"Vertical")) ((QSlider *)widget())->setOrientation(Qt::Vertical); - else c->warning( __tr2qs("Unknown orientation '%Q'"),&szOrientation); + else c->warning( __tr2qs_ctx("Unknown orientation '%Q'","objects"),&szOrientation); return true; } -bool KviKvsObject_slider::functionvalueChangedEvent(KviKvsObjectFunctionCall *c) +KVSO_CLASS_FUNCTION(slider,valueChangedEvent) { emitSignal("valueChanged",c,c->params()); return true; diff --git a/src/modules/objects/class_slider.h b/src/modules/objects/class_slider.h index acc3fe3f9..536179457 100644 --- a/src/modules/objects/class_slider.h +++ b/src/modules/objects/class_slider.h @@ -38,21 +38,21 @@ public: protected: virtual bool init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams); - bool functionsetTracking(KviKvsObjectFunctionCall *c); - bool functionsetValue(KviKvsObjectFunctionCall *c); - bool functionsetMinValue(KviKvsObjectFunctionCall *c); - bool functionsetMaxValue(KviKvsObjectFunctionCall *c); - bool functionsetLineStep(KviKvsObjectFunctionCall *c); - bool functionsetPageStep(KviKvsObjectFunctionCall *c); - bool functionsetTickInterval(KviKvsObjectFunctionCall *c); - bool functionvalue(KviKvsObjectFunctionCall *c); - bool functionminValue(KviKvsObjectFunctionCall *c); - bool functionmaxValue(KviKvsObjectFunctionCall *c); - bool functionlineStep(KviKvsObjectFunctionCall *c); - bool functionpageStep(KviKvsObjectFunctionCall *c); - bool functionsetTickmarks(KviKvsObjectFunctionCall *c); - bool functionsetOrientation(KviKvsObjectFunctionCall *c); - bool functionvalueChangedEvent(KviKvsObjectFunctionCall *c); + bool setTracking(KviKvsObjectFunctionCall *c); + bool setValue(KviKvsObjectFunctionCall *c); + bool setMinValue(KviKvsObjectFunctionCall *c); + bool setMaxValue(KviKvsObjectFunctionCall *c); + bool setLineStep(KviKvsObjectFunctionCall *c); + bool setPageStep(KviKvsObjectFunctionCall *c); + bool setTickInterval(KviKvsObjectFunctionCall *c); + bool value(KviKvsObjectFunctionCall *c); + bool minValue(KviKvsObjectFunctionCall *c); + bool maxValue(KviKvsObjectFunctionCall *c); + bool lineStep(KviKvsObjectFunctionCall *c); + bool pageStep(KviKvsObjectFunctionCall *c); + bool setTickmarks(KviKvsObjectFunctionCall *c); + bool setOrientation(KviKvsObjectFunctionCall *c); + bool valueChangedEvent(KviKvsObjectFunctionCall *c); protected slots: void valueChanged(int); diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 5d113d261..242dadcb2 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -425,12 +425,12 @@ KVSO_CLASS_FUNCTION(socket,read) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Buffer parameter is not an object")); + c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects")); return true; } if (!pObject->inheritsClass("memorybuffer")) { - c->warning(__tr2qs("Buffer parameter is not a memorybuffer object")); + c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer object","objects")); return true; } @@ -496,7 +496,7 @@ KVSO_CLASS_FUNCTION(socket,write) pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject); if (!pObject) { - c->warning(__tr2qs("Buffer parameter is not an object")); + c->warning(__tr2qs_ctx("Buffer parameter is not an object","objects")); return true; } if (pObject->inheritsClass("memorybuffer")) @@ -509,7 +509,7 @@ KVSO_CLASS_FUNCTION(socket,write) KviFile *pFile=((KviKvsObject_file *)pObject)->pFile(); if (!pFile->isOpen()) { - c->warning(__tr2qs("File is not open !")); + c->warning(__tr2qs_ctx("File is not open !","objects")); return true; } if (!uLen) uLen=pFile->size(); @@ -520,7 +520,7 @@ KVSO_CLASS_FUNCTION(socket,write) } else { - c->warning(__tr2qs("Buffer parameter is not a memorybuffer or file object")); + c->warning(__tr2qs_ctx("Buffer parameter is not a memorybuffer or file object","objects")); return true; } @@ -563,13 +563,13 @@ KVSO_CLASS_FUNCTION(socket,accept) if(!pObject) { - c->warning(__tr2qs("No socket object specified")); + c->warning(__tr2qs_ctx("No socket object specified","objects")); return true; } if(!pObject->inheritsClass("socket")) { - c->warning(__tr2qs("Invalid socket object specified (it doesn't inherit from socket)")); + c->warning(__tr2qs_ctx("Invalid socket object specified (it doesn't inherit from socket)","objects")); return true; } @@ -581,7 +581,7 @@ KVSO_CLASS_FUNCTION(socket,accept) m_uSecondaryPort = 0; m_szSecondaryIp=""; } else { - c->warning(__tr2qs("There is no connection to accept!")); + c->warning(__tr2qs_ctx("There is no connection to accept!","objects")); } return true; } @@ -607,7 +607,7 @@ KVSO_CLASS_FUNCTION(socket,writeHex) KVSO_PARAMETERS_END(c) if (m_szHex.length()%2) { - c->warning(__tr2qs("Lenght of hex string is not multiple 2")); + c->warning(__tr2qs_ctx("Lenght of hex string is not multiple 2","objects")); return true; } unsigned char byte,lsb,msb; @@ -624,7 +624,7 @@ KVSO_CLASS_FUNCTION(socket,writeHex) lsb>='A'?lsb-='7':lsb-='0'; } else{ - c->warning("The hex string is not correct!"); + c->warning(__tr2qs_ctx("The hex string is not correct!","objects")); return true; } byte=(msb*16)+lsb; @@ -649,12 +649,12 @@ KVSO_CLASS_FUNCTION(socket,functionConnect) if (m_uRemotePort>65535) { - c->warning(__tr2qs("Value %d for port is out of range (values allowed are from 0 to 65535"),m_uRemotePort); + c->warning(__tr2qs_ctx("Value %d for port is out of range (values allowed are from 0 to 65535","objects"),m_uRemotePort); return true; } if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) { - c->warning(__tr2qs("Another connection in progress")); + c->warning(__tr2qs_ctx("Another connection in progress","objects")); c->returnValue()->setBoolean(true); return true; } @@ -685,7 +685,7 @@ KVSO_CLASS_FUNCTION(socket,listen) { if((m_sock != KVI_INVALID_SOCKET) || (m_iStatus != KVI_SCRIPT_SOCKET_STATUS_DISCONNECTED)) { - c->warning(__tr2qs("Another connection in progress")); + c->warning(__tr2qs_ctx("Another connection in progress","objects")); c->returnValue()->setBoolean(false); return true; } @@ -724,7 +724,7 @@ KVSO_CLASS_FUNCTION(socket,listen) m_bIPv6 = true; } else { #else - c->warning(__tr2qs("Invalid IP address specified ('%Q')"),&m_szLocalIp); + c->warning(__tr2qs_ctx("Invalid IP address specified ('%Q')","objects"),&m_szLocalIp); c->returnValue()->setBoolean(false); reset(); return true; @@ -745,7 +745,7 @@ KVSO_CLASS_FUNCTION(socket,listen) if(m_sock == KVI_INVALID_SOCKET) { - c->warning(__tr2qs("Socket creation failed")); + c->warning(__tr2qs_ctx("Socket creation failed","objects")); c->returnValue()->setBoolean(false); reset(); return true; @@ -760,7 +760,7 @@ KVSO_CLASS_FUNCTION(socket,listen) #endif if(!sa.socketAddress()) { - c->warning(__tr2qs("Invalid socket address")); + c->warning(__tr2qs_ctx("Invalid socket address","objects")); reset(); c->returnValue()->setBoolean(false); return true; @@ -768,7 +768,7 @@ KVSO_CLASS_FUNCTION(socket,listen) if(!kvi_socket_bind(m_sock,sa.socketAddress(),((int)(sa.addressLength())))) { - c->warning(__tr2qs("Bind failure")); + c->warning(__tr2qs_ctx("Bind failure","objects")); reset(); c->returnValue()->setBoolean(false); return true; @@ -781,7 +781,7 @@ KVSO_CLASS_FUNCTION(socket,listen) #endif if(!sa.socketAddress()) { - c->warning(__tr2qs("Invalid socket address")); + c->warning(__tr2qs_ctx("Invalid socket address","objects")); reset(); c->returnValue()->setBoolean(false); return true; @@ -789,7 +789,7 @@ KVSO_CLASS_FUNCTION(socket,listen) if(!kvi_socket_bind(m_sock,sa.socketAddress(),((int)(sa.addressLength())))) { - c->warning(__tr2qs("Bind failure")); + c->warning(__tr2qs_ctx("Bind failure","objects")); reset(); c->returnValue()->setBoolean(false); return true; @@ -799,7 +799,7 @@ KVSO_CLASS_FUNCTION(socket,listen) if(!kvi_socket_listen(m_sock,5)) { - c->warning(__tr2qs("Listen failure")); + c->warning(__tr2qs_ctx("Listen failure","objects")); reset(); c->returnValue()->setBoolean(false); return true; @@ -932,13 +932,13 @@ void KviKvsObject_socket::doConnect() if(!sa.socketAddress()) { unsigned int uOldConnectionId = m_uConnectionId; - QString ipAddressError=__tr2qs("Invalid ip address "); + QString ipAddressError=__tr2qs_ctx("Invalid ip address ","objects"); ipAddressError.append(m_szRemoteIp); KviKvsVariantList params; QString tmp; - KviQString::sprintf(tmp,__tr2qs("Invalid ip address (%Q)"),&m_szRemoteIp); + KviQString::sprintf(tmp,__tr2qs_ctx("Invalid ip address (%Q)","objects"),&m_szRemoteIp); params.append(new KviKvsVariant(tmp)); callFunction(this,"connectFailedEvent",¶ms); if(m_uConnectionId == uOldConnectionId)reset(); @@ -972,7 +972,7 @@ debug ("Socket created"); unsigned int uOldConnectionId = m_uConnectionId; callFunction(this,"connectFailedEvent",new KviKvsVariantList( - new KviKvsVariant(__tr2qs("Failed to setup a nonblocking socket")))); + new KviKvsVariant(__tr2qs_ctx("Failed to setup a nonblocking socket","objects")))); if(m_uConnectionId == uOldConnectionId)reset(); // else it has already been called! return; @@ -993,7 +993,7 @@ debug ("Socket created"); (void *)&sockError,&iSize))sockError=0; } unsigned int uOldConnectionId = m_uConnectionId; - QString callBackError=__tr2qs("Connect failure: "); + QString callBackError=__tr2qs_ctx("Connect failure: ","objects"); callBackError.append((KviError::getDescription(KviError::translateSystemError(sockError)).toUtf8().data())); callFunction(this,"connectFailedEvent",new KviKvsVariantList(new KviKvsVariant(callBackError))); @@ -1020,7 +1020,7 @@ void KviKvsObject_socket::connectTimeoutSlot() unsigned int uOldConnectionId = m_uConnectionId; callFunction(this,"connectFailedEvent",new KviKvsVariantList( - new KviKvsVariant(__tr2qs("Connect attempt timed out")))); + new KviKvsVariant(__tr2qs_ctx("Connect attempt timed out","objects")))); if(m_uConnectionId == uOldConnectionId)reset(); // else it has already been called! } @@ -1049,7 +1049,7 @@ void KviKvsObject_socket::lookupRemoteIp() unsigned int uOldConnectionId = m_uConnectionId; callFunction(this,"connectFailedEvent",new KviKvsVariantList( - new KviKvsVariant(__tr2qs("Can't start the DNS thread")))); + new KviKvsVariant(__tr2qs_ctx("Can't start the DNS thread","objects")))); if(m_uConnectionId == uOldConnectionId)reset(); // else it has already been called! } @@ -1195,7 +1195,7 @@ void KviKvsObject_socket::readNotifierFired(int) if(m_uInDataLen > (4096 * 1024)) // too much data in buffer (not reading) { callFunction(this,"disconnectEvent",new KviKvsVariantList( - new KviKvsVariant(__tr2qs("Too much unprocessed incoming data (you've left this socket unmanaged ?)")))); + new KviKvsVariant(__tr2qs_ctx("Too much unprocessed incoming data (you've left this socket unmanaged ?)","objects")))); reset(); } } diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h index cea176c44..634d050e3 100644 --- a/src/modules/objects/object_macros.h +++ b/src/modules/objects/object_macros.h @@ -102,7 +102,7 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct #define CHECK_INTERNAL_POINTER(__pointer)\ if(!__pointer) \ { \ - c->error(__tr2qs("Internal error: no valid pointer for this object")); \ + c->error(__tr2qs_ctx("Internal error: no valid pointer for this object","objects")); \ return false; \ } #endif diff --git a/src/modules/objects/objects_QT4_vc05.vcproj b/src/modules/objects/objects_QT4_vc05.vcproj index 982ec0071..a088a7175 100644 --- a/src/modules/objects/objects_QT4_vc05.vcproj +++ b/src/modules/objects/objects_QT4_vc05.vcproj @@ -521,8 +521,8 @@ >