From 40d985c7f98371d029cc4f6f6940575514ce0ac6 Mon Sep 17 00:00:00 2001 From: Ethan Warth Date: Fri, 14 Aug 2015 15:48:01 -0500 Subject: [PATCH] performed a make format --- src/ui/behavioursettingspage.cpp | 51 +++++++++++++++++--------------- src/ui/mainwindow.cpp | 23 +++++++------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/src/ui/behavioursettingspage.cpp b/src/ui/behavioursettingspage.cpp index 41c5e1bac..b93ef8bd8 100644 --- a/src/ui/behavioursettingspage.cpp +++ b/src/ui/behavioursettingspage.cpp @@ -47,21 +47,21 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog) MainWindow::PlayBehaviour_IfStopped); ui_->doubleclick_playmode->setItemData(2, MainWindow::PlayBehaviour_Always); - ui_->doubleclick_playlist_addmode->setItemData(0, - MainWindow::PlaylistAddBehaviour_Play); - ui_->doubleclick_playlist_addmode->setItemData(1, - MainWindow::PlaylistAddBehaviour_Enqueue); - ui_->doubleclick_playlist_addmode->setItemData(2, - MainWindow::PlaylistAddBehaviour_PlayNext); - ui_->doubleclick_playlist_addmode->setItemData(3, - MainWindow::PlaylistAddBehaviour_Nothing); + ui_->doubleclick_playlist_addmode->setItemData( + 0, MainWindow::PlaylistAddBehaviour_Play); + ui_->doubleclick_playlist_addmode->setItemData( + 1, MainWindow::PlaylistAddBehaviour_Enqueue); + ui_->doubleclick_playlist_addmode->setItemData( + 2, MainWindow::PlaylistAddBehaviour_PlayNext); + ui_->doubleclick_playlist_addmode->setItemData( + 3, MainWindow::PlaylistAddBehaviour_Nothing); - ui_->doubleclick_playlist_playmode->setItemData(0, - MainWindow::PlaylistPlayBehaviour_Never); - ui_->doubleclick_playlist_playmode->setItemData(1, - MainWindow::PlaylistPlayBehaviour_IfStopped); - ui_->doubleclick_playlist_playmode->setItemData(2, - MainWindow::PlaylistPlayBehaviour_Always); + ui_->doubleclick_playlist_playmode->setItemData( + 0, MainWindow::PlaylistPlayBehaviour_Never); + ui_->doubleclick_playlist_playmode->setItemData( + 1, MainWindow::PlaylistPlayBehaviour_IfStopped); + ui_->doubleclick_playlist_playmode->setItemData( + 2, MainWindow::PlaylistPlayBehaviour_Always); ui_->menu_playmode->setItemData(0, MainWindow::PlayBehaviour_Never); ui_->menu_playmode->setItemData(1, MainWindow::PlayBehaviour_IfStopped); @@ -81,9 +81,9 @@ BehaviourSettingsPage::BehaviourSettingsPage(SettingsDialog* dialog) QString code = lang_re.cap(1); QString lookup_code = QString(code) - .replace("@latin", "_Latn") - .replace("_CN", "_Hans_CN") - .replace("_TW", "_Hant_TW"); + .replace("@latin", "_Latn") + .replace("_CN", "_Hans_CN") + .replace("_TW", "_Hant_TW"); QString language_name = QLocale::languageToString(QLocale(lookup_code).language()); #if QT_VERSION >= 0x040800 @@ -128,11 +128,11 @@ void BehaviourSettingsPage::Load() { ui_->doubleclick_playlist_addmode->setCurrentIndex( ui_->doubleclick_playlist_addmode->findData( s.value("doubleclick_playlist_addmode", - MainWindow::PlaylistAddBehaviour_Play).toInt())); + MainWindow::PlaylistAddBehaviour_Play).toInt())); ui_->doubleclick_playlist_playmode->setCurrentIndex( ui_->doubleclick_playlist_playmode->findData( s.value("doubleclick_playlist_playmode", - MainWindow::PlaylistPlayBehaviour_IfStopped).toInt())); + MainWindow::PlaylistPlayBehaviour_IfStopped).toInt())); ui_->menu_playmode->setCurrentIndex(ui_->menu_playmode->findData( s.value("menu_playmode", MainWindow::PlayBehaviour_IfStopped).toInt())); @@ -155,7 +155,8 @@ void BehaviourSettingsPage::Load() { s.beginGroup(Player::kSettingsGroup); ui_->menu_previousmode->setCurrentIndex(ui_->menu_previousmode->findData( - s.value("menu_previousmode", Player::PreviousBehaviour_DontRestart).toInt())); + s.value("menu_previousmode", Player::PreviousBehaviour_DontRestart) + .toInt())); ui_->seek_step_sec->setValue(s.value("seek_step_sec", 10).toInt()); s.endGroup(); @@ -218,12 +219,14 @@ void BehaviourSettingsPage::Save() { .toInt()); MainWindow::PlaylistAddBehaviour doubleclick_playlist_addmode = MainWindow::PlaylistAddBehaviour( - ui_->doubleclick_playlist_addmode->itemData( - ui_->doubleclick_playlist_addmode->currentIndex()).toInt()); + ui_->doubleclick_playlist_addmode + ->itemData(ui_->doubleclick_playlist_addmode->currentIndex()) + .toInt()); MainWindow::PlaylistPlayBehaviour doubleclick_playlist_playmode = MainWindow::PlaylistPlayBehaviour( - ui_->doubleclick_playlist_playmode->itemData( - ui_->doubleclick_playlist_playmode->currentIndex()).toInt()); + ui_->doubleclick_playlist_playmode + ->itemData(ui_->doubleclick_playlist_playmode->currentIndex()) + .toInt()); MainWindow::PlayBehaviour menu_playmode = MainWindow::PlayBehaviour( ui_->menu_playmode->itemData(ui_->menu_playmode->currentIndex()).toInt()); diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 7e32a62aa..b15ecf1f1 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -992,10 +992,10 @@ void MainWindow::ReloadSettings() { s.value("doubleclick_playmode", PlayBehaviour_IfStopped).toInt()); doubleclick_playlist_addmode_ = PlaylistAddBehaviour(s.value("doubleclick_playlist_addmode", - PlaylistAddBehaviour_Play).toInt()); - doubleclick_playlist_playmode_ = PlaylistPlayBehaviour( - s.value("doubleclick_playlist_playmode", - PlaylistPlayBehaviour_IfStopped).toInt()); + PlaylistAddBehaviour_Play).toInt()); + doubleclick_playlist_playmode_ = + PlaylistPlayBehaviour(s.value("doubleclick_playlist_playmode", + PlaylistPlayBehaviour_IfStopped).toInt()); menu_playmode_ = PlayBehaviour(s.value("menu_playmode", PlayBehaviour_IfStopped).toInt()); } @@ -1253,8 +1253,8 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) { switch (doubleclick_playlist_playmode_) { case PlaylistPlayBehaviour_IfStopped: if (app_->player()->GetState() == Engine::Playing) { - break; // don't play if already playing - } // otherwise, behave the same as for "Always" (no break statement) + break; // don't play if already playing + } // otherwise, behave the same as for "Always" (no break statement) case PlaylistPlayBehaviour_Always: app_->playlist_manager()->SetActiveToCurrent(); @@ -1269,23 +1269,23 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) { case PlaylistAddBehaviour_PlayNext: app_->playlist_manager()->current()->queue()->Clear(); - // continue as if enqueueing (no break statement) + // continue as if enqueueing (no break statement) case PlaylistAddBehaviour_Enqueue: dummyIndexList.append(index); - app_->playlist_manager()->current()->queue()-> - ToggleTracks(dummyIndexList); + app_->playlist_manager()->current()->queue()->ToggleTracks( + dummyIndexList); switch (doubleclick_playlist_playmode_) { case PlaylistPlayBehaviour_Always: case PlaylistPlayBehaviour_IfStopped: if (app_->player()->GetState() != Engine::Playing) { app_->player()->PlayAt( - app_->playlist_manager()->current()->queue()->TakeNext(), + app_->playlist_manager()->current()->queue()->TakeNext(), Engine::Manual, true); } break; case PlaylistPlayBehaviour_Never: // deliberately do nothing here - break; + break; } break; @@ -1293,7 +1293,6 @@ void MainWindow::PlaylistDoubleClick(const QModelIndex& index) { // deliberately do nothing here break; } - } void MainWindow::VolumeWheelEvent(int delta) {