From d773959a5d76c42bce9760f70f646dd7c9923530 Mon Sep 17 00:00:00 2001 From: Piyush Aggarwal Date: Sun, 23 May 2021 10:42:29 +0530 Subject: [PATCH] remove hardcoded window icon path in favour of fromTheme call --- app/main.cpp | 3 +-- daemon/kdeconnectd.cpp | 3 +-- plugins/notifications/sendreplydialog.cpp | 3 +-- settings/main.cpp | 3 +-- smsapp/main.cpp | 3 +-- urlhandler/kdeconnect-handler.cpp | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index f1ed12e5e..29ab2b65c 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -19,8 +19,7 @@ int main(int argc, char* argv[]) { QApplication app(argc, argv); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); KAboutData aboutData(QStringLiteral("kdeconnect.app"), i18n("KDE Connect"), QStringLiteral("1.0"), i18n("KDE Connect"), KAboutLicense::GPL, i18n("(c) 2015, Aleix Pol Gonzalez")); aboutData.addAuthor(i18n("Aleix Pol Gonzalez"), i18n("Maintainer"), QStringLiteral("aleixpol@kde.org")); KAboutData::setApplicationData(aboutData); diff --git a/daemon/kdeconnectd.cpp b/daemon/kdeconnectd.cpp index 5effe65f0..de747f5b0 100644 --- a/daemon/kdeconnectd.cpp +++ b/daemon/kdeconnectd.cpp @@ -38,8 +38,7 @@ public: : Daemon(parent) , m_nam(nullptr) { - qApp->setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + qApp->setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); } void askPairingConfirmation(Device* device) override diff --git a/plugins/notifications/sendreplydialog.cpp b/plugins/notifications/sendreplydialog.cpp index 473a32ee9..f51bab961 100644 --- a/plugins/notifications/sendreplydialog.cpp +++ b/plugins/notifications/sendreplydialog.cpp @@ -29,8 +29,7 @@ SendReplyDialog::SendReplyDialog(const QString& originalMessage, const QString& connect(this, &QDialog::accepted, this, &SendReplyDialog::sendButtonClicked); setWindowTitle(topicName); - setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); setAttribute(Qt::WA_DeleteOnClose); m_ui->replyEdit->setFocus(); } diff --git a/settings/main.cpp b/settings/main.cpp index 46275e477..f8cbd4353 100644 --- a/settings/main.cpp +++ b/settings/main.cpp @@ -18,8 +18,7 @@ int main(int argc, char** argv) { QApplication app(argc, argv); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); KAboutData about(QStringLiteral("kdeconnect-settings"), i18n("KDE Connect Settings"), QStringLiteral(KDECONNECT_VERSION_STRING), diff --git a/smsapp/main.cpp b/smsapp/main.cpp index f8142213c..e04e849c8 100644 --- a/smsapp/main.cpp +++ b/smsapp/main.cpp @@ -27,8 +27,7 @@ int main(int argc, char *argv[]) { QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QApplication app(argc, argv); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); KAboutData aboutData(QStringLiteral("kdeconnect.sms"), i18n("KDE Connect SMS"), QStringLiteral(KDECONNECT_VERSION_STRING), diff --git a/urlhandler/kdeconnect-handler.cpp b/urlhandler/kdeconnect-handler.cpp index ef6515a80..dc234e493 100644 --- a/urlhandler/kdeconnect-handler.cpp +++ b/urlhandler/kdeconnect-handler.cpp @@ -31,8 +31,7 @@ int main(int argc, char** argv) { QApplication app(argc, argv); - app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"), - QIcon(QStandardPaths::locate(QStandardPaths::AppLocalDataLocation, QStringLiteral("icons/hicolor/scalable/apps/kdeconnect.svg"))))); + app.setWindowIcon(QIcon::fromTheme(QStringLiteral("kdeconnect"))); const QString description = i18n("KDE Connect URL handler"); KAboutData about(QStringLiteral("kdeconnect-urlhandler"), description,