aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/objects
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/objects')
-rw-r--r--src/modules/objects/class_socket.cpp24
-rw-r--r--src/modules/objects/class_tablewidget.cpp52
-rw-r--r--src/modules/objects/class_widget.cpp1
3 files changed, 40 insertions, 37 deletions
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index cd807a3e9..ee0e306ac 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -148,12 +148,12 @@
the length of the available data in bytes.[br]
You can use one of the $read* functions to obtain the data.
- !fn: $read(<length>)
+ !fn: $read(<length>[,<hobject>])
Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the
available data range (<length> < 0 or <length> > available_data_length), this function
returns all the available data.[br]
- Please note that this function can't deal withi binary data: NULL characters are transformed to
- ASCII characters 255.
+ By default this function can deal ascii data only: NULL characters are transformed to
+ ASCII characters 255. You can pass a [class]memorybuffer[/class] object to read binary data.
!fn: $readHex(<length>)
Reads at most <length> bytes of data from the socket. If <length> is anything "outside" the
@@ -161,9 +161,9 @@
returns all the available data.[br]
Returns the data encoded as hexadecimal digit string: this function can deal with binary data too.
- !fn: $write(<data>)
+ !fn: $write(<data, files or hobject>[,length])
Writes <data> to the socket.[br]
- This function can't deal with binary data (you can't send a NULL character)[br]
+ This function can deal with binary data passing a [class]memorybuffer[/class] object[br]
Please note that when this function finishes it does not mean that the data has reached the remote end.[br]
Basically it does not even mean that the data has been sent to the remote host.[br]
The data is enqueued for sending and will be sent as soon as possible.[br]
@@ -195,7 +195,7 @@
The return value is meaningful only if the socket is in connected or connecting state.
!fn: $setProtocol(<protocol>)
- Let KVIrc use TCP jr UDP protocol
+ Let KVIrc use TCP or UDP protocol
!fn: $remotePort()
Returns the port of the remote end of this socket.[br]
@@ -249,7 +249,8 @@
{[br]
# the connection to the server failed[br]
echo "Connection failed: "$0[br]
- delete $$[br]
+ delete $$[br]ite)
+ KVSO_REGISTER_HANDLER_BY_NAME(KviKvsObject_socket,w
}[br]
connectEvent() [br]
{[br]
@@ -348,7 +349,7 @@ KVSO_END_DESTRUCTOR(KviKvsObject_socket)
KVSO_CLASS_FUNCTION(socket,status)
{
- c->returnValue()->setInteger(m_iStatus);
+ c->returnValue()->setInteger(m_iStatus);http://ansa.it/
return true;
}
@@ -489,7 +490,7 @@ KVSO_CLASS_FUNCTION(socket,write)
KviKvsVariant * pVariantData;
kvs_hobject_t hObject;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("data_or_file_or_",KVS_PT_VARIANT,0,pVariantData)
+ KVSO_PARAMETER("data_or_file_or_memorybuffer",KVS_PT_VARIANT,0,pVariantData)
KVSO_PARAMETER("length",KVS_PT_UNSIGNEDINTEGER,KVS_PF_OPTIONAL,uLen)
KVSO_PARAMETERS_END(c)
if (pVariantData->isHObject())
@@ -515,10 +516,10 @@ KVSO_CLASS_FUNCTION(socket,write)
return true;
}
if (!uLen) uLen=pFile->size();
- kvs_int_t siz=pFile->size();
+ kvs_int_t size=pFile->size();
pFile->flush();
m_pOutBuffer->append((const unsigned char*)pFile->read(uLen).data(),uLen);
- c->returnValue()->setBoolean((siz-pFile->pos()==0));
+ c->returnValue()->setBoolean((size-pFile->pos()==0));
}
else
{
@@ -536,6 +537,7 @@ KVSO_CLASS_FUNCTION(socket,write)
QByteArray szData8 = szData.toUtf8();
if(szData8.length() > 0)
{
+ debug("write on socket %s",szData8.data());
m_pOutBuffer->append((const unsigned char*)szData8.data(),szData8.length());
}
}
diff --git a/src/modules/objects/class_tablewidget.cpp b/src/modules/objects/class_tablewidget.cpp
index f8c5d1852..f9851927e 100644
--- a/src/modules/objects/class_tablewidget.cpp
+++ b/src/modules/objects/class_tablewidget.cpp
@@ -141,33 +141,33 @@ KVSO_CLASS_FUNCTION(tablewidget,clear)
KVSO_CLASS_FUNCTION(tablewidget,setText)
{
CHECK_INTERNAL_POINTER(widget())
- kvs_uint_t uCol,uRow;
+ kvs_int_t iCol,iRow;
QString szText;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
- KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
+ KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
+ KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
KVSO_PARAMETERS_END(c)
- if(uRow>=((QTableWidget *)widget())->rowCount() || uRow>=((QTableWidget *)widget())->rowCount())
+ if(iRow>=((QTableWidget *)widget())->rowCount() || iRow>=((QTableWidget *)widget())->rowCount())
c->warning(__tr2qs_ctx("Item out of the tablewidget size","objects"));
- QTableWidgetItem *item=((QTableWidget *)widget())->item(uRow,uCol);
+ QTableWidgetItem *item=((QTableWidget *)widget())->item(iRow,iCol);
if(!item)
{
item=new QTableWidgetItem();
- ((QTableWidget *)widget())->setItem(uRow,uCol,item);
+ ((QTableWidget *)widget())->setItem(iRow,iCol,item);
}
item->setText(szText);
return true;
}
KVSO_CLASS_FUNCTION(tablewidget,setIcon)
{
- kvs_uint_t uCol,uRow;
+ kvs_int_t iCol,iRow;
KviKvsObject *obPixmap;
kvs_hobject_t obHpixmap;
KviKvsVariant * vPixmap;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
- KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
+ KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
+ KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
KVSO_PARAMETER("icon",KVS_PT_VARIANT,0,vPixmap)
KVSO_PARAMETERS_END(c)
QPixmap *pix = 0;
@@ -191,11 +191,11 @@ KVSO_CLASS_FUNCTION(tablewidget,setIcon)
return true;
}
}
- QTableWidgetItem *item=((QTableWidget *)widget())->item(uRow,uCol);
+ QTableWidgetItem *item=((QTableWidget *)widget())->item(iRow,iCol);
if(!item)
{
item=new QTableWidgetItem();
- ((QTableWidget *)widget())->setItem(uRow,uCol,item);
+ ((QTableWidget *)widget())->setItem(iRow,iCol,item);
}
item->setIcon(QIcon(*pix));
return true;
@@ -203,14 +203,14 @@ KVSO_CLASS_FUNCTION(tablewidget,setIcon)
KVSO_CLASS_FUNCTION(tablewidget,text)
{
CHECK_INTERNAL_POINTER(widget())
- kvs_uint_t uCol,uRow;
+ kvs_int_t iCol,iRow;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
- KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,uCol)
+ KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
+ KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol)
KVSO_PARAMETERS_END(c)
- QTableWidgetItem *item=((QTableWidget *)widget())->item(uRow,uCol);
+ QTableWidgetItem *item=((QTableWidget *)widget())->item(iRow,iCol);
if(!item) c->returnValue()->setNothing();
- else c->returnValue()->setString(((QTableWidget *)widget())->item(uRow,uCol)->text());
+ else c->returnValue()->setString(((QTableWidget *)widget())->item(iRow,iCol)->text());
return true;
}
KVSO_CLASS_FUNCTION(tablewidget,setRowCount)
@@ -250,7 +250,7 @@ KVSO_CLASS_FUNCTION(tablewidget,columnCount)
KVSO_CLASS_FUNCTION(tablewidget,itemRowColAt)
{
CHECK_INTERNAL_POINTER(widget())
- kvs_uint_t uX,uY;
+ kvs_int_t uX,uY;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("uX",KVS_PT_UNSIGNEDINTEGER,0,uX)
KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY)
@@ -267,7 +267,7 @@ KVSO_CLASS_FUNCTION(tablewidget,setToolTip)
{
CHECK_INTERNAL_POINTER(widget())
QString szTooltip;
- kvs_uint_t uX,uY;
+ kvs_int_t uX,uY;
KVSO_PARAMETERS_BEGIN(c)
KVSO_PARAMETER("uX",KVS_PT_UNSIGNEDINTEGER,0,uX)
KVSO_PARAMETER("uY",KVS_PT_UNSIGNEDINTEGER,0,uY)
@@ -335,8 +335,8 @@ KVSO_CLASS_FUNCTION(tablewidget,setHorizontalHeaderLabels)
QStringList szColumns;
if(KviKvsArray * a = ac.array())
{
- kvs_uint_t uIdx = 0;
- kvs_uint_t uSize = a->size();
+ kvs_int_t uIdx = 0;
+ kvs_int_t uSize = a->size();
while(uIdx < uSize)
{
KviKvsVariant * v = a->at(uIdx);
@@ -364,8 +364,8 @@ KVSO_CLASS_FUNCTION(tablewidget,setVerticalHeaderLabels)
QStringList szColumns;
if(KviKvsArray * a = ac.array())
{
- kvs_uint_t uIdx = 0;
- kvs_uint_t uSize = a->size();
+ kvs_int_t uIdx = 0;
+ kvs_int_t uSize = a->size();
while(uIdx < uSize)
{
KviKvsVariant * v = a->at(uIdx);
@@ -389,15 +389,15 @@ KVSO_CLASS_FUNCTION(tablewidget,setCellWidget)
CHECK_INTERNAL_POINTER(widget())
KviKvsObject * pObject;
kvs_hobject_t hObject;
- kvs_uint_t uRow,uCol;
+ kvs_int_t iRow,iCol;
KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
- KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,uCol)
+ KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,iRow)
+ KVSO_PARAMETER("column",KVS_PT_UNSIGNEDINTEGER,0,iCol)
KVSO_PARAMETER("widget",KVS_PT_HOBJECT,0,hObject)
KVSO_PARAMETERS_END(c)
pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
CHECK_HOBJECT_IS_WIDGET(pObject)
- ((QTableWidget *)object())->setCellWidget(uRow,uCol,((QWidget *)(pObject->object())));
+ ((QTableWidget *)object())->setCellWidget(iRow,iCol,((QWidget *)(pObject->object())));
return true;
}
KVSO_CLASS_FUNCTION(tablewidget,hideHorizontalHeader)
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index e3e842312..5d7623b3f 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1957,6 +1957,7 @@ KVSO_CLASS_FUNCTION(widget,setKeyShortcut)
KVSO_CLASS_FUNCTION(widget,insertIntoStatusBar)
{
CHECK_INTERNAL_POINTER(widget())
+ debug("instertinto");
if (g_pFrame->mainStatusBar())
g_pFrame->mainStatusBar()->insertPermanentWidgetAtTheEnd(widget(),0);
return true;
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:43:06 +0000