From 563d5b8b5ba4372b31e46199d435ec33fc6aab85 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Fri, 27 Jun 2008 15:01:37 +0000 Subject: [PATCH] made enumeration match current coding style git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1180 0778d3d1-df1d-0410-868b-ea421aaaa00d --- include/led_checkbox.h | 9 ++++++--- src/gui/peak_controller_dialog.cpp | 1 - src/gui/widgets/instrument_function_views.cpp | 1 - src/gui/widgets/ladspa_control_view.cpp | 2 +- src/gui/widgets/led_checkbox.cpp | 16 +++++++--------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/led_checkbox.h b/include/led_checkbox.h index 80dd19eb4..8bdbdec1a 100644 --- a/include/led_checkbox.h +++ b/include/led_checkbox.h @@ -36,14 +36,17 @@ class EXPORT ledCheckBox : public automatableButton { Q_OBJECT public: - enum ledColors + enum LedColors { - YELLOW, GREEN, TOTAL_COLORS + Yellow, + Green, + Red, + NumColors } ; ledCheckBox( const QString & _txt, QWidget * _parent, const QString & _name = QString::null, - ledColors _color = YELLOW ); + LedColors _color = Yellow ); virtual ~ledCheckBox(); diff --git a/src/gui/peak_controller_dialog.cpp b/src/gui/peak_controller_dialog.cpp index 04fb14d34..7872c8d88 100644 --- a/src/gui/peak_controller_dialog.cpp +++ b/src/gui/peak_controller_dialog.cpp @@ -36,7 +36,6 @@ #include "gui_templates.h" #include "embed.h" #include "engine.h" -#include "led_checkbox.h" #include "main_window.h" #include "tooltip.h" diff --git a/src/gui/widgets/instrument_function_views.cpp b/src/gui/widgets/instrument_function_views.cpp index dc55040f0..c7a746077 100644 --- a/src/gui/widgets/instrument_function_views.cpp +++ b/src/gui/widgets/instrument_function_views.cpp @@ -35,7 +35,6 @@ #include "group_box.h" #include "gui_templates.h" #include "knob.h" -#include "led_checkbox.h" #include "pixmap_button.h" #include "tempo_sync_knob.h" #include "tooltip.h" diff --git a/src/gui/widgets/ladspa_control_view.cpp b/src/gui/widgets/ladspa_control_view.cpp index 5de7005b6..c6ffb8b9f 100644 --- a/src/gui/widgets/ladspa_control_view.cpp +++ b/src/gui/widgets/ladspa_control_view.cpp @@ -62,7 +62,7 @@ ladspaControlView::ladspaControlView( QWidget * _parent, ledCheckBox * toggle = new ledCheckBox( m_ctl->getPort()->name, this, QString::null, - ledCheckBox::GREEN ); + ledCheckBox::Green ); toggle->setModel( m_ctl->getToggledModel() ); layout->addWidget( toggle ); if( link != NULL ) diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp index 320273c9e..ad482ce2d 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/led_checkbox.cpp @@ -3,7 +3,7 @@ /* * led_checkbox.cpp - class ledCheckBox, an improved QCheckBox * - * Copyright (c) 2005-2007 Tobias Doerffel + * Copyright (c) 2005-2008 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -25,33 +25,31 @@ */ -#include "led_checkbox.h" - #include #include -#include +#include "led_checkbox.h" #include "embed.h" #include "gui_templates.h" -static const QString names[ledCheckBox::TOTAL_COLORS] = +static const QString names[ledCheckBox::NumColors] = { - "led_yellow", "led_green" + "led_yellow", "led_green", "led_red" } ; ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent, - const QString & _name, ledColors _color ) : + const QString & _name, LedColors _color ) : automatableButton( _parent, _name ), m_text( _text ) { setCheckable( TRUE ); - if( _color >= TOTAL_COLORS || _color < YELLOW ) + if( _color >= NumColors || _color < Yellow ) { - _color = YELLOW; + _color = Yellow; } m_ledOnPixmap = new QPixmap( embed::getIconPixmap( names[_color].toAscii().constData() ) );