diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index b5423af3f..28cac46a9 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -297,7 +297,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd, ui_->tabs->setBackgroundPixmap(QPixmap(":/sidebar_background.png")); // Do this only after all default tabs have been added - ui_->tabs->loadSettings(kSettingsGroup); + ui_->tabs->loadSettings(settings_); track_position_timer_->setInterval(kTrackPositionUpdateTimeMs); connect(track_position_timer_, SIGNAL(timeout()), diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp index 37030feb5..98f4b2daf 100644 --- a/src/widgets/fancytabwidget.cpp +++ b/src/widgets/fancytabwidget.cpp @@ -290,10 +290,7 @@ FancyTabWidget::FancyTabWidget(QWidget* parent) : QTabWidget(parent), connect(tabBar, SIGNAL(currentChanged(int)), this, SLOT(currentTabChanged(int))); } -void FancyTabWidget::loadSettings(const char *kSettingsGroup) { - QSettings settings; - settings.beginGroup(kSettingsGroup); - +void FancyTabWidget::loadSettings(const QSettings& settings) { for (int i = 0; i < count(); i++) { int originalIndex = tabBar()->tabData(i).toInt(); QString k = "tab_index_" + QString::number(originalIndex); diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h index 5a4acc2d6..c18de5221 100644 --- a/src/widgets/fancytabwidget.h +++ b/src/widgets/fancytabwidget.h @@ -44,7 +44,7 @@ class FancyTabWidget : public QTabWidget { void setBackgroundPixmap(const QPixmap& pixmap); void addSpacer(); - void loadSettings(const char *); + void loadSettings(const QSettings&); void saveSettings(QSettings*); // Values are persisted - only add to the end enum Mode {