From 1fbfabdf666c75ccc26bfde1f1f3254178b07012 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Tue, 2 Oct 2018 00:46:54 +0200 Subject: [PATCH] Remove whitespaces --- cmake/Summary.cmake | 2 +- src/context/contextview.cpp | 14 +++++++------- src/core/mainwindow.cpp | 2 +- src/core/qtsystemtrayicon.h | 2 +- src/covermanager/albumcoverchoicecontroller.cpp | 2 +- src/covermanager/albumcovermanager.cpp | 2 +- src/device/macdevicelister.mm | 2 +- src/engine/vlcengine.h | 2 +- src/musicbrainz/acoustidclient.h | 2 +- src/widgets/playingwidget.cpp | 2 +- src/widgets/playingwidget.h | 2 +- src/widgets/sliderwidget.cpp | 4 ++-- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 06afcb33a..360c7de57 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -50,7 +50,7 @@ function(optional_component name default description) set(current_dep_name) set(missing_deps) - foreach(arg ${ARGN}) + foreach(arg ${ARGN}) if(${next_arg_is_dep_name}) set(current_dep_name "${arg}") set(next_arg_is_dep_name FALSE) diff --git a/src/context/contextview.cpp b/src/context/contextview.cpp index 43628d2cc..7a5367038 100644 --- a/src/context/contextview.cpp +++ b/src/context/contextview.cpp @@ -133,7 +133,7 @@ void ContextView::AddActions() { action_show_output_ = new QAction(tr("Show engine and device"), this); action_show_output_->setCheckable(true); - action_show_output_->setChecked(true); + action_show_output_->setChecked(true); action_show_albums_ = new QAction(tr("Show albums by artist"), this); action_show_albums_->setCheckable(true); @@ -141,7 +141,7 @@ void ContextView::AddActions() { action_show_lyrics_ = new QAction(tr("Show song lyrics"), this); action_show_lyrics_->setCheckable(true); - action_show_lyrics_->setChecked(false); + action_show_lyrics_->setChecked(false); menu_->addAction(action_show_data_); menu_->addAction(action_show_output_); @@ -512,13 +512,13 @@ void ContextView::UpdateLyrics(quint64 id, const QString lyrics) { bool ContextView::eventFilter(QObject *object, QEvent *event) { - switch(event->type()) { - case QEvent::Paint:{ + switch(event->type()) { + case QEvent::Paint:{ handlePaintEvent(object, event); - } - default:{ + } + default:{ return QObject::eventFilter(object, event); - } + } } return(true); diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 87b5bf746..aa90a14a6 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -317,7 +317,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co ui_->action_stop->setIcon(IconLoader::Load("media-stop")); ui_->action_stop_after_this_track->setIcon(IconLoader::Load("media-stop")); ui_->action_next_track->setIcon(IconLoader::Load("media-forward")); - ui_->action_quit->setIcon(IconLoader::Load("application-exit")); + ui_->action_quit->setIcon(IconLoader::Load("application-exit")); // Playlist diff --git a/src/core/qtsystemtrayicon.h b/src/core/qtsystemtrayicon.h index 391870030..1f2b51cac 100644 --- a/src/core/qtsystemtrayicon.h +++ b/src/core/qtsystemtrayicon.h @@ -1,5 +1,5 @@ /* - * Strawberry Music Player + * Strawberry Music Player * This file was part of Clementine. * Copyright 2010, David Sansome * diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index 7a1128ced..c1fd89b8a 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -217,7 +217,7 @@ void AlbumCoverChoiceController::ShowCover(const Song &song, const QImage image) QUrl url_automatic(song.art_automatic()); if (url_manual.isLocalFile() || url_automatic.isLocalFile()) { - QPixmap pixmap = AlbumCoverLoader::TryLoadPixmap(song.art_automatic(), song.art_manual(), song.url().toLocalFile()); + QPixmap pixmap = AlbumCoverLoader::TryLoadPixmap(song.art_automatic(), song.art_manual(), song.url().toLocalFile()); ShowCover(song, pixmap); } else if (!image.isNull()) ShowCover(song, QPixmap::fromImage(image)); diff --git a/src/covermanager/albumcovermanager.cpp b/src/covermanager/albumcovermanager.cpp index ddf7abf0c..c6ad989c9 100644 --- a/src/covermanager/albumcovermanager.cpp +++ b/src/covermanager/albumcovermanager.cpp @@ -631,7 +631,7 @@ void AlbumCoverManager::SaveCoverToFile() { } else if(!song.art_automatic().isEmpty() && QFile::exists(song.art_automatic())) { image = QImage(song.art_automatic()); - } + } else { image = no_cover_image_; } diff --git a/src/device/macdevicelister.mm b/src/device/macdevicelister.mm index ce1a5a93e..24f32a7a7 100644 --- a/src/device/macdevicelister.mm +++ b/src/device/macdevicelister.mm @@ -364,7 +364,7 @@ void MacDeviceLister::DiskAddedCallback(DADiskRef disk, void* context) { } #endif - NSURL* volume_path = + NSURL* volume_path = [[properties objectForKey:(NSString*)kDADiskDescriptionVolumePathKey] copy]; if (volume_path) { diff --git a/src/engine/vlcengine.h b/src/engine/vlcengine.h index 0e34d1141..9e51469b4 100644 --- a/src/engine/vlcengine.h +++ b/src/engine/vlcengine.h @@ -55,7 +55,7 @@ class VLCEngine : public Engine::Base { void Unpause(); void Seek(quint64 offset_nanosec); protected: - void SetVolumeSW(uint percent); + void SetVolumeSW(uint percent); public: virtual qint64 position_nanosec() const; virtual qint64 length_nanosec() const; diff --git a/src/musicbrainz/acoustidclient.h b/src/musicbrainz/acoustidclient.h index d1ebd0eda..9335bf51f 100644 --- a/src/musicbrainz/acoustidclient.h +++ b/src/musicbrainz/acoustidclient.h @@ -37,7 +37,7 @@ class AcoustidClient : public QObject { Q_OBJECT // Gets a MBID from a Chromaprint fingerprint. - // A fingerprint identifies one particular encoding of a song and is created by Fingerprinter. + // A fingerprint identifies one particular encoding of a song and is created by Fingerprinter. // An MBID identifies the actual song and can be passed to Musicbrainz to get metadata. // You can create one AcoustidClient and make multiple requests using it. // IDs are provided by the caller when a request is started and included in the Finished signal - they have no meaning to AcoustidClient. diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 87636ff15..8be32f57e 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -179,7 +179,7 @@ void PlayingWidget::SetVisible(bool visible) { return; } - if (visible == visible_) return; + if (visible == visible_) return; timeline_show_hide_->setFrameRange(0, total_height_); timeline_show_hide_->setDirection(visible ? QTimeLine::Forward : QTimeLine::Backward); diff --git a/src/widgets/playingwidget.h b/src/widgets/playingwidget.h index 42e0d1e8c..eb003b9c3 100644 --- a/src/widgets/playingwidget.h +++ b/src/widgets/playingwidget.h @@ -99,7 +99,7 @@ class PlayingWidget : public QWidget { void AutomaticCoverSearchDone(); void AlbumArtLoaded(const Song &song, const QString &uri, const QImage &image); - void SetHeight(int height); + void SetHeight(int height); void FadePreviousTrack(qreal value); private: diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp index bdc7eeb13..7f3e302c6 100644 --- a/src/widgets/sliderwidget.cpp +++ b/src/widgets/sliderwidget.cpp @@ -303,7 +303,7 @@ void Amarok::VolumeSlider::paintEvent(QPaintEvent*) { const int padding = 7; const int offset = int(double((width() - 2 * padding) * value()) / maximum()); - // If theme changed since last paintEvent, redraw the volume pixmap with new theme colors + // If theme changed since last paintEvent, redraw the volume pixmap with new theme colors if (m_previous_theme_text_color != palette().color(QPalette::WindowText)) { m_pixmapInset = drawVolumePixmap(); m_previous_theme_text_color = palette().color(QPalette::WindowText); @@ -384,7 +384,7 @@ void Amarok::VolumeSlider::drawVolumeSliderHandle() { painter.setCompositionMode(QPainter::CompositionMode_DestinationIn); painter.drawImage(0, 0, pixmapHandleGlow); - // Overlay the volume slider handle image + // Overlay the volume slider handle image painter.setCompositionMode(QPainter::CompositionMode_SourceAtop); painter.drawImage(0, 0, pixmapHandle);