From 7e8163e126a6f070df840ca6799e865881eb3430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Fri, 17 Jun 2022 17:14:06 +0200 Subject: Use file-specific logging categories --- src/gui/newwizard/CMakeLists.txt | 2 -- src/gui/newwizard/logging.cpp | 3 --- src/gui/newwizard/logging.h | 5 ----- src/gui/newwizard/setupwizardcontroller.cpp | 13 +++++++------ src/gui/newwizard/setupwizardwindow.cpp | 7 ++++--- 5 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 src/gui/newwizard/logging.cpp delete mode 100644 src/gui/newwizard/logging.h (limited to 'src/gui/newwizard') diff --git a/src/gui/newwizard/CMakeLists.txt b/src/gui/newwizard/CMakeLists.txt index 76a228c37..5ba480f6b 100644 --- a/src/gui/newwizard/CMakeLists.txt +++ b/src/gui/newwizard/CMakeLists.txt @@ -40,8 +40,6 @@ add_library(newwizard STATIC postfixlineedit.cpp syncmode.cpp - - logging.cpp ) target_link_libraries(newwizard PUBLIC Qt5::Widgets libsync) set_target_properties(newwizard PROPERTIES AUTOUIC ON AUTORCC ON) diff --git a/src/gui/newwizard/logging.cpp b/src/gui/newwizard/logging.cpp deleted file mode 100644 index ebfc8c236..000000000 --- a/src/gui/newwizard/logging.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "logging.h" - -Q_LOGGING_CATEGORY(lcWizard, "wizard") diff --git a/src/gui/newwizard/logging.h b/src/gui/newwizard/logging.h deleted file mode 100644 index b45c74370..000000000 --- a/src/gui/newwizard/logging.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include - -Q_DECLARE_LOGGING_CATEGORY(lcWizard) diff --git a/src/gui/newwizard/setupwizardcontroller.cpp b/src/gui/newwizard/setupwizardcontroller.cpp index 6a5f06043..03868a509 100644 --- a/src/gui/newwizard/setupwizardcontroller.cpp +++ b/src/gui/newwizard/setupwizardcontroller.cpp @@ -7,7 +7,6 @@ #include "gui/folderman.h" #include "jobs/checkbasicauthjobfactory.h" #include "jobs/resolveurljobfactory.h" -#include "logging.h" #include "networkjobs/fetchuserinfojobfactory.h" #include "pages/accountconfiguredwizardpage.h" #include "pages/basiccredentialssetupwizardpage.h" @@ -30,6 +29,8 @@ const QStringList supportedUrlSchemesC({ defaultUrlSchemeC, QStringLiteral("http namespace OCC::Wizard { +Q_LOGGING_CATEGORY(lcSetupWizardController, "setupwizard.controller") + SetupWizardController::SetupWizardController(QWidget *parent) : QObject(parent) , _wizardWindow(new SetupWizardWindow(parent)) @@ -43,18 +44,18 @@ SetupWizardController::SetupWizardController(QWidget *parent) // allow settings dialog to clean up the wizard controller and all the objects it created connect(_wizardWindow, &SetupWizardWindow::rejected, this, [this]() { - qCDebug(lcWizard) << "wizard window closed"; + qCDebug(lcSetupWizardController) << "wizard window closed"; Q_EMIT finished(nullptr, SyncMode::Invalid); }); connect(_wizardWindow, &SetupWizardWindow::paginationEntryClicked, this, [this, paginationEntries](PageIndex currentPage, PageIndex clickedPageIndex) { Q_ASSERT(currentPage < paginationEntries.size()); - qCDebug(lcWizard) << "pagination entry clicked: current page" << currentPage << "clicked page" << clickedPageIndex; + qCDebug(lcSetupWizardController) << "pagination entry clicked: current page" << currentPage << "clicked page" << clickedPageIndex; nextStep(currentPage, clickedPageIndex); }); connect(_wizardWindow, &SetupWizardWindow::nextButtonClicked, this, [this, paginationEntries](PageIndex currentPage) { Q_ASSERT(currentPage < paginationEntries.size()); - qCDebug(lcWizard) << "next button clicked on current page" << currentPage; + qCDebug(lcSetupWizardController) << "next button clicked on current page" << currentPage; nextStep(currentPage, std::nullopt); }); @@ -62,7 +63,7 @@ SetupWizardController::SetupWizardController(QWidget *parent) connect(_wizardWindow, &SetupWizardWindow::backButtonClicked, this, [this](PageIndex currentPage) { // back button should be disabled on the first page Q_ASSERT(currentPage > 0); - qCDebug(lcWizard) << "back button clicked on current page" << currentPage; + qCDebug(lcSetupWizardController) << "back button clicked on current page" << currentPage; nextStep(currentPage, currentPage - 1); }); } @@ -102,7 +103,7 @@ void SetupWizardController::nextStep(std::optional currentPage, std:: if (!std::any_of(supportedUrlSchemesC.begin(), supportedUrlSchemesC.end(), [userProvidedUrl](const QString &scheme) { return userProvidedUrl.startsWith(scheme); })) { - qCDebug(lcWizard) << "no URL scheme provided, prepending default URL scheme" << defaultUrlSchemeC; + qCDebug(lcSetupWizardController) << "no URL scheme provided, prepending default URL scheme" << defaultUrlSchemeC; userProvidedUrl.prepend(defaultUrlSchemeC); } diff --git a/src/gui/newwizard/setupwizardwindow.cpp b/src/gui/newwizard/setupwizardwindow.cpp index 6db96359b..68d4a941c 100644 --- a/src/gui/newwizard/setupwizardwindow.cpp +++ b/src/gui/newwizard/setupwizardwindow.cpp @@ -4,7 +4,6 @@ #include "gui/application.h" #include "gui/owncloudgui.h" #include "gui/settingsdialog.h" -#include "logging.h" #include "theme.h" #include @@ -30,6 +29,8 @@ QString replaceCssColors(QString stylesheet) namespace OCC::Wizard { +Q_LOGGING_CATEGORY(lcSetupWizardWindow, "setupwizard.window") + SetupWizardWindow::SetupWizardWindow(QWidget *parent) : QDialog(parent) , _ui(new ::Ui::SetupWizardWindow) @@ -67,7 +68,7 @@ SetupWizardWindow::SetupWizardWindow(QWidget *parent) if (OC_ENSURE(fusionStyle != nullptr)) { _ui->contentWidget->setStyle(fusionStyle); } else { - qCDebug(lcWizard) << "Could not set up default style, wizard contents will be shown using default style"; + qCDebug(lcSetupWizardWindow) << "Could not set up default style, wizard contents will be shown using default style"; } loadStylesheet(); @@ -86,7 +87,7 @@ void SetupWizardWindow::loadStylesheet() QFile file(path); Q_ASSERT(file.exists()); if (!OC_ENSURE(file.open(QIODevice::ReadOnly))) { - qCCritical(lcWizard) << "failed to load stylesheet"; + qCCritical(lcSetupWizardWindow) << "failed to load stylesheet"; } QString stylesheet = replaceCssColors(QString::fromUtf8(file.readAll())); -- cgit v1.2.3