From 951235d08264878194dd3f3795f70b6d023e14e1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 26 Dec 2018 01:16:38 +0100 Subject: [PATCH] Improve logging in Dolphin integration --- .../syncthingfileitemactionstaticdata.cpp | 4 +++- fileitemactionplugin/syncthingmenuaction.cpp | 19 +++++++++++++++++++ fileitemactionplugin/syncthingmenuaction.h | 3 +++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp index 2f247b0..2bcb116 100644 --- a/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp +++ b/fileitemactionplugin/syncthingfileitemactionstaticdata.cpp @@ -7,6 +7,7 @@ #include "../connector/syncthingconnectionsettings.h" #include +#include #include #include @@ -23,6 +24,7 @@ using namespace std; using namespace Dialogs; using namespace Data; +using namespace EscapeCodes; SyncthingFileItemActionStaticData::SyncthingFileItemActionStaticData() : m_initialized(false) @@ -134,7 +136,7 @@ bool SyncthingFileItemActionStaticData::applySyncthingConfiguration( setCurrentError(errorMessage); return false; } - cerr << "Syncthing config loaded from \"" << syncthingConfigFilePath.toLocal8Bit().data() << "\"" << endl; + cerr << Phrases::Info << "Syncthing config loaded from \"" << syncthingConfigFilePath.toLocal8Bit().data() << "\"" << Phrases::End; // check whether the URL is present if (config.guiAddress.isEmpty()) { diff --git a/fileitemactionplugin/syncthingmenuaction.cpp b/fileitemactionplugin/syncthingmenuaction.cpp index 0fd0cca..8be5f03 100644 --- a/fileitemactionplugin/syncthingmenuaction.cpp +++ b/fileitemactionplugin/syncthingmenuaction.cpp @@ -5,9 +5,17 @@ #include "../connector/syncthingconnection.h" +#ifdef DEBUG_BUILD +#include +#endif + #include #include +#ifdef DEBUG_BUILD +#include +#endif + using namespace Data; SyncthingMenuAction::SyncthingMenuAction(const KFileItemListProperties &properties, const QList &actions, QWidget *parentWidget) @@ -15,6 +23,10 @@ SyncthingMenuAction::SyncthingMenuAction(const KFileItemListProperties &properti , m_properties(properties) , m_notifier(SyncthingFileItemAction::staticData().connection()) { +#ifdef DEBUG_BUILD + std::cerr << EscapeCodes::Phrases::Info << "Creating SyncthingMenuAction: " << this << EscapeCodes::Phrases::EndFlush; +#endif + // init according to current state createMenu(actions); updateActionStatus(); @@ -25,6 +37,13 @@ SyncthingMenuAction::SyncthingMenuAction(const KFileItemListProperties &properti connect(&m_notifier, &SyncthingNotifier::disconnected, this, &SyncthingMenuAction::handleConnectedChanged); } +#ifdef DEBUG_BUILD +SyncthingMenuAction::~SyncthingMenuAction() +{ + std::cerr << EscapeCodes::Phrases::Info << "Destroying SyncthingMenuAction: " << this << EscapeCodes::Phrases::EndFlush; +} +#endif + void SyncthingMenuAction::handleConnectedChanged() { // update the current menu diff --git a/fileitemactionplugin/syncthingmenuaction.h b/fileitemactionplugin/syncthingmenuaction.h index 7775b2b..d44823b 100644 --- a/fileitemactionplugin/syncthingmenuaction.h +++ b/fileitemactionplugin/syncthingmenuaction.h @@ -20,6 +20,9 @@ class SyncthingMenuAction : public QAction { public: explicit SyncthingMenuAction(const KFileItemListProperties &properties = KFileItemListProperties(), const QList &actions = QList(), QWidget *parentWidget = nullptr); +#ifdef DEBUG_BUILD + ~SyncthingMenuAction() override; +#endif private Q_SLOTS: void handleConnectedChanged();