diff --git a/src/config/configureoptionsdialog.cpp b/src/config/configureoptionsdialog.cpp index 75bf78d..1b251bf 100644 --- a/src/config/configureoptionsdialog.cpp +++ b/src/config/configureoptionsdialog.cpp @@ -28,6 +28,7 @@ #include #include +#include "util/guihelpers.h" #include "ui_configurepagefilesystemcolors.h" @@ -143,7 +144,7 @@ bool ConfigureOptionsDialog::isDefault() void ConfigureOptionsDialog::updateWidgetsDefault() { bool useDefaults = Config::self()->useDefaults(true); - generalPageWidget().setDefaultFileSystem(FileSystem::defaultFileSystem()); + generalPageWidget().setDefaultFileSystem(GuiHelpers::defaultFileSystem()); generalPageWidget().radioButton->setChecked(true); if (advancedPageWidget().isVisible()) diff --git a/src/config/generalpagewidget.cpp b/src/config/generalpagewidget.cpp index 5d2964a..bd1643e 100644 --- a/src/config/generalpagewidget.cpp +++ b/src/config/generalpagewidget.cpp @@ -55,7 +55,7 @@ void GeneralPageWidget::setupDialog() foreach (const QString& fsName, fsNames) comboDefaultFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); - setDefaultFileSystem(FileSystem::defaultFileSystem()); + setDefaultFileSystem(GuiHelpers::defaultFileSystem()); kcfg_shredSource->setId(radioButton, 0); kcfg_shredSource->setId(radioButton_2, 1); diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index f38ec13..f73a7ad 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -73,7 +73,7 @@ void NewDialog::setupDialog() foreach (const QString& fsName, fsNames) dialogWidget().comboFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); - QString selected = FileSystem::nameForType(FileSystem::defaultFileSystem()); + QString selected = FileSystem::nameForType(GuiHelpers::defaultFileSystem()); const int idx = dialogWidget().comboFileSystem().findText(selected); dialogWidget().comboFileSystem().setCurrentIndex(idx != -1 ? idx : 0); diff --git a/src/util/guihelpers.cpp b/src/util/guihelpers.cpp index 702f84f..a873768 100644 --- a/src/util/guihelpers.cpp +++ b/src/util/guihelpers.cpp @@ -134,3 +134,12 @@ Capacity::Unit preferredUnit() { return static_cast(Config::preferredUnit()); } + +namespace GuiHelpers { + + FileSystem::Type defaultFileSystem() + { + return static_cast(Config::defaultFileSystem()); + } + +} diff --git a/src/util/guihelpers.h b/src/util/guihelpers.h index 67de7de..40afbbb 100644 --- a/src/util/guihelpers.h +++ b/src/util/guihelpers.h @@ -31,6 +31,9 @@ LIBKPMGUI_EXPORT bool checkPermissions(); LIBKPMGUI_EXPORT bool loadBackend(); QIcon createFileSystemColor(FileSystem::Type type, quint32 size); Capacity::Unit preferredUnit(); +namespace GuiHelpers { + FileSystem::Type defaultFileSystem(); +} QString suCommand();