diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index 5e60b54a8..df5347573 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -37,7 +37,7 @@ #include "AudioDevice.h" -class lcdSpinBox; +class LcdSpinBox; class QLineEdit; @@ -66,7 +66,7 @@ public: private: QLineEdit * m_device; - lcdSpinBox * m_channels; + LcdSpinBox * m_channels; } ; diff --git a/include/AudioJack.h b/include/AudioJack.h index 523ffe2c4..20d62cb61 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -39,7 +39,7 @@ class QLineEdit; -class lcdSpinBox; +class LcdSpinBox; class AudioJack : public QObject, public AudioDevice @@ -66,7 +66,7 @@ public: private: QLineEdit * m_clientName; - lcdSpinBox * m_channels; + LcdSpinBox * m_channels; } ; diff --git a/include/AudioOss.h b/include/AudioOss.h index 4d1d32bb0..5a41d0f4f 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -32,7 +32,7 @@ #include "AudioDevice.h" -class lcdSpinBox; +class LcdSpinBox; class QLineEdit; @@ -60,7 +60,7 @@ public: private: QLineEdit * m_device; - lcdSpinBox * m_channels; + LcdSpinBox * m_channels; } ; diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index eec48be94..93e86f13d 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -57,7 +57,7 @@ public: class comboBox; -class lcdSpinBox; +class LcdSpinBox; class AudioPortAudio : public AudioDevice @@ -88,7 +88,7 @@ public: private: comboBox * m_backend; comboBox * m_device; - lcdSpinBox * m_channels; + LcdSpinBox * m_channels; AudioPortAudioSetupUtil m_setupUtil; } ; diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index f7eb8c6c2..e5254848e 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -34,7 +34,7 @@ #include "AudioDevice.h" -class lcdSpinBox; +class LcdSpinBox; class QLineEdit; @@ -62,7 +62,7 @@ public: private: QLineEdit * m_device; - lcdSpinBox * m_channels; + LcdSpinBox * m_channels; } ; diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index 531c2ae94..9d8a6ca11 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -42,7 +42,7 @@ class AutoDetectMidiController; class comboBox; class groupBox; class tabWidget; -class lcdSpinBox; +class LcdSpinBox; class ledCheckBox; class MidiPortMenu; @@ -77,8 +77,8 @@ protected slots: private: // Midi groupBox * m_midiGroupBox; - lcdSpinBox * m_midiChannelSpinBox; - lcdSpinBox * m_midiControllerSpinBox; + LcdSpinBox * m_midiChannelSpinBox; + LcdSpinBox * m_midiControllerSpinBox; ledCheckBox * m_midiAutoDetectCheckBox; MidiPortMenu * m_readablePorts; BoolModel m_midiAutoDetect; diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index 047613062..40081e2cd 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -32,7 +32,7 @@ class groupBox; -class lcdSpinBox; +class LcdSpinBox; class QToolButton; @@ -47,15 +47,15 @@ private: virtual void modelChanged(); groupBox * m_midiInputGroupBox; - lcdSpinBox * m_inputChannelSpinBox; - lcdSpinBox * m_fixedInputVelocitySpinBox; + LcdSpinBox * m_inputChannelSpinBox; + LcdSpinBox * m_fixedInputVelocitySpinBox; QToolButton * m_rpBtn; groupBox * m_midiOutputGroupBox; - lcdSpinBox * m_outputChannelSpinBox; - lcdSpinBox * m_fixedOutputVelocitySpinBox; - lcdSpinBox * m_outputProgramSpinBox; - lcdSpinBox * m_fixedOutputNoteSpinBox; + LcdSpinBox * m_outputChannelSpinBox; + LcdSpinBox * m_fixedOutputVelocitySpinBox; + LcdSpinBox * m_outputProgramSpinBox; + LcdSpinBox * m_fixedOutputNoteSpinBox; QToolButton * m_wpBtn; } ; diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 2e212e4b5..6f9a0c6cf 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -49,7 +49,7 @@ class Instrument; class InstrumentTrackWindow; class InstrumentMidiIOView; class knob; -class lcdSpinBox; +class LcdSpinBox; class midiPortMenu; class DataFile; class PluginView; @@ -400,8 +400,8 @@ private: knob * m_volumeKnob; knob * m_panningKnob; knob * m_pitchKnob; - lcdSpinBox* m_pitchRangeSpinBox; - lcdSpinBox * m_effectChannelNumber; + LcdSpinBox* m_pitchRangeSpinBox; + LcdSpinBox * m_effectChannelNumber; // tab-widget with all children diff --git a/include/lcd_spinbox.h b/include/LcdSpinBox.h similarity index 86% rename from include/lcd_spinbox.h rename to include/LcdSpinBox.h index e53878c77..a827b17cb 100644 --- a/include/lcd_spinbox.h +++ b/include/LcdSpinBox.h @@ -1,5 +1,5 @@ /* - * lcd_spinbox.h - class lcdSpinBox, an improved QLCDNumber + * LcdSpinBox.h - class LcdSpinBox, an improved QLCDNumber * * Copyright (c) 2005-2014 Tobias Doerffel * @@ -30,15 +30,15 @@ #include "AutomatableModelView.h" -class EXPORT lcdSpinBox : public LcdWidget, public IntModelView +class EXPORT LcdSpinBox : public LcdWidget, public IntModelView { Q_OBJECT public: - lcdSpinBox( int numDigits, QWidget* parent, const QString& name = QString::null ); + LcdSpinBox( int numDigits, QWidget* parent, const QString& name = QString::null ); - lcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null ); + LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null ); - virtual ~lcdSpinBox(); + virtual ~LcdSpinBox(); virtual void modelChanged() { @@ -82,6 +82,6 @@ signals: } ; -typedef IntModel lcdSpinBoxModel; +typedef IntModel LcdSpinBoxModel; #endif diff --git a/include/MeterDialog.h b/include/MeterDialog.h index 94d76ce3f..698c6ce37 100644 --- a/include/MeterDialog.h +++ b/include/MeterDialog.h @@ -30,7 +30,7 @@ #include "ModelView.h" -class lcdSpinBox; +class LcdSpinBox; class MeterDialog : public QWidget, public ModelView @@ -43,8 +43,8 @@ public: private: - lcdSpinBox * m_numerator; - lcdSpinBox * m_denominator; + LcdSpinBox * m_numerator; + LcdSpinBox * m_denominator; } ; diff --git a/include/song_editor.h b/include/song_editor.h index e029ff64a..955d1481f 100644 --- a/include/song_editor.h +++ b/include/song_editor.h @@ -34,7 +34,7 @@ class QScrollBar; class automatableSlider; class comboBox; -class lcdSpinBox; +class LcdSpinBox; class MeterDialog; class song; class textFloat; @@ -108,7 +108,7 @@ private: toolButton * m_recordButton; toolButton * m_recordAccompanyButton; toolButton * m_stopButton; - lcdSpinBox * m_tempoSpinBox; + LcdSpinBox * m_tempoSpinBox; timeLine * m_timeLine; diff --git a/plugins/opl2/opl2instrument.cpp b/plugins/opl2/opl2instrument.cpp index 5f41b6454..26c3ae10a 100644 --- a/plugins/opl2/opl2instrument.cpp +++ b/plugins/opl2/opl2instrument.cpp @@ -58,7 +58,7 @@ #include "math.h" #include "knob.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "pixmap_button.h" #include "tooltip.h" @@ -578,7 +578,7 @@ opl2instrumentView::opl2instrumentView( Instrument * _instrument, InstrumentView( _instrument, _parent ) { /* Unnecessary? - m_patch = new lcdSpinBox( 3, this , "PRESET"); + m_patch = new LcdSpinBox( 3, this , "PRESET"); m_patch->setLabel( "PRESET" ); m_patch->move( 100, 1 ); m_patch->setEnabled( true ); diff --git a/plugins/opl2/opl2instrument.h b/plugins/opl2/opl2instrument.h index 9f47a0cfe..016717b10 100644 --- a/plugins/opl2/opl2instrument.h +++ b/plugins/opl2/opl2instrument.h @@ -29,7 +29,7 @@ #include "InstrumentView.h" #include "opl.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "knob.h" #include "pixmap_button.h" @@ -140,7 +140,7 @@ class opl2instrumentView : public InstrumentView public: opl2instrumentView( Instrument * _instrument, QWidget * _parent ); virtual ~opl2instrumentView(); - lcdSpinBox *m_patch; + LcdSpinBox *m_patch; void modelChanged(); knob *op1_a_kn; diff --git a/plugins/sf2_player/patches_dialog.cpp b/plugins/sf2_player/patches_dialog.cpp index 68675d3b8..ac259c5fc 100644 --- a/plugins/sf2_player/patches_dialog.cpp +++ b/plugins/sf2_player/patches_dialog.cpp @@ -113,8 +113,8 @@ patchesDialog::~patchesDialog() // Dialog setup loader. void patchesDialog::setup ( fluid_synth_t * pSynth, int iChan, const QString & _chanName, - lcdSpinBoxModel * _bankModel, - lcdSpinBoxModel * _progModel, + LcdSpinBoxModel * _bankModel, + LcdSpinBoxModel * _progModel, QLabel * _patchLabel ) { diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h index a429c90dc..deaf491b8 100644 --- a/plugins/sf2_player/patches_dialog.h +++ b/plugins/sf2_player/patches_dialog.h @@ -27,7 +27,7 @@ #define _PATCHES_DIALOG_H #include "ui_patches_dialog.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include #include @@ -50,7 +50,7 @@ public: void setup(fluid_synth_t *pSynth, int iChan, const QString & _chanName, - lcdSpinBoxModel * _bankModel, lcdSpinBoxModel * _progModel, QLabel *_patchLabel ); + LcdSpinBoxModel * _bankModel, LcdSpinBoxModel * _progModel, QLabel *_patchLabel ); public slots: @@ -85,8 +85,8 @@ private: //int m_iDirtyCount; int m_dirty; - lcdSpinBoxModel * m_bankModel; - lcdSpinBoxModel * m_progModel; + LcdSpinBoxModel * m_bankModel; + LcdSpinBoxModel * m_progModel; QLabel *m_patchLabel; }; diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index fe690ab8a..afb053245 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -40,7 +40,7 @@ #include "patches_dialog.h" #include "tooltip.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "embed.cpp" @@ -832,12 +832,12 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, // LCDs - m_bankNumLcd = new lcdSpinBox( 3, "21pink", this ); + m_bankNumLcd = new LcdSpinBox( 3, "21pink", this ); m_bankNumLcd->move(131, 62); // m_bankNumLcd->addTextForValue( -1, "---" ); // m_bankNumLcd->setEnabled( false ); - m_patchNumLcd = new lcdSpinBox( 3, "21pink", this ); + m_patchNumLcd = new LcdSpinBox( 3, "21pink", this ); m_patchNumLcd->move(190, 62); // m_patchNumLcd->addTextForValue( -1, "---" ); // m_patchNumLcd->setEnabled( false ); diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h index 0287de16c..4ff8f0cc5 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -33,7 +33,7 @@ #include "pixmap_button.h" #include "InstrumentView.h" #include "knob.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "led_checkbox.h" #include "fluidsynth.h" #include "SampleBuffer.h" @@ -132,8 +132,8 @@ private: int m_lastMidiPitchRange; int m_channel; - lcdSpinBoxModel m_bankNum; - lcdSpinBoxModel m_patchNum; + LcdSpinBoxModel m_bankNum; + LcdSpinBoxModel m_patchNum; FloatModel m_gain; @@ -193,8 +193,8 @@ private: pixmapButton * m_fileDialogButton; pixmapButton * m_patchDialogButton; - lcdSpinBox * m_bankNumLcd; - lcdSpinBox * m_patchNumLcd; + LcdSpinBox * m_bankNumLcd; + LcdSpinBox * m_patchNumLcd; QLabel * m_filenameLabel; QLabel * m_patchLabel; diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index 7683ab680..4e2dd70d1 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -32,7 +32,7 @@ #include "endian_handling.h" #include "config_mgr.h" #include "engine.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "gui_templates.h" #include "templates.h" @@ -502,13 +502,13 @@ AudioAlsa::setupWidget::setupWidget( QWidget * _parent ) : dev_lbl->setFont( pointSize<7>( dev_lbl->font() ) ); dev_lbl->setGeometry( 10, 40, 160, 10 ); - lcdSpinBoxModel * m = new lcdSpinBoxModel( /* this */ ); + LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ ); m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS ); m->setStep( 2 ); m->setValue( configManager::inst()->value( "audioalsa", "channels" ).toInt() ); - m_channels = new lcdSpinBox( 1, this ); + m_channels = new LcdSpinBox( 1, this ); m_channels->setModel( m ); m_channels->setLabel( tr( "CHANNELS" ) ); m_channels->move( 180, 20 ); diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index dd97b5a7b..d29dc7a15 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -37,7 +37,7 @@ #include "templates.h" #include "gui_templates.h" #include "config_mgr.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "AudioPort.h" #include "MainWindow.h" @@ -446,13 +446,13 @@ AudioJack::setupWidget::setupWidget( QWidget * _parent ) : cn_lbl->setFont( pointSize<7>( cn_lbl->font() ) ); cn_lbl->setGeometry( 10, 40, 160, 10 ); - lcdSpinBoxModel * m = new lcdSpinBoxModel( /* this */ ); + LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ ); m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS ); m->setStep( 2 ); m->setValue( configManager::inst()->value( "audiojack", "channels" ).toInt() ); - m_channels = new lcdSpinBox( 1, this ); + m_channels = new LcdSpinBox( 1, this ); m_channels->setModel( m ); m_channels->setLabel( tr( "CHANNELS" ) ); m_channels->move( 180, 20 ); diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index f9f62b6d5..31a98a40b 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -31,7 +31,7 @@ #include #include "endian_handling.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "engine.h" #include "gui_templates.h" #include "templates.h" @@ -338,13 +338,13 @@ AudioOss::setupWidget::setupWidget( QWidget * _parent ) : dev_lbl->setFont( pointSize<7>( dev_lbl->font() ) ); dev_lbl->setGeometry( 10, 40, 160, 10 ); - lcdSpinBoxModel * m = new lcdSpinBoxModel( /* this */ ); + LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ ); m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS ); m->setStep( 2 ); m->setValue( configManager::inst()->value( "audiooss", "channels" ).toInt() ); - m_channels = new lcdSpinBox( 1, this ); + m_channels = new LcdSpinBox( 1, this ); m_channels->setModel( m ); m_channels->setLabel( tr( "CHANNELS" ) ); m_channels->move( 180, 20 ); diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index 7da82f841..2afaa3c63 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -47,7 +47,7 @@ void AudioPortAudioSetupUtil::updateChannels() #include "gui_templates.h" #include "templates.h" #include "combobox.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) : @@ -405,13 +405,13 @@ AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) : dev_lbl->setFont( pointSize<7>( dev_lbl->font() ) ); dev_lbl->move( 8, 38 ); -/* lcdSpinBoxModel * m = new lcdSpinBoxModel( ); +/* LcdSpinBoxModel * m = new LcdSpinBoxModel( ); m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS ); m->setStep( 2 ); m->setValue( configManager::inst()->value( "audioportaudio", "channels" ).toInt() ); - m_channels = new lcdSpinBox( 1, this ); + m_channels = new LcdSpinBox( 1, this ); m_channels->setModel( m ); m_channels->setLabel( tr( "CHANNELS" ) ); m_channels->move( 308, 20 );*/ diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp index 63038d2c6..12e119ddc 100644 --- a/src/core/audio/AudioPulseAudio.cpp +++ b/src/core/audio/AudioPulseAudio.cpp @@ -31,7 +31,7 @@ #include "endian_handling.h" #include "config_mgr.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "gui_templates.h" #include "templates.h" #include "engine.h" @@ -289,13 +289,13 @@ AudioPulseAudio::setupWidget::setupWidget( QWidget * _parent ) : dev_lbl->setFont( pointSize<7>( dev_lbl->font() ) ); dev_lbl->setGeometry( 10, 40, 160, 10 ); - lcdSpinBoxModel * m = new lcdSpinBoxModel( /* this */ ); + LcdSpinBoxModel * m = new LcdSpinBoxModel( /* this */ ); m->setRange( DEFAULT_CHANNELS, SURROUND_CHANNELS ); m->setStep( 2 ); m->setValue( configManager::inst()->value( "audiopa", "channels" ).toInt() ); - m_channels = new lcdSpinBox( 1, this ); + m_channels = new LcdSpinBox( 1, this ); m_channels->setModel( m ); m_channels->setLabel( tr( "CHANNELS" ) ); m_channels->move( 180, 20 ); diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp index 66fed87d3..ba9833dc8 100644 --- a/src/gui/ControllerConnectionDialog.cpp +++ b/src/gui/ControllerConnectionDialog.cpp @@ -34,7 +34,7 @@ #include "MidiController.h" #include "MidiClient.h" #include "MidiPortMenu.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "led_checkbox.h" #include "combobox.h" #include "tab_widget.h" @@ -142,13 +142,13 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, connect( m_midiGroupBox->model(), SIGNAL( dataChanged() ), this, SLOT( midiToggled() ) ); - m_midiChannelSpinBox = new lcdSpinBox( 2, m_midiGroupBox, + m_midiChannelSpinBox = new LcdSpinBox( 2, m_midiGroupBox, tr( "Input channel" ) ); m_midiChannelSpinBox->addTextForValue( 0, "--" ); m_midiChannelSpinBox->setLabel( tr( "CHANNEL" ) ); m_midiChannelSpinBox->move( 8, 24 ); - m_midiControllerSpinBox = new lcdSpinBox( 3, m_midiGroupBox, + m_midiControllerSpinBox = new LcdSpinBox( 3, m_midiGroupBox, tr( "Input controller" ) ); m_midiControllerSpinBox->addTextForValue( 0, "---" ); m_midiControllerSpinBox->setLabel( tr( "CONTROLLER" ) ); diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index d863833b6..6ed9e5848 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -44,7 +44,7 @@ #include "debug.h" #include "tooltip.h" #include "led_checkbox.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "FileDialog.h" diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 74b9acc53..5ba03914d 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -41,7 +41,7 @@ #include "config_mgr.h" #include "cpuload_widget.h" #include "embed.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "MainWindow.h" #include "MeterDialog.h" #include "text_float.h" @@ -115,7 +115,7 @@ songEditor::songEditor( song * _song ) : engine::mainWindow()->addSpacingToToolBar( 10 ); - m_tempoSpinBox = new lcdSpinBox( 3, tb, tr( "Tempo" ) ); + m_tempoSpinBox = new LcdSpinBox( 3, tb, tr( "Tempo" ) ); m_tempoSpinBox->setModel( &m_s->m_tempoModel ); m_tempoSpinBox->setLabel( tr( "TEMPO/BPM" ) ); toolTip::add( m_tempoSpinBox, tr( "tempo of song" ) ); diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp index 8c01179a7..03f3edf0d 100644 --- a/src/gui/widgets/InstrumentMidiIOView.cpp +++ b/src/gui/widgets/InstrumentMidiIOView.cpp @@ -32,7 +32,7 @@ #include "embed.h" #include "group_box.h" #include "gui_templates.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "MidiClient.h" #include "Mixer.h" #include "tooltip.h" @@ -54,13 +54,13 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : midiInputLayout->setContentsMargins( 8, 18, 8, 8 ); midiInputLayout->setSpacing( 6 ); - m_inputChannelSpinBox = new lcdSpinBox( 2, m_midiInputGroupBox ); + m_inputChannelSpinBox = new LcdSpinBox( 2, m_midiInputGroupBox ); m_inputChannelSpinBox->addTextForValue( 0, "--" ); m_inputChannelSpinBox->setLabel( tr( "CHANNEL" ) ); m_inputChannelSpinBox->setEnabled( false ); midiInputLayout->addWidget( m_inputChannelSpinBox ); - m_fixedInputVelocitySpinBox = new lcdSpinBox( 3, m_midiInputGroupBox ); + m_fixedInputVelocitySpinBox = new LcdSpinBox( 3, m_midiInputGroupBox ); m_fixedInputVelocitySpinBox->setDisplayOffset( 1 ); m_fixedInputVelocitySpinBox->addTextForValue( 0, "---" ); m_fixedInputVelocitySpinBox->setLabel( tr( "VELOCITY" ) ); @@ -82,24 +82,24 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : midiOutputLayout->setContentsMargins( 8, 18, 8, 8 ); midiOutputLayout->setSpacing( 6 ); - m_outputChannelSpinBox = new lcdSpinBox( 2, m_midiOutputGroupBox ); + m_outputChannelSpinBox = new LcdSpinBox( 2, m_midiOutputGroupBox ); m_outputChannelSpinBox->setLabel( tr( "CHANNEL" ) ); m_outputChannelSpinBox->setEnabled( false ); midiOutputLayout->addWidget( m_outputChannelSpinBox ); - m_fixedOutputVelocitySpinBox = new lcdSpinBox( 3, m_midiOutputGroupBox ); + m_fixedOutputVelocitySpinBox = new LcdSpinBox( 3, m_midiOutputGroupBox ); m_fixedOutputVelocitySpinBox->setDisplayOffset( 1 ); m_fixedOutputVelocitySpinBox->addTextForValue( 0, "---" ); m_fixedOutputVelocitySpinBox->setLabel( tr( "VELOCITY" ) ); m_fixedOutputVelocitySpinBox->setEnabled( false ); midiOutputLayout->addWidget( m_fixedOutputVelocitySpinBox ); - m_outputProgramSpinBox = new lcdSpinBox( 3, m_midiOutputGroupBox ); + m_outputProgramSpinBox = new LcdSpinBox( 3, m_midiOutputGroupBox ); m_outputProgramSpinBox->setLabel( tr( "PROGRAM" ) ); m_outputProgramSpinBox->setEnabled( false ); midiOutputLayout->addWidget( m_outputProgramSpinBox ); - m_fixedOutputNoteSpinBox = new lcdSpinBox( 3, m_midiOutputGroupBox ); + m_fixedOutputNoteSpinBox = new LcdSpinBox( 3, m_midiOutputGroupBox ); m_fixedOutputNoteSpinBox->setDisplayOffset( 1 ); m_fixedOutputNoteSpinBox->addTextForValue( 0, "---" ); m_fixedOutputNoteSpinBox->setLabel( tr( "NOTE" ) ); diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/LcdSpinBox.cpp similarity index 84% rename from src/gui/widgets/lcd_spinbox.cpp rename to src/gui/widgets/LcdSpinBox.cpp index efb8759cf..a94c86435 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/LcdSpinBox.cpp @@ -1,5 +1,5 @@ /* - * lcd_spinbox.cpp - class lcdSpinBox, an improved QLCDNumber + * lcd_spinbox.cpp - class LcdSpinBox, an improved QLCDNumber * * Copyright (c) 2005-2014 Tobias Doerffel * Copyright (c) 2008 Paul Giblock @@ -30,7 +30,7 @@ #include #include -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "caption_menu.h" #include "engine.h" #include "embed.h" @@ -40,7 +40,7 @@ -lcdSpinBox::lcdSpinBox( int numDigits, QWidget* parent, const QString& name ) : +LcdSpinBox::LcdSpinBox( int numDigits, QWidget* parent, const QString& name ) : LcdWidget( numDigits, parent, name ), IntModelView( new IntModel( 0, 0, 0, NULL, name, true ), this ), m_mouseMoving( false ), @@ -52,7 +52,7 @@ lcdSpinBox::lcdSpinBox( int numDigits, QWidget* parent, const QString& name ) : -lcdSpinBox::lcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name ) : +LcdSpinBox::LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name ) : LcdWidget( numDigits, parent, name ), IntModelView( new IntModel( 0, 0, 0, NULL, name, true ), this ), m_mouseMoving( false ), @@ -63,13 +63,13 @@ lcdSpinBox::lcdSpinBox( int numDigits, const QString& style, QWidget* parent, co -lcdSpinBox::~lcdSpinBox() +LcdSpinBox::~LcdSpinBox() { } -void lcdSpinBox::update() +void LcdSpinBox::update() { setValue( model()->value() + m_displayOffset ); @@ -78,7 +78,7 @@ void lcdSpinBox::update() -void lcdSpinBox::contextMenuEvent( QContextMenuEvent* event ) +void LcdSpinBox::contextMenuEvent( QContextMenuEvent* event ) { // for the case, the user clicked right while pressing left mouse- // button, the context-menu appears while mouse-cursor is still hidden @@ -94,7 +94,7 @@ void lcdSpinBox::contextMenuEvent( QContextMenuEvent* event ) -void lcdSpinBox::mousePressEvent( QMouseEvent* event ) +void LcdSpinBox::mousePressEvent( QMouseEvent* event ) { if( event->button() == Qt::LeftButton && ! ( event->modifiers() & Qt::ControlModifier ) && @@ -114,7 +114,7 @@ void lcdSpinBox::mousePressEvent( QMouseEvent* event ) -void lcdSpinBox::mouseMoveEvent( QMouseEvent* event ) +void LcdSpinBox::mouseMoveEvent( QMouseEvent* event ) { if( m_mouseMoving ) { @@ -132,7 +132,7 @@ void lcdSpinBox::mouseMoveEvent( QMouseEvent* event ) -void lcdSpinBox::mouseReleaseEvent( QMouseEvent* ) +void LcdSpinBox::mouseReleaseEvent( QMouseEvent* ) { if( m_mouseMoving ) { @@ -148,7 +148,7 @@ void lcdSpinBox::mouseReleaseEvent( QMouseEvent* ) -void lcdSpinBox::wheelEvent( QWheelEvent * _we ) +void LcdSpinBox::wheelEvent( QWheelEvent * _we ) { _we->accept(); model()->setInitValue( model()->value() + @@ -158,5 +158,5 @@ void lcdSpinBox::wheelEvent( QWheelEvent * _we ) -#include "moc_lcd_spinbox.cxx" +#include "moc_LcdSpinBox.cxx" diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp index 7b7d1f626..e5fbe139d 100644 --- a/src/gui/widgets/MeterDialog.cpp +++ b/src/gui/widgets/MeterDialog.cpp @@ -32,7 +32,7 @@ #include "MeterModel.h" #include "embed.h" #include "gui_templates.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" MeterDialog::MeterDialog( QWidget * _parent, bool _simple ) : @@ -49,7 +49,7 @@ MeterDialog::MeterDialog( QWidget * _parent, bool _simple ) : num_layout->setMargin( 0 ); - m_numerator = new lcdSpinBox( 2, num, tr( "Meter Numerator" ) ); + m_numerator = new LcdSpinBox( 2, num, tr( "Meter Numerator" ) ); num_layout->addWidget( m_numerator ); @@ -69,7 +69,7 @@ MeterDialog::MeterDialog( QWidget * _parent, bool _simple ) : den_layout->setSpacing( 0 ); den_layout->setMargin( 0 ); - m_denominator = new lcdSpinBox( 2, den, tr( "Meter Denominator" ) ); + m_denominator = new LcdSpinBox( 2, den, tr( "Meter Denominator" ) ); if( _simple ) { m_denominator->setLabel( tr( "TIME SIG" ) ); diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 482f3333c..8add3edc2 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -60,7 +60,7 @@ #include "InstrumentFunctionViews.h" #include "InstrumentMidiIOView.h" #include "knob.h" -#include "lcd_spinbox.h" +#include "LcdSpinBox.h" #include "led_checkbox.h" #include "MainWindow.h" #include "MidiClient.h" @@ -1103,12 +1103,12 @@ void InstrumentTrackView::midiConfigChanged() -class fxLineLcdSpinBox : public lcdSpinBox +class fxLineLcdSpinBox : public LcdSpinBox { public: fxLineLcdSpinBox( int _num_digits, QWidget * _parent, const QString & _name ) : - lcdSpinBox( _num_digits, _parent, _name ) {} + LcdSpinBox( _num_digits, _parent, _name ) {} protected: virtual void mouseDoubleClickEvent ( QMouseEvent * _me ) @@ -1183,7 +1183,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : basicControlsLayout->addWidget( m_pitchKnob ); // set up pitch range knob - m_pitchRangeSpinBox= new lcdSpinBox( 2, NULL, tr( "Pitch range (semitones)" ) ); + m_pitchRangeSpinBox= new LcdSpinBox( 2, NULL, tr( "Pitch range (semitones)" ) ); m_pitchRangeSpinBox->setLabel( tr( "RANGE" ) ); basicControlsLayout->addWidget( m_pitchRangeSpinBox );