From 64b75c8f00200093dfdbf32c11973b2aa0fe6a7d Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 13 May 2025 13:29:39 +0200 Subject: [PATCH] fix(cloudproviders): use a class static variable instead of a global one Signed-off-by: Matthieu Gallien --- src/gui/cloudproviders/cloudproviderwrapper.cpp | 5 +++-- src/gui/cloudproviders/cloudproviderwrapper.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/cloudproviders/cloudproviderwrapper.cpp b/src/gui/cloudproviders/cloudproviderwrapper.cpp index 99ede45bae..023e571495 100644 --- a/src/gui/cloudproviders/cloudproviderwrapper.cpp +++ b/src/gui/cloudproviders/cloudproviderwrapper.cpp @@ -22,7 +22,8 @@ using namespace OCC; GSimpleActionGroup *actionGroup = nullptr; -int preferredTextWidth = 0; + +int CloudProviderWrapper::preferredTextWidth = 0; CloudProviderWrapper::CloudProviderWrapper(QObject *parent, Folder *folder, int folderId, CloudProvidersProviderExporter* cloudprovider) : QObject(parent) , _folder(folder) @@ -207,7 +208,7 @@ void CloudProviderWrapper::slotSyncFinished(const SyncResult &result) static GMenuItem* addMenuItem(const QString text, const gchar *action) { QFontMetrics fm = QApplication::fontMetrics(); - preferredTextWidth = MAX (preferredTextWidth, (fm.boundingRect (text)).width ()); + CloudProviderWrapper::preferredTextWidth = MAX (CloudProviderWrapper::preferredTextWidth, (fm.boundingRect (text)).width ()); return menu_item_new (text, action); } diff --git a/src/gui/cloudproviders/cloudproviderwrapper.h b/src/gui/cloudproviders/cloudproviderwrapper.h index 1046f87ad3..eaf9a633c0 100644 --- a/src/gui/cloudproviders/cloudproviderwrapper.h +++ b/src/gui/cloudproviders/cloudproviderwrapper.h @@ -29,6 +29,8 @@ class CloudProviderWrapper : public QObject { Q_OBJECT public: + static int preferredTextWidth; + explicit CloudProviderWrapper(QObject *parent = nullptr, Folder *folder = nullptr, int folderId = 0, CloudProvidersProviderExporter* cloudprovider = nullptr); ~CloudProviderWrapper() override; CloudProvidersAccountExporter* accountExporter();