aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/channelsjoin/channelsjoinwindow.cpp9
-rw-r--r--src/modules/dcc/chat.cpp12
-rw-r--r--src/modules/dcc/libkvidcc.cpp4
-rw-r--r--src/modules/dcc/thread.cpp6
-rw-r--r--src/modules/dcc/video.cpp8
-rw-r--r--src/modules/eventeditor/eventeditor.cpp14
-rw-r--r--src/modules/links/linkswindow.cpp2
-rw-r--r--src/modules/popupeditor/popupeditor.cpp4
-rw-r--r--src/modules/raweditor/raweditor.cpp14
-rw-r--r--src/modules/regchan/libkviregchan.cpp101
-rw-r--r--src/modules/spaste/libkvispaste.cpp39
11 files changed, 113 insertions, 100 deletions
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index cc1317513..1dee30d49 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -33,9 +33,9 @@
#include "kvi_console.h"
#include "kvi_regchan.h"
#include "kvi_kvs_script.h"
-#include <QTreeWidget>
#include "kvi_tal_groupbox.h"
+#include <QTreeWidget>
#include <QLabel>
#include <QLineEdit>
#include <QLayout>
@@ -168,14 +168,13 @@ void KviChannelsJoinWindow::fillListView()
par->setText(0,__tr2qs("Registered Channels"));
par->setExpanded(true);
- KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
+ QHash<QString,KviRegisteredChannelList *> * d = g_pRegisteredChannelDataBase->channelDict();
if(d)
{
- KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
- while(it.current())
+ for(QHash<QString,KviRegisteredChannelList *>::Iterator it = d->begin();it != d->end();++it)
{
QTreeWidgetItem * chld = new QTreeWidgetItem(par);
- chld->setText(0,it.currentKey());
+ chld->setText(0,it.key());
chld->setIcon(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
++it;
}
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 02e897a04..1ed7cd0d8 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -31,8 +31,6 @@
#include "dialogs.h"
#endif
-#define _KVI_DEBUG_CHECK_RANGE_
-
#include "kvi_debug.h"
#include "kvi_options.h"
#include "kvi_input.h"
@@ -684,7 +682,7 @@ void KviDccChatThread::run()
if(!handleInvalidSocketRead(readLen))
{
if(data.iLen)handleIncomingData(&data,true); // critical
- __range_invalid(data.iLen);
+ KVI_ASSERT(!data.iLen);
break; // error
}
}
@@ -712,8 +710,8 @@ out_of_the_loop:
bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
{
- __range_valid(data->iLen);
- __range_valid(data->buffer);
+ KVI_ASSERT(data->iLen);
+ KVI_ASSERT(data->buffer);
char * aux = data->buffer;
char * end = data->buffer + data->iLen;
while(aux != end)
@@ -733,7 +731,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
// so len += 1; --> new data->iLen -= len;
data->iLen -= (len + 1);
// debug("iLen now = %d",data->iLen);
- __range_valid(data->iLen >= 0);
+ KVI_ASSERT(data->iLen >= 0);
if(data->iLen > 0)
{
// memmove the remaining part to the beginning
@@ -744,7 +742,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
aux = data->buffer;
} else {
// no more data in the buffer
- __range_valid(data->iLen == 0);
+ KVI_ASSERT(data->iLen == 0);
kvi_free(data->buffer);
data->buffer = end = aux = 0;
}
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 5f252728c..9520c48dc 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -94,7 +94,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
} else d->setConsole(c->window()->frame()->firstConsole());
}
- __range_valid(d->console());
+ KVI_ASSERT(d->console());
if(!d->console()->isConnected())
{
@@ -1284,7 +1284,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
else d->console() = c->window()->frame()->firstConsole();
}
- __range_valid(d->console());
+ KVI_ASSERT(d->console());
if(!d->console()->isConnected())
{
diff --git a/src/modules/dcc/thread.cpp b/src/modules/dcc/thread.cpp
index bee9d374c..d89f8422e 100644
--- a/src/modules/dcc/thread.cpp
+++ b/src/modules/dcc/thread.cpp
@@ -22,8 +22,6 @@
//
//=============================================================================
-#define _KVI_DEBUG_CHECK_RANGE_
-
#include "thread.h"
#include "kvi_debug.h"
@@ -57,7 +55,7 @@ KviDccThread::~KviDccThread()
m_pSSL = 0;
#endif
if(m_fd != KVI_INVALID_SOCKET)kvi_socket_close(m_fd);
- __range_invalid(m_pMutex->locked());
+ KVI_ASSERT(!m_pMutex->locked());
delete m_pMutex;
}
@@ -71,7 +69,7 @@ void KviDccThread::setSSL(KviSSL * s)
bool KviDccThread::handleInvalidSocketRead(int readLen)
{
- __range_valid(readLen < 1);
+ KVI_ASSERT(readLen < 1);
if(readLen == 0)
{
// connection closed
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index e2232ee18..7d6bd6833 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -241,8 +241,8 @@ bool KviDccVideoThread::textStep()
bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool bCritical)
{
// qDebug("KviDccVideoThread::handleIncomingData");
- __range_valid(data->iLen);
- __range_valid(data->buffer);
+ KVI_ASSERT(data->iLen);
+ KVI_ASSERT(data->buffer);
char * aux = data->buffer;
char * end = data->buffer + data->iLen;
while(aux != end)
@@ -262,7 +262,7 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
// so len += 1; --> new data->iLen -= len;
data->iLen -= (len + 1);
// debug("iLen now = %d",data->iLen);
- __range_valid(data->iLen >= 0);
+ KVI_ASSERT(data->iLen >= 0);
if(data->iLen > 0)
{
// memmove the remaining part to the beginning
@@ -273,7 +273,7 @@ bool KviDccVideoThread::handleIncomingData(KviDccThreadIncomingData * data,bool
aux = data->buffer;
} else {
// no more data in the buffer
- __range_valid(data->iLen == 0);
+ KVI_ASSERT(data->iLen == 0);
kvi_free(data->buffer);
data->buffer = end = aux = 0;
}
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 472f974ab..605e844e4 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -183,7 +183,7 @@ void KviEventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(it)
{
@@ -221,7 +221,7 @@ void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &buffer)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
QString newName = buffer;
if(newName.isEmpty())newName = __tr2qs_ctx("unnamed","editor");
@@ -251,7 +251,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &bu
void KviEventEditor::addHandlerForCurrentEvent()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(!m_pTreeWidget->selectedItems().isEmpty())
{
@@ -273,7 +273,7 @@ void KviEventEditor::addHandlerForCurrentEvent()
void KviEventEditor::removeCurrentHandler()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(m_pLastEditedItem)
{
QTreeWidgetItem * it = m_pLastEditedItem;
@@ -294,7 +294,7 @@ void KviEventEditor::removeCurrentHandler()
void KviEventEditor::toggleCurrentHandlerEnabled()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(m_pLastEditedItem)
{
m_pLastEditedItem->setEnabled(!(m_pLastEditedItem->m_bEnabled));
@@ -340,7 +340,7 @@ void KviEventEditor::commit()
void KviEventEditor::saveLastEditedItem()
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(!m_pLastEditedItem)return;
((KviEventHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
QString buffer = m_pNameEditor->text();
@@ -360,7 +360,7 @@ void KviEventEditor::saveLastEditedItem()
void KviEventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
saveLastEditedItem();
if(!it)
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index bb4c545d3..eaf40beda 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -312,7 +312,7 @@ void KviLinksWindow::endOfLinks()
QTreeWidgetItem * KviLinksWindow::insertLink(KviLink *l)
{
- __range_valid(l->hops > 0);
+ KVI_ASSERT(l->hops > 0);
QTreeWidgetItem * i = getItemByHost(l->parent.ptr(),0);
QTreeWidgetItem * it = 0;
if(!i)
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 95be5f0fc..d6e33d62a 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -1069,7 +1069,7 @@ void KviPopupEditor::oneTimeSetup()
void KviPopupEditor::customContextMenuRequested(const QPoint &pos)
{
QTreeWidgetItem *it=m_pTreeWidget->itemAt(pos);
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(it)
{
@@ -1266,7 +1266,7 @@ void KviPopupEditor::commit()
void KviPopupEditor::getUniquePopupName(KviMenuTreeWidgetItem *item,QString &buffer)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(buffer.isEmpty())buffer = __tr2qs_ctx("unnamed","editor");
QString newName = buffer;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 005fa9989..c6e842e19 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -144,7 +144,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
{
QTreeWidgetItem *it;
it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
m_pContextPopup->clear();
if(it)
{
@@ -185,7 +185,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
QString newName = buffer;
if(newName.isEmpty())newName = __tr2qs_ctx("unnamed","editor");
@@ -247,7 +247,7 @@ add_handler:
void KviRawEditor::addHandlerForCurrentRaw()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
KviRawTreeWidgetItem * it = (KviRawTreeWidgetItem *) m_pTreeWidget->currentItem();
if(it)
@@ -268,7 +268,7 @@ void KviRawEditor::addHandlerForCurrentRaw()
void KviRawEditor::removeCurrentHandler()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(m_pLastEditedItem)
{
QTreeWidgetItem * it = m_pLastEditedItem;
@@ -283,7 +283,7 @@ void KviRawEditor::removeCurrentHandler()
void KviRawEditor::toggleCurrentHandlerEnabled()
{
- __range_valid(m_pOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(m_pLastEditedItem)
{
m_pLastEditedItem->m_bEnabled = !(m_pLastEditedItem->m_bEnabled);
@@ -329,7 +329,7 @@ void KviRawEditor::commit()
void KviRawEditor::saveLastEditedItem()
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
if(!m_pLastEditedItem)return;
QString buffer = m_pNameEditor->text();
@@ -349,7 +349,7 @@ void KviRawEditor::saveLastEditedItem()
void KviRawEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
{
- __range_valid(m_bOneTimeSetupDone);
+ KVI_ASSERT(m_bOneTimeSetupDone);
saveLastEditedItem();
if(it->parent())
{
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 44e0989c8..d4adea0b8 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -29,7 +29,7 @@
#include "kvi_out.h"
#include "kvi_mirccntrl.h"
#include "kvi_window.h"
-
+#include "kvi_debug.h"
// kvi_app.cpp
extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
@@ -71,7 +71,8 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("channel name",KVS_PT_NONEMPTYSTRING,0,szChan)
KVSM_PARAMETER("netmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNetmask)
KVSM_PARAMETERS_END(c)
- if(szNetmask.isEmpty())szNetmask="*";
+ if(szNetmask.isEmpty())
+ szNetmask="*";
g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNetmask));
return true;
}
@@ -111,13 +112,16 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("network",KVS_PT_NONEMPTYSTRING,0,szNetwork)
KVSM_PARAMETERS_END(c)
KviRegisteredChannel * ch;
- if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan.toUtf8().data(),szNetwork.toUtf8().data());
- else ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+ if(c->hasSwitch('e',"exactly"))
+ ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
+ else
+ ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
if(ch)
{
g_pRegisteredChannelDataBase->remove(ch);
} else {
- if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs_ctx("No such channel/netmask entry in the database","register"));
+ if(!c->hasSwitch('q',"quiet"))
+ c->warning(__tr2qs_ctx("No such channel/netmask entry in the database","register"));
}
return true;
}
@@ -163,18 +167,21 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
KVSM_PARAMETER("value",KVS_PT_STRING,0,szValue)
KVSM_PARAMETERS_END(c)
KviRegisteredChannel * ch;
- if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan.toUtf8().data(),szNetwork.toUtf8().data());
- else ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+ if(c->hasSwitch('e',"exactly"))
+ ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
+ else
+ ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
if(ch)
{
if(!szValue.isEmpty())
{
- ch->setProperty(szProperty.toUtf8().data(),new KviStr(szValue));
+ ch->setProperty(szProperty,szValue);
} else {
- ch->removeProperty(szProperty.toUtf8().data());
+ ch->removeProperty(szProperty);
}
} else {
- if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs_ctx("No such channel/netmask entry in the database","register"));
+ if(!c->hasSwitch('q',"quiet"))
+ c->warning(__tr2qs_ctx("No such channel/netmask entry in the database","register"));
}
return true;
}
@@ -198,19 +205,31 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
int tot = 0;
- KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*(g_pRegisteredChannelDataBase->channelDict()));
- while(KviRegisteredChannelList * l = it.current())
+ QHash<QString,KviRegisteredChannelList *>::Iterator it;
+ for(it = g_pRegisteredChannelDataBase->channelDict()->begin();it != g_pRegisteredChannelDataBase->channelDict()->end();++it)
{
+ KviRegisteredChannelList * l = it.value();
+ KVI_ASSERT(l);
+
for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
{
tot++;
- c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx("Channel: %c%s@%s","register"),
- KVI_TEXT_BOLD,ch->name().ptr(),ch->netMask().ptr());
- KviPointerHashTableIterator<const char *,KviStr> pit(*(ch->propertyDict()));
- while(KviStr * s = pit.current())
+ c->window()->outputNoFmt(
+ KVI_OUT_SYSTEMMESSAGE,
+ __tr2qs_ctx("Channel: %1%2@%3","register")
+ .arg(QChar(KVI_TEXT_BOLD))
+ .arg(ch->name())
+ .arg(ch->netMask())
+ );
+
+ for(QHash<QString,QString>::Iterator it2 = ch->propertyDict()->begin();it2 != ch->propertyDict()->end();++it2)
{
- c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs_ctx(" Property: %s=%s","register"),pit.currentKey(),s->ptr());
- ++pit;
+ c->window()->outputNoFmt(
+ KVI_OUT_SYSTEMMESSAGE,
+ __tr2qs_ctx(" Property: %1=%2","register")
+ .arg(it2.key())
+ .arg(it2.value())
+ );
}
}
++it;
@@ -250,32 +269,29 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
KVSM_PARAMETERS_END(c)
KviKvsArray* pArray = new KviKvsArray();
-// KviKvsArray* pArrayCN = new KviKvsArray();
-// pArrayCN->set(0,new KviKvsVariant(QString("")));
-// pArrayCN->set(1,new KviKvsVariant(QString("")));
+
int aid=0;
- if(szChan.isEmpty())szChan="*";
- if(szNetmask.isEmpty())szNetmask="*";
+ if(szChan.isEmpty())
+ szChan="*";
+ if(szNetmask.isEmpty())
+ szNetmask="*";
- KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
- KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
- while(KviRegisteredChannelList * l = it.current())
+ QHash<QString,KviRegisteredChannelList *>::Iterator it;
+ for(it = g_pRegisteredChannelDataBase->channelDict()->begin();it != g_pRegisteredChannelDataBase->channelDict()->end();++it)
{
+ KviRegisteredChannelList * l = it.value();
+ KVI_ASSERT(l);
+
for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
- if(KviQString::matchWildExpressions(ch->name().ptr(),szChan) &&
- KviQString::matchWildExpressions(ch->netMask().ptr(),szNetmask))
{
-// FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, netmask)
- pArray->set(aid,new KviKvsVariant(QString(ch->name()+"@"+ch->netMask())));
-// pArray->set(aid,new KviKvsVariant(QString(ch->name()));
-// pArrayCN->set(0,new KviKvsVariant(QString(ch->name())));
-// pArrayCN->set(1,new KviKvsVariant(QString(ch->netMask())));
-// pArray->set(aid,new KviKvsVariant(pArrayCN));
- aid++;
+ if(KviQString::matchWildExpressions(ch->name(),szChan) && KviQString::matchWildExpressions(ch->netMask(),szNetmask))
+ {
+ pArray->set(aid,new KviKvsVariant(QString::fromUtf8("%1@%2").arg(ch->name(),ch->netMask())));
+ aid++;
+ }
}
- ++it;
}
c->returnValue()->setArray(pArray);
return true;
@@ -310,12 +326,13 @@ static bool regchan_kvs_fnc_property(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
KVSM_PARAMETER("property name",KVS_PT_NONEMPTYSTRING,0,szPropertyName)
KVSM_PARAMETERS_END(c)
- KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+ KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
if(ch)
{
- KviStr * p = ch->property(szPropertyName.toUtf8().data());
- if(p)c->returnValue()->setString(p->ptr());
- } //else c->warning(__tr("User %s not found"),parms->safeFirstParam());
+ QString szProp = ch->property(szPropertyName);
+ if(!szProp.isEmpty())
+ c->returnValue()->setString(szProp);
+ }
return true;
}
/*
@@ -348,7 +365,7 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
KVSM_PARAMETERS_END(c)
- KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetwork.toUtf8().data());
+ KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
c->returnValue()->setBoolean(ch);
return true;
}
@@ -384,7 +401,7 @@ static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
KVSM_PARAMETER("netmask",KVS_PT_STRING,0,szNetmask)
KVSM_PARAMETERS_END(c)
- KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan.toUtf8().data(),szNetmask.toUtf8().data());
+ KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetmask);
c->returnValue()->setBoolean(ch);
return true;
}
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 81b1a7b2e..5049167b6 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -206,34 +206,35 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
{
while(g_pControllerList->first()) delete g_pControllerList->first();
return true;
- } else {
- KviPointerListIterator<SPasteController> it(*g_pControllerList);
- SPasteController *item;
+ }
- if(!iId) //Delete all spaste's from the current window
+ KviPointerListIterator<SPasteController> it(*g_pControllerList);
+ SPasteController *item;
+
+ if(!iId) //Delete all spaste's from the current window
+ {
+ if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
{
- if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
- {
- QString szWinId = c->window()->id();
- c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
- return false;
- } else {
- while( (item = it.current()) != 0)
- {
- ++it;
- if(KviQString::equalCS(item->window()->id(),c->window()->id()))delete item;
- }
- }
+ QString szWinId = c->window()->id();
+ c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
+ return false;
} else {
- //Delete the spaste with the given id
while( (item = it.current()) != 0)
{
++it;
- if(item->getId() == iId)delete item;
+ if(KviQString::equalCS(item->window()->id(),c->window()->id()))delete item;
}
}
- return true;
+ } else {
+ //Delete the spaste with the given id
+ while( (item = it.current()) != 0)
+ {
+ ++it;
+ if(item->getId() == (kvs_int_t)iId)
+ delete item;
+ }
}
+ return true;
}
/*
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 07:31:35 +0000