@@ -20,6 +20,7 @@
2020#include <unity/shell/application/MirSurfaceInterface.h>
2121
2222#include <QQmlEngine>
23+#include <QTextStream>
2324
2425namespace unityapi = unity::shell::application;
2526
@@ -117,6 +118,7 @@ void Window::close()
117118
118119void Window::activate()
119120{
121+ DEBUG_MSG << "()";
120122 if (m_surface) {
121123 m_surface->activate();
122124 } else {
@@ -206,17 +208,18 @@ void Window::setFocused(bool value)
206208
207209QString Window::toString() const
208210{
209− if (surface()) {
210− return QString("Window[0x%1, id=%2, MirSurface[0x%3,\"%4\"]]").arg(
211− QString::number((quintptr)this, 16),
212− QString::number(id()),
213− QString::number((quintptr)surface(), 16),
214− surface()->name());
215− } else {
216− return QString("Window[0x%1, id=%2, null]").arg(
217− QString::number((quintptr)this, 0, 16),
218− QString::number(id()));
211+ QString result;
212+ {
213+ QTextStream stream(&result);
214+ stream << "Window["<<(void*)this<<", id="<<id()<<", ";
215+ if (surface()) {
216+ stream << "MirSurface["<<(void*)surface()<<",\""<<surface()->name()<<"\"]";
217+ } else {
218+ stream << "null";
219+ }
220+ stream << "]";
219221 }
222+ return result;
220223}
221224
222225QDebug operator<<(QDebug dbg, const Window *window)