Merge lp:~charon030/unity/fix-tabs-spaces into lp:unity

[Charon]

Whitespace cleanup in dash source files.

This is just simple code cleaning of the dash. I removed whitespace characters at the end of lines and replaced tabs with the correct amount of spaces.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'dash/CoverflowResultView.cpp'
--- dash/CoverflowResultView.cpp	2012-10-11 01:44:15 +0000
+++ dash/CoverflowResultView.cpp	2012-11-19 18:59:20 +0000
@@ -84,11 +84,11 @@
   std::string const& icon_hint = result.icon_hint;
   std::string icon_name = !icon_hint.empty() ? icon_hint : ". GThemedIcon text-x-preview";
   static const int element_size = style.GetTileHeight();
-  
+
   icon_texture_ = new IconTexture(icon_name.c_str(), element_size, true);
   icon_texture_->SinkReference();
   icon_texture_->LoadIcon();
-  
+
   icon_texture_->texture_updated.connect([&] (nux::BaseTexture *texture)
   {
     if (parent_)
@@ -168,7 +168,7 @@
     glib::String proposed_unique_id;
 
     g_variant_get(data, "(iss)", &nav_mode, &uri, &proposed_unique_id);
-   
+
     if (proposed_unique_id.Str() != parent_->unique_id())
       return;
 
@@ -176,7 +176,7 @@
     int current_index = GetIndexForUri(uri);
     if (nav_mode == -1) // left
     {
-      current_index--;  
+      current_index--;
     }
     else if (nav_mode == 1) // right
     {
@@ -187,7 +187,7 @@
     {
       return;
     }
-    
+
     if (nav_mode)
     {
       std::string uri = GetUriForIndex(current_index);
@@ -198,7 +198,7 @@
 
 CoverflowResultView::Impl::~Impl()
 {
-  
+
 }
 
 int CoverflowResultView::Impl::GetIndexForUri(std::string uri)
@@ -228,7 +228,7 @@
 
 CoverflowResultView::~CoverflowResultView()
 {
-  
+
 }
 
 void CoverflowResultView::SetModelRenderer(ResultRenderer* renderer)
@@ -254,7 +254,7 @@
       pimpl->coverflow_->model()->RemoveItem(item);
       break;
     }
-  }  
+  }
 }
 
 void CoverflowResultView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -280,7 +280,7 @@
 
     GfxContext.GetRenderStates().SetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
   }
-  
+
   if (GetCompositionLayout())
   {
     nux::Geometry geo = GetCompositionLayout()->GetGeometry();
 
=== modified file 'dash/CoverflowResultView.h'
--- dash/CoverflowResultView.h	2012-10-11 01:44:15 +0000
+++ dash/CoverflowResultView.h	2012-11-19 18:59:20 +0000
@@ -39,7 +39,7 @@
 
   virtual void AddResult(Result& result);
   virtual void RemoveResult(Result& result);
-  
+
   virtual void Activate(std::string const& uri, int index, ActivateType type);
 
 protected:
@@ -51,9 +51,9 @@
 private:
   struct Impl;
   Impl* pimpl;
-};  
-
-}
-}
-
-#endif
 \ No newline at end of file
+};
+
+}
+}
+
+#endif
 
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-11-08 09:12:24 +0000
+++ dash/DashController.cpp	2012-11-19 18:59:20 +0000
@@ -83,7 +83,7 @@
     {
       // Relayout here so the input window size updates.
       Relayout();
-      
+
       window_->PushToFront();
       window_->SetInputFocus();
       nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
@@ -443,7 +443,7 @@
     {
       LOG_WARNING(logger) << "Object registration failed. Dash DBus interface not available.";
     }
-    
+
     g_dbus_node_info_unref(introspection_data);
   }
 }
 
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-11-14 08:57:56 +0000
+++ dash/DashView.cpp	2012-11-19 18:59:20 +0000
@@ -266,10 +266,10 @@
     AddChild(preview_container_.GetPointer());
     preview_container_->SetParentObject(this);
     preview_container_->Preview(model, previews::Navigation::NONE); // no swipe left or right
-    
+
     preview_container_->SetGeometry(layout_->GetGeometry());
     preview_displaying_ = true;
- 
+
     // connect to nav left/right signals to request nav left/right movement.
     preview_container_->navigate_left.connect([&] () {
       preview_navigation_mode_ = previews::Navigation::LEFT;
@@ -281,7 +281,7 @@
 
     preview_container_->navigate_right.connect([&] () {
       preview_navigation_mode_ = previews::Navigation::RIGHT;
-      
+
       // sends a message to all result views, sending the the uri of the current preview result
       // and the unique id of the result view that should be handling the results
       ubus_manager_.SendMessage(UBUS_DASH_PREVIEW_NAVIGATION_REQUEST, g_variant_new("(iss)", 1, last_activated_uri_.c_str(), stored_activated_unique_id_.c_str()));
@@ -531,7 +531,7 @@
   auto& style = dash::Style::Instance();
 
   renderer_.DrawInner(graphics_engine, content_geo_, GetAbsoluteGeometry(), GetGeometry());
-  
+
   nux::Geometry clip_geo = layout_->GetGeometry();
   clip_geo.x += style.GetVSeparatorSize();
   graphics_engine.PushClippingRectangle(clip_geo);
@@ -600,7 +600,7 @@
   {
     layout_->ProcessDraw(graphics_engine, force_draw);
   }
-  
+
   // Animation effect rendering
   if (display_ghost || IsFullRedraw())
   {
@@ -609,7 +609,7 @@
     unsigned int current_dest_blend_factor;
     graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
 
-    float ghost_opacity = 0.25f;    
+    float ghost_opacity = 0.25f;
     float tint_factor = 1.2f;
     float saturation_ref = 0.4f;
     nux::Color bg_color = background_color_;
@@ -643,7 +643,7 @@
             nux::Color(fade_out_value_, fade_out_value_, fade_out_value_, fade_out_value_)
             );
           filter_width += active_lens_view_->filter_bar()->GetWidth();
-        }  
+        }
 
         float saturation = fade_out_value_ + (1.0f - fade_out_value_) * saturation_ref;
         float opacity = fade_out_value_ < ghost_opacity ? ghost_opacity : fade_out_value_;
@@ -1186,7 +1186,7 @@
       search_bar_->search_string = "";
     else
       ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
-    
+
     return true;
   }
   return false;
@@ -1439,7 +1439,7 @@
 
 nux::Geometry const& DashView::GetContentGeometry() const
 {
-  return content_geo_;  
+  return content_geo_;
 }
 
 }
 
=== modified file 'dash/FilterAllButton.cpp'
--- dash/FilterAllButton.cpp	2012-09-18 11:55:33 +0000
+++ dash/FilterAllButton.cpp	2012-11-19 18:59:20 +0000
@@ -38,7 +38,7 @@
   SetInputEventSensitivity(false);
 
   state_change.connect(sigc::mem_fun(this, &FilterAllButton::OnStateChanged));
-  
+
   SetRedirectRenderingToTexture(true);
   //SetCopyPreviousFboTexture(false);
   SetClearBeforeDraw(true);
 
=== modified file 'dash/FilterRatingsButton.cpp'
--- dash/FilterRatingsButton.cpp	2012-09-06 05:36:00 +0000
+++ dash/FilterRatingsButton.cpp	2012-11-19 18:59:20 +0000
@@ -126,7 +126,7 @@
 
   for (int index = 0; index < num_stars; ++index)
   {
-	Style& style = Style::Instance();
+    Style& style = Style::Instance();
     nux::BaseTexture* texture = style.GetStarSelectedIcon();
     if (index < total_full_stars)
     {
 
=== modified file 'dash/LensBar.cpp'
--- dash/LensBar.cpp	2012-11-08 09:12:24 +0000
+++ dash/LensBar.cpp	2012-11-19 18:59:20 +0000
@@ -234,8 +234,8 @@
 
     if (activate_previous && icon->IsVisible())
     {
-	SetActive(icon);
-	return;
+      SetActive(icon);
+      return;
     }
     if (icon->active)
       activate_previous = true;
 
=== modified file 'dash/LensBarIcon.cpp'
--- dash/LensBarIcon.cpp	2012-09-06 05:36:00 +0000
+++ dash/LensBarIcon.cpp	2012-11-19 18:59:20 +0000
@@ -49,7 +49,7 @@
   SetMaximumHeight(FOCUS_OVERLAY_HEIGHT);
 
   focus_layer_.reset(Style::Instance().FocusOverlay(FOCUS_OVERLAY_WIDTH, FOCUS_OVERLAY_HEIGHT));
-  
+
   SetOpacity(inactive_opacity_);
 
   SetAcceptKeyNavFocus(true);
 
=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp	2012-11-14 08:57:56 +0000
+++ dash/LensView.cpp	2012-11-19 18:59:20 +0000
@@ -155,12 +155,12 @@
   lens_->connected.changed.connect([&](bool is_connected) { if (is_connected) initial_activation_ = true; });
   lens_->categories_reordered.connect(sigc::mem_fun(this, &LensView::OnCategoryOrderChanged));
   search_string.SetGetterFunction(sigc::mem_fun(this, &LensView::get_search_string));
-  filters_expanded.changed.connect([&](bool expanded) 
-  { 
-    fscroll_view_->SetVisible(expanded); 
-    QueueRelayout(); 
+  filters_expanded.changed.connect([&](bool expanded)
+  {
+    fscroll_view_->SetVisible(expanded);
+    QueueRelayout();
     OnColumnsChanged();
-    ubus_manager_.SendMessage(UBUS_REFINE_STATUS, 
+    ubus_manager_.SendMessage(UBUS_REFINE_STATUS,
                               g_variant_new(UBUS_REFINE_STATUS_FORMAT_STRING, expanded ? TRUE : FALSE));
   });
   view_type.changed.connect(sigc::mem_fun(this, &LensView::OnViewTypeChanged));
@@ -360,7 +360,7 @@
     {
       case ResultView::ActivateType::DIRECT:
       {
-        lens_->Activate(uri);  
+        lens_->Activate(uri);
       } break;
       case ResultView::ActivateType::PREVIEW:
       {
@@ -370,7 +370,7 @@
     };
 
   }, unique_id));
-  
+
 
   /* Set up filter model for this category */
   Results::Ptr results_model = lens_->results;
 
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp	2012-11-08 16:49:26 +0000
+++ dash/PlacesGroup.cpp	2012-11-19 18:59:20 +0000
@@ -195,7 +195,7 @@
   _name->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _expand_label->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
   _expand_icon->mouse_click.connect(sigc::mem_fun(this, &PlacesGroup::RecvMouseClick));
-  
+
   key_nav_focus_change.connect([&](nux::Area* area, bool has_focus, nux::KeyNavDirection direction)
   {
     if (!has_focus)
@@ -220,7 +220,7 @@
     nux::TexCoordXForm texxform;
     if (status && _using_nofilters_background)
     {
-      _background_layer.reset(new nux::TextureLayer(_background->GetDeviceTexture(), 
+      _background_layer.reset(new nux::TextureLayer(_background->GetDeviceTexture(),
                               texxform, 
                               nux::color::White,
                               false,
@@ -229,12 +229,12 @@
     }
     else if (!status && !_using_nofilters_background)
     {
-      _background_layer.reset(new nux::TextureLayer(_background_nofilters->GetDeviceTexture(), 
-                              texxform, 
+      _background_layer.reset(new nux::TextureLayer(_background_nofilters->GetDeviceTexture(),
+                              texxform,
                               nux::color::White,
                               false,
                               rop));
-      
+
       _using_nofilters_background = true;
     }
     QueueDraw();
@@ -326,9 +326,9 @@
   _group_layout->AddLayout(new nux::SpaceLayout(2,2,2,2), 0); // top padding
   _group_layout->AddLayout(layout, 1);
 
-  view->results_per_row.changed.connect([&] (int results_per_row) 
+  view->results_per_row.changed.connect([&] (int results_per_row)
   {
-    _n_visible_items_in_unexpand_mode = results_per_row;  
+    _n_visible_items_in_unexpand_mode = results_per_row;
     RefreshLabel();
   });
 
@@ -420,7 +420,6 @@
 {
   if (GetChildView())
   {
-    
 
     Refresh();
     QueueDraw();
@@ -473,7 +472,7 @@
 
     graphics_engine.GetRenderStates().SetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
   }
-  
+
   if (ShouldBeHighlighted())
   {
     nux::Geometry geo(_header_layout->GetGeometry());
@@ -492,10 +491,10 @@
     bg_width = _background->GetWidth();
 
   bg_geo.x = std::max(bg_geo.width - bg_width,0);
-  
+
   bg_geo.width = std::min(bg_width, bg_geo.GetWidth()) + 1; // to render into a space left over by the scrollview
   bg_geo.height = _background->GetHeight();
-  
+
   _background_layer->SetGeometry(bg_geo);
   _background_layer->Renderlayer(graphics_engine);
 
 
=== modified file 'dash/PlacesGroup.h'
--- dash/PlacesGroup.h	2012-11-06 18:19:09 +0000
+++ dash/PlacesGroup.h	2012-11-19 18:59:20 +0000
@@ -142,7 +142,7 @@
   unsigned _category_index;
   std::string _cached_name;
   nux::Geometry _cached_geometry;
-  
+
   std::string _renderer_name;
   bool _coverflow_enabled;
 
 
=== modified file 'dash/PreviewStateMachine.cpp'
--- dash/PreviewStateMachine.cpp	2012-10-29 09:34:54 +0000
+++ dash/PreviewStateMachine.cpp	2012-11-19 18:59:20 +0000
@@ -95,7 +95,7 @@
   if (GetSplitPosition(LENS_BAR) < 0) return;
   if (GetSplitPosition(SEARCH_BAR) < 0) return;
    */
- 
+
   if (left_results < 0 ||
       right_results < 0)
     return;
 
=== modified file 'dash/PreviewStateMachine.h'
--- dash/PreviewStateMachine.h	2012-08-09 16:12:30 +0000
+++ dash/PreviewStateMachine.h	2012-11-19 18:59:20 +0000
@@ -53,7 +53,7 @@
   nux::Property<bool> preview_active;
   nux::Property<int> left_results;
   nux::Property<int> right_results;
-  
+
   sigc::signal<void, Preview::Ptr> PreviewActivated;
 
 private:
 
=== modified file 'dash/ResultView.cpp'
--- dash/ResultView.cpp	2012-11-06 18:19:09 +0000
+++ dash/ResultView.cpp	2012-11-19 18:59:20 +0000
@@ -223,7 +223,7 @@
 
   // clear children (no delete).
   RemoveAllChildren();
-  
+
   std::set<std::string> existing_results;
   // re-create list of children.
   int index = 0;
@@ -279,7 +279,7 @@
 }
 
 void ResultView::UpdateResultWrapper(debug::ResultWrapper* wrapper, Result const& result, int index)
-{  
+{
 }
 
 }
 
=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-11-13 22:39:49 +0000
+++ dash/ResultViewGrid.cpp	2012-11-19 18:59:20 +0000
@@ -106,7 +106,7 @@
     gchar* uri = NULL;
     gchar* proposed_unique_id = NULL;
     g_variant_get(data, "(iss)", &nav_mode, &uri, &proposed_unique_id);
-   
+
     if (std::string(proposed_unique_id) != unique_id())
       return;
 
@@ -128,7 +128,7 @@
         LOG_ERROR(logger) << "requested to activated a result that does not exist: " << current_index;
         return;
       }
-      
+
       // closed
       if (nav_mode == 0)
       {
@@ -506,7 +506,7 @@
       focused_uri_ = (*first_iter).uri;
       selected_index_ = 0;
     }
-    
+
     int items_per_row = GetItemsPerRow();
     unsigned num_results = GetNumResults();
 
@@ -519,7 +519,7 @@
       int total_rows = std::ceil(num_results / (double)items_per_row);
       selected_index_ = items_per_row * (total_rows-1);
     }
-    
+
     if (direction != nux::KEY_NAV_NONE)
     {
       std::tuple<int, int> focused_coord = GetResultPosition(selected_index_);
@@ -660,7 +660,7 @@
           offset_x = 0;
           offset_y = 0;
         }
-        
+
         nux::Geometry render_geo(x_position, y_position, renderer_->width, renderer_->height);
         Result result(*GetIteratorAtRow(index));
         renderer_->Render(GfxContext, result, state, render_geo, offset_x, offset_y);
@@ -764,7 +764,7 @@
   int items_per_row = GetItemsPerRow();
   int column_size = renderer_->width + horizontal_spacing + extra_horizontal_spacing_;
   int row_size = renderer_->height + vertical_spacing;
-  
+
   int y = row_size * (index / items_per_row) + padding;
   int x = column_size * (index % items_per_row) + padding;
 
 
=== modified file 'dash/ResultViewGrid.h'
--- dash/ResultViewGrid.h	2012-11-06 18:19:09 +0000
+++ dash/ResultViewGrid.h	2012-11-19 18:59:20 +0000
@@ -52,7 +52,7 @@
 
   int GetSelectedIndex();
   virtual unsigned GetIndexAtPosition(int x, int y);
-  
+
   virtual void Activate(std::string const& uri, int index, ActivateType type);
 
 protected: