From 64473df5bab6c6f7e7fb8cc5d8a5d12b61e5f8d0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 10 Jun 2019 22:48:26 +0200 Subject: [PATCH] Adapt to changes in c++utilities --- cli/application.cpp | 16 ++--- cli/args.h | 2 +- cli/helper.h | 26 ++++--- cli/tests/application.cpp | 6 +- connector/syncthingconnection.cpp | 3 +- connector/syncthingconnection.h | 68 +++++++++---------- connector/syncthingconnection_requests.cpp | 5 +- connector/syncthingconnectionmockhelpers.cpp | 6 +- connector/syncthingdev.h | 2 +- connector/syncthingdir.cpp | 5 +- connector/syncthingdir.h | 26 +++---- connector/syncthingnotifier.cpp | 4 +- connector/syncthingnotifier.h | 9 ++- connector/syncthingprocess.cpp | 2 +- connector/syncthingprocess.h | 10 +-- connector/syncthingservice.cpp | 2 +- connector/syncthingservice.h | 22 +++--- connector/tests/connectiontests.cpp | 13 ++-- connector/tests/misctests.cpp | 5 +- connector/utils.cpp | 3 +- connector/utils.h | 6 +- .../syncthingfileitemactionstaticdata.cpp | 8 +-- fileitemactionplugin/syncthingmenuaction.cpp | 1 + libsyncthing/CMakeLists.txt | 3 + libsyncthing/tests/interfacetests.cpp | 32 ++++++--- model/syncthingdevicemodel.cpp | 3 +- model/syncthingdirectorymodel.cpp | 3 +- model/syncthingdownloadmodel.cpp | 2 +- model/syncthingstatusselectionmodel.cpp | 2 +- model/syncthingstatusselectionmodel.h | 4 +- plasmoid/lib/settingsdialog.cpp | 15 ++-- plasmoid/lib/syncthingapplet.cpp | 19 +++--- plasmoid/lib/syncthingapplet.h | 12 ++-- testhelper/helper.cpp | 4 +- testhelper/helper.h | 8 +-- testhelper/syncthingtestinstance.cpp | 5 +- testhelper/syncthingtestinstance.h | 4 +- testhelper/tests/manualtesting.cpp | 2 +- tray/application/main.cpp | 6 +- tray/application/singleinstance.cpp | 4 +- tray/gui/trayicon.cpp | 7 +- tray/gui/trayicon.h | 2 +- tray/gui/traymenu.cpp | 4 +- tray/gui/traywidget.cpp | 12 ++-- tray/gui/traywidget.h | 8 +-- widgets/misc/dbusstatusnotifier.cpp | 2 +- widgets/misc/dbusstatusnotifier.h | 16 ++--- widgets/misc/direrrorsdialog.cpp | 2 +- widgets/misc/internalerror.h | 4 +- widgets/misc/internalerrorsdialog.cpp | 2 +- widgets/misc/syncthingkiller.cpp | 2 +- widgets/misc/syncthinglauncher.cpp | 2 +- widgets/misc/syncthinglauncher.h | 12 ++-- widgets/misc/textviewdialog.cpp | 2 +- widgets/settings/connectionoptionpage.ui | 14 ++-- widgets/settings/launcheroptionpage.ui | 12 ++-- widgets/settings/settings.cpp | 4 +- widgets/settings/settings.h | 4 +- widgets/settings/settingsdialog.cpp | 38 +++++------ widgets/settings/settingsdialog.h | 18 ++--- widgets/settings/systemdoptionpage.ui | 4 +- widgets/webview/webviewdialog.cpp | 2 +- 62 files changed, 266 insertions(+), 285 deletions(-) diff --git a/cli/application.cpp b/cli/application.cpp index 3c093f5..740e3d1 100644 --- a/cli/application.cpp +++ b/cli/application.cpp @@ -13,11 +13,11 @@ #include "resources/config.h" -#include #include #include #include #include +#include #include @@ -35,10 +35,9 @@ using namespace std; using namespace std::placeholders; -using namespace ApplicationUtilities; -using namespace EscapeCodes; -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; +using namespace CppUtilities::EscapeCodes; +using namespace QtUtilities; using namespace Data; namespace Cli { @@ -118,7 +117,7 @@ int Application::exec(int argc, const char *const *argv) m_args.parser.checkConstraints(); m_argsRead = true; - } catch (const Failure &failure) { + } catch (const ParseError &failure) { cerr << failure; return 1; } @@ -237,7 +236,6 @@ int Application::loadConfig() bool Application::waitForConnected(int timeout) { - using namespace TestUtilities; bool isConnected = m_connection.isConnected(); const function checkStatus([this, &isConnected](SyncthingStatus) { isConnected = m_connection.isConnected(); }); return waitForSignalsOrFail(bind(static_cast(&SyncthingConnection::reconnect), @@ -248,7 +246,6 @@ bool Application::waitForConnected(int timeout) bool Application::waitForConfig(int timeout) { - using namespace TestUtilities; m_connection.applySettings(m_settings); return waitForSignalsOrFail(bind(&SyncthingConnection::requestConfig, ref(m_connection)), timeout, signalInfo(&m_connection, &SyncthingConnection::error), signalInfo(&m_connection, &SyncthingConnection::newConfig), @@ -257,7 +254,6 @@ bool Application::waitForConfig(int timeout) bool Application::waitForConfigAndStatus(int timeout) { - using namespace TestUtilities; m_connection.applySettings(m_settings); return waitForSignalsOrFail(bind(&SyncthingConnection::requestConfigAndStatus, ref(m_connection)), timeout, signalInfo(&m_connection, &SyncthingConnection::error), signalInfo(&m_connection, &SyncthingConnection::newConfig), @@ -692,7 +688,6 @@ void Application::editConfig(const ArgumentOccurrence &) } // post new config - using namespace TestUtilities; cerr << Phrases::Info << "Posting new configuration ..." << TextAttribute::Reset << flush; if (!waitForSignalsOrFail(bind(&SyncthingConnection::postConfigFromByteArray, ref(m_connection), ref(newConfig)), 0, signalInfo(&m_connection, &SyncthingConnection::error), signalInfo(&m_connection, &SyncthingConnection::newConfigTriggered))) { @@ -958,7 +953,6 @@ void Application::waitForIdle(const ArgumentOccurrence &) // invoke handler manually because Syncthing could already be idling handleNewDirsOrDevs(); - using namespace TestUtilities; waitForSignals(&noop, m_idleTimeout, signalInfo(&m_connection, &SyncthingConnection::dirStatusChanged, handleStatusChange, &isLongEnoughIdle), signalInfo(&m_connection, &SyncthingConnection::devStatusChanged, handleStatusChange, &isLongEnoughIdle), signalInfo(&m_connection, &SyncthingConnection::newDirs, handleNewDirsOrDevs, &isLongEnoughIdle), diff --git a/cli/args.h b/cli/args.h index 2bf994e..1793b2a 100644 --- a/cli/args.h +++ b/cli/args.h @@ -5,7 +5,7 @@ namespace Cli { -using namespace ApplicationUtilities; +using namespace CppUtilities; struct Args { Args(); diff --git a/cli/helper.h b/cli/helper.h index 21c00e1..06ea53f 100644 --- a/cli/helper.h +++ b/cli/helper.h @@ -15,10 +15,10 @@ namespace Cli { -inline void printProperty(const char *propName, const char *value, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) +inline void printProperty(const char *propName, const char *value, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { if (*value) { - std::cout << indentation << propName << ApplicationUtilities::Indentation(30 - strlen(propName)) << value; + std::cout << indentation << propName << CppUtilities::Indentation(30 - strlen(propName)) << value; if (suffix) { std::cout << ' ' << suffix; } @@ -26,19 +26,17 @@ inline void printProperty(const char *propName, const char *value, const char *s } } -inline void printProperty(const char *propName, const QString &value, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) +inline void printProperty(const char *propName, const QString &value, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { printProperty(propName, value.toLocal8Bit().data(), suffix, indentation); } -inline void printProperty( - const char *propName, const std::string &value, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) +inline void printProperty(const char *propName, const std::string &value, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { printProperty(propName, value.data(), suffix, indentation); } -inline void printProperty( - const char *propName, const QStringList &value, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) +inline void printProperty(const char *propName, const QStringList &value, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { for (const QString &str : value) { printProperty(propName, str, suffix, indentation); @@ -47,32 +45,32 @@ inline void printProperty( } inline void printProperty( - const char *propName, ChronoUtilities::TimeSpan timeSpan, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) + const char *propName, CppUtilities::TimeSpan timeSpan, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { if (!timeSpan.isNull()) { - printProperty(propName, timeSpan.toString(ChronoUtilities::TimeSpanOutputFormat::WithMeasures).data(), suffix, indentation); + printProperty(propName, timeSpan.toString(CppUtilities::TimeSpanOutputFormat::WithMeasures).data(), suffix, indentation); } } inline void printProperty( - const char *propName, ChronoUtilities::DateTime dateTime, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) + const char *propName, CppUtilities::DateTime dateTime, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { if (!dateTime.isNull()) { printProperty(propName, dateTime.toString().data(), suffix, indentation); } } -inline void printProperty(const char *propName, bool value, const char *suffix = nullptr, ApplicationUtilities::Indentation indentation = 3) +inline void printProperty(const char *propName, bool value, const char *suffix = nullptr, CppUtilities::Indentation indentation = 3) { printProperty(propName, value ? "yes" : "no", suffix, indentation); } -template , std::is_integral> * = nullptr> +template , std::is_integral> * = nullptr> inline void printProperty( - const char *propName, const NumberType value, const char *suffix = nullptr, bool force = false, ApplicationUtilities::Indentation indentation = 3) + const char *propName, const NumberType value, const char *suffix = nullptr, bool force = false, CppUtilities::Indentation indentation = 3) { if (value >= 0 || force) { - printProperty(propName, ConversionUtilities::numberToString(value).data(), suffix, indentation); + printProperty(propName, CppUtilities::numberToString(value).data(), suffix, indentation); } } } // namespace Cli diff --git a/cli/tests/application.cpp b/cli/tests/application.cpp index e073980..1be59da 100644 --- a/cli/tests/application.cpp +++ b/cli/tests/application.cpp @@ -16,10 +16,8 @@ using namespace std; using namespace Data; -using namespace ChronoUtilities; -using namespace IoUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace CPPUNIT_NS; diff --git a/connector/syncthingconnection.cpp b/connector/syncthingconnection.cpp index e6efedf..39715ca 100644 --- a/connector/syncthingconnection.cpp +++ b/connector/syncthingconnection.cpp @@ -23,8 +23,7 @@ #include using namespace std; -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; namespace Data { diff --git a/connector/syncthingconnection.h b/connector/syncthingconnection.h index ad4b69f..d654f51 100644 --- a/connector/syncthingconnection.h +++ b/connector/syncthingconnection.h @@ -84,7 +84,7 @@ class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingConnection : public QObject { Q_PROPERTY(double totalOutgoingRate READ totalOutgoingRate NOTIFY trafficChanged) Q_PROPERTY(QString lastSyncedFile READ lastSyncedFile) Q_PROPERTY(QString syncthingVersion READ syncthingVersion) - Q_PROPERTY(ChronoUtilities::DateTime lastSyncTime READ lastSyncTime) + Q_PROPERTY(CppUtilities::DateTime lastSyncTime READ lastSyncTime) Q_PROPERTY(QList expectedSslErrors READ expectedSslErrors) Q_PROPERTY(std::vector connectedDevices READ connectedDevices) Q_PROPERTY(QStringList directoryIds READ directoryIds) @@ -142,9 +142,9 @@ public: const std::vector &devInfo() const; SyncthingOverallDirStatistics computeOverallDirStatistics() const; const QString &lastSyncedFile() const; - ChronoUtilities::DateTime lastSyncTime() const; - ChronoUtilities::DateTime startTime() const; - ChronoUtilities::TimeSpan uptime() const; + CppUtilities::DateTime lastSyncTime() const; + CppUtilities::DateTime startTime() const; + CppUtilities::TimeSpan uptime() const; const QString &syncthingVersion() const; QStringList directoryIds() const; QStringList deviceIds() const; @@ -220,11 +220,10 @@ Q_SIGNALS: void devStatusChanged(const SyncthingDev &dev, int index); void downloadProgressChanged(); void dirStatisticsChanged(); - void dirCompleted(ChronoUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev = nullptr); - void newNotification(ChronoUtilities::DateTime when, const QString &message); - void newDevAvailable(ChronoUtilities::DateTime when, const QString &devId, const QString &address); - void newDirAvailable( - ChronoUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel); + void dirCompleted(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev = nullptr); + void newNotification(CppUtilities::DateTime when, const QString &message); + void newDevAvailable(CppUtilities::DateTime when, const QString &devId, const QString &address); + void newDirAvailable(CppUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel); void error(const QString &errorMessage, SyncthingErrorCategory category, int networkError, const QNetworkRequest &request = QNetworkRequest(), const QByteArray &response = QByteArray()); void statusChanged(SyncthingStatus newStatus); @@ -258,20 +257,19 @@ private Q_SLOTS: void readEvents(); void readEventsFromJsonArray(const QJsonArray &events, int &idVariable); void readStartingEvent(const QJsonObject &eventData); - void readStatusChangedEvent(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData); - void readDownloadProgressEvent(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData); - void readDirEvent(ChronoUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); - void readDeviceEvent(ChronoUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); - void readItemStarted(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData); - void readItemFinished(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData); - void readFolderErrors(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); - void readFolderCompletion(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); - void readFolderCompletion( - ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId); - void readLocalFolderCompletion(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); + void readStatusChangedEvent(CppUtilities::DateTime eventTime, const QJsonObject &eventData); + void readDownloadProgressEvent(CppUtilities::DateTime eventTime, const QJsonObject &eventData); + void readDirEvent(CppUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); + void readDeviceEvent(CppUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); + void readItemStarted(CppUtilities::DateTime eventTime, const QJsonObject &eventData); + void readItemFinished(CppUtilities::DateTime eventTime, const QJsonObject &eventData); + void readFolderErrors(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); + void readFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); + void readFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId); + void readLocalFolderCompletion(CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index); void readRemoteFolderCompletion( - ChronoUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId); - void readRemoteIndexUpdated(ChronoUtilities::DateTime eventTime, const QJsonObject &eventData); + CppUtilities::DateTime eventTime, const QJsonObject &eventData, SyncthingDir &dirInfo, int index, const QString &devId); + void readRemoteIndexUpdated(CppUtilities::DateTime eventTime, const QJsonObject &eventData); void readPostConfig(); void readRescan(); void readDevPauseResume(); @@ -280,13 +278,13 @@ private Q_SLOTS: void readShutdown(); void readDirStatus(); void readDirPullErrors(); - void readDirSummary(ChronoUtilities::DateTime eventTime, const QJsonObject &summary, SyncthingDir &dirInfo, int index); - void readDirRejected(ChronoUtilities::DateTime eventTime, const QString &dirId, const QJsonObject &eventData); - void readDevRejected(ChronoUtilities::DateTime eventTime, const QString &devId, const QJsonObject &eventData); + void readDirSummary(CppUtilities::DateTime eventTime, const QJsonObject &summary, SyncthingDir &dirInfo, int index); + void readDirRejected(CppUtilities::DateTime eventTime, const QString &dirId, const QJsonObject &eventData); + void readDevRejected(CppUtilities::DateTime eventTime, const QString &devId, const QJsonObject &eventData); void readCompletion(); void readVersion(); void readDiskEvents(); - void readChangeEvent(ChronoUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); + void readChangeEvent(CppUtilities::DateTime eventTime, const QString &eventType, const QJsonObject &eventData); void readLog(); void readQrCode(); @@ -295,7 +293,7 @@ private Q_SLOTS: void continueReconnecting(); void autoReconnect(); void setStatus(SyncthingStatus status); - void emitNotification(ChronoUtilities::DateTime when, const QString &message); + void emitNotification(CppUtilities::DateTime when, const QString &message); void emitError(const QString &message, const QJsonParseError &jsonError, QNetworkReply *reply, const QByteArray &response = QByteArray()); void emitError(const QString &message, SyncthingErrorCategory category, QNetworkReply *reply); void emitMyIdChanged(const QString &newId); @@ -357,10 +355,10 @@ private: bool m_hasDiskEvents; std::vector m_dirs; std::vector m_devs; - ChronoUtilities::DateTime m_lastConnectionsUpdate; - ChronoUtilities::DateTime m_lastFileTime; - ChronoUtilities::DateTime m_lastErrorTime; - ChronoUtilities::DateTime m_startTime; + CppUtilities::DateTime m_lastConnectionsUpdate; + CppUtilities::DateTime m_lastFileTime; + CppUtilities::DateTime m_lastErrorTime; + CppUtilities::DateTime m_startTime; QString m_lastFileName; QString m_syncthingVersion; bool m_lastFileDeleted; @@ -684,7 +682,7 @@ inline const QString &SyncthingConnection::lastSyncedFile() const /*! * \brief Returns the time of the most recent sync. */ -inline ChronoUtilities::DateTime SyncthingConnection::lastSyncTime() const +inline CppUtilities::DateTime SyncthingConnection::lastSyncTime() const { return m_lastFileTime; } @@ -692,7 +690,7 @@ inline ChronoUtilities::DateTime SyncthingConnection::lastSyncTime() const /*! * \brief Returns when Syncthing has been started. */ -inline ChronoUtilities::DateTime SyncthingConnection::startTime() const +inline CppUtilities::DateTime SyncthingConnection::startTime() const { return m_startTime; } @@ -700,9 +698,9 @@ inline ChronoUtilities::DateTime SyncthingConnection::startTime() const /*! * \brief Returns how long Syncthing has been running. */ -inline ChronoUtilities::TimeSpan SyncthingConnection::uptime() const +inline CppUtilities::TimeSpan SyncthingConnection::uptime() const { - return ChronoUtilities::DateTime::gmtNow() - m_startTime; + return CppUtilities::DateTime::gmtNow() - m_startTime; } /*! diff --git a/connector/syncthingconnection_requests.cpp b/connector/syncthingconnection_requests.cpp index 4ef5073..5377fce 100644 --- a/connector/syncthingconnection_requests.cpp +++ b/connector/syncthingconnection_requests.cpp @@ -25,10 +25,9 @@ #include using namespace std; -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; #if defined(LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS) || defined(LIB_SYNCTHING_CONNECTOR_LOG_API_CALLS) -using namespace EscapeCodes; +using namespace CppUtilities::EscapeCodes; #endif namespace Data { diff --git a/connector/syncthingconnectionmockhelpers.cpp b/connector/syncthingconnectionmockhelpers.cpp index 17bb527..2edb4db 100644 --- a/connector/syncthingconnectionmockhelpers.cpp +++ b/connector/syncthingconnectionmockhelpers.cpp @@ -14,10 +14,8 @@ #include using namespace std; -using namespace IoUtilities; -using namespace EscapeCodes; -using namespace ConversionUtilities; -using namespace TestUtilities; +using namespace CppUtilities; +using namespace CppUtilities::EscapeCodes; namespace Data { diff --git a/connector/syncthingdev.h b/connector/syncthingdev.h index 692c401..95ed928 100644 --- a/connector/syncthingdev.h +++ b/connector/syncthingdev.h @@ -36,7 +36,7 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDev { QString connectionAddress; QString connectionType; QString clientVersion; - ChronoUtilities::DateTime lastSeen; + CppUtilities::DateTime lastSeen; }; inline SyncthingDev::SyncthingDev(const QString &id, const QString &name) diff --git a/connector/syncthingdir.cpp b/connector/syncthingdir.cpp index 9f364ef..6b1bd68 100644 --- a/connector/syncthingdir.cpp +++ b/connector/syncthingdir.cpp @@ -6,8 +6,7 @@ #include #include -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; namespace Data { @@ -89,7 +88,7 @@ bool SyncthingDir::finalizeStatusUpdate(SyncthingDirStatus newStatus, DateTime t * \brief Assigns the status from the specified status string. * \returns Returns whether the status has actually changed. */ -bool SyncthingDir::assignStatus(const QString &statusStr, ChronoUtilities::DateTime time) +bool SyncthingDir::assignStatus(const QString &statusStr, CppUtilities::DateTime time) { if (!checkWhetherStatusUpdateRelevant(time)) { return false; diff --git a/connector/syncthingdir.h b/connector/syncthingdir.h index c2f8267..5e25edf 100644 --- a/connector/syncthingdir.h +++ b/connector/syncthingdir.h @@ -41,7 +41,7 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingFileChange { QString type; QString modifiedBy; QString path; - ChronoUtilities::DateTime eventTime; + CppUtilities::DateTime eventTime; bool local = false; }; @@ -60,12 +60,12 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingItemDownloadProgress { int bytesAlreadyHandled; int totalNumberOfBytes = 0; QString label; - ChronoUtilities::DateTime lastUpdate; + CppUtilities::DateTime lastUpdate; static constexpr unsigned int syncthingBlockSize = 128 * 1024; }; struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingCompletion { - ChronoUtilities::DateTime lastUpdate; + CppUtilities::DateTime lastUpdate; double percentage = 0; quint64 globalBytes = 0; struct Needed { @@ -131,8 +131,8 @@ constexpr bool SyncthingStatistics::operator!=(const SyncthingStatistics &other) struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir { SyncthingDir(const QString &id = QString(), const QString &label = QString(), const QString &path = QString()); - bool assignStatus(const QString &statusStr, ChronoUtilities::DateTime time); - bool assignStatus(SyncthingDirStatus newStatus, ChronoUtilities::DateTime time); + bool assignStatus(const QString &statusStr, CppUtilities::DateTime time); + bool assignStatus(SyncthingDirStatus newStatus, CppUtilities::DateTime time); bool assignDirType(const QString &dirType); const QString &displayName() const; QString statusString() const; @@ -151,8 +151,8 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir { int rescanInterval = 0; int minDiskFreePercentage = 0; SyncthingDirStatus status = SyncthingDirStatus::Unknown; - ChronoUtilities::DateTime lastStatusUpdate; - ChronoUtilities::DateTime lastSyncStarted; + CppUtilities::DateTime lastStatusUpdate; + CppUtilities::DateTime lastSyncStarted; int completionPercentage = 0; int scanningPercentage = 0; double scanningRate = 0; @@ -163,9 +163,9 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir { std::vector itemErrors; std::vector recentChanges; SyncthingStatistics globalStats, localStats, neededStats; - ChronoUtilities::DateTime lastStatisticsUpdate; - ChronoUtilities::DateTime lastScanTime; - ChronoUtilities::DateTime lastFileTime; + CppUtilities::DateTime lastStatisticsUpdate; + CppUtilities::DateTime lastScanTime; + CppUtilities::DateTime lastFileTime; QString lastFileName; std::vector downloadingItems; int blocksAlreadyDownloaded = 0; @@ -181,8 +181,8 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingDir { bool paused = false; private: - bool checkWhetherStatusUpdateRelevant(ChronoUtilities::DateTime time); - bool finalizeStatusUpdate(SyncthingDirStatus newStatus, ChronoUtilities::DateTime time); + bool checkWhetherStatusUpdateRelevant(CppUtilities::DateTime time); + bool finalizeStatusUpdate(SyncthingDirStatus newStatus, CppUtilities::DateTime time); }; inline SyncthingDir::SyncthingDir(const QString &id, const QString &label, const QString &path) @@ -212,7 +212,7 @@ inline bool SyncthingDir::isUnshared() const return deviceIds.empty() && (status == SyncthingDirStatus::Idle || status == SyncthingDirStatus::Unknown); } -inline bool SyncthingDir::assignStatus(SyncthingDirStatus newStatus, ChronoUtilities::DateTime time) +inline bool SyncthingDir::assignStatus(SyncthingDirStatus newStatus, CppUtilities::DateTime time) { return checkWhetherStatusUpdateRelevant(time) && finalizeStatusUpdate(newStatus, time); } diff --git a/connector/syncthingnotifier.cpp b/connector/syncthingnotifier.cpp index 3eae9a6..9b00b82 100644 --- a/connector/syncthingnotifier.cpp +++ b/connector/syncthingnotifier.cpp @@ -9,7 +9,7 @@ #include -using namespace ChronoUtilities; +using namespace CppUtilities; namespace Data { @@ -171,7 +171,7 @@ void SyncthingNotifier::emitConnectedAndDisconnected(SyncthingStatus newStatus) /*! * \brief Emits the syncComplete() signal. */ -void SyncthingNotifier::emitSyncComplete(ChronoUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev) +void SyncthingNotifier::emitSyncComplete(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev) { VAR_UNUSED(when) VAR_UNUSED(index) diff --git a/connector/syncthingnotifier.h b/connector/syncthingnotifier.h index 3f3aad6..2162c53 100644 --- a/connector/syncthingnotifier.h +++ b/connector/syncthingnotifier.h @@ -5,7 +5,7 @@ #include -namespace ChronoUtilities { +namespace CppUtilities { class DateTime; } @@ -93,14 +93,13 @@ Q_SIGNALS: private Q_SLOTS: void handleStatusChangedEvent(SyncthingStatus newStatus); - void handleNewDevEvent(ChronoUtilities::DateTime when, const QString &devId, const QString &address); - void handleNewDirEvent( - ChronoUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel); + void handleNewDevEvent(CppUtilities::DateTime when, const QString &devId, const QString &address); + void handleNewDirEvent(CppUtilities::DateTime when, const QString &devId, const SyncthingDev *dev, const QString &dirId, const QString &dirLabel); private: bool isDisconnectRelevant() const; void emitConnectedAndDisconnected(SyncthingStatus newStatus); - void emitSyncComplete(ChronoUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev); + void emitSyncComplete(CppUtilities::DateTime when, const SyncthingDir &dir, int index, const SyncthingDev *remoteDev); const SyncthingConnection &m_connection; #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD diff --git a/connector/syncthingprocess.cpp b/connector/syncthingprocess.cpp index 2262cba..928d431 100644 --- a/connector/syncthingprocess.cpp +++ b/connector/syncthingprocess.cpp @@ -2,7 +2,7 @@ #include -using namespace ChronoUtilities; +using namespace CppUtilities; namespace Data { diff --git a/connector/syncthingprocess.h b/connector/syncthingprocess.h index 659a554..574963d 100644 --- a/connector/syncthingprocess.h +++ b/connector/syncthingprocess.h @@ -13,13 +13,13 @@ namespace Data { class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingProcess : public QProcess { Q_OBJECT Q_PROPERTY(bool running READ isRunning) - Q_PROPERTY(ChronoUtilities::DateTime activeSince READ activeSince) + Q_PROPERTY(CppUtilities::DateTime activeSince READ activeSince) Q_PROPERTY(bool manuallyStopped READ isManuallyStopped) public: explicit SyncthingProcess(QObject *parent = nullptr); bool isRunning() const; - ChronoUtilities::DateTime activeSince() const; + CppUtilities::DateTime activeSince() const; bool isActiveFor(unsigned int atLeastSeconds) const; bool isManuallyStopped() const; static SyncthingProcess *mainInstance(); @@ -43,7 +43,7 @@ private Q_SLOTS: private: QString m_program; QStringList m_arguments; - ChronoUtilities::DateTime m_activeSince; + CppUtilities::DateTime m_activeSince; QTimer m_killTimer; bool m_manuallyStopped; static SyncthingProcess *s_mainInstance; @@ -54,14 +54,14 @@ inline bool SyncthingProcess::isRunning() const return state() != QProcess::NotRunning; } -inline ChronoUtilities::DateTime SyncthingProcess::activeSince() const +inline CppUtilities::DateTime SyncthingProcess::activeSince() const { return m_activeSince; } inline bool SyncthingProcess::isActiveFor(unsigned int atLeastSeconds) const { - return !m_activeSince.isNull() && (ChronoUtilities::DateTime::gmtNow() - m_activeSince).totalSeconds() > atLeastSeconds; + return !m_activeSince.isNull() && (CppUtilities::DateTime::gmtNow() - m_activeSince).totalSeconds() > atLeastSeconds; } inline bool SyncthingProcess::isManuallyStopped() const diff --git a/connector/syncthingservice.cpp b/connector/syncthingservice.cpp index 850b29c..79d8db2 100644 --- a/connector/syncthingservice.cpp +++ b/connector/syncthingservice.cpp @@ -20,7 +20,7 @@ using namespace std; using namespace std::placeholders; -using namespace ChronoUtilities; +using namespace CppUtilities; namespace Data { diff --git a/connector/syncthingservice.h b/connector/syncthingservice.h index b5a3915..bde9275 100644 --- a/connector/syncthingservice.h +++ b/connector/syncthingservice.h @@ -38,7 +38,7 @@ class SyncthingService : public QObject { Q_PROPERTY(bool unitAvailable READ isUnitAvailable NOTIFY unitAvailableChanged) Q_PROPERTY(QString activeState READ activeState NOTIFY activeStateChanged) Q_PROPERTY(QString subState READ subState NOTIFY subStateChanged) - Q_PROPERTY(ChronoUtilities::DateTime activeSince READ activeSince NOTIFY activeStateChanged) + Q_PROPERTY(CppUtilities::DateTime activeSince READ activeSince NOTIFY activeStateChanged) Q_PROPERTY(QString unitFileState READ unitFileState NOTIFY unitFileStateChanged) Q_PROPERTY(QString description READ description NOTIFY descriptionChanged) Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) @@ -53,11 +53,11 @@ public: bool isUnitAvailable() const; const QString &activeState() const; const QString &subState() const; - ChronoUtilities::DateTime activeSince() const; + CppUtilities::DateTime activeSince() const; bool isActiveFor(unsigned int atLeastSeconds) const; bool isActiveWithoutSleepFor(unsigned int atLeastSeconds) const; - static bool isActiveWithoutSleepFor(ChronoUtilities::DateTime activeSince, unsigned int atLeastSeconds); - static ChronoUtilities::DateTime lastWakeUp(); + static bool isActiveWithoutSleepFor(CppUtilities::DateTime activeSince, unsigned int atLeastSeconds); + static CppUtilities::DateTime lastWakeUp(); const QString &unitFileState() const; const QString &description() const; bool isRunning() const; @@ -80,7 +80,7 @@ Q_SIGNALS: void unitNameChanged(const QString &unitName); void systemdAvailableChanged(bool available); void unitAvailableChanged(bool available); - void stateChanged(const QString &activeState, const QString &subState, ChronoUtilities::DateTime activeSince); + void stateChanged(const QString &activeState, const QString &subState, CppUtilities::DateTime activeSince); void activeStateChanged(const QString &activeState); void subStateChanged(const QString &subState); void unitFileStateChanged(const QString &unitFileState); @@ -104,14 +104,14 @@ private Q_SLOTS: private: bool handlePropertyChanged(QString &variable, void (SyncthingService::*signal)(const QString &), const QString &propertyName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties); - bool handlePropertyChanged(ChronoUtilities::DateTime &variable, const QString &propertyName, const QVariantMap &changedProperties, + bool handlePropertyChanged(CppUtilities::DateTime &variable, const QString &propertyName, const QVariantMap &changedProperties, const QStringList &invalidatedProperties); void registerErrorHandler(const QDBusPendingCall &call, const char *context); static OrgFreedesktopSystemd1ManagerInterface *s_manager; static OrgFreedesktopLogin1ManagerInterface *s_loginManager; static bool s_fallingAsleep; - static ChronoUtilities::DateTime s_lastWakeUp; + static CppUtilities::DateTime s_lastWakeUp; static SyncthingService *s_mainInstance; QString m_unitName; QDBusServiceWatcher *m_serviceWatcher; @@ -122,7 +122,7 @@ private: QString m_activeState; QString m_subState; QString m_unitFileState; - ChronoUtilities::DateTime m_activeSince; + CppUtilities::DateTime m_activeSince; bool m_manuallyStopped; bool m_unitAvailable; }; @@ -182,14 +182,14 @@ inline bool SyncthingService::isManuallyStopped() const return m_manuallyStopped; } -inline ChronoUtilities::DateTime SyncthingService::activeSince() const +inline CppUtilities::DateTime SyncthingService::activeSince() const { return m_activeSince; } inline bool SyncthingService::isActiveFor(unsigned int atLeastSeconds) const { - return !m_activeSince.isNull() && (ChronoUtilities::DateTime::gmtNow() - m_activeSince).totalSeconds() > atLeastSeconds; + return !m_activeSince.isNull() && (CppUtilities::DateTime::gmtNow() - m_activeSince).totalSeconds() > atLeastSeconds; } inline bool SyncthingService::isActiveWithoutSleepFor(unsigned int atLeastSeconds) const @@ -197,7 +197,7 @@ inline bool SyncthingService::isActiveWithoutSleepFor(unsigned int atLeastSecond return isActiveWithoutSleepFor(m_activeSince, atLeastSeconds); } -inline ChronoUtilities::DateTime SyncthingService::lastWakeUp() +inline CppUtilities::DateTime SyncthingService::lastWakeUp() { return s_lastWakeUp; } diff --git a/connector/tests/connectiontests.cpp b/connector/tests/connectiontests.cpp index 555ed5f..4df87ac 100644 --- a/connector/tests/connectiontests.cpp +++ b/connector/tests/connectiontests.cpp @@ -15,9 +15,8 @@ using namespace std; using namespace Data; -using namespace ChronoUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace CPPUNIT_NS; @@ -415,10 +414,10 @@ void ConnectionTests::testInitialConnection() void ConnectionTests::testSendingError() { - bool newNotificationEmitted = false; - const DateTime sentTime(DateTime::now()); - const QString sentMessage(QStringLiteral("test notification")); - const auto newNotificationHandler = [&](ChronoUtilities::DateTime receivedTime, const QString &receivedMessage) { + auto newNotificationEmitted = false; + const auto sentTime(DateTime::now()); + const auto sentMessage(QStringLiteral("test notification")); + const auto newNotificationHandler = [&](DateTime receivedTime, const QString &receivedMessage) { newNotificationEmitted |= receivedTime == sentTime && receivedMessage == sentMessage; }; waitForSignals([this, sentTime, &sentMessage] { m_connection.emitNotification(sentTime, sentMessage); }, 500, diff --git a/connector/tests/misctests.cpp b/connector/tests/misctests.cpp index f66ad86..f1b935c 100644 --- a/connector/tests/misctests.cpp +++ b/connector/tests/misctests.cpp @@ -19,9 +19,8 @@ using namespace std; using namespace Data; -using namespace ChronoUtilities; -using namespace TestUtilities; -using namespace TestUtilities::Literals; +using namespace CppUtilities; +using namespace CppUtilities::Literals; using namespace CPPUNIT_NS; diff --git a/connector/utils.cpp b/connector/utils.cpp index 4b33b7d..aebfcca 100644 --- a/connector/utils.cpp +++ b/connector/utils.cpp @@ -14,8 +14,7 @@ #include #include -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; namespace Data { diff --git a/connector/utils.h b/connector/utils.h index fde721d..f10ae0a 100644 --- a/connector/utils.h +++ b/connector/utils.h @@ -15,17 +15,19 @@ QT_FORWARD_DECLARE_CLASS(QJsonObject) QT_FORWARD_DECLARE_CLASS(QHostAddress) -namespace ChronoUtilities { +namespace CppUtilities { class DateTime; } namespace Data { +namespace Traits = CppUtilities::Traits; + struct SyncthingStatistics; struct SyncthingDir; struct SyncthingDev; -QString LIB_SYNCTHING_CONNECTOR_EXPORT agoString(ChronoUtilities::DateTime dateTime); +QString LIB_SYNCTHING_CONNECTOR_EXPORT agoString(CppUtilities::DateTime dateTime); QString LIB_SYNCTHING_CONNECTOR_EXPORT trafficString(std::uint64_t total, double rate); QString LIB_SYNCTHING_CONNECTOR_EXPORT directoryStatusString(const Data::SyncthingStatistics &stats); QString LIB_SYNCTHING_CONNECTOR_EXPORT syncCompleteString( diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp index f53fe97..4ccc07f 100644 --- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp +++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp @@ -23,9 +23,9 @@ #include "resources/qtconfig.h" using namespace std; -using namespace Dialogs; +using namespace CppUtilities::EscapeCodes; +using namespace QtUtilities; using namespace Data; -using namespace EscapeCodes; SyncthingFileItemActionStaticData::SyncthingFileItemActionStaticData() : m_initialized(false) @@ -98,8 +98,8 @@ void SyncthingFileItemActionStaticData::showAboutDialog() { 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), renderSvgImage(makeSyncthingIcon()).toImage()); + QStringLiteral(APP_VERSION), CppUtilities::applicationInfo.dependencyVersions, QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), + renderSvgImage(makeSyncthingIcon()).toImage()); aboutDialog->setWindowTitle(tr("About") + QStringLiteral(" - " APP_NAME)); aboutDialog->setWindowIcon(QIcon::fromTheme(QStringLiteral("syncthingtray"))); aboutDialog->setAttribute(Qt::WA_DeleteOnClose); diff --git a/fileitemactionplugin/syncthingmenuaction.cpp b/fileitemactionplugin/syncthingmenuaction.cpp index 6799cd2..4b0d466 100644 --- a/fileitemactionplugin/syncthingmenuaction.cpp +++ b/fileitemactionplugin/syncthingmenuaction.cpp @@ -16,6 +16,7 @@ #include #endif +using namespace CppUtilities; using namespace Data; SyncthingMenuAction::SyncthingMenuAction(const KFileItemListProperties &properties, const QList &actions, QObject *parent) diff --git a/libsyncthing/CMakeLists.txt b/libsyncthing/CMakeLists.txt index f4320de..18c1596 100644 --- a/libsyncthing/CMakeLists.txt +++ b/libsyncthing/CMakeLists.txt @@ -122,6 +122,9 @@ list(APPEND CMAKE_MODULE_PATH ${CPP_UTILITIES_MODULE_DIRS}) list(APPEND PRIVATE_SHARED_INCLUDE_DIRS ${CPP_UTILITIES_INCLUDE_DIRS}) list(APPEND PRIVATE_STATIC_INCLUDE_DIRS ${CPP_UTILITIES_INCLUDE_DIRS}) +# use std::filesystem +use_standard_filesystem() + # include modules to apply configuration include(BasicConfig) include(WindowsResources) diff --git a/libsyncthing/tests/interfacetests.cpp b/libsyncthing/tests/interfacetests.cpp index 0202eff..93f9824 100644 --- a/libsyncthing/tests/interfacetests.cpp +++ b/libsyncthing/tests/interfacetests.cpp @@ -11,15 +11,13 @@ #include #include +#include #include #include using namespace std; -using namespace ChronoUtilities; -using namespace ConversionUtilities; -using namespace IoUtilities; -using namespace TestUtilities; +using namespace CppUtilities; using namespace LibSyncthing; using namespace CPPUNIT_NS; @@ -76,16 +74,28 @@ string InterfaceTests::setupConfigDir() if (configFilePath.empty()) { throw runtime_error("Unable to setup Syncthing config directory."); } + // clean database const auto configDir(directory(configFilePath)); - for (const auto &dir : directoryEntries(configDir.data(), DirectoryEntryType::Directory)) { - if (dir == "." || dir == "..") { - continue; - } - for (const auto &file : directoryEntries((configDir % '/' + dir).data(), DirectoryEntryType::File)) { - const auto toRemove(configDir % '/' % dir % '/' + file); - CPPUNIT_ASSERT_EQUAL_MESSAGE("removing " + toRemove, 0, remove(toRemove.data())); + try { + const auto dirIterator = filesystem::directory_iterator(configDir); + for (const auto &dir : dirIterator) { + if (!dir.is_directory() || dir == "." || dir == "..") { + continue; + } + const auto dirPath = dir.path(); + const auto subdirIterator = filesystem::directory_iterator(configDir % '/' + dirPath); + for (const auto &file : subdirIterator) { + if (file.is_directory()) { + continue; + } + const auto toRemove = configDir % '/' % dirPath % '/' + file.path(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("removing " + toRemove, 0, remove(toRemove.data())); + } } + + } catch (const filesystem::filesystem_error &error) { + CPPUNIT_FAIL(argsToString("Unable to clean config dir ", configDir, ": ", error.what())); } return configDir; } diff --git a/model/syncthingdevicemodel.cpp b/model/syncthingdevicemodel.cpp index bc7304f..82dcd22 100644 --- a/model/syncthingdevicemodel.cpp +++ b/model/syncthingdevicemodel.cpp @@ -10,8 +10,7 @@ #include using namespace std; -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; namespace Data { diff --git a/model/syncthingdirectorymodel.cpp b/model/syncthingdirectorymodel.cpp index 8bbb156..abb70c9 100644 --- a/model/syncthingdirectorymodel.cpp +++ b/model/syncthingdirectorymodel.cpp @@ -10,8 +10,7 @@ #include using namespace std; -using namespace ChronoUtilities; -using namespace ConversionUtilities; +using namespace CppUtilities; namespace Data { diff --git a/model/syncthingdownloadmodel.cpp b/model/syncthingdownloadmodel.cpp index de2aa1b..202cb99 100644 --- a/model/syncthingdownloadmodel.cpp +++ b/model/syncthingdownloadmodel.cpp @@ -6,7 +6,7 @@ #include using namespace std; -using namespace ChronoUtilities; +using namespace CppUtilities; namespace Data { diff --git a/model/syncthingstatusselectionmodel.cpp b/model/syncthingstatusselectionmodel.cpp index 0e8649c..0052911 100644 --- a/model/syncthingstatusselectionmodel.cpp +++ b/model/syncthingstatusselectionmodel.cpp @@ -2,7 +2,7 @@ #include "../connector/syncthingconnection.h" -using namespace Models; +using namespace QtUtilities; namespace Data { diff --git a/model/syncthingstatusselectionmodel.h b/model/syncthingstatusselectionmodel.h index a5b2cbe..4458102 100644 --- a/model/syncthingstatusselectionmodel.h +++ b/model/syncthingstatusselectionmodel.h @@ -7,14 +7,12 @@ namespace Data { -class LIB_SYNCTHING_MODEL_EXPORT SyncthingStatusSelectionModel : public Models::ChecklistModel { +class LIB_SYNCTHING_MODEL_EXPORT SyncthingStatusSelectionModel : public QtUtilities::ChecklistModel { Q_OBJECT public: explicit SyncthingStatusSelectionModel(QObject *parent = nullptr); QString labelForId(const QVariant &id) const override; - -protected: }; } // namespace Data diff --git a/plasmoid/lib/settingsdialog.cpp b/plasmoid/lib/settingsdialog.cpp index f5d24da..c7914d2 100644 --- a/plasmoid/lib/settingsdialog.cpp +++ b/plasmoid/lib/settingsdialog.cpp @@ -17,9 +17,9 @@ #include #include -using namespace Dialogs; using namespace Data; using namespace QtGui; +using namespace QtUtilities; namespace Plasmoid { @@ -118,15 +118,14 @@ QWidget *AppearanceOptionPage::setupWidget() SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet) { // setup categories - QList categories; - Dialogs::OptionCategory *category; + QList categories; + OptionCategory *category; category = new OptionCategory; m_appearanceOptionPage = new AppearanceOptionPage(applet); category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Plasmoid")); - category->assignPages(QList() - << new ConnectionOptionPage(applet.connection()) << new NotificationsOptionPage(GuiType::Plasmoid) << m_appearanceOptionPage - << new IconsOptionPage << new ShortcutOptionPage(applet)); + category->assignPages(QList() << new ConnectionOptionPage(applet.connection()) << new NotificationsOptionPage(GuiType::Plasmoid) + << m_appearanceOptionPage << new IconsOptionPage << new ShortcutOptionPage(applet)); category->setIcon(QIcon::fromTheme(QStringLiteral("plasma"))); categories << category; @@ -143,9 +142,9 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet) category = new OptionCategory; category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Extras")); - category->assignPages(QList() << webViewPage + category->assignPages(QList() << webViewPage #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - << systemdPage + << systemdPage #endif ); category->setIcon( diff --git a/plasmoid/lib/syncthingapplet.cpp b/plasmoid/lib/syncthingapplet.cpp index 5818687..13b03b0 100644 --- a/plasmoid/lib/syncthingapplet.cpp +++ b/plasmoid/lib/syncthingapplet.cpp @@ -41,10 +41,9 @@ using namespace std; using namespace Data; using namespace Plasma; -using namespace Dialogs; +using namespace CppUtilities; +using namespace QtUtilities; using namespace QtGui; -using namespace ConversionUtilities; -using namespace ChronoUtilities; namespace Plasmoid { @@ -229,7 +228,7 @@ bool SyncthingApplet::areNotificationsAvailable() const return !m_notifications.empty(); } -void SyncthingApplet::setPassiveStates(const QList &passiveStates) +void SyncthingApplet::setPassiveStates(const QList &passiveStates) { m_passiveSelectionModel.setItems(passiveStates); const auto currentState = static_cast(m_connection.status()); @@ -258,13 +257,13 @@ void SyncthingApplet::showSettingsDlg() if (!m_settingsDlg) { m_settingsDlg = new SettingsDialog(*this); // ensure settings take effect when applied - connect(m_settingsDlg, &Dialogs::SettingsDialog::applied, this, &SyncthingApplet::handleSettingsChanged); + connect(m_settingsDlg, &SettingsDialog::applied, this, &SyncthingApplet::handleSettingsChanged); // save plasmoid specific settings to disk when applied - connect(m_settingsDlg, &Dialogs::SettingsDialog::applied, this, &SyncthingApplet::configChanged); + connect(m_settingsDlg, &SettingsDialog::applied, this, &SyncthingApplet::configChanged); // save global/general settings to disk when applied - connect(m_settingsDlg, &Dialogs::SettingsDialog::applied, &Settings::save); + connect(m_settingsDlg, &SettingsDialog::applied, &Settings::save); } - Dialogs::centerWidget(m_settingsDlg); + centerWidget(m_settingsDlg); m_settingsDlg->show(); m_settingsDlg->activateWindow(); } @@ -313,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::applicationInfo.dependencyVersions, QStringLiteral(APP_URL), - QStringLiteral(APP_DESCRIPTION), renderSvgImage(makeSyncthingIcon()).toImage()); + QStringLiteral(APP_VERSION), CppUtilities::applicationInfo.dependencyVersions, QStringLiteral(APP_URL), QStringLiteral(APP_DESCRIPTION), + renderSvgImage(makeSyncthingIcon()).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/plasmoid/lib/syncthingapplet.h b/plasmoid/lib/syncthingapplet.h index 7c3f613..4b97b8c 100644 --- a/plasmoid/lib/syncthingapplet.h +++ b/plasmoid/lib/syncthingapplet.h @@ -65,7 +65,7 @@ class SyncthingApplet : public Plasma::Applet { Q_PROPERTY(QSize size READ size WRITE setSize NOTIFY sizeChanged) Q_PROPERTY(bool notificationsAvailable READ areNotificationsAvailable NOTIFY notificationsAvailableChanged) Q_PROPERTY(bool passive READ isPassive NOTIFY passiveChanged) - Q_PROPERTY(QList passiveStates READ passiveStates WRITE setPassiveStates) + Q_PROPERTY(QList passiveStates READ passiveStates WRITE setPassiveStates) public: SyncthingApplet(QObject *parent, const QVariantList &data); @@ -99,8 +99,8 @@ public: void setSize(const QSize &size); bool areNotificationsAvailable() const; bool isPassive() const; - const QList &passiveStates() const; - void setPassiveStates(const QList &passiveStates); + const QList &passiveStates() const; + void setPassiveStates(const QList &passiveStates); public Q_SLOTS: void init() override; @@ -153,7 +153,7 @@ private Q_SLOTS: #ifndef SYNCTHINGWIDGETS_NO_WEBVIEW void handleWebViewDeleted(); #endif - void handleNewNotification(ChronoUtilities::DateTime when, const QString &msg); + void handleNewNotification(CppUtilities::DateTime when, const QString &msg); void handleSystemdServiceError(const QString &context, const QString &name, const QString &message); #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD void handleSystemdStatusChanged(); @@ -161,7 +161,7 @@ private Q_SLOTS: void setPassive(bool passive); private: - Dialogs::AboutDialog *m_aboutDlg; + QtUtilities::AboutDialog *m_aboutDlg; Data::SyncthingConnection m_connection; Data::SyncthingOverallDirStatistics m_overallStats; Data::SyncthingNotifier m_notifier; @@ -260,7 +260,7 @@ inline bool SyncthingApplet::isPassive() const return status() == Plasma::Types::PassiveStatus; } -inline const QList &SyncthingApplet::passiveStates() const +inline const QList &SyncthingApplet::passiveStates() const { return m_passiveSelectionModel.items(); } diff --git a/testhelper/helper.cpp b/testhelper/helper.cpp index b816873..11e02cf 100644 --- a/testhelper/helper.cpp +++ b/testhelper/helper.cpp @@ -1,6 +1,6 @@ #include "./helper.h" -namespace TestUtilities { +namespace CppUtilities { /*! * \brief Specifies the factor for multiplying all timeouts passed to functions declared in helper.h. @@ -8,4 +8,4 @@ namespace TestUtilities { * The default factor is 1.0. */ double timeoutFactor = 1.0; -} // namespace TestUtilities +} // namespace CppUtilities diff --git a/testhelper/helper.h b/testhelper/helper.h index 9e973c7..5e9c5bd 100644 --- a/testhelper/helper.h +++ b/testhelper/helper.h @@ -17,12 +17,12 @@ #include #ifndef SYNCTHINGTESTHELPER_FOR_CLI -#define SYNCTHINGTESTHELPER_TIMEOUT(timeout) static_cast(timeout * ::TestUtilities::timeoutFactor) +#define SYNCTHINGTESTHELPER_TIMEOUT(timeout) static_cast(timeout * ::CppUtilities::timeoutFactor) #else #define SYNCTHINGTESTHELPER_TIMEOUT(timeout) timeout #endif -using namespace ConversionUtilities; +using namespace CppUtilities; /*! * \brief Prints a QString; required to use QString with CPPUNIT_ASSERT_EQUAL_MESSAGE. @@ -48,7 +48,7 @@ inline std::ostream &operator<<(std::ostream &o, const QSet &qstringset return o << qstringset.toList().join(QStringLiteral(", ")).toLocal8Bit().data(); } -namespace TestUtilities { +namespace CppUtilities { extern double timeoutFactor; @@ -397,6 +397,6 @@ bool waitForSignalsOrFail(Action action, int timeout, const SignalInfo &failure, return !failureEmitted && !timeoutFailed; } -} // namespace TestUtilities +} // namespace CppUtilities #endif // SYNCTHINGTESTHELPER_H diff --git a/testhelper/syncthingtestinstance.cpp b/testhelper/syncthingtestinstance.cpp index d2d2745..2ffa44d 100644 --- a/testhelper/syncthingtestinstance.cpp +++ b/testhelper/syncthingtestinstance.cpp @@ -9,9 +9,8 @@ #include using namespace std; -using namespace ConversionUtilities; -namespace TestUtilities { +namespace CppUtilities { static int dummy1 = 0; static char *dummy2; @@ -139,4 +138,4 @@ void SyncthingTestInstance::setInterleavedOutputEnabledFromEnv() setInterleavedOutputEnabled(true); } } -} // namespace TestUtilities +} // namespace CppUtilities diff --git a/testhelper/syncthingtestinstance.h b/testhelper/syncthingtestinstance.h index ae29ad9..ddfae6c 100644 --- a/testhelper/syncthingtestinstance.h +++ b/testhelper/syncthingtestinstance.h @@ -11,7 +11,7 @@ using namespace std; -namespace TestUtilities { +namespace CppUtilities { /*! * \brief The SyncthingTestInstance class provides running a test instance of Syncthing. @@ -69,6 +69,6 @@ inline bool SyncthingTestInstance::isInterleavedOutputEnabled() const { return m_interleavedOutput; } -} // namespace TestUtilities +} // namespace CppUtilities #endif // SYNCTHINGTESTHELPER_SYNCTHINGTESTINSTANCE_H diff --git a/testhelper/tests/manualtesting.cpp b/testhelper/tests/manualtesting.cpp index 3c1f252..10549d0 100644 --- a/testhelper/tests/manualtesting.cpp +++ b/testhelper/tests/manualtesting.cpp @@ -5,7 +5,7 @@ #include using namespace std; -using namespace TestUtilities; +using namespace CppUtilities; /*! * \brief Launches a Syncthing test instance for manual testing. diff --git a/tray/application/main.cpp b/tray/application/main.cpp index f70dbe9..a1d13df 100644 --- a/tray/application/main.cpp +++ b/tray/application/main.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -30,7 +30,7 @@ #include using namespace std; -using namespace ApplicationUtilities; +using namespace CppUtilities; using namespace QtGui; using namespace Data; @@ -140,7 +140,7 @@ int runApplication(int argc, const char *const *argv) widgetsGuiArg.addSubArgument(&connectionArg); parser.setMainArguments({ &qtConfigArgs.qtWidgetsGuiArg(), &parser.noColorArg(), &parser.helpArg() }); - parser.parseArgsOrExit(argc, argv); + parser.parseArgs(argc, argv); if (!qtConfigArgs.qtWidgetsGuiArg().isPresent()) { return 0; } diff --git a/tray/application/singleinstance.cpp b/tray/application/singleinstance.cpp index 8675d34..56038fc 100644 --- a/tray/application/singleinstance.cpp +++ b/tray/application/singleinstance.cpp @@ -12,8 +12,8 @@ #include using namespace std; -using namespace ConversionUtilities; -using namespace EscapeCodes; +using namespace CppUtilities; +using namespace CppUtilities::EscapeCodes; namespace QtGui { diff --git a/tray/gui/trayicon.cpp b/tray/gui/trayicon.cpp index 8d214c9..3e0a033 100644 --- a/tray/gui/trayicon.cpp +++ b/tray/gui/trayicon.cpp @@ -25,11 +25,8 @@ #endif using namespace std; -using namespace Dialogs; +using namespace QtUtilities; using namespace Data; -#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS -using namespace MiscUtils; -#endif namespace QtGui { @@ -214,7 +211,7 @@ void TrayIcon::showInternalError( m_errorsAction->setVisible(true); } -void TrayIcon::showSyncthingNotification(ChronoUtilities::DateTime when, const QString &message) +void TrayIcon::showSyncthingNotification(CppUtilities::DateTime when, const QString &message) { if (m_notifyOnSyncthingErrors) { #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS diff --git a/tray/gui/trayicon.h b/tray/gui/trayicon.h index b5b1972..f0bb559 100644 --- a/tray/gui/trayicon.h +++ b/tray/gui/trayicon.h @@ -34,7 +34,7 @@ public: public slots: void showInternalError( const QString &errorMsg, Data::SyncthingErrorCategory category, int networkError, const QNetworkRequest &request, const QByteArray &response); - void showSyncthingNotification(ChronoUtilities::DateTime when, const QString &message); + void showSyncthingNotification(CppUtilities::DateTime when, const QString &message); void showInternalErrorsDialog(); void updateStatusIconAndText(); void showNewDev(const QString &devId, const QString &message); diff --git a/tray/gui/traymenu.cpp b/tray/gui/traymenu.cpp index ff9a4d8..49e392d 100644 --- a/tray/gui/traymenu.cpp +++ b/tray/gui/traymenu.cpp @@ -11,6 +11,8 @@ #include #include +using namespace QtUtilities; + namespace QtGui { TrayMenu::TrayMenu(TrayIcon *trayIcon, QWidget *parent) @@ -52,7 +54,7 @@ void TrayMenu::showAtCursor() { resize(sizeHint()); QPoint pos(QCursor::pos()); - moveInside(pos, size(), Dialogs::availableScreenGeometryAtPoint(pos)); + moveInside(pos, size(), availableScreenGeometryAtPoint(pos)); popup(pos); } } // namespace QtGui diff --git a/tray/gui/traywidget.cpp b/tray/gui/traywidget.cpp index 50a1120..45527ce 100644 --- a/tray/gui/traywidget.cpp +++ b/tray/gui/traywidget.cpp @@ -44,17 +44,15 @@ #include #include -using namespace ApplicationUtilities; -using namespace ConversionUtilities; -using namespace ChronoUtilities; -using namespace Dialogs; +using namespace CppUtilities; +using namespace QtUtilities; using namespace Data; using namespace std; namespace QtGui { SettingsDialog *TrayWidget::m_settingsDlg = nullptr; -Dialogs::AboutDialog *TrayWidget::m_aboutDlg = nullptr; +QtUtilities::AboutDialog *TrayWidget::m_aboutDlg = nullptr; vector TrayWidget::m_instances; /*! @@ -437,7 +435,7 @@ void TrayWidget::applySettingsOnAllInstances() void TrayWidget::openDir(const SyncthingDir &dir) { if (QDir(dir.path).exists()) { - DesktopUtils::openLocalFileOrDir(dir.path); + openLocalFileOrDir(dir.path); } else { QMessageBox::warning( this, QCoreApplication::applicationName(), tr("The directory %1 does not exist on the local machine.").arg(dir.path)); @@ -448,7 +446,7 @@ void TrayWidget::openItemDir(const SyncthingItemDownloadProgress &item) { const QDir containingDir(item.fileInfo.absoluteDir()); if (containingDir.exists()) { - DesktopUtils::openLocalFileOrDir(containingDir.path()); + openLocalFileOrDir(containingDir.path()); } else { QMessageBox::warning(this, QCoreApplication::applicationName(), tr("The containing directory %1 does not exist on the local machine.").arg(item.fileInfo.filePath())); diff --git a/tray/gui/traywidget.h b/tray/gui/traywidget.h index 5e1081e..78d9b31 100644 --- a/tray/gui/traywidget.h +++ b/tray/gui/traywidget.h @@ -20,11 +20,11 @@ QT_FORWARD_DECLARE_CLASS(QFrame) QT_FORWARD_DECLARE_CLASS(QMenu) QT_FORWARD_DECLARE_CLASS(QActionGroup) -namespace ApplicationUtilities { +namespace CppUtilities { class QtConfigArguments; } -namespace Dialogs { +namespace QtUtilities { class AboutDialog; } @@ -83,7 +83,7 @@ private slots: #ifndef SYNCTHINGWIDGETS_NO_WEBVIEW void handleWebViewDeleted(); #endif - void handleNewNotification(ChronoUtilities::DateTime when, const QString &msg); + void handleNewNotification(CppUtilities::DateTime when, const QString &msg); void handleConnectionSelected(QAction *connectionAction); void showDialog(QWidget *dlg); @@ -91,7 +91,7 @@ private: TrayMenu *m_menu; std::unique_ptr m_ui; static SettingsDialog *m_settingsDlg; - static Dialogs::AboutDialog *m_aboutDlg; + static QtUtilities::AboutDialog *m_aboutDlg; #ifndef SYNCTHINGWIDGETS_NO_WEBVIEW WebViewDialog *m_webViewDlg; #endif diff --git a/widgets/misc/dbusstatusnotifier.cpp b/widgets/misc/dbusstatusnotifier.cpp index 82bd8f2..418a119 100644 --- a/widgets/misc/dbusstatusnotifier.cpp +++ b/widgets/misc/dbusstatusnotifier.cpp @@ -10,7 +10,7 @@ #include using namespace Data; -using namespace MiscUtils; +using namespace QtUtilities; namespace QtGui { diff --git a/widgets/misc/dbusstatusnotifier.h b/widgets/misc/dbusstatusnotifier.h index 61d3130..ce13c47 100644 --- a/widgets/misc/dbusstatusnotifier.h +++ b/widgets/misc/dbusstatusnotifier.h @@ -26,7 +26,7 @@ public Q_SLOTS: void showDisconnect(); void hideDisconnect(); void showInternalError(const InternalError &error); - void showSyncthingNotification(ChronoUtilities::DateTime when, const QString &message); + void showSyncthingNotification(CppUtilities::DateTime when, const QString &message); void showSyncComplete(const QString &message); void showNewDev(const QString &devId, const QString &message); void showNewDir(const QString &devId, const QString &dirId, const QString &message); @@ -43,12 +43,12 @@ private Q_SLOTS: void handleSyncthingNotificationAction(const QString &action); private: - MiscUtils::DBusNotification m_disconnectedNotification; - MiscUtils::DBusNotification m_internalErrorNotification; - MiscUtils::DBusNotification m_syncthingNotification; - MiscUtils::DBusNotification m_syncCompleteNotification; - MiscUtils::DBusNotification m_newDevNotification; - MiscUtils::DBusNotification m_newDirNotification; + QtUtilities::DBusNotification m_disconnectedNotification; + QtUtilities::DBusNotification m_internalErrorNotification; + QtUtilities::DBusNotification m_syncthingNotification; + QtUtilities::DBusNotification m_syncCompleteNotification; + QtUtilities::DBusNotification m_newDevNotification; + QtUtilities::DBusNotification m_newDirNotification; }; inline void DBusStatusNotifier::showDisconnect() @@ -66,7 +66,7 @@ inline void DBusStatusNotifier::showInternalError(const InternalError &error) m_internalErrorNotification.update(error.message); } -inline void DBusStatusNotifier::showSyncthingNotification(ChronoUtilities::DateTime when, const QString &message) +inline void DBusStatusNotifier::showSyncthingNotification(CppUtilities::DateTime when, const QString &message) { Q_UNUSED(when) m_syncthingNotification.update(message); diff --git a/widgets/misc/direrrorsdialog.cpp b/widgets/misc/direrrorsdialog.cpp index 039d48b..7f6a08c 100644 --- a/widgets/misc/direrrorsdialog.cpp +++ b/widgets/misc/direrrorsdialog.cpp @@ -19,7 +19,7 @@ #include using namespace std; -using namespace ChronoUtilities; +using namespace CppUtilities; using namespace Data; namespace QtGui { diff --git a/widgets/misc/internalerror.h b/widgets/misc/internalerror.h index a181b95..1a5151c 100644 --- a/widgets/misc/internalerror.h +++ b/widgets/misc/internalerror.h @@ -24,14 +24,14 @@ struct SYNCTHINGWIDGETS_EXPORT InternalError { QString message; QUrl url; QByteArray response; - ChronoUtilities::DateTime when; + CppUtilities::DateTime when; }; inline InternalError::InternalError(const QString &message, const QUrl &url, const QByteArray &response) : message(message) , url(url) , response(response) - , when(ChronoUtilities::DateTime::now()) + , when(CppUtilities::DateTime::now()) { } } // namespace QtGui diff --git a/widgets/misc/internalerrorsdialog.cpp b/widgets/misc/internalerrorsdialog.cpp index b5a236c..abaef92 100644 --- a/widgets/misc/internalerrorsdialog.cpp +++ b/widgets/misc/internalerrorsdialog.cpp @@ -13,7 +13,7 @@ #include using namespace std; -using namespace ChronoUtilities; +using namespace CppUtilities; using namespace Data; namespace QtGui { diff --git a/widgets/misc/syncthingkiller.cpp b/widgets/misc/syncthingkiller.cpp index a07f89a..2f1df4c 100644 --- a/widgets/misc/syncthingkiller.cpp +++ b/widgets/misc/syncthingkiller.cpp @@ -9,7 +9,7 @@ using namespace std; using namespace Data; -using namespace TestUtilities; +using namespace CppUtilities; namespace QtGui { diff --git a/widgets/misc/syncthinglauncher.cpp b/widgets/misc/syncthinglauncher.cpp index 3917976..a24c72d 100644 --- a/widgets/misc/syncthinglauncher.cpp +++ b/widgets/misc/syncthinglauncher.cpp @@ -7,7 +7,7 @@ using namespace std; using namespace std::placeholders; -using namespace ChronoUtilities; +using namespace CppUtilities; namespace Data { diff --git a/widgets/misc/syncthinglauncher.h b/widgets/misc/syncthinglauncher.h index d2f9c64..0a82586 100644 --- a/widgets/misc/syncthinglauncher.h +++ b/widgets/misc/syncthinglauncher.h @@ -17,7 +17,7 @@ namespace Data { class SYNCTHINGWIDGETS_EXPORT SyncthingLauncher : public QObject { Q_OBJECT Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged) - Q_PROPERTY(ChronoUtilities::DateTime activeSince READ activeSince) + Q_PROPERTY(CppUtilities::DateTime activeSince READ activeSince) Q_PROPERTY(bool manuallyStopped READ isManuallyStopped) Q_PROPERTY(bool useLibSyncthing READ isUseLibSyncthing WRITE setUseLibSyncthing) @@ -25,7 +25,7 @@ public: explicit SyncthingLauncher(QObject *parent = nullptr); bool isRunning() const; - ChronoUtilities::DateTime activeSince() const; + CppUtilities::DateTime activeSince() const; bool isActiveFor(unsigned int atLeastSeconds) const; bool isManuallyStopped() const; bool isUseLibSyncthing() const; @@ -56,7 +56,7 @@ private Q_SLOTS: private: SyncthingProcess m_process; QFuture m_future; - ChronoUtilities::DateTime m_futureStarted; + CppUtilities::DateTime m_futureStarted; bool m_manuallyStopped; bool m_useLibSyncthing; static SyncthingLauncher *s_mainInstance; @@ -67,20 +67,20 @@ inline bool SyncthingLauncher::isRunning() const return m_process.isRunning() || m_future.isRunning(); } -inline ChronoUtilities::DateTime SyncthingLauncher::activeSince() const +inline CppUtilities::DateTime SyncthingLauncher::activeSince() const { if (m_process.isRunning()) { return m_process.activeSince(); } else if (m_future.isRunning()) { return m_futureStarted; } - return ChronoUtilities::DateTime(); + return CppUtilities::DateTime(); } inline bool SyncthingLauncher::isActiveFor(unsigned int atLeastSeconds) const { const auto activeSince(this->activeSince()); - return !activeSince.isNull() && (ChronoUtilities::DateTime::gmtNow() - activeSince).totalSeconds() > atLeastSeconds; + return !activeSince.isNull() && (CppUtilities::DateTime::gmtNow() - activeSince).totalSeconds() > atLeastSeconds; } inline bool SyncthingLauncher::isManuallyStopped() const diff --git a/widgets/misc/textviewdialog.cpp b/widgets/misc/textviewdialog.cpp index d7fd3c3..b6c5601 100644 --- a/widgets/misc/textviewdialog.cpp +++ b/widgets/misc/textviewdialog.cpp @@ -21,7 +21,7 @@ using namespace std; using namespace std::placeholders; -using namespace Dialogs; +using namespace QtUtilities; using namespace Data; namespace QtGui { diff --git a/widgets/settings/connectionoptionpage.ui b/widgets/settings/connectionoptionpage.ui index 6e3a95d..b23817b 100644 --- a/widgets/settings/connectionoptionpage.ui +++ b/widgets/settings/connectionoptionpage.ui @@ -179,7 +179,7 @@ - + @@ -202,7 +202,7 @@ - + false @@ -219,7 +219,7 @@ - + false @@ -236,7 +236,7 @@ - + @@ -246,7 +246,7 @@ - + 0 @@ -449,13 +449,13 @@ - Widgets::PathSelection + QtUtilities::PathSelection QWidget
qtutilities/widgets/pathselection.h
1 - Widgets::ClearLineEdit + QtUtilities::ClearLineEdit QLineEdit
qtutilities/widgets/clearlineedit.h
 diff --git a/widgets/settings/launcheroptionpage.ui b/widgets/settings/launcheroptionpage.ui index 05da7ff..09a3029 100644 --- a/widgets/settings/launcheroptionpage.ui +++ b/widgets/settings/launcheroptionpage.ui @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -152,7 +152,7 @@ - + false @@ -178,18 +178,18 @@ - Widgets::PathSelection + QtUtilities::PathSelection QWidget
qtutilities/widgets/pathselection.h
1 - Widgets::ClearLineEdit + QtUtilities::ClearLineEdit QLineEdit
qtutilities/widgets/clearlineedit.h
 - Widgets::ClearPlainTextEdit + QtUtilities::ClearPlainTextEdit QPlainTextEdit
qtutilities/widgets/clearplaintextedit.h
 diff --git a/widgets/settings/settings.cpp b/widgets/settings/settings.cpp index abe96f5..a3df17b 100644 --- a/widgets/settings/settings.cpp +++ b/widgets/settings/settings.cpp @@ -30,9 +30,7 @@ using namespace std; using namespace Data; -#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS -using namespace MiscUtils; -#endif +using namespace QtUtilities; namespace std { diff --git a/widgets/settings/settings.h b/widgets/settings/settings.h index cb77e24..810d47c 100644 --- a/widgets/settings/settings.h +++ b/widgets/settings/settings.h @@ -17,7 +17,7 @@ #include #include -namespace Dialogs { +namespace QtUtilities { class QtSettings; } @@ -115,7 +115,7 @@ struct SYNCTHINGWIDGETS_EXPORT Settings { #if defined(SYNCTHINGWIDGETS_USE_WEBENGINE) || defined(SYNCTHINGWIDGETS_USE_WEBKIT) WebView webView; #endif - Dialogs::QtSettings qt; + QtUtilities::QtSettings qt; void apply(Data::SyncthingNotifier ¬ifier) const; }; diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp index 3e89c50..2ac5d0a 100644 --- a/widgets/settings/settingsdialog.cpp +++ b/widgets/settings/settingsdialog.cpp @@ -57,11 +57,9 @@ using namespace std; using namespace std::placeholders; using namespace Settings; -using namespace Dialogs; using namespace Data; -#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS -using namespace MiscUtils; -#endif +using namespace CppUtilities; +using namespace QtUtilities; namespace QtGui { @@ -514,9 +512,9 @@ QWidget *IconsOptionPage::setupWidget() // populate widgets array auto &widgetsForColor = m_widgets[index++] = { { - new Widgets::ColorButton(statusIconsGroupBox), - new Widgets::ColorButton(statusIconsGroupBox), - new Widgets::ColorButton(statusIconsGroupBox), + new ColorButton(statusIconsGroupBox), + new ColorButton(statusIconsGroupBox), + new ColorButton(statusIconsGroupBox), }, new QLabel(statusIconsGroupBox), &colorMapping.setting, @@ -539,7 +537,7 @@ QWidget *IconsOptionPage::setupWidget() QSize(32, 32))); }; for (const auto &colorButton : widgetsForColor.colorButtons) { - QObject::connect(colorButton, &Widgets::ColorButton::colorChanged, updatePreview); + QObject::connect(colorButton, &ColorButton::colorChanged, updatePreview); } // setup color buttons @@ -980,7 +978,7 @@ void setIndicatorColor(QWidget *indicator, const QColor &color) indicator->setStyleSheet(QStringLiteral("border-radius:8px;background-color:") + color.name()); } -void SystemdOptionPage::handleStatusChanged(const QString &activeState, const QString &subState, ChronoUtilities::DateTime activeSince) +void SystemdOptionPage::handleStatusChanged(const QString &activeState, const QString &subState, DateTime activeSince) { QStringList status; if (!activeState.isEmpty()) { @@ -994,7 +992,7 @@ void SystemdOptionPage::handleStatusChanged(const QString &activeState, const QS QString timeStamp; if (isRunning && !activeSince.isNull()) { timeStamp = QLatin1Char('\n') % QCoreApplication::translate("QtGui::SystemdOptionPage", "since ") - % QString::fromUtf8(activeSince.toString(ChronoUtilities::DateTimeOutputFormat::DateAndTime).data()); + % QString::fromUtf8(activeSince.toString(DateTimeOutputFormat::DateAndTime).data()); } ui()->statusValueLabel->setText( @@ -1063,35 +1061,35 @@ void WebViewOptionPage::reset() } SettingsDialog::SettingsDialog(const QList &categories, QWidget *parent) - : Dialogs::SettingsDialog(parent) + : QtUtilities::SettingsDialog(parent) { categoryModel()->setCategories(categories); init(); } SettingsDialog::SettingsDialog(QWidget *parent) - : Dialogs::SettingsDialog(parent) + : QtUtilities::SettingsDialog(parent) { init(); } SettingsDialog::SettingsDialog(Data::SyncthingConnection *connection, QWidget *parent) - : Dialogs::SettingsDialog(parent) + : QtUtilities::SettingsDialog(parent) { // setup categories - QList categories; - Dialogs::OptionCategory *category; + QList categories; + OptionCategory *category; category = new OptionCategory(this); category->setDisplayName(tr("Tray")); - category->assignPages(QList() - << new ConnectionOptionPage(connection) << new NotificationsOptionPage << new AppearanceOptionPage << new IconsOptionPage); + category->assignPages(QList() << new ConnectionOptionPage(connection) << new NotificationsOptionPage << new AppearanceOptionPage + << new IconsOptionPage); category->setIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg"))); categories << category; category = new OptionCategory(this); category->setDisplayName(tr("Web view")); - category->assignPages(QList() << new WebViewOptionPage); + category->assignPages(QList() << new WebViewOptionPage); category->setIcon( QIcon::fromTheme(QStringLiteral("internet-web-browser"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/internet-web-browser.svg")))); categories << category; @@ -1099,9 +1097,9 @@ SettingsDialog::SettingsDialog(Data::SyncthingConnection *connection, QWidget *p category = new OptionCategory(this); category->setDisplayName(tr("Startup")); category->assignPages( - QList() << new AutostartOptionPage << new LauncherOptionPage << new LauncherOptionPage(QStringLiteral("Inotify")) + QList() << new AutostartOptionPage << new LauncherOptionPage << new LauncherOptionPage(QStringLiteral("Inotify")) #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - << new SystemdOptionPage + << new SystemdOptionPage #endif ); category->setIcon(QIcon::fromTheme(QStringLiteral("system-run"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/system-run.svg")))); diff --git a/widgets/settings/settingsdialog.h b/widgets/settings/settingsdialog.h index 055c437..3049b60 100644 --- a/widgets/settings/settingsdialog.h +++ b/widgets/settings/settingsdialog.h @@ -16,10 +16,14 @@ QT_FORWARD_DECLARE_CLASS(QLabel) -namespace ChronoUtilities { +namespace CppUtilities { class DateTime; } +namespace QtUtilities { +class ColorButton; +} + namespace Data { class SyncthingConnection; class SyncthingService; @@ -27,10 +31,6 @@ class SyncthingProcess; class SyncthingLauncher; } // namespace Data -namespace Widgets { -class ColorButton; -} - namespace QtGui { /*! @@ -84,7 +84,7 @@ private: void update(); Data::StatusIconSettings m_settings; struct { - Widgets::ColorButton *colorButtons[3] = {}; + QtUtilities::ColorButton *colorButtons[3] = {}; QLabel *previewLabel = nullptr; Data::StatusIconColorSet *setting = nullptr; Data::StatusEmblem statusEmblem = Data::StatusEmblem::None; @@ -118,7 +118,7 @@ BEGIN_DECLARE_UI_FILE_BASED_OPTION_PAGE(SystemdOptionPage) private: DECLARE_SETUP_WIDGETS void handleDescriptionChanged(const QString &description); -void handleStatusChanged(const QString &activeState, const QString &subState, ChronoUtilities::DateTime activeSince); +void handleStatusChanged(const QString &activeState, const QString &subState, CppUtilities::DateTime activeSince); void handleEnabledChanged(const QString &unitFileState); Data::SyncthingService *const m_service; END_DECLARE_OPTION_PAGE @@ -130,11 +130,11 @@ DECLARE_UI_FILE_BASED_OPTION_PAGE(WebViewOptionPage) DECLARE_OPTION_PAGE(WebViewOptionPage) #endif -class SYNCTHINGWIDGETS_EXPORT SettingsDialog : public Dialogs::SettingsDialog { +class SYNCTHINGWIDGETS_EXPORT SettingsDialog : public QtUtilities::SettingsDialog { Q_OBJECT public: explicit SettingsDialog(Data::SyncthingConnection *connection, QWidget *parent = nullptr); - explicit SettingsDialog(const QList &categories, QWidget *parent = nullptr); + explicit SettingsDialog(const QList &categories, QWidget *parent = nullptr); explicit SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog() override; diff --git a/widgets/settings/systemdoptionpage.ui b/widgets/settings/systemdoptionpage.ui index 0d5f419..4b685f3 100644 --- a/widgets/settings/systemdoptionpage.ui +++ b/widgets/settings/systemdoptionpage.ui @@ -64,7 +64,7 @@ - + @@ -263,7 +263,7 @@ - Widgets::ClearLineEdit + QtUtilities::ClearLineEdit QLineEdit
qtutilities/widgets/clearlineedit.h
 diff --git a/widgets/webview/webviewdialog.cpp b/widgets/webview/webviewdialog.cpp index e379bc2..309616e 100644 --- a/widgets/webview/webviewdialog.cpp +++ b/widgets/webview/webviewdialog.cpp @@ -14,7 +14,7 @@ #include #endif -using namespace Dialogs; +using namespace QtUtilities; namespace QtGui {