From c334b5b1b035cd362e7369fe33971d2ebe6d542a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Thu, 26 May 2016 15:51:32 +0000
Subject: [PATCH] kdecore: remove overload for KGlobal::staticQString()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kdecore/io/kurl.cpp             |  4 ++--
 kdecore/kernel/kglobal.cpp      | 11 -----------
 kdecore/kernel/kglobal.h        | 19 -------------------
 kdecore/services/kmimetype.cpp  |  4 ++--
 kdecore/text/kstringhandler.cpp |  2 +-
 5 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/kdecore/io/kurl.cpp b/kdecore/io/kurl.cpp
index 5395c226..a26584a5 100644
--- a/kdecore/io/kurl.cpp
+++ b/kdecore/io/kurl.cpp
@@ -61,10 +61,10 @@ static QString cleanpath( const QString &_path, bool cleanDirSeparator, bool dec
 
   if (decodeDots)
   {
-     static const QString &encodedDot = KGlobal::staticQString("%2e");
+     static const QString &encodedDot = KGlobal::staticQString(QLatin1String("%2e"));
      if (path.indexOf(encodedDot, 0, Qt::CaseInsensitive) != -1)
      {
-        static const QString &encodedDOT = KGlobal::staticQString("%2E"); // Uppercase!
+        static const QString &encodedDOT = KGlobal::staticQString(QLatin1String("%2E")); // Uppercase!
         path.replace(encodedDot, QString(QLatin1Char('.')));
         path.replace(encodedDOT, QString(QLatin1Char('.')));
         len = path.length();
diff --git a/kdecore/kernel/kglobal.cpp b/kdecore/kernel/kglobal.cpp
index 6e4d8112..1b58698f 100644
--- a/kdecore/kernel/kglobal.cpp
+++ b/kdecore/kernel/kglobal.cpp
@@ -260,17 +260,6 @@ void KGlobal::setLocale(KLocale *newLocale, CopyCatalogs copy)
     d->locale = newLocale;
 }
 
-/**
- * Create a static QString
- *
- * To be used inside functions(!) like:
- * static const QString &myString = KGlobal::staticQString("myText");
- */
-const QString &KGlobal::staticQString(const char *str)
-{
-    return staticQString(QLatin1String(str));
-}
-
 /**
  * Create a static QString
  *
diff --git a/kdecore/kernel/kglobal.h b/kdecore/kernel/kglobal.h
index 749a4224..6157f3ff 100644
--- a/kdecore/kernel/kglobal.h
+++ b/kdecore/kernel/kglobal.h
@@ -386,25 +386,6 @@ namespace KGlobal
      */
     KDECORE_EXPORT mode_t umask();
 
-    /**
-     * Creates a static QString.
-     *
-     * To be used inside functions(!) like:
-     * @code
-     * static const QString &myString = KGlobal::staticQString("myText");
-     * @endcode
-     *
-     * @attention Do @b NOT use code such as:
-     * @code
-     * static QString myString = KGlobal::staticQString("myText");
-     * @endcode
-     * This creates a static object (instead of a static reference)
-     * and as you know static objects are EVIL.
-     * @param str the string to create
-     * @return the static string
-     */
-    KDECORE_EXPORT const QString& staticQString(const char *str); //krazy:exclude=constref (doesn't make sense otherwise)
-
     /**
      * Creates a static QString.
      *
diff --git a/kdecore/services/kmimetype.cpp b/kdecore/services/kmimetype.cpp
index b9d4cb9c..d1264ff0 100644
--- a/kdecore/services/kmimetype.cpp
+++ b/kdecore/services/kmimetype.cpp
@@ -442,7 +442,7 @@ QString KMimeType::iconNameForUrl( const KUrl & _url, mode_t mode )
     if (!mt) {
         return QString();
     }
-    static const QString& unknown = KGlobal::staticQString("unknown");
+    static const QString& unknown = KGlobal::staticQString(QLatin1String("unknown"));
     const QString mimeTypeIcon = mt->iconName( _url );
     QString i = mimeTypeIcon;
 
@@ -566,7 +566,7 @@ QStringList KMimeType::allParentMimeTypes() const
 QString KMimeType::defaultMimeType()
 {
     static const QString & s_strDefaultMimeType =
-        KGlobal::staticQString( "application/octet-stream" );
+        KGlobal::staticQString(QLatin1String("application/octet-stream"));
     return s_strDefaultMimeType;
 }
 
diff --git a/kdecore/text/kstringhandler.cpp b/kdecore/text/kstringhandler.cpp
index cd1d160e..6b7be8ed 100644
--- a/kdecore/text/kstringhandler.cpp
+++ b/kdecore/text/kstringhandler.cpp
@@ -289,7 +289,7 @@ QString KStringHandler::from8Bit( const char *str )
   if (!str)
     return QString();
   if (!*str) {
-    static const QString &emptyString = KGlobal::staticQString("");
+    static const QString &emptyString = KGlobal::staticQString(QLatin1String(""));
     return emptyString;
   }
   return KStringHandler::isUtf8( str ) ?