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/gui/kernel/qplatformwindow.cpp | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src/gui/kernel/qplatformwindow.cpp')

diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index 01377d1aa03..b710701e7f8 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -42,6 +42,7 @@
 #include "qplatformwindow.h"
 #include "qplatformwindow_p.h"
 
+#include <private/qguiapplication_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>
@@ -424,6 +425,29 @@ bool QPlatformWindow::frameStrutEventsEnabled() const
     return false;
 }
 
+/*!
+    Call this method to put together a window title composed of
+    \a title
+    \a separator
+    the application display name
+
+    If the display name isn't set, and the title is empty, the raw app name is used.
+*/
+QString QPlatformWindow::formatWindowTitle(const QString &title, const QString &separator)
+{
+    QString fullTitle = title;
+    if (QGuiApplicationPrivate::displayName) {
+        // Append display name, if set.
+        if (!fullTitle.isEmpty())
+            fullTitle += separator;
+        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();
+    }
+    return fullTitle;
+}
+
 /*!
     \class QPlatformWindow
     \since 4.8
-- 
cgit v1.2.3