Reformat done with clang-3.5 svn200967

src/analyzers/baranalyzer.h

@@ -43,8 +43,8 @@ class BarAnalyzer : public Analyzer::Base {
   // every iteration
   uint m_lvlMapper[256];
   std::vector<aroofMemVec> m_roofMem;
-  std::vector<uint> barVector;  // positions of bars
+  std::vector<uint> barVector;           // positions of bars
-  std::vector<int> roofVector;  // positions of roofs
+  std::vector<int> roofVector;           // positions of roofs
   std::vector<uint> roofVelocityVector;  // speed that roofs falls
 
   const QPixmap* gradient() const { return &m_pixBarGradient; }

src/analyzers/blockanalyzer.cpp

@@ -14,8 +14,8 @@
 
 const uint BlockAnalyzer::HEIGHT = 2;
 const uint BlockAnalyzer::WIDTH = 4;
-const uint BlockAnalyzer::MIN_ROWS = 3;  // arbituary
+const uint BlockAnalyzer::MIN_ROWS = 3;       // arbituary
-const uint BlockAnalyzer::MIN_COLUMNS = 32;  // arbituary
+const uint BlockAnalyzer::MIN_COLUMNS = 32;   // arbituary
 const uint BlockAnalyzer::MAX_COLUMNS = 256;  // must be 2**n
 const uint BlockAnalyzer::FADE_SIZE = 90;
 

src/analyzers/blockanalyzer.h

@@ -44,11 +44,11 @@ class BlockAnalyzer : public Analyzer::Base {
   QPixmap* bar() { return &m_barPixmap; }
 
   uint m_columns, m_rows;  // number of rows and columns of blocks
-  uint m_y;  // y-offset from top of widget
+  uint m_y;                // y-offset from top of widget
   QPixmap m_barPixmap;
   QPixmap m_topBarPixmap;
   QPixmap m_background;
-  Scope m_scope;  // so we don't create a vector every frame
+  Scope m_scope;               // so we don't create a vector every frame
   std::vector<float> m_store;  // current bar heights
   std::vector<float> m_yscale;
 

src/core/gnomeglobalshortcutbackend.cpp

@@ -50,7 +50,7 @@ bool GnomeGlobalShortcutBackend::DoRegister() {
   qLog(Debug) << "registering";
   // Check if the GSD service is available
   if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(
-           kGsdService)) {
+          kGsdService)) {
     qLog(Warning) << "gnome settings daemon not registered";
     return false;
   }
@@ -100,7 +100,7 @@ void GnomeGlobalShortcutBackend::DoUnregister() {
 #ifdef QT_DBUS_LIB
   // Check if the GSD service is available
   if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(
-           kGsdService))
+          kGsdService))
     return;
   if (!interface_ || !is_connected_) return;
 

src/devices/devicemanager.cpp

@@ -309,7 +309,7 @@ QVariant DeviceManager::data(const QModelIndex& index, int role) const {
       if (!info.device_) {
         if (info.database_id_ == -1 &&
             !info.BestBackend()->lister_->DeviceNeedsMount(
-                 info.BestBackend()->unique_id_)) {
+                info.BestBackend()->unique_id_)) {
 
           if (info.BestBackend()->lister_->AskForScan(
                   info.BestBackend()->unique_id_)) {

src/ui/albumcoverchoicecontroller.cpp

@@ -132,7 +132,7 @@ void AlbumCoverChoiceController::SaveCoverToFile(const Song& song,
   QString extension = save_filename.right(4);
   if (!extension.startsWith('.') ||
       !QImageWriter::supportedImageFormats().contains(
-           extension.right(3).toUtf8())) {
+          extension.right(3).toUtf8())) {
     save_filename.append(".jpg");
   }
 

src/ui/edittagdialog.cpp

@@ -673,7 +673,7 @@ void EditTagDialog::SaveData(const QList<Data>& data) {
     if (ref.current_.IsMetadataEqual(ref.original_)) continue;
 
     if (!TagReaderClient::Instance()->SaveFileBlocking(
-             ref.current_.url().toLocalFile(), ref.current_)) {
+            ref.current_.url().toLocalFile(), ref.current_)) {
       emit Error(tr("An error occurred writing metadata to '%1'")
                      .arg(ref.current_.url().toLocalFile()));
     }

src/ui/mainwindow.cpp

@@ -856,7 +856,7 @@ MainWindow::MainWindow(Application* app, SystemTrayIcon* tray_icon, OSD* osd,
 
   restoreGeometry(settings_.value("geometry").toByteArray());
   if (!ui_->splitter->restoreState(
-           settings_.value("splitter_state").toByteArray())) {
+          settings_.value("splitter_state").toByteArray())) {
     ui_->splitter->setSizes(QList<int>() << 300 << width() - 300);
   }
   ui_->tabs->SetCurrentIndex(

src/widgets/sliderwidget.h

@@ -66,7 +66,7 @@ signals:
   bool m_outside;
   int m_prevValue;
 
-  Slider(const Slider&);  // undefined
+  Slider(const Slider&);             // undefined
   Slider& operator=(const Slider&);  // undefined
 };
 
@@ -87,7 +87,7 @@ class PrettySlider : public Slider {
   virtual void mousePressEvent(QMouseEvent*);
 
  private:
-  PrettySlider(const PrettySlider&);  // undefined
+  PrettySlider(const PrettySlider&);             // undefined
   PrettySlider& operator=(const PrettySlider&);  // undefined
 
   SliderMode m_mode;
@@ -115,7 +115,7 @@ class VolumeSlider : public Slider {
  private:
   void generateGradient();
 
-  VolumeSlider(const VolumeSlider&);  // undefined
+  VolumeSlider(const VolumeSlider&);             // undefined
   VolumeSlider& operator=(const VolumeSlider&);  // undefined
 
   ////////////////////////////////////////////////////////////////