From 8dacbaa8d71f00dc6280c1aaf1ef6e923820031b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 5 May 2019 18:42:19 +0200 Subject: [PATCH] Adapt to new c++utilities API --- fileitemactionplugin/syncthingfileitemactionstaticdata.cpp | 7 ++++--- plasmoid/lib/syncthingapplet.cpp | 4 ++-- tray/gui/traywidget.cpp | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp index 8092807..3564f90 100644 --- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp +++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp @@ -93,9 +93,10 @@ void SyncthingFileItemActionStaticData::rescanDir(const QString &dirId, const QS void SyncthingFileItemActionStaticData::showAboutDialog() { - auto *const aboutDialog = new AboutDialog(nullptr, QStringLiteral(APP_NAME), - QStringLiteral(APP_AUTHOR "\nSyncthing icons from Syncthing project"), QStringLiteral(APP_VERSION), ApplicationUtilities::dependencyVersions, - QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), QImage(statusIcons().scanninig.pixmap(128).toImage())); + auto *const aboutDialog + = new AboutDialog(nullptr, QStringLiteral(APP_NAME), QStringLiteral(APP_AUTHOR "\nSyncthing icons from Syncthing project"), + QStringLiteral(APP_VERSION), ApplicationUtilities::applicationInfo.dependencyVersions, QStringLiteral(APP_URL), + QStringLiteral(APP_DESCRIPTION), QImage(statusIcons().scanninig.pixmap(128).toImage())); aboutDialog->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME)); aboutDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("syncthingtray"))); aboutDialog->setAttribute(Qt::WA_DeleteOnClose); diff --git a/plasmoid/lib/syncthingapplet.cpp b/plasmoid/lib/syncthingapplet.cpp index 31a6133..6decfdb 100644 --- a/plasmoid/lib/syncthingapplet.cpp +++ b/plasmoid/lib/syncthingapplet.cpp @@ -312,8 +312,8 @@ void SyncthingApplet::showAboutDialog() QStringLiteral("

Developed by " APP_AUTHOR "
Syncthing icons from Syncthing project
Using " "icons from Font " "Awesome (see their license)

"), - QStringLiteral(APP_VERSION), ApplicationUtilities::dependencyVersions, QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), - QImage(statusIcons().scanninig.pixmap(128).toImage())); + QStringLiteral(APP_VERSION), ApplicationUtilities::applicationInfo.dependencyVersions, QStringLiteral(APP_URL), + QStringLiteral(APP_DESCRIPTION), QImage(statusIcons().scanninig.pixmap(128).toImage())); m_aboutDlg->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME)); m_aboutDlg->setWindowIcon(QIcon::fromTheme(QStringLiteral("syncthingtray"))); m_aboutDlg->setAttribute(Qt::WA_DeleteOnClose); diff --git a/tray/gui/traywidget.cpp b/tray/gui/traywidget.cpp index 4ab1188..35200df 100644 --- a/tray/gui/traywidget.cpp +++ b/tray/gui/traywidget.cpp @@ -203,8 +203,7 @@ void TrayWidget::showAboutDialog() "
Fallback icons from KDE/Breeze project
Syncthing icons from Syncthing project
Using " "icons from Font " "Awesome (see their license)

"), - QString(), ApplicationUtilities::dependencyVersions, QString(), QStringLiteral(APP_DESCRIPTION), - QImage(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg"))); + QString(), {}, QString(), QString(), QImage(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg"))); m_aboutDlg->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME)); m_aboutDlg->setWindowIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg"))); }