summaryrefslogtreecommitdiffstats
path: root/kdcop
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 13:38:04 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 13:38:04 +0900
commitce4a92763fb8ce1d6eec291bf5018bfacdae48fc (patch)
tree0ad5931150cae33fa63e16b3f477b05766ed3af1 /kdcop
parent7ea414a2abd06da7d22dc90d1ed8d3fe79ddca68 (diff)
downloadtdebase-ce4a92763fb8ce1d6eec291bf5018bfacdae48fc.tar.gz
tdebase-ce4a92763fb8ce1d6eec291bf5018bfacdae48fc.zip
Added support for new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kdcop')
-rw-r--r--kdcop/kdcopwindow.cpp25
1 files changed, 12 insertions, 13 deletions
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index b096ddd47..3821390c8 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -872,11 +872,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
TQDataStream reply(replyData, IO_ReadOnly);
if (demarshal(replyType, reply, mainView->lb_replyData))
{
- mainView->l_replyType->setText
- (
- i18n("<strong>%1</strong>")
- .arg(TQString::fromUtf8(replyType))
- );
+ mainView->l_replyType->setText(i18n("<strong>%1</strong>").arg(TQString::fromUtf8(replyType)));
mainView->lb_replyData->show();
}
else
@@ -914,12 +910,7 @@ void KDCOPWindow::slotFillApplications()
TDEApplication::restoreOverrideCursor();
}
-bool KDCOPWindow::demarshal
-(
- TQCString & replyType,
- TQDataStream & reply,
- TQListBox *theList
-)
+bool KDCOPWindow::demarshal(TQCString &replyType, TQDataStream &reply, TQListBox *theList)
{
TQStringList ret;
TQPixmap pret;
@@ -1082,6 +1073,15 @@ bool KDCOPWindow::demarshal
reply >> r;
ret << r.toString();
}
+ else if (replyType == "TQStringVariantMap")
+ {
+ TQStringVariantMap r;
+ reply >> r;
+ for (TQStringVariantMap::ConstIterator it(r.begin()); it != r.end(); ++it)
+ {
+ ret << it.key() + " : " + it.data().toString();
+ }
+ }
else if (replyType == "DCOPRef")
{
DCOPRef r;
@@ -1091,8 +1091,7 @@ bool KDCOPWindow::demarshal
}
else
{
- ret <<
- i18n("Do not know how to demarshal %1").arg(TQString::fromUtf8(replyType));
+ ret << i18n("Do not know how to demarshal %1").arg(TQString::fromUtf8(replyType));
isValid = false;
}