From ee201011423c22823b246ce96c012641e31b95e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Mon, 28 Apr 2014 17:11:20 +0200
Subject: [PATCH] Fix deprecated warnings for KAboutData

Ctor with catalog name got deprecated, use ctor without it.
---
 kcmkwin/kwindecoration/kwindecoration.cpp | 2 +-
 kcmkwin/kwindesktop/main.cpp              | 3 +--
 kcmkwin/kwinoptions/main.cpp              | 2 +-
 kcmkwin/kwinrules/kcm.cpp                 | 2 +-
 kcmkwin/kwinscripts/module.cpp            | 2 +-
 main.cpp                                  | 1 -
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index e4d82b0295..feb869e1ea 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -93,7 +93,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList &
     layout->addWidget(m_ui);
 
     KAboutData *about =
-        new KAboutData(i18n("kcmkwindecoration"), QString(),
+        new KAboutData(QStringLiteral("kcmkwindecoration"),
                        i18n("Window Decoration Control Module"),
                        QString(), QString(), KAboutData::License_GPL,
                        i18n("(c) 2001 Karol Szwed"));
diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp
index f59f29a8d9..843ffdcec3 100644
--- a/kcmkwin/kwindesktop/main.cpp
+++ b/kcmkwin/kwindesktop/main.cpp
@@ -551,7 +551,7 @@ void KWinDesktopConfig::slotAboutEffectClicked()
         const QString license = pluginInfo.license();
         const QString icon    = pluginInfo.icon();
 
-        KAboutData aboutData(name, name, name, version, comment, KAboutLicense::byKeyword(license).key(), QString(), QString(), website.toLatin1());
+        KAboutData aboutData(name, name, version, comment, KAboutLicense::byKeyword(license).key(), QString(), QString(), website.toLatin1());
         aboutData.setProgramIconName(icon);
         const QStringList authors = author.split(',');
         const QStringList emails = email.split(',');
@@ -568,7 +568,6 @@ void KWinDesktopConfig::slotAboutEffectClicked()
     } else {
         const BuiltInEffects::EffectData &data = BuiltInEffects::effectData(builtIn);
         KAboutData aboutData(data.name,
-                             QString(),
                              data.displayName,
                              QStringLiteral(KWIN_VERSION_STRING),
                              data.comment,
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index cd15d03f3c..fe804708ea 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -99,7 +99,7 @@ KWinOptions::KWinOptions(QWidget *parent, const QVariantList &)
     connect(mAdvanced, SIGNAL(changed(bool)), this, SLOT(moduleChanged(bool)));
 
     KAboutData *about =
-        new KAboutData(i18n("kcmkwinoptions"), QString(), i18n("Window Behavior Configuration Module"),
+        new KAboutData(QStringLiteral("kcmkwinoptions"), i18n("Window Behavior Configuration Module"),
                        QString(), QString(), KAboutData::License_GPL,
                        i18n("(c) 1997 - 2002 KWin and KControl Authors"));
 
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index 167d6aa532..90cf6398aa 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -46,7 +46,7 @@ KCMRules::KCMRules(QWidget *parent, const QVariantList &)
     widget = new KCMRulesList(this);
     layout->addWidget(widget);
     connect(widget, SIGNAL(changed(bool)), SLOT(moduleChanged(bool)));
-    KAboutData *about = new KAboutData(i18n("kcmkwinrules"), QString(),
+    KAboutData *about = new KAboutData(QStringLiteral("kcmkwinrules"),
                                        i18n("Window-Specific Settings Configuration Module"),
                                        QString(), QString(), KAboutData::License_GPL, i18n("(c) 2004 KWin and KControl Authors"));
     about->addAuthor(i18n("Lubos Lunak"), QString(), "l.lunak@kde.org");
diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
index 2b81ac6268..f83ca0c84f 100644
--- a/kcmkwin/kwinscripts/module.cpp
+++ b/kcmkwin/kwinscripts/module.cpp
@@ -46,7 +46,7 @@ Module::Module(QWidget *parent, const QVariantList &args) :
     ui(new Ui::Module),
     m_kwinConfig(KSharedConfig::openConfig("kwinrc"))
 {
-    KAboutData *about = new KAboutData("kwin-scripts", QString(),
+    KAboutData *about = new KAboutData("kwin-scripts",
                                        i18n("KWin Scripts"),
                                        global_s_versionStringFull,
                                        i18n("Configure KWin scripts"),
diff --git a/main.cpp b/main.cpp
index fe50176b04..46a4829991 100644
--- a/main.cpp
+++ b/main.cpp
@@ -487,7 +487,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
     a.setApplicationDisplayName(i18n("KWin"));
 
     KAboutData aboutData(QStringLiteral(KWIN_NAME),          // The program name used internally
-                         QString(),                          // The message catalog name. If null, program name is used instead
                          i18n("KWin"),                       // A displayable program name string
                          QStringLiteral(KWIN_VERSION_STRING), // The program version string
                          i18n(description),                  // Short description of what the app does