Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
KDE Connect
Commits
774fe41d
Commit
774fe41d
authored
Oct 27, 2021
by
Nicolas Fella
Browse files
Revert "Pass QVariants by reference when possible"
This reverts commit
c8c19369
.
parent
6957b6aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
declarativeplugin/responsewaiter.cpp
View file @
774fe41d
...
...
@@ -43,7 +43,7 @@ DBusResponseWaiter::DBusResponseWaiter()
;
}
QVariant
DBusResponseWaiter
::
waitForReply
(
const
QVariant
&
variant
)
const
QVariant
DBusResponseWaiter
::
waitForReply
(
QVariant
variant
)
const
{
if
(
QDBusPendingCall
*
call
=
extractPendingCall
(
variant
))
{
...
...
@@ -74,7 +74,8 @@ DBusAsyncResponse::DBusAsyncResponse(QObject* parent)
connect
(
&
m_timeout
,
&
QTimer
::
timeout
,
this
,
&
DBusAsyncResponse
::
onTimeout
);
}
void
DBusAsyncResponse
::
setPendingCall
(
const
QVariant
&
variant
)
void
DBusAsyncResponse
::
setPendingCall
(
QVariant
variant
)
{
if
(
QDBusPendingCall
*
call
=
DBusResponseWaiter
::
instance
()
->
extractPendingCall
(
variant
))
{
...
...
@@ -123,7 +124,7 @@ void DBusAsyncResponse::onTimeout()
Q_EMIT
error
(
QStringLiteral
(
"timeout when waiting dbus response!"
));
}
QDBusPendingCall
*
DBusResponseWaiter
::
extractPendingCall
(
const
QVariant
&
variant
)
const
QDBusPendingCall
*
DBusResponseWaiter
::
extractPendingCall
(
QVariant
&
variant
)
const
{
for
(
int
type
:
qAsConst
(
m_registered
))
{
...
...
declarativeplugin/responsewaiter.h
View file @
774fe41d
...
...
@@ -23,9 +23,9 @@ public:
static
DBusResponseWaiter
*
instance
();
///extract QDbusPendingCall from \p variant and blocks until completed
Q_INVOKABLE
QVariant
waitForReply
(
const
QVariant
&
variant
)
const
;
Q_INVOKABLE
QVariant
waitForReply
(
QVariant
variant
)
const
;
QDBusPendingCall
*
extractPendingCall
(
const
QVariant
&
variant
)
const
;
QDBusPendingCall
*
extractPendingCall
(
QVariant
&
variant
)
const
;
private:
DBusResponseWaiter
();
...
...
@@ -44,7 +44,7 @@ public:
explicit
DBusAsyncResponse
(
QObject
*
parent
=
nullptr
);
~
DBusAsyncResponse
()
override
=
default
;
Q_INVOKABLE
void
setPendingCall
(
const
QVariant
&
e
);
Q_INVOKABLE
void
setPendingCall
(
QVariant
e
);
void
setAutodelete
(
bool
b
)
{
m_autodelete
=
b
;};
bool
autodelete
()
const
{
return
m_autodelete
;}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment