diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2025-10-15 17:08:24 +0300 |
|---|---|---|
| committer | Pekka Vuorela <pvuorela@iki.fi> | 2025-10-15 21:04:55 +0300 |
| commit | 018eff9c33b7732eb53ce9f8dc4acb3de503677d (patch) | |
| tree | 748e5c4a72f75822dbf7d6f266f4cae2e1a2ba63 /src | |
| parent | 945aec721c243f8e3bc1e5e8be6088bc1a3e3720 (diff) | |
Remove QMail::messageServerPath() and messageSettingsPath()
Not used in the library itself and the implementations don't make too
much sense: the paths are using QCoreApplication::applicationDirPath()
referring the random client app binary path so there's no much idea
where the qmf content really is.
There is some use for the server path in an example project, perhaps
even proving how little it makes sense as it tries to launch a specific
hard-coded binary from the directory.
If something, the API should have a method for requesting launching the
messageserver.
Change-Id: I9b4b245e5c17f2e49fe3b9ed8b30cb175c5e8e45
Reviewed-by: <matti.viljanen@kapsi.fi>
Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Reviewed-by: Damien Caliste <dcaliste@free.fr>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libraries/qmfclient/support/qmailnamespace.cpp | 30 | ||||
| -rw-r--r-- | src/libraries/qmfclient/support/qmailnamespace.h | 2 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/libraries/qmfclient/support/qmailnamespace.cpp b/src/libraries/qmfclient/support/qmailnamespace.cpp index 5e6e8430..948e9b12 100644 --- a/src/libraries/qmfclient/support/qmailnamespace.cpp +++ b/src/libraries/qmfclient/support/qmailnamespace.cpp @@ -57,9 +57,7 @@ #include <fcntl.h> #endif -static const char* QMF_DATA_ENV="QMF_DATA"; -static const char* QMF_SERVER_ENV="QMF_SERVER"; -static const char* QMF_SETTINGS_ENV="QMF_SETTINGS"; +static const char* QMF_DATA_ENV = "QMF_DATA"; struct StandardFolderInfo { @@ -132,7 +130,6 @@ QDateTime QMail::lastDbUpdated() return info.lastModified(); } - /*! Returns the path to where the Messaging framework will store its temporary files. */ @@ -154,29 +151,6 @@ QString QMail::tempPath() } /*! - Returns the path to where the Messaging framework will invoke the messageserver process. -*/ -QString QMail::messageServerPath() -{ - static QString serverEnv(QString::fromUtf8(qgetenv(QMF_SERVER_ENV))); - if (!serverEnv.isEmpty()) - return serverEnv + QChar::fromLatin1('/'); - - return QCoreApplication::applicationDirPath() + QChar::fromLatin1('/'); -} - -/*! - Returns the path to where the Messaging framework will search for settings information. -*/ -QString QMail::messageSettingsPath() -{ - static QString settingsEnv(QString::fromUtf8(qgetenv(QMF_SETTINGS_ENV))); - if (!settingsEnv.isEmpty()) - return settingsEnv + QChar::fromLatin1('/'); - return QCoreApplication::applicationDirPath() + QChar::fromLatin1('/'); -} - -/*! Returns the database where the Messaging framework will store its message metadata. If the database does not exist, it is created. */ @@ -216,7 +190,7 @@ void QMail::closeDatabase() qCDebug(lcMailStore) << "closing database"; instance->init = false; QSqlDatabase::removeDatabase(instance->dbConnectionName()); - } // else nothing todo + } } QSqlDatabase QMail::createDatabase() diff --git a/src/libraries/qmfclient/support/qmailnamespace.h b/src/libraries/qmfclient/support/qmailnamespace.h index 978145fe..c7a4bd7e 100644 --- a/src/libraries/qmfclient/support/qmailnamespace.h +++ b/src/libraries/qmfclient/support/qmailnamespace.h @@ -51,8 +51,6 @@ namespace QMail QMF_EXPORT QString dataPath(); QMF_EXPORT QDateTime lastDbUpdated(); QMF_EXPORT QString tempPath(); - QMF_EXPORT QString messageServerPath(); - QMF_EXPORT QString messageSettingsPath(); void closeDatabase(); QMF_EXPORT QSqlDatabase createDatabase(); |