added 1 changeset to branch 'refs/remotes/looncraz-github/CAP-dirty' old head: 80dab88e3b1d6fc07a19126ec0be72e0f06069e1 new head: 1f8a7aca6efc757a53ad50598365f455b55fc354 overview: https://github.com/looncraz/haiku/compare/80dab88e3b1d...1f8a7aca6efc ---------------------------------------------------------------------------- 1f8a7aca6efc: Style cleanup [ looncraz <looncraz@xxxxxxxxxxxx> ] ---------------------------------------------------------------------------- Commit: 1f8a7aca6efc757a53ad50598365f455b55fc354 Author: looncraz <looncraz@xxxxxxxxxxxx> Date: Mon Mar 23 17:03:08 2015 UTC ---------------------------------------------------------------------------- 5 files changed, 10 insertions(+), 10 deletions(-) src/servers/app/View.cpp | 4 ++-- src/servers/app/decorator/DecorManager.cpp | 6 +++--- .../app/drawing/Painter/drawing_modes/DrawingModeSelectSUBPIX.h | 2 +- src/servers/app/drawing/Painter/drawing_modes/PixelFormat.cpp | 4 ++-- src/servers/app/drawing/interface/local/CompositeWindow.cpp | 4 ++-- ---------------------------------------------------------------------------- diff --git a/src/servers/app/View.cpp b/src/servers/app/View.cpp index b7289bf..fcbf4d4 100644 --- a/src/servers/app/View.cpp +++ b/src/servers/app/View.cpp @@ -576,12 +576,12 @@ View::UpdateOverlay() const BPoint& View::_GetOffsetFromWindow() const { - if (fOffsetFromWindowValid == false){ + if (fOffsetFromWindowValid == false) { fOffsetFromWindow = BPoint(0,0);; ConvertToParent(&fOffsetFromWindow); View * parent = fParent; - while (parent != NULL && parent->fParent != NULL){ + while (parent != NULL && parent->fParent != NULL) { parent->ConvertToParent(&fOffsetFromWindow); parent = parent->fParent; } diff --git a/src/servers/app/decorator/DecorManager.cpp b/src/servers/app/decorator/DecorManager.cpp index d4f35b8..22aeb50 100644 --- a/src/servers/app/decorator/DecorManager.cpp +++ b/src/servers/app/decorator/DecorManager.cpp @@ -136,7 +136,7 @@ DecorManager::AllocateDecorator(Window* window) if (window == fPreviewWindow) { if (fPreviewDecor != NULL) { return fPreviewDecor->AllocateDecorator(window->Desktop(), - window->GetDecoratorDrawingEngine(), window->Frame(), + window->GetDecoratorDrawingEngine(), window->Frame(), window->Title(), window->Look(), window->Flags()); } else { fPreviewWindow = NULL; @@ -166,7 +166,7 @@ void DecorManager::CleanupForWindow(Window* window) { // Given window is being deleted, do any cleanup needed - if (fPreviewWindow == window && window != NULL){ + if (fPreviewWindow == window && window != NULL) { fPreviewWindow = NULL; if (fPreviewDecor != NULL) @@ -180,7 +180,7 @@ DecorManager::CleanupForWindow(Window* window) status_t DecorManager::PreviewDecorator(BString path, Window* window) { - if (fPreviewWindow != NULL && fPreviewWindow != window){ + if (fPreviewWindow != NULL && fPreviewWindow != window) { // Reset other window to current decorator - only one can preview Window* oldPreviewWindow = fPreviewWindow; fPreviewWindow = NULL; diff --git a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelectSUBPIX.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelectSUBPIX.h index f9eacb2..6a95df8 100644 --- a/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelectSUBPIX.h +++ b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelectSUBPIX.h @@ -34,7 +34,7 @@ blend_solid_hspan_select_subpix(int x, int y, unsigned len, const color_type& c, const int subpixelR = gSubpixelOrderingRGB ? 0 : 2; do { if (pattern->IsHighColor(x, y)) { - if (compare(p, high, low, &color)){ + if (compare(p, high, low, &color)) { BLEND_SELECT_SUBPIX(p, color.red, color.green, color.blue, covers[subpixelL], covers[subpixelM], covers[subpixelR]); } diff --git a/src/servers/app/drawing/Painter/drawing_modes/PixelFormat.cpp b/src/servers/app/drawing/Painter/drawing_modes/PixelFormat.cpp index 0e4508f..07a5f75 100644 --- a/src/servers/app/drawing/Painter/drawing_modes/PixelFormat.cpp +++ b/src/servers/app/drawing/Painter/drawing_modes/PixelFormat.cpp @@ -211,7 +211,7 @@ PixelFormat::SetDrawingMode(drawing_mode mode, source_alpha alphaSrcMode, case B_OP_COPY: if (text) { fBlendPixel = blend_pixel_copy_text; - fBlendHLine = blend_hline_copy_text; + fBlendHLine = blend_hline_copy_text; fBlendSolidHSpanSubpix = blend_solid_hspan_copy_text_subpix; fBlendSolidHSpan = blend_solid_hspan_copy_text; fBlendSolidVSpan = blend_solid_vspan_copy_text; @@ -310,7 +310,7 @@ PixelFormat::SetDrawingMode(drawing_mode mode, source_alpha alphaSrcMode, fBlendSolidVSpan = blend_solid_vspan_alpha_cc; fBlendColorHSpan = blend_color_hspan_alpha_cc; } - } else if (alphaSrcMode == B_PIXEL_ALPHA){ + } else if (alphaSrcMode == B_PIXEL_ALPHA) { if (alphaFncMode == B_ALPHA_OVERLAY) { if (fPatternHandler->IsSolid()) { fBlendPixel = blend_pixel_alpha_po_solid; diff --git a/src/servers/app/drawing/interface/local/CompositeWindow.cpp b/src/servers/app/drawing/interface/local/CompositeWindow.cpp index b00ad37..33e208c 100644 --- a/src/servers/app/drawing/interface/local/CompositeWindow.cpp +++ b/src/servers/app/drawing/interface/local/CompositeWindow.cpp @@ -117,7 +117,7 @@ CompositeWindow::ProcessDirtyRegion(BRegion& regionOnScreen) And, eventually, when a window changes shape... */ - if (!IsCompositeWindow()){ + if (!IsCompositeWindow()) { Window::ProcessDirtyRegion(regionOnScreen); return; } @@ -445,7 +445,7 @@ CompositeWindow::ConvertDrawingToScreen(BRect* rect) const void CompositeWindow::ConvertDrawingToScreen(BRegion* region) const { - if (!IsCompositeWindow()){ + if (!IsCompositeWindow()) { Window::ConvertDrawingToScreen(region); return; }