From 4b7bfc5f337b15e9d6061c7742193633415b0fa8 Mon Sep 17 00:00:00 2001 From: Nikolay Sinyov Date: Wed, 3 Jul 2024 22:34:48 +0300 Subject: [PATCH] renamed for aurora --- src/appsettings.cpp | 2 +- src/dbusadaptor.h | 2 +- src/dbusinterface.h | 4 ++-- src/harbour-fernschreiber.cpp | 10 +++++----- src/notificationmanager.cpp | 6 +++--- src/tdlibwrapper.cpp | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/appsettings.cpp b/src/appsettings.cpp index 6df3f38..e1a92ad 100644 --- a/src/appsettings.cpp +++ b/src/appsettings.cpp @@ -44,7 +44,7 @@ namespace { const QString KEY_HIGHLIGHT_UNREADCONVS("highlightUnreadConversations"); } -AppSettings::AppSettings(QObject *parent) : QObject(parent), settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/de.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat) +AppSettings::AppSettings(QObject *parent) : QObject(parent), settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/org.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat) { } diff --git a/src/dbusadaptor.h b/src/dbusadaptor.h index 750775f..fcd8961 100644 --- a/src/dbusadaptor.h +++ b/src/dbusadaptor.h @@ -26,7 +26,7 @@ class DBusAdaptor : public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "de.ygriega.fernschreiber") + Q_CLASSINFO("D-Bus Interface", "org.ygriega.fernschreiber") public: DBusAdaptor(QObject *parent); diff --git a/src/dbusinterface.h b/src/dbusinterface.h index 8c3add7..3f8d653 100644 --- a/src/dbusinterface.h +++ b/src/dbusinterface.h @@ -25,8 +25,8 @@ #include "dbusadaptor.h" -const QString INTERFACE_NAME = "de.ygriega.fernschreiber"; -const QString PATH_NAME = "/de/ygriega/fernschreiber"; +const QString INTERFACE_NAME = "org.ygriega.fernschreiber"; +const QString PATH_NAME = "/org/ygriega/fernschreiber"; class DBusInterface : public QObject { diff --git a/src/harbour-fernschreiber.cpp b/src/harbour-fernschreiber.cpp index a6dfd66..b19cce5 100644 --- a/src/harbour-fernschreiber.cpp +++ b/src/harbour-fernschreiber.cpp @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -73,7 +73,7 @@ void migrateSettings() { int sailfishOSMinorVersion = sailfishOSVersion.value(1).toInt(); if ((sailfishOSMajorVersion == 4 && sailfishOSMinorVersion >= 4) || sailfishOSMajorVersion > 4) { LOG("Checking if we need to migrate settings..."); - QSettings settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/de.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat); + QSettings settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/org.ygriega/Fernschreiber/settings.conf", QSettings::NativeFormat); if (settings.contains("migrated")) { return; } @@ -120,8 +120,8 @@ int main(int argc, char *argv[]) { QLoggingCategory::setFilterRules(DEFAULT_LOG_FILTER); - QScopedPointer app(SailfishApp::application(argc, argv)); - QScopedPointer view(SailfishApp::createView()); + QScopedPointer app(Aurora::Application::application(argc, argv)); + QScopedPointer view(Aurora::Application::createView()); QQmlContext *context = view.data()->rootContext(); @@ -182,7 +182,7 @@ int main(int argc, char *argv[]) contactsProxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive); context->setContextProperty("contactsProxyModel", &contactsProxyModel); - view->setSource(SailfishApp::pathTo("qml/harbour-fernschreiber.qml")); + view->setSource(Aurora::Application::pathTo("qml/harbour-fernschreiber.qml")); view->show(); return app->exec(); } diff --git a/src/notificationmanager.cpp b/src/notificationmanager.cpp index f4d6127..f3c88bd 100644 --- a/src/notificationmanager.cpp +++ b/src/notificationmanager.cpp @@ -20,7 +20,7 @@ #include "notificationmanager.h" #include "fernschreiberutils.h" #include "chatmodel.h" -#include +#include #include #include #include @@ -126,7 +126,7 @@ NotificationManager::NotificationGroup::~NotificationGroup() } NotificationManager::NotificationManager(TDLibWrapper *tdLibWrapper, AppSettings *appSettings, MceInterface *mceInterface, ChatModel *chatModel) : - appIconFile(SailfishApp::pathTo("images/fernschreiber-notification.png").toLocalFile()) + appIconFile(Aurora::Application::pathTo("images/fernschreiber-notification.png").toLocalFile()) { LOG("Initializing..."); this->tdLibWrapper = tdLibWrapper; @@ -335,7 +335,7 @@ void NotificationManager::publishNotification(const NotificationGroup *notificat remoteActionArguments.append(QString::number(notificationGroup->chatId)); remoteActionArguments.append(messageMap.value(ID).toString()); nemoNotification->setRemoteAction(Notification::remoteAction("default", "openMessage", - "de.ygriega.fernschreiber", "/de/ygriega/fernschreiber", "de.ygriega.fernschreiber", + "org.ygriega.fernschreiber", "/org/ygriega/fernschreiber", "org.ygriega.fernschreiber", "openMessage", remoteActionArguments)); } diff --git a/src/tdlibwrapper.cpp b/src/tdlibwrapper.cpp index 70dcf65..4d9d186 100644 --- a/src/tdlibwrapper.cpp +++ b/src/tdlibwrapper.cpp @@ -2336,9 +2336,9 @@ void TDLibWrapper::initializeOpenWith() } else { fileOut << QString("MimeType=x-url-handler/t.me;x-scheme-handler/tg;").toUtf8() << "\n"; } - fileOut << QString("X-Maemo-Service=de.ygriega.fernschreiber").toUtf8() << "\n"; - fileOut << QString("X-Maemo-Object-Path=/de/ygriega/fernschreiber").toUtf8() << "\n"; - fileOut << QString("X-Maemo-Method=de.ygriega.fernschreiber.openUrl").toUtf8() << "\n"; + fileOut << QString("X-Maemo-Service=org.ygriega.fernschreiber").toUtf8() << "\n"; + fileOut << QString("X-Maemo-Object-Path=/org/ygriega/fernschreiber").toUtf8() << "\n"; + fileOut << QString("X-Maemo-Method=org.ygriega.fernschreiber.openUrl").toUtf8() << "\n"; fileOut << QString("Hidden=true;").toUtf8() << "\n"; fileOut.flush(); desktopFile.close(); @@ -2351,7 +2351,7 @@ void TDLibWrapper::initializeOpenWith() LOG("Creating D-Bus directory" << dbusPathName); dbusPath.mkpath(dbusPathName); } - QString dbusServiceFileName = dbusPathName + "/de.ygriega.fernschreiber.service"; + QString dbusServiceFileName = dbusPathName + "/org.ygriega.fernschreiber.service"; QFile dbusServiceFile(dbusServiceFileName); if (dbusServiceFile.exists()) { LOG("D-BUS service file existing, removing to ensure proper re-creation..."); @@ -2362,8 +2362,8 @@ void TDLibWrapper::initializeOpenWith() QTextStream fileOut(&dbusServiceFile); fileOut.setCodec("UTF-8"); fileOut << QString("[D-BUS Service]").toUtf8() << "\n"; - fileOut << QString("Name=de.ygriega.fernschreiber").toUtf8() << "\n"; - fileOut << QString("Exec=sailjail -- /usr/bin/harbour-fernschreiber").toUtf8() << "\n"; + fileOut << QString("Name=org.ygriega.fernschreiber").toUtf8() << "\n"; + fileOut << QString("Exec=sailjail -- /usr/bin/org.ygriega.Fernschreiberr").toUtf8() << "\n"; fileOut.flush(); dbusServiceFile.close(); }