summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2010-12-13 14:42:54 +0200
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2010-12-13 14:42:54 +0200
commit4f51c0c761caf5adebccf71cabbbd179ae17fe33 (patch)
tree9bd4d95ccb85ed8e43a1e3cb03e7f6bba9960768
parent832bb77ecdb2a9e8fbce8d9208aa89d16be23bbf (diff)
No need to transform those values now that get() does that automatically.
-rw-r--r--src/QGlib/signal.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/QGlib/signal.cpp b/src/QGlib/signal.cpp
index 06da8f8..a3479d0 100644
--- a/src/QGlib/signal.cpp
+++ b/src/QGlib/signal.cpp
@@ -208,12 +208,7 @@ Value Signal::emit(void *instance, const char *detailedSignal, const QList<Value
g_value_unset(&returnValue);
}
} catch (const QString & msg) {
- QString instanceName;
- SharedValue instanceValue(&values[0]);
- if (instanceValue.type().isInstantiatable() && instanceValue.canTransformTo(Type::String)) {
- //instances can be transformed to strings for debugging purposes
- instanceName = instanceValue.transformTo(Type::String).get<QString>();
- }
+ QString instanceName = SharedValue(&values[0]).get<QString>();
qCritical() << "Error during emission of signal" << detailedSignal
<< "on object"<< instanceName << ":" << msg;
@@ -282,12 +277,7 @@ static void c_marshaller(GClosure *closure, GValue *returnValue, uint paramValue
}
}
- QString instanceName;
- const Value & instanceValue = params.at(0);
- if (instanceValue.type().isInstantiatable() && instanceValue.canTransformTo(Type::String)) {
- //instances can be transformed to strings for debugging purposes
- instanceName = instanceValue.transformTo(Type::String).get<QString>();
- }
+ QString instanceName = params.at(0).get<QString>();
//attempt to determine the cause of the failure
QString msg;