From 381aec18ce775aa1fa6e7b6cee6f332757928b7c Mon Sep 17 00:00:00 2001 From: "Friedrich W. H. Kossebau" Date: Thu, 9 Jan 2020 00:50:38 +0100 Subject: [PATCH] kdevplatform: remove About data feature With KDevPlatform no longer a stand-alone product, but effectively only an internal architecture platform of KDevelop, the About data and the About KDevPlatform dialog no longer make sense Any author information is merged with the one of the KDevelop app, which it already almost was a subset of. --- app/kdevelopui.rc | 3 +- app/main.cpp | 4 +- kdevplatform/interfaces/icore.h | 5 --- kdevplatform/shell/core.cpp | 43 ++----------------- kdevplatform/shell/core.h | 4 -- kdevplatform/shell/mainwindow_actions.cpp | 8 ---- kdevplatform/shell/mainwindow_p.cpp | 7 --- kdevplatform/shell/mainwindow_p.h | 1 - .../shell/tests/test_projectcontroller.cpp | 4 +- 9 files changed, 9 insertions(+), 70 deletions(-) diff --git a/app/kdevelopui.rc b/app/kdevelopui.rc index be783f7b93..f4cfac9cf6 100644 --- a/app/kdevelopui.rc +++ b/app/kdevelopui.rc @@ -1,5 +1,5 @@ - + @@ -177,7 +177,6 @@ Help - diff --git a/app/main.cpp b/app/main.cpp index 46cb374cd7..cba680e930 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -395,9 +395,9 @@ int main( int argc, char *argv[] ) i18n("Copyright 1999-%1, The KDevelop developers", QStringLiteral("2020")), QString(), QStringLiteral("https://www.kdevelop.org/")); aboutData.setDesktopFileName(QStringLiteral("org.kde.kdevelop")); - aboutData.addAuthor( i18n("Kevin Funk"), i18n( "Co-maintainer, C++/Clang, QA, Windows Support" ), QStringLiteral("kfunk@kde.org") ); + aboutData.addAuthor( i18n("Kevin Funk"), i18n( "Co-maintainer, C++/Clang, QA, Windows Support, Performance, Website" ), QStringLiteral("kfunk@kde.org") ); aboutData.addAuthor( i18n("Sven Brauch"), i18n( "Co-maintainer, AppImage, Python Support, User Interface improvements" ), QStringLiteral("svenbrauch@gmail.com") ); - aboutData.addAuthor( i18n("Aleix Pol Gonzalez"), i18n( "CMake Support, Run Support, Kross Support" ), QStringLiteral("aleixpol@gmail.com") ); + aboutData.addAuthor( i18n("Aleix Pol Gonzalez"), i18n( "CMake Support, Run Support, Kross Support" ), QStringLiteral("aleixpol@kde.org") ); aboutData.addAuthor( i18n("Milian Wolff"), i18n( "C++/Clang, Generic manager, Webdevelopment Plugins, Snippets, Performance" ), QStringLiteral("mail@milianw.de") ); aboutData.addAuthor( i18n("Olivier JG"), i18n( "C++/Clang, DUChain, Bug Fixes" ), QStringLiteral("olivier.jg@gmail.com") ); aboutData.addAuthor( i18n("Andreas Pakulat"), i18n( "Architecture, VCS Support, Project Management Support, QMake Projectmanager" ), QStringLiteral("apaku@gmx.de") ); diff --git a/kdevplatform/interfaces/icore.h b/kdevplatform/interfaces/icore.h index 992f66fe66..3776171dad 100644 --- a/kdevplatform/interfaces/icore.h +++ b/kdevplatform/interfaces/icore.h @@ -26,8 +26,6 @@ Boston, MA 02110-1301, USA. #include "isessionlock.h" -class KAboutData; - /** * The KDevelop namespace contains all classes provided by the KDevelop * platform libraries. @@ -125,9 +123,6 @@ public: /** @return the runtime controller */ Q_SCRIPTABLE virtual KDevelop::IRuntimeController* runtimeController() = 0; - /** @return the about data of the framework, different from the main about data which is created by the application */ - virtual KAboutData aboutData() const = 0; - /** @return true if the application is currently being shut down */ virtual bool shuttingDown() const = 0; diff --git a/kdevplatform/shell/core.cpp b/kdevplatform/shell/core.cpp index cfe9d7e7fa..772aecf94a 100644 --- a/kdevplatform/shell/core.cpp +++ b/kdevplatform/shell/core.cpp @@ -89,40 +89,10 @@ namespace KDevelop { Core *Core::m_self = nullptr; -KAboutData createAboutData() -{ - KAboutData aboutData( QStringLiteral("kdevplatform"), - i18n("KDevelop Platform"), QStringLiteral(KDEVPLATFORM_VERSION_STRING), - i18n("Development Platform for IDE-like Applications"), - KAboutLicense::LGPL_V2, - i18n("Copyright 2004-%1, The KDevelop developers", QStringLiteral("2020")), - QString(), QStringLiteral("https://www.kdevelop.org/")); - - aboutData.addAuthor( i18n("Andreas Pakulat"), i18n( "Architecture, VCS Support, Project Management Support, QMake Projectmanager" ), QStringLiteral("apaku@gmx.de") ); - aboutData.addAuthor( i18n("Alexander Dymo"), i18n( "Architecture, Sublime UI, Ruby support" ), QStringLiteral("adymo@kdevelop.org") ); - aboutData.addAuthor( i18n("David Nolden"), i18n( "Definition-Use Chain, C++ Support" ), QStringLiteral("david.nolden.kdevelop@art-master.de") ); - aboutData.addAuthor( i18n("Aleix Pol Gonzalez"), i18n( "CMake Support, Run Support, Kross Support" ), QStringLiteral("aleixpol@kde.org") ); - aboutData.addAuthor( i18n("Vladimir Prus"), i18n( "GDB integration" ), QStringLiteral("ghost@cs.msu.su") ); - aboutData.addAuthor( i18n("Hamish Rodda"), i18n( "Text editor integration, definition-use chain" ), QStringLiteral("rodda@kde.org") ); - - aboutData.addCredit( i18n("Matt Rogers"), QString(), QStringLiteral("mattr@kde.org")); - aboutData.addCredit( i18n("Cédric Pasteur"), i18n("astyle and indent support"), QStringLiteral("cedric.pasteur@free.fr") ); - aboutData.addCredit( i18n("Evgeniy Ivanov"), i18n("Distributed VCS, Git, Mercurial"), QStringLiteral("powerfox@kde.ru") ); - //Veritas is outside in playground currently. - //aboutData.addCredit( i18n("Manuel Breugelmanns"), i18n( "Veritas, QTest integration"), "mbr.nxi@gmail.com" ); - aboutData.addCredit( i18n("Robert Gruber") , i18n( "SnippetPart, debugger and usability patches" ), QStringLiteral("rgruber@users.sourceforge.net") ); - aboutData.addCredit( i18n("Dukju Ahn"), i18n( "Subversion plugin, Custom Make Manager, Overall improvements" ), QStringLiteral("dukjuahn@gmail.com") ); - aboutData.addAuthor( i18n("Niko Sams"), i18n( "GDB integration, Webdevelopment Plugins" ), QStringLiteral("niko.sams@gmail.com") ); - aboutData.addAuthor( i18n("Milian Wolff"), i18n( "Generic manager, Webdevelopment Plugins, Snippets, Performance" ), QStringLiteral("mail@milianw.de") ); - aboutData.addAuthor( i18n("Kevin Funk"), i18n( "Co-maintainer, C++/Clang, QA, Windows Support, Performance, Website" ), QStringLiteral("kfunk@kde.org") ); - aboutData.addAuthor( i18n("Sven Brauch"), i18n( "Co-maintainer, AppImage, Python Support, User Interface improvements" ), QStringLiteral("svenbrauch@gmx.de") ); - aboutData.addAuthor( i18n("Friedrich W. H. Kossebau"), QString(), QStringLiteral("kossebau@kde.org") ); - - return aboutData; -} - -CorePrivate::CorePrivate(Core *core): - m_aboutData( createAboutData() ), m_core(core), m_cleanedUp(false), m_shuttingDown(false) +CorePrivate::CorePrivate(Core *core) + : m_core(core) + , m_cleanedUp(false) + , m_shuttingDown(false) { } @@ -446,11 +416,6 @@ void Core::cleanup() emit shutdownCompleted(); } -KAboutData Core::aboutData() const -{ - return d->m_aboutData; -} - IUiController *Core::uiController() { return d->uiController.data(); diff --git a/kdevplatform/shell/core.h b/kdevplatform/shell/core.h index 45558c7c10..e9280b737d 100644 --- a/kdevplatform/shell/core.h +++ b/kdevplatform/shell/core.h @@ -24,8 +24,6 @@ #include "shellexport.h" #include -class KAboutData; - namespace KDevelop { class UiController; @@ -88,8 +86,6 @@ public: ISession *activeSession() override; ISessionLock::Ptr activeSessionLock() override; - KAboutData aboutData() const override; - /// The following methods may only be used within the shell. UiController *uiControllerInternal(); diff --git a/kdevplatform/shell/mainwindow_actions.cpp b/kdevplatform/shell/mainwindow_actions.cpp index 872b7b1939..28f110b4f6 100644 --- a/kdevplatform/shell/mainwindow_actions.cpp +++ b/kdevplatform/shell/mainwindow_actions.cpp @@ -22,8 +22,6 @@ Boston, MA 02110-1301, USA. #include -#include -#include #include #include #include @@ -205,12 +203,6 @@ void MainWindowPrivate::configureNotifications() KNotifyConfigWidget::configure(m_mainWindow); } -void MainWindowPrivate::showAboutPlatform() -{ - ScopedDialog dlg(Core::self()->aboutData(), m_mainWindow ); - dlg->exec(); -} - void MainWindowPrivate::showLoadedPlugins() { ScopedDialog dlg(m_mainWindow); diff --git a/kdevplatform/shell/mainwindow_p.cpp b/kdevplatform/shell/mainwindow_p.cpp index 998ae2d4d3..973be03d3c 100644 --- a/kdevplatform/shell/mainwindow_p.cpp +++ b/kdevplatform/shell/mainwindow_p.cpp @@ -238,13 +238,6 @@ void MainWindowPrivate::setupActions() action->setToolTip( i18nc("@info:tooltip", "Configure notifications") ); action->setWhatsThis( i18nc( "@info:whatsthis", "Shows a dialog that lets you configure notifications." ) ); - action = actionCollection()->addAction( QStringLiteral("about_platform"), this, SLOT(showAboutPlatform()) ); - action->setIcon(QIcon::fromTheme(QStringLiteral("kdevelop"))); - action->setText( i18n("About KDevelop Platform") ); - action->setMenuRole( QAction::NoRole ); // OSX: prevent QT from hiding this due to conflict with 'About KDevelop' - action->setStatusTip( i18n("Show Information about KDevelop Platform") ); - action->setWhatsThis( i18nc( "@info:whatsthis", "Shows a dialog with information about KDevelop Platform." ) ); - action = actionCollection()->addAction( QStringLiteral("loaded_plugins"), this, SLOT(showLoadedPlugins()) ); action->setIcon(QIcon::fromTheme(QStringLiteral("plugins"))); action->setText( i18n("Loaded Plugins") ); diff --git a/kdevplatform/shell/mainwindow_p.h b/kdevplatform/shell/mainwindow_p.h index 1e915a0759..11eba60d6e 100644 --- a/kdevplatform/shell/mainwindow_p.h +++ b/kdevplatform/shell/mainwindow_p.h @@ -116,7 +116,6 @@ public Q_SLOTS: bool changingActiveView() const ; void configureNotifications(); - void showAboutPlatform(); void showLoadedPlugins(); void toggleArea(bool b); diff --git a/kdevplatform/shell/tests/test_projectcontroller.cpp b/kdevplatform/shell/tests/test_projectcontroller.cpp index 51c718fef1..61836e936d 100644 --- a/kdevplatform/shell/tests/test_projectcontroller.cpp +++ b/kdevplatform/shell/tests/test_projectcontroller.cpp @@ -68,12 +68,12 @@ class FakeFileManager : public IPlugin, public IProjectFileManager Q_INTERFACES(KDevelop::IProjectFileManager) public: FakeFileManager(QObject*, const QVariantList&) - : IPlugin(ICore::self()->aboutData().componentName(), Core::self()) + : IPlugin(QStringLiteral("FakeFileManager"), Core::self()) { } FakeFileManager() - : IPlugin(ICore::self()->aboutData().componentName(), Core::self()) + : IPlugin(QStringLiteral("FakeFileManager"), Core::self()) { } -- GitLab