From bbe686e290dcc59d47792e2e9947346159ee732f Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 16 Jan 2014 23:45:33 +0100 Subject: [PATCH] LmmsStyle: adopted new coding style and renamed class --- include/{lmms_style.h => LmmsStyle.h} | 12 +++++------ src/core/main.cpp | 6 +++--- src/gui/FxMixerView.cpp | 1 - src/gui/{lmms_style.cpp => LmmsStyle.cpp} | 26 +++++++++++------------ 4 files changed, 22 insertions(+), 23 deletions(-) rename include/{lmms_style.h => LmmsStyle.h} (90%) rename src/gui/{lmms_style.cpp => LmmsStyle.cpp} (96%) diff --git a/include/lmms_style.h b/include/LmmsStyle.h similarity index 90% rename from include/lmms_style.h rename to include/LmmsStyle.h index 8786c3492..48c48d449 100644 --- a/include/lmms_style.h +++ b/include/LmmsStyle.h @@ -1,8 +1,8 @@ /* - * lmms_style.h - the graphical style used by LMMS to create a consistent + * LmmsStyle.h - the graphical style used by LMMS to create a consistent * interface * - * Copyright (c) 2007-2008 Tobias Doerffel + * Copyright (c) 2007-2014 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -30,7 +30,7 @@ #include -class lmmsStyle : public QPlastiqueStyle +class LmmsStyle : public QPlastiqueStyle { public: enum ColorRole @@ -61,8 +61,8 @@ public: NumColorRoles }; - lmmsStyle(); - virtual ~lmmsStyle() + LmmsStyle(); + virtual ~LmmsStyle() { } @@ -90,7 +90,7 @@ public: private: QImage colorizeXpm( const char * const * xpm, const QBrush& fill ) const; void hoverColors( bool sunken, bool hover, bool active, QColor& color, QColor& blend ) const; - QColor m_colors[ lmmsStyle::NumColorRoles ]; + QColor m_colors[ LmmsStyle::NumColorRoles ]; } ; diff --git a/src/core/main.cpp b/src/core/main.cpp index df7943389..346d76c0e 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,7 +1,7 @@ /* * main.cpp - just main.cpp which is starting up app... * - * Copyright (c) 2004-2013 Tobias Doerffel + * Copyright (c) 2004-2014 Tobias Doerffel * Copyright (c) 2012-2013 Paul Giblock

* * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net @@ -58,7 +58,7 @@ #include "config_mgr.h" #include "embed.h" #include "engine.h" -#include "lmms_style.h" +#include "LmmsStyle.h" #include "ImportFilter.h" #include "MainWindow.h" #include "ProjectRenderer.h" @@ -386,7 +386,7 @@ int main( int argc, char * * argv ) if( render_out.isEmpty() ) { // init style and palette - QApplication::setStyle( new lmmsStyle() ); + QApplication::setStyle( new LmmsStyle() ); // init splash screen - this is a bit difficult as we have a // semi-transparent splash-image therefore we first need to grab diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index 07825fa33..8d1b124e0 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -42,7 +42,6 @@ #include "gui_templates.h" #include "tooltip.h" #include "pixmap_button.h" -#include "lmms_style.h" diff --git a/src/gui/lmms_style.cpp b/src/gui/LmmsStyle.cpp similarity index 96% rename from src/gui/lmms_style.cpp rename to src/gui/LmmsStyle.cpp index eb235e129..16a244ea7 100644 --- a/src/gui/lmms_style.cpp +++ b/src/gui/LmmsStyle.cpp @@ -1,8 +1,8 @@ /* - * lmms_style.cpp - the graphical style used by LMMS to create a consistent + * LmmsStyle.cpp - the graphical style used by LMMS to create a consistent * interface * - * Copyright (c) 2007-2008 Tobias Doerffel + * Copyright (c) 2007-2014 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -31,7 +31,7 @@ #include #include -#include "lmms_style.h" +#include "LmmsStyle.h" const int BUTTON_LENGTH = 24; @@ -214,7 +214,7 @@ static QString getCacheKey( const QString & _key, } -lmmsStyle::lmmsStyle() : +LmmsStyle::LmmsStyle() : QPlastiqueStyle() { QFile file( "resources:style.css" ); @@ -227,7 +227,7 @@ lmmsStyle::lmmsStyle() : -QPalette lmmsStyle::standardPalette( void ) const +QPalette LmmsStyle::standardPalette( void ) const { QPalette pal = QPlastiqueStyle::standardPalette(); /* pal.setColor( QPalette::Background, QColor( 91, 101, 113 ) ); @@ -262,7 +262,7 @@ QPalette lmmsStyle::standardPalette( void ) const -void lmmsStyle::drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const +void LmmsStyle::drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const { switch( element ) @@ -450,7 +450,7 @@ void lmmsStyle::drawControl( ControlElement element, const QStyleOption* option, -void lmmsStyle::drawComplexControl( ComplexControl control, +void LmmsStyle::drawComplexControl( ComplexControl control, const QStyleOptionComplex * option, QPainter *painter, const QWidget *widget ) const @@ -487,7 +487,7 @@ void lmmsStyle::drawComplexControl( ComplexControl control, -void lmmsStyle::drawPrimitive( PrimitiveElement element, +void LmmsStyle::drawPrimitive( PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const { @@ -599,7 +599,7 @@ void lmmsStyle::drawPrimitive( PrimitiveElement element, } -int lmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, +int LmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, const QWidget * _widget ) const { switch( _metric ) @@ -627,7 +627,7 @@ int lmmsStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option, // QStyle::SH_TitleBar_NoBorder -QSize lmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const +QSize LmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const { if( type == CT_ScrollBar ) { @@ -650,7 +650,7 @@ QSize lmmsStyle::sizeFromContents( ContentsType type, const QStyleOption* option } -QRect lmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const +QRect LmmsStyle::subControlRect( ComplexControl control, const QStyleOptionComplex* option, SubControl subControl, const QWidget* widget ) const { QRect rect = QPlastiqueStyle::subControlRect( control, option, subControl, widget ); @@ -794,7 +794,7 @@ QRect lmmsStyle::subControlRect( ComplexControl control, const QStyleOptionCompl -QImage lmmsStyle::colorizeXpm( const char * const * xpm, const QBrush& fill ) const +QImage LmmsStyle::colorizeXpm( const char * const * xpm, const QBrush& fill ) const { QImage arrowXpm( xpm ); QImage arrow( arrowXpm.size(), QImage::Format_ARGB32 ); @@ -807,7 +807,7 @@ QImage lmmsStyle::colorizeXpm( const char * const * xpm, const QBrush& fill ) co } -void lmmsStyle::hoverColors( bool sunken, bool hover, bool active, QColor& color, QColor& blend ) const +void LmmsStyle::hoverColors( bool sunken, bool hover, bool active, QColor& color, QColor& blend ) const { if( active ) {