From ca19cba2ac3cf9785b9a2211c4ba7d1e14d87bf2 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 14 Dec 2012 18:25:03 +0100
Subject: Factorize code for formatting window titles into QPlatformWindow.

Change-Id: I0dcccd08916fc2ea1b795681e9b98a9550ef51b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/platforms/windows/qwindowswindow.cpp | 13 +------------
 src/plugins/platforms/xcb/qxcbwindow.cpp         | 12 +-----------
 2 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 5d6d4620b7..2708d7d428 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -1216,18 +1216,7 @@ void QWindowsWindow::setWindowTitle(const QString &title)
     if (QWindowsContext::verboseWindows)
         qDebug() << __FUNCTION__ << this << window() <<title;
     if (m_data.hwnd) {
-
-        QString fullTitle = title;
-        if (QGuiApplicationPrivate::displayName) {
-            // Append display name, if set.
-            if (!fullTitle.isEmpty())
-                fullTitle += QStringLiteral(" - ");
-            fullTitle += *QGuiApplicationPrivate::displayName;
-        } else if (fullTitle.isEmpty()) {
-            // Don't let the window title be completely empty, use the app name as fallback.
-            fullTitle = QCoreApplication::applicationName();
-        }
-
+        const QString fullTitle = formatWindowTitle(title, QStringLiteral(" - "));
         SetWindowText(m_data.hwnd, (const wchar_t*)fullTitle.utf16());
     }
 }
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 60cc547979..b7668e6270 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1122,18 +1122,8 @@ void QXcbWindow::setParent(const QPlatformWindow *parent)
 
 void QXcbWindow::setWindowTitle(const QString &title)
 {
-    QString fullTitle = title;
-    if (QGuiApplicationPrivate::displayName) {
-        // Append display name, if set.
-        if (!fullTitle.isEmpty())
-            fullTitle += QString::fromUtf8(" \xe2\x80\x94 "); // unicode character U+2014, EM DASH
-        fullTitle += *QGuiApplicationPrivate::displayName;
-    } else if (fullTitle.isEmpty()) {
-        // Don't let the window title be completely empty, use the app name as fallback.
-        fullTitle = QCoreApplication::applicationName();
-    }
+    const QString fullTitle = formatWindowTitle(title, QString::fromUtf8(" \xe2\x80\x94 ")); // unicode character U+2014, EM DASH
     const QByteArray ba = fullTitle.toUtf8();
-
     Q_XCB_CALL(xcb_change_property(xcb_connection(),
                                    XCB_PROP_MODE_REPLACE,
                                    m_window,
-- 
cgit v1.2.3