From c33bef346a2b1c3713625ef60e128528eeea1e49 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Wed, 26 Nov 2014 01:21:42 +0100 Subject: [PATCH] Rename automatable_button to AutomatableButton --- ...tomatable_button.h => AutomatableButton.h} | 16 +++++----- include/led_checkbox.h | 4 +-- include/pixmap_button.h | 4 +-- .../audio_file_processor.h | 2 +- plugins/lb302/lb302.cpp | 2 +- plugins/monstro/Monstro.h | 2 +- plugins/nes/Nes.h | 2 +- .../triple_oscillator/TripleOscillator.cpp | 2 +- plugins/watsyn/Watsyn.h | 2 +- ...table_button.cpp => AutomatableButton.cpp} | 32 +++++++++---------- src/gui/widgets/pixmap_button.cpp | 6 ++-- 11 files changed, 37 insertions(+), 37 deletions(-) rename include/{automatable_button.h => AutomatableButton.h} (83%) rename src/gui/widgets/{automatable_button.cpp => AutomatableButton.cpp} (84%) diff --git a/include/automatable_button.h b/include/AutomatableButton.h similarity index 83% rename from include/automatable_button.h rename to include/AutomatableButton.h index 43816b62c..1d0f69e2f 100644 --- a/include/automatable_button.h +++ b/include/AutomatableButton.h @@ -1,5 +1,5 @@ /* - * automatable_button.h - class automatableButton, the base for all buttons + * AutomatableButton.h - class automatableButton, the base for all buttons * * Copyright (c) 2006-2008 Tobias Doerffel * @@ -34,13 +34,13 @@ class automatableButtonGroup; -class EXPORT automatableButton : public QPushButton, public BoolModelView +class EXPORT AutomatableButton : public QPushButton, public BoolModelView { Q_OBJECT public: - automatableButton( QWidget * _parent, const QString & _name + AutomatableButton( QWidget * _parent, const QString & _name = QString::null ); - virtual ~automatableButton(); + virtual ~AutomatableButton(); inline void setCheckable( bool _on ) { @@ -87,10 +87,10 @@ public: = QString::null ); virtual ~automatableButtonGroup(); - void addButton( automatableButton * _btn ); - void removeButton( automatableButton * _btn ); + void addButton( AutomatableButton * _btn ); + void removeButton( AutomatableButton * _btn ); - void activateButton( automatableButton * _btn ); + void activateButton( AutomatableButton * _btn ); virtual void modelChanged(); @@ -100,7 +100,7 @@ private slots: private: - QList m_buttons; + QList m_buttons; } ; diff --git a/include/led_checkbox.h b/include/led_checkbox.h index 808774313..0ee8d369c 100644 --- a/include/led_checkbox.h +++ b/include/led_checkbox.h @@ -26,13 +26,13 @@ #ifndef LED_CHECKBOX_H #define LED_CHECKBOX_H -#include "automatable_button.h" +#include "AutomatableButton.h" class QPixmap; -class EXPORT ledCheckBox : public automatableButton +class EXPORT ledCheckBox : public AutomatableButton { Q_OBJECT public: diff --git a/include/pixmap_button.h b/include/pixmap_button.h index e08b91e2e..63095ab71 100644 --- a/include/pixmap_button.h +++ b/include/pixmap_button.h @@ -28,10 +28,10 @@ #include -#include "automatable_button.h" +#include "AutomatableButton.h" -class EXPORT pixmapButton : public automatableButton +class EXPORT pixmapButton : public AutomatableButton { Q_OBJECT public: diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index 964ee380f..1889ced85 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -34,7 +34,7 @@ #include "SampleBuffer.h" #include "knob.h" #include "pixmap_button.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "combobox.h" diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index e10c5f05d..3d9fbda3c 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -29,7 +29,7 @@ */ #include "lb302.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "Engine.h" #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h index 8bbdcb83e..8b97df197 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -30,7 +30,7 @@ #include "Instrument.h" #include "InstrumentView.h" #include "AutomatableModel.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" #include "pixmap_button.h" diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index 337d31c69..d76a90d2b 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -28,7 +28,7 @@ #include "Instrument.h" #include "InstrumentView.h" #include "AutomatableModel.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" #include "pixmap_button.h" diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index 97bd18de7..154aeb666 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -28,7 +28,7 @@ #include #include "TripleOscillator.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "debug.h" #include "Engine.h" #include "InstrumentTrack.h" diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index 7b2a09bb4..8f1a92098 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -30,7 +30,7 @@ #include "InstrumentView.h" #include "graph.h" #include "AutomatableModel.h" -#include "automatable_button.h" +#include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" #include "pixmap_button.h" diff --git a/src/gui/widgets/automatable_button.cpp b/src/gui/widgets/AutomatableButton.cpp similarity index 84% rename from src/gui/widgets/automatable_button.cpp rename to src/gui/widgets/AutomatableButton.cpp index 9c1e11328..8d1d3390d 100644 --- a/src/gui/widgets/automatable_button.cpp +++ b/src/gui/widgets/AutomatableButton.cpp @@ -1,5 +1,5 @@ /* - * automatable_button.cpp - implementation of class automatableButton and + * AutomatableButton.cpp - implementation of class automatableButton and * automatableButtonGroup * * Copyright (c) 2006-2011 Tobias Doerffel @@ -23,7 +23,7 @@ * */ -#include "automatable_button.h" +#include "AutomatableButton.h" #include #include @@ -36,7 +36,7 @@ -automatableButton::automatableButton( QWidget * _parent, +AutomatableButton::AutomatableButton( QWidget * _parent, const QString & _name ) : QPushButton( _parent ), BoolModelView( new BoolModel( false, NULL, _name, true ), this ), @@ -50,7 +50,7 @@ automatableButton::automatableButton( QWidget * _parent, -automatableButton::~automatableButton() +AutomatableButton::~AutomatableButton() { if( m_group != NULL ) { @@ -61,7 +61,7 @@ automatableButton::~automatableButton() -void automatableButton::modelChanged() +void AutomatableButton::modelChanged() { if( QPushButton::isChecked() != model()->value() ) { @@ -72,7 +72,7 @@ void automatableButton::modelChanged() -void automatableButton::update() +void AutomatableButton::update() { if( QPushButton::isChecked() != model()->value() ) { @@ -84,7 +84,7 @@ void automatableButton::update() -void automatableButton::contextMenuEvent( QContextMenuEvent * _me ) +void AutomatableButton::contextMenuEvent( QContextMenuEvent * _me ) { // for the case, the user clicked right while pressing left mouse- // button, the context-menu appears while mouse-cursor is still hidden @@ -110,7 +110,7 @@ void automatableButton::contextMenuEvent( QContextMenuEvent * _me ) -void automatableButton::mousePressEvent( QMouseEvent * _me ) +void AutomatableButton::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton && ! ( _me->modifiers() & Qt::ControlModifier ) ) @@ -147,7 +147,7 @@ void automatableButton::mousePressEvent( QMouseEvent * _me ) -void automatableButton::mouseReleaseEvent( QMouseEvent * _me ) +void AutomatableButton::mouseReleaseEvent( QMouseEvent * _me ) { if( _me && _me->button() == Qt::LeftButton ) { @@ -158,7 +158,7 @@ void automatableButton::mouseReleaseEvent( QMouseEvent * _me ) -void automatableButton::toggle() +void AutomatableButton::toggle() { if( isCheckable() && m_group != NULL ) { @@ -194,7 +194,7 @@ automatableButtonGroup::automatableButtonGroup( QWidget * _parent, automatableButtonGroup::~automatableButtonGroup() { - for( QList::iterator it = m_buttons.begin(); + for( QList::iterator it = m_buttons.begin(); it != m_buttons.end(); ++it ) { ( *it )->m_group = NULL; @@ -204,7 +204,7 @@ automatableButtonGroup::~automatableButtonGroup() -void automatableButtonGroup::addButton( automatableButton * _btn ) +void automatableButtonGroup::addButton( AutomatableButton * _btn ) { _btn->m_group = this; _btn->setCheckable( true ); @@ -221,7 +221,7 @@ void automatableButtonGroup::addButton( automatableButton * _btn ) -void automatableButtonGroup::removeButton( automatableButton * _btn ) +void automatableButtonGroup::removeButton( AutomatableButton * _btn ) { m_buttons.erase( qFind( m_buttons.begin(), m_buttons.end(), _btn ) ); _btn->m_group = NULL; @@ -230,13 +230,13 @@ void automatableButtonGroup::removeButton( automatableButton * _btn ) -void automatableButtonGroup::activateButton( automatableButton * _btn ) +void automatableButtonGroup::activateButton( AutomatableButton * _btn ) { if( _btn != m_buttons[model()->value()] && m_buttons.indexOf( _btn ) != -1 ) { model()->setValue( m_buttons.indexOf( _btn ) ); - foreach( automatableButton * btn, m_buttons ) + foreach( AutomatableButton * btn, m_buttons ) { btn->update(); } @@ -261,7 +261,7 @@ void automatableButtonGroup::updateButtons() { model()->setRange( 0, m_buttons.size() - 1 ); int i = 0; - foreach( automatableButton * btn, m_buttons ) + foreach( AutomatableButton * btn, m_buttons ) { btn->model()->setValue( i == model()->value() ); ++i; diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp index fddbaf789..3f1d0f4fb 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/pixmap_button.cpp @@ -34,7 +34,7 @@ pixmapButton::pixmapButton( QWidget * _parent, const QString & _name ) : - automatableButton( _parent, _name ), + AutomatableButton( _parent, _name ), m_activePixmap(), m_inactivePixmap(), m_pressed( false ) @@ -83,7 +83,7 @@ void pixmapButton::mousePressEvent( QMouseEvent * _me ) update(); } - automatableButton::mousePressEvent( _me ); + AutomatableButton::mousePressEvent( _me ); } @@ -91,7 +91,7 @@ void pixmapButton::mousePressEvent( QMouseEvent * _me ) void pixmapButton::mouseReleaseEvent( QMouseEvent * _me ) { - automatableButton::mouseReleaseEvent( _me ); + AutomatableButton::mouseReleaseEvent( _me ); if( !isCheckable() ) {