From 9c73055a1017e89bb646b172d33743be642031ca Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Wed, 14 May 2014 04:49:33 +0200 Subject: [PATCH] Adapt to changes in KAboutData. --- kcmkwin/kwindecoration/kwindecoration.cpp | 2 +- kcmkwin/kwindesktop/main.cpp | 2 +- kcmkwin/kwinoptions/main.cpp | 2 +- kcmkwin/kwinrules/kcm.cpp | 2 +- kcmkwin/kwinscripts/module.cpp | 2 +- main.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp index feb869e1ea..726ccf3ef4 100644 --- a/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kcmkwin/kwindecoration/kwindecoration.cpp @@ -95,7 +95,7 @@ KWinDecorationModule::KWinDecorationModule(QWidget* parent, const QVariantList & 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(), "gallium@kde.org"); setAboutData(about); diff --git a/kcmkwin/kwindesktop/main.cpp b/kcmkwin/kwindesktop/main.cpp index 843ffdcec3..c343dce9d7 100644 --- a/kcmkwin/kwindesktop/main.cpp +++ b/kcmkwin/kwindesktop/main.cpp @@ -571,7 +571,7 @@ void KWinDesktopConfig::slotAboutEffectClicked() 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); diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp index fe804708ea..5c018def1b 100644 --- a/kcmkwin/kwinoptions/main.cpp +++ b/kcmkwin/kwinoptions/main.cpp @@ -100,7 +100,7 @@ KWinOptions::KWinOptions(QWidget *parent, const QVariantList &) 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(), "ettrich@kde.org"); diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp index 90cf6398aa..8012d193e8 100644 --- a/kcmkwin/kwinrules/kcm.cpp +++ b/kcmkwin/kwinrules/kcm.cpp @@ -48,7 +48,7 @@ KCMRules::KCMRules(QWidget *parent, const QVariantList &) 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(), "l.lunak@kde.org"); setAboutData(about); } diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp index f83ca0c84f..d098efbc1c 100644 --- a/kcmkwin/kwinscripts/module.cpp +++ b/kcmkwin/kwinscripts/module.cpp @@ -50,7 +50,7 @@ Module::Module(QWidget *parent, const QVariantList &args) : 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); diff --git a/main.cpp b/main.cpp index cabdbaab11..a3ce899d2b 100644 --- a/main.cpp +++ b/main.cpp @@ -496,7 +496,7 @@ KWIN_EXPORT int kdemain(int argc, char * argv[]) 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("ettrich@kde.org"));