diff --git a/src/gui/folderman.h b/src/gui/folderman.h index 91b68f8a5c240..6c236ce8e8a4b 100644 --- a/src/gui/folderman.h +++ b/src/gui/folderman.h @@ -31,7 +31,6 @@ class TestShareModel; class ShareTestHelper; class EndToEndTestHelper; class TestSyncConflictsModel; -class TestGeneralSettings; //MagentaCustomizationV25 namespace OCC { @@ -397,7 +396,6 @@ private slots: friend class ::TestCfApiShellExtensionsIPC; friend class ::ShareTestHelper; friend class ::EndToEndTestHelper; - friend class ::TestGeneralSettings; //MagentaCustomizationV25 }; } // namespace OCC diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index 2e2a62aa2a3e5..0133d5759c9e0 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -218,7 +218,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) // OEM themes are not obliged to ship mono icons, so there // is no point in offering an option - _ui->monoIconsCheckBox->setVisible(false);/* MagentaCustomizationV25 */ + _ui->monoIconsCheckBox->setVisible(false);//MagentaCustomizationV25 connect(_ui->ignoredFilesButton, &QAbstractButton::clicked, this, &GeneralSettings::slotIgnoreFilesEditor); connect(_ui->debugArchiveButton, &QAbstractButton::clicked, this, &GeneralSettings::slotCreateDebugArchive);