[patch] Move license key enum calls to KAboutLicense

kwin-4.96.0_fix_framework5_license_move.patch (text/plain), 3.89 KB, created by Sven Eden on 2014-06-20 07:19:40 UTC

--- a/kcmkwin/kwinscripts/module.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/kcmkwin/kwinscripts/module.cpp	2014-06-20 09:09:36.616010045 +0200
@@ -50,7 +50,7 @@
                                        i18n("KWin Scripts"),
                                        global_s_versionStringFull,
                                        i18n("Configure KWin scripts"),
-                                       KAboutData::License_GPL_V2);
+                                       KAboutLicense::GPL_V2);
 
     about->addAuthor(i18n("Tamás Krutki"));
     setAboutData(about);
--- a/kcmkwin/kwinrules/kcm.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/kcmkwin/kwinrules/kcm.cpp	2014-06-20 09:10:28.992009659 +0200
@@ -48,7 +48,7 @@
     connect(widget, SIGNAL(changed(bool)), SLOT(moduleChanged(bool)));
     KAboutData *about = new KAboutData(QStringLiteral("kcmkwinrules"),
                                        i18n("Window-Specific Settings Configuration Module"),
-                                       QString(), QString(), KAboutData::License_GPL, i18n("(c) 2004 KWin and KControl Authors"));
+                                       QString(), QString(), KAboutLicense::GPL, i18n("(c) 2004 KWin and KControl Authors"));
     about->addAuthor(i18n("Lubos Lunak"), QString(), "[e-mail]");
     setAboutData(about);
 }
--- a/kcmkwin/kwinoptions/main.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/kcmkwin/kwinoptions/main.cpp	2014-06-20 09:11:11.416009346 +0200
@@ -100,7 +100,7 @@
 
     KAboutData *about =
         new KAboutData(QStringLiteral("kcmkwinoptions"), i18n("Window Behavior Configuration Module"),
-                       QString(), QString(), KAboutData::License_GPL,
+                       QString(), QString(), KAboutLicense::GPL,
                        i18n("(c) 1997 - 2002 KWin and KControl Authors"));
 
     about->addAuthor(i18n("Matthias Ettrich"), QString(), "[e-mail]");
--- a/kcmkwin/kwindecoration/kwindecoration.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp	2014-06-20 09:11:48.968009069 +0200
@@ -95,7 +95,7 @@
     KAboutData *about =
         new KAboutData(QStringLiteral("kcmkwindecoration"),
                        i18n("Window Decoration Control Module"),
-                       QString(), QString(), KAboutData::License_GPL,
+                       QString(), QString(), KAboutLicense::GPL,
                        i18n("(c) 2001 Karol Szwed"));
     about->addAuthor(i18n("Karol Szwed"), QString(), "[e-mail]");
     setAboutData(about);
--- a/kcmkwin/kwindesktop/main.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/kcmkwin/kwindesktop/main.cpp	2014-06-20 09:12:43.937008663 +0200
@@ -571,7 +571,7 @@
                              data.displayName,
                              QStringLiteral(KWIN_VERSION_STRING),
                              data.comment,
-                             KAboutData::License_GPL_V2);
+                             KAboutLicense::GPL_V2);
         aboutData.setProgramIconName(QStringLiteral("preferences-system-windows"));
         aboutData.addAuthor(i18n("KWin development team"));
         showDialog(aboutData);
--- a/main.cpp~	2014-05-09 16:58:15.000000000 +0200
+++ b/main.cpp	2014-06-20 09:13:40.401008247 +0200
@@ -496,7 +496,7 @@
                          i18n("KWin"),                       // A displayable program name string
                          QStringLiteral(KWIN_VERSION_STRING), // The program version string
                          i18n(description),                  // Short description of what the app does
-                         KAboutData::License_GPL,            // The license this code is released under
+                         KAboutLicense::GPL,            // The license this code is released under
                          i18n("(c) 1999-2013, The KDE Developers"));   // Copyright Statement
 
     aboutData.addAuthor(i18n("Matthias Ettrich"), QString(), QStringLiteral("[e-mail]"));