diff --git a/include/AudioDevice.h b/include/AudioDevice.h index ce83c3996..298279ddb 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -30,7 +30,7 @@ #include #include "Mixer.h" -#include "tab_widget.h" +#include "TabWidget.h" class AudioPort; @@ -90,12 +90,12 @@ public: - class setupWidget : public tabWidget + class setupWidget : public TabWidget { public: setupWidget( const QString & _caption, QWidget * _parent ) : - tabWidget( tabWidget::tr( "Settings for %1" ).arg( - tabWidget::tr( _caption.toLatin1() ) ). + TabWidget( TabWidget::tr( "Settings for %1" ).arg( + TabWidget::tr( _caption.toLatin1() ) ). toUpper(), _parent ) { } diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index 07993d434..b388f727a 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -56,7 +56,7 @@ public: #endif -class comboBox; +class ComboBox; class LcdSpinBox; @@ -86,8 +86,8 @@ public: virtual void saveSettings(); private: - comboBox * m_backend; - comboBox * m_device; + ComboBox * m_backend; + ComboBox * m_device; AudioPortAudioSetupUtil m_setupUtil; } ; diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index be0157ccc..83b0a022b 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -34,17 +34,17 @@ #include "MidiTime.h" #include "AutomationPattern.h" #include "ComboBoxModel.h" -#include "knob.h" +#include "Knob.h" class QPainter; class QPixmap; class QScrollBar; -class comboBox; +class ComboBox; class NotePlayHandle; class Timeline; -class toolButton; +class ToolButton; class AutomationEditor : public QWidget, public JournallingObject @@ -191,27 +191,27 @@ private: QWidget * m_toolBar; - toolButton * m_playButton; - toolButton * m_stopButton; + ToolButton * m_playButton; + ToolButton * m_stopButton; - toolButton * m_drawButton; - toolButton * m_eraseButton; - toolButton * m_selectButton; - toolButton * m_moveButton; + ToolButton * m_drawButton; + ToolButton * m_eraseButton; + ToolButton * m_selectButton; + ToolButton * m_moveButton; - toolButton * m_discreteButton; - toolButton * m_linearButton; - toolButton * m_cubicHermiteButton; - knob * m_tensionKnob; + ToolButton * m_discreteButton; + ToolButton * m_linearButton; + ToolButton * m_cubicHermiteButton; + Knob * m_tensionKnob; FloatModel * m_tensionModel; - toolButton * m_cutButton; - toolButton * m_copyButton; - toolButton * m_pasteButton; + ToolButton * m_cutButton; + ToolButton * m_copyButton; + ToolButton * m_pasteButton; - comboBox * m_zoomingXComboBox; - comboBox * m_zoomingYComboBox; - comboBox * m_quantizeComboBox; + ComboBox * m_zoomingXComboBox; + ComboBox * m_zoomingYComboBox; + ComboBox * m_quantizeComboBox; ComboBoxModel m_zoomingXModel; ComboBoxModel m_zoomingYModel; diff --git a/include/BBTrackContainer.h b/include/BBTrackContainer.h index 56173c602..691bea13c 100644 --- a/include/BBTrackContainer.h +++ b/include/BBTrackContainer.h @@ -27,7 +27,7 @@ #define BB_TRACK_CONTAINER_H #include "TrackContainer.h" -#include "combobox.h" +#include "ComboBox.h" class EXPORT BBTrackContainer : public TrackContainer diff --git a/include/cpuload_widget.h b/include/CPULoadWidget.h similarity index 88% rename from include/cpuload_widget.h rename to include/CPULoadWidget.h index b02a78c38..e15368519 100644 --- a/include/cpuload_widget.h +++ b/include/CPULoadWidget.h @@ -1,5 +1,5 @@ /* - * cpuload_widget.h - widget for displaying CPU-load (partly based on + * CPULoadWidget.h - widget for displaying CPU-load (partly based on * Hydrogen's CPU-load-widget) * * Copyright (c) 2005-2014 Tobias Doerffel @@ -34,12 +34,12 @@ #include "lmms_basics.h" -class cpuloadWidget : public QWidget +class CPULoadWidget : public QWidget { Q_OBJECT public: - cpuloadWidget( QWidget * _parent ); - virtual ~cpuloadWidget(); + CPULoadWidget( QWidget * _parent ); + virtual ~CPULoadWidget(); protected: diff --git a/include/combobox.h b/include/ComboBox.h similarity index 88% rename from include/combobox.h rename to include/ComboBox.h index 067c69a8d..fdfe12bf3 100644 --- a/include/combobox.h +++ b/include/ComboBox.h @@ -1,5 +1,5 @@ /* - * combobox.h - class ComboBox, a combo box view for models + * ComboBox.h - class ComboBox, a combo box view for models * * Copyright (c) 2006-2014 Tobias Doerffel * @@ -34,12 +34,12 @@ -class EXPORT comboBox : public QWidget, public IntModelView +class EXPORT ComboBox : public QWidget, public IntModelView { Q_OBJECT public: - comboBox( QWidget* parent = NULL, const QString& name = QString() ); - virtual ~comboBox(); + ComboBox( QWidget* parent = NULL, const QString& name = QString() ); + virtual ~ComboBox(); ComboBoxModel* model() { diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index d28b4e305..02a717abd 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -39,11 +39,11 @@ class QLineEdit; class QListView; class QScrollArea; class AutoDetectMidiController; -class comboBox; -class groupBox; -class tabWidget; +class ComboBox; +class GroupBox; +class TabWidget; class LcdSpinBox; -class ledCheckBox; +class LedCheckBox; class MidiPortMenu; @@ -76,19 +76,19 @@ protected slots: private: // Midi - groupBox * m_midiGroupBox; + GroupBox * m_midiGroupBox; LcdSpinBox * m_midiChannelSpinBox; LcdSpinBox * m_midiControllerSpinBox; - ledCheckBox * m_midiAutoDetectCheckBox; + LedCheckBox * m_midiAutoDetectCheckBox; MidiPortMenu * m_readablePorts; BoolModel m_midiAutoDetect; // User - groupBox * m_userGroupBox; - comboBox * m_userController; + GroupBox * m_userGroupBox; + ComboBox * m_userController; // Mapping - tabWidget * m_mappingBox; + TabWidget * m_mappingBox; QLineEdit * m_mappingFunction; Controller * m_controller; diff --git a/include/ControllerView.h b/include/ControllerView.h index 9e40590b2..f1d73c400 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -36,7 +36,7 @@ class QLabel; class QPushButton; class QMdiSubWindow; -class ledCheckBox; +class LedCheckBox; class ControllerView : public QWidget, public ModelView diff --git a/include/EffectRackView.h b/include/EffectRackView.h index a3a82a7ab..58d6bc3fc 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -36,7 +36,7 @@ class QScrollArea; class QVBoxLayout; class EffectView; -class groupBox; +class GroupBox; class EffectRackView : public QWidget, public ModelView @@ -75,7 +75,7 @@ private: QVector m_effectViews; - groupBox* m_effectsGroupBox; + GroupBox* m_effectsGroupBox; QScrollArea* m_scrollArea; int m_lastY; diff --git a/include/EffectView.h b/include/EffectView.h index 614a43939..c251a41ae 100644 --- a/include/EffectView.h +++ b/include/EffectView.h @@ -36,8 +36,8 @@ class QPushButton; class QMdiSubWindow; class EffectControlDialog; -class knob; -class ledCheckBox; +class Knob; +class LedCheckBox; class TempoSyncKnob; @@ -81,10 +81,10 @@ protected: private: QPixmap m_bg; - ledCheckBox * m_bypass; - knob * m_wetDry; + LedCheckBox * m_bypass; + Knob * m_wetDry; TempoSyncKnob * m_autoQuit; - knob * m_gate; + Knob * m_gate; QMdiSubWindow * m_subWindow; EffectControlDialog * m_controlView; diff --git a/include/Engine.h b/include/Engine.h index d0a708638..d317b52c4 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -43,7 +43,7 @@ class ProjectJournal; class MainWindow; class Mixer; class PianoRoll; -class projectNotes; +class ProjectNotes; class Song; class SongEditor; class Ladspa2LMMS; @@ -123,7 +123,7 @@ public: return s_pianoRoll; } - static projectNotes * getProjectNotes() + static ProjectNotes * getProjectNotes() { return s_projectNotes; } @@ -191,7 +191,7 @@ private: static AutomationEditor * s_automationEditor; static bbEditor * s_bbEditor; static PianoRoll* s_pianoRoll; - static projectNotes * s_projectNotes; + static ProjectNotes * s_projectNotes; static Ladspa2LMMS * s_ladspaManager; static QMap s_pluginFileHandling; diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index d62a85f04..f491ea7bf 100644 --- a/include/EnvelopeAndLfoView.h +++ b/include/EnvelopeAndLfoView.h @@ -36,9 +36,9 @@ class QPixmap; class EnvelopeAndLfoParameters; class automatableButtonGroup; -class knob; -class ledCheckBox; -class pixmapButton; +class Knob; +class LedCheckBox; +class PixmapButton; class TempoSyncKnob; @@ -72,24 +72,24 @@ private: // envelope stuff - knob * m_predelayKnob; - knob * m_attackKnob; - knob * m_holdKnob; - knob * m_decayKnob; - knob * m_sustainKnob; - knob * m_releaseKnob; - knob * m_amountKnob; + Knob * m_predelayKnob; + Knob * m_attackKnob; + Knob * m_holdKnob; + Knob * m_decayKnob; + Knob * m_sustainKnob; + Knob * m_releaseKnob; + Knob * m_amountKnob; // LFO stuff - knob * m_lfoPredelayKnob; - knob * m_lfoAttackKnob; + Knob * m_lfoPredelayKnob; + Knob * m_lfoAttackKnob; TempoSyncKnob * m_lfoSpeedKnob; - knob * m_lfoAmountKnob; - pixmapButton * m_userLfoBtn; + Knob * m_lfoAmountKnob; + PixmapButton * m_userLfoBtn; automatableButtonGroup * m_lfoWaveBtnGrp; - ledCheckBox * m_x100Cb; - ledCheckBox * m_controlEnvAmountCb; + LedCheckBox * m_x100Cb; + LedCheckBox * m_controlEnvAmountCb; float m_randomGraph; } ; diff --git a/include/fade_button.h b/include/FadeButton.h similarity index 88% rename from include/fade_button.h rename to include/FadeButton.h index c16fdf23e..6e7371f9f 100644 --- a/include/fade_button.h +++ b/include/FadeButton.h @@ -1,5 +1,5 @@ /* - * fade_button.h - declaration of class fadeButton + * FadeButton.h - declaration of class fadeButton * * Copyright (c) 2005-2009 Tobias Doerffel * @@ -31,14 +31,14 @@ #include -class fadeButton : public QAbstractButton +class FadeButton : public QAbstractButton { Q_OBJECT public: - fadeButton( const QColor & _normal_color, const QColor & + FadeButton( const QColor & _normal_color, const QColor & _activated_color, QWidget * _parent ); - virtual ~fadeButton(); + virtual ~FadeButton(); public slots: diff --git a/include/fader.h b/include/Fader.h similarity index 93% rename from include/fader.h rename to include/Fader.h index 4f4844463..efbc4ebf1 100644 --- a/include/fader.h +++ b/include/Fader.h @@ -1,5 +1,5 @@ /* - * fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen + * Fader.h - fader-widget used in FX-mixer - partly taken from Hydrogen * * Copyright (c) 2008-2012 Tobias Doerffel * @@ -54,17 +54,17 @@ #include "AutomatableModelView.h" -class textFloat; +class TextFloat; -class fader : public QWidget, public FloatModelView +class Fader : public QWidget, public FloatModelView { Q_OBJECT public: Q_PROPERTY( QColor peakGreen READ peakGreen WRITE setPeakGreen ) Q_PROPERTY( QColor peakRed READ peakRed WRITE setPeakRed ) - fader( FloatModel * _model, const QString & _name, QWidget * _parent ); - virtual ~fader(); + Fader( FloatModel * _model, const QString & _name, QWidget * _parent ); + virtual ~Fader(); void setPeak_L( float fPeak ); float getPeak_L() { return m_fPeakValue_L; } @@ -116,7 +116,7 @@ private: int m_moveStartPoint; float m_startValue; - static textFloat * s_textFloat; + static TextFloat * s_textFloat; void updateTextFloat(); QColor m_peakGreen; diff --git a/include/FxLine.h b/include/FxLine.h index d540c8c5a..2cc479799 100644 --- a/include/FxLine.h +++ b/include/FxLine.h @@ -29,7 +29,7 @@ #include #include -#include "knob.h" +#include "Knob.h" #include "LcdWidget.h" #include "SendButtonIndicator.h" @@ -52,7 +52,7 @@ public: inline int channelIndex() { return m_channelIndex; } void setChannelIndex(int index); - knob * m_sendKnob; + Knob * m_sendKnob; SendButtonIndicator * m_sendBtn; QBrush backgroundActive() const; diff --git a/include/FxMixerView.h b/include/FxMixerView.h index a6735ca7a..e2cee4be6 100644 --- a/include/FxMixerView.h +++ b/include/FxMixerView.h @@ -34,9 +34,9 @@ #include "FxMixer.h" #include "ModelView.h" #include "Engine.h" -#include "fader.h" -#include "pixmap_button.h" -#include "tooltip.h" +#include "Fader.h" +#include "PixmapButton.h" +#include "ToolTip.h" #include "embed.h" #include "EffectRackView.h" @@ -54,9 +54,9 @@ public: FxChannelView(QWidget * _parent, FxMixerView * _mv, int _chIndex ); FxLine * m_fxLine; - pixmapButton * m_muteBtn; - pixmapButton * m_soloBtn; - fader * m_fader; + PixmapButton * m_muteBtn; + PixmapButton * m_soloBtn; + Fader * m_fader; EffectRackView * m_rackView; }; diff --git a/include/graph.h b/include/Graph.h similarity index 93% rename from include/graph.h rename to include/Graph.h index 054c7c355..018b0ff0d 100644 --- a/include/graph.h +++ b/include/Graph.h @@ -1,5 +1,5 @@ /* - * graph.h - a QT widget for displaying and manipulating waveforms + * Graph.h - a QT widget for displaying and manipulating waveforms * * Copyright (c) 2006-2007 Andreas Brandmaier * 2008 Paul Giblock @@ -38,7 +38,7 @@ class graphModel; -class EXPORT graph : public QWidget, public ModelView +class EXPORT Graph : public QWidget, public ModelView { Q_OBJECT public: @@ -51,11 +51,11 @@ public: NumGraphStyles }; - graph( QWidget * _parent, graphStyle _style = graph::LinearStyle, + Graph( QWidget * _parent, graphStyle _style = Graph::LinearStyle, int _width = 132, int _height = 104 ); - virtual ~graph(); + virtual ~Graph(); void setForeground( const QPixmap & _pixmap ); @@ -179,7 +179,7 @@ private: float m_maxValue; float m_step; - friend class graph; + friend class Graph; }; diff --git a/include/group_box.h b/include/GroupBox.h similarity index 84% rename from include/group_box.h rename to include/GroupBox.h index 9fcdae618..3b71c2dbd 100644 --- a/include/group_box.h +++ b/include/GroupBox.h @@ -1,5 +1,5 @@ /* - * group_box.h - LMMS-groupbox + * GroupBox.h - LMMS-groupbox * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -29,22 +29,22 @@ #include #include "AutomatableModelView.h" -#include "pixmap_button.h" +#include "PixmapButton.h" class QPixmap; -class groupBox : public QWidget, public BoolModelView +class GroupBox : public QWidget, public BoolModelView { Q_OBJECT public: - groupBox( const QString & _caption, QWidget * _parent = NULL ); - virtual ~groupBox(); + GroupBox( const QString & _caption, QWidget * _parent = NULL ); + virtual ~GroupBox(); virtual void modelChanged(); - pixmapButton * ledButton() + PixmapButton * ledButton() { return m_led; } @@ -63,7 +63,7 @@ protected: private: void updatePixmap(); - pixmapButton * m_led; + PixmapButton * m_led; QString m_caption; const int m_titleBarHeight; diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index 05c285d18..c8c91f302 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -30,9 +30,9 @@ #include class QLabel; -class comboBox; -class groupBox; -class knob; +class ComboBox; +class GroupBox; +class Knob; class TempoSyncKnob; class InstrumentFunctionArpeggio; @@ -53,9 +53,9 @@ private: InstrumentFunctionNoteStacking * m_cc; - groupBox * m_chordsGroupBox; - comboBox * m_chordsComboBox; - knob * m_chordRangeKnob; + GroupBox * m_chordsGroupBox; + ComboBox * m_chordsComboBox; + Knob * m_chordRangeKnob; } ; @@ -75,14 +75,14 @@ private: virtual void modelChanged(); InstrumentFunctionArpeggio * m_a; - groupBox * m_arpGroupBox; - comboBox * m_arpComboBox; - knob * m_arpRangeKnob; + GroupBox * m_arpGroupBox; + ComboBox * m_arpComboBox; + Knob * m_arpRangeKnob; TempoSyncKnob * m_arpTimeKnob; - knob * m_arpGateKnob; + Knob * m_arpGateKnob; - comboBox * m_arpDirectionComboBox; - comboBox * m_arpModeComboBox; + ComboBox * m_arpDirectionComboBox; + ComboBox * m_arpModeComboBox; } ; diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index 70ce4c141..14437642b 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -31,7 +31,7 @@ #include "ModelView.h" -class groupBox; +class GroupBox; class LcdSpinBox; class QToolButton; @@ -46,12 +46,12 @@ public: private: virtual void modelChanged(); - groupBox * m_midiInputGroupBox; + GroupBox * m_midiInputGroupBox; LcdSpinBox * m_inputChannelSpinBox; LcdSpinBox * m_fixedInputVelocitySpinBox; QToolButton * m_rpBtn; - groupBox * m_midiOutputGroupBox; + GroupBox * m_midiOutputGroupBox; LcdSpinBox * m_outputChannelSpinBox; LcdSpinBox * m_fixedOutputVelocitySpinBox; LcdSpinBox * m_outputProgramSpinBox; diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index 59734ce76..8f87bb51c 100644 --- a/include/InstrumentSoundShapingView.h +++ b/include/InstrumentSoundShapingView.h @@ -33,10 +33,10 @@ class QLabel; class EnvelopeAndLfoView; -class comboBox; -class groupBox; -class knob; -class tabWidget; +class ComboBox; +class GroupBox; +class Knob; +class TabWidget; class InstrumentSoundShapingView : public QWidget, public ModelView @@ -54,14 +54,14 @@ private: InstrumentSoundShaping * m_ss; - tabWidget * m_targetsTabWidget; + TabWidget * m_targetsTabWidget; EnvelopeAndLfoView * m_envLfoViews[InstrumentSoundShaping::NumTargets]; // filter-stuff - groupBox * m_filterGroupBox; - comboBox * m_filterComboBox; - knob * m_filterCutKnob; - knob * m_filterResKnob; + GroupBox * m_filterGroupBox; + ComboBox * m_filterComboBox; + Knob * m_filterCutKnob; + Knob * m_filterResKnob; QLabel* m_singleStreamInfoLabel; diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 1a64825a0..3aeb6f6ae 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -44,17 +44,17 @@ class InstrumentFunctionArpeggioView; class InstrumentFunctionNoteStackingView; class EffectRackView; class InstrumentSoundShapingView; -class fadeButton; +class FadeButton; class Instrument; class InstrumentTrackWindow; class InstrumentMidiIOView; -class knob; +class Knob; class LcdSpinBox; class midiPortMenu; class DataFile; class PluginView; -class tabWidget; -class trackLabelButton; +class TabWidget; +class TrackLabelButton; class EXPORT InstrumentTrack : public Track, public MidiEventProcessor @@ -321,10 +321,10 @@ private: static QQueue s_windowCache; // widgets in track-settings-widget - trackLabelButton * m_tlb; - knob * m_volumeKnob; - knob * m_panningKnob; - fadeButton * m_activityIndicator; + TrackLabelButton * m_tlb; + Knob * m_volumeKnob; + Knob * m_panningKnob; + FadeButton * m_activityIndicator; QMenu * m_midiMenu; @@ -350,7 +350,7 @@ public: virtual ~InstrumentTrackWindow(); // parent for all internal tab-widgets - tabWidget * tabWidgetParent() + TabWidget * tabWidgetParent() { return m_tabWidget; } @@ -406,15 +406,15 @@ private: // widgets on the top of an instrument-track-window QLineEdit * m_nameLineEdit; - knob * m_volumeKnob; - knob * m_panningKnob; - knob * m_pitchKnob; + Knob * m_volumeKnob; + Knob * m_panningKnob; + Knob * m_pitchKnob; LcdSpinBox* m_pitchRangeSpinBox; LcdSpinBox * m_effectChannelNumber; // tab-widget with all children - tabWidget * m_tabWidget; + TabWidget * m_tabWidget; PluginView * m_instrumentView; InstrumentSoundShapingView * m_ssView; InstrumentFunctionNoteStackingView* m_noteStackingView; diff --git a/include/knob.h b/include/Knob.h similarity index 94% rename from include/knob.h rename to include/Knob.h index 760302e3c..c41ebf08d 100644 --- a/include/knob.h +++ b/include/Knob.h @@ -1,5 +1,5 @@ /* - * knob.h - powerful knob-widget + * Knob.h - powerful knob-widget * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -34,7 +34,7 @@ class QPixmap; -class textFloat; +class TextFloat; enum knobTypes { @@ -43,7 +43,7 @@ enum knobTypes -class EXPORT knob : public QWidget, public FloatModelView +class EXPORT Knob : public QWidget, public FloatModelView { Q_OBJECT Q_ENUMS( knobTypes ) @@ -70,9 +70,9 @@ class EXPORT knob : public QWidget, public FloatModelView void onKnobNumUpdated(); //!< to be called when you updated @a m_knobNum public: - knob( knobTypes _knob_num, QWidget * _parent = NULL, const QString & _name = QString() ); - knob( QWidget * _parent = NULL, const QString & _name = QString() ); //!< default ctor - virtual ~knob(); + Knob( knobTypes _knob_num, QWidget * _parent = NULL, const QString & _name = QString() ); + Knob( QWidget * _parent = NULL, const QString & _name = QString() ); //!< default ctor + virtual ~Knob(); // TODO: remove inline void setHintText( const QString & _txt_before, @@ -161,7 +161,7 @@ private: } - static textFloat * s_textFloat; + static TextFloat * s_textFloat; QString m_label; diff --git a/include/led_checkbox.h b/include/LedCheckbox.h similarity index 87% rename from include/led_checkbox.h rename to include/LedCheckbox.h index 0ee8d369c..f2e215b2f 100644 --- a/include/led_checkbox.h +++ b/include/LedCheckbox.h @@ -1,5 +1,5 @@ /* - * led_checkbox.h - class ledCheckBox, an improved QCheckBox + * LedCheckbox.h - class LedCheckBox, an improved QCheckBox * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -32,7 +32,7 @@ class QPixmap; -class EXPORT ledCheckBox : public AutomatableButton +class EXPORT LedCheckBox : public AutomatableButton { Q_OBJECT public: @@ -44,14 +44,14 @@ public: NumColors } ; - ledCheckBox( const QString & _txt, QWidget * _parent, + LedCheckBox( const QString & _txt, QWidget * _parent, const QString & _name = QString::null, LedColors _color = Yellow ); - ledCheckBox( QWidget * _parent, + LedCheckBox( QWidget * _parent, const QString & _name = QString::null, LedColors _color = Yellow ); - virtual ~ledCheckBox(); + virtual ~LedCheckBox(); inline const QString & text() diff --git a/include/LfoController.h b/include/LfoController.h index b00bdfcac..8cc5ec70f 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -35,10 +35,10 @@ #include "Oscillator.h" class automatableButtonGroup; -class knob; -class ledCheckBox; +class Knob; +class LedCheckBox; class TempoSyncKnob; -class pixmapButton; +class PixmapButton; class LfoController : public Controller @@ -103,17 +103,17 @@ protected: LfoController * m_lfo; - knob * m_baseKnob; + Knob * m_baseKnob; TempoSyncKnob * m_speedKnob; - knob * m_amountKnob; - knob * m_phaseKnob; - pixmapButton * m_userLfoBtn; + Knob * m_amountKnob; + Knob * m_phaseKnob; + PixmapButton * m_userLfoBtn; automatableButtonGroup * m_waveBtnGrp; automatableButtonGroup * m_multiplierBtnGrp; private: - pixmapButton * m_userWaveBtn; + PixmapButton * m_userWaveBtn; private slots: void askUserDefWave(); diff --git a/include/MainWindow.h b/include/MainWindow.h index 5a238ae34..5e9fb3254 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -37,7 +37,7 @@ class QMdiArea; class ConfigManager; class PluginView; -class toolButton; +class ToolButton; class MainWindow : public QMainWindow diff --git a/include/MidiClient.h b/include/MidiClient.h index 533c2b5e0..09e4a07ae 100644 --- a/include/MidiClient.h +++ b/include/MidiClient.h @@ -31,7 +31,7 @@ #include "MidiEvent.h" #include "MidiEventProcessor.h" -#include "tab_widget.h" +#include "TabWidget.h" class MidiPort; @@ -107,11 +107,11 @@ public: static MidiClient * openMidiClient(); - class setupWidget : public tabWidget + class setupWidget : public TabWidget { public: setupWidget( const QString & _caption, QWidget * _parent ) : - tabWidget( tabWidget::tr( "Settings for %1" ).arg( + TabWidget( TabWidget::tr( "Settings for %1" ).arg( tr( _caption.toLatin1() ) ).toUpper(), _parent ) { diff --git a/include/nstate_button.h b/include/NStateButton.h similarity index 89% rename from include/nstate_button.h rename to include/NStateButton.h index c146d63b6..37dcde1dd 100644 --- a/include/nstate_button.h +++ b/include/NStateButton.h @@ -1,5 +1,5 @@ /* - * nstate_button.h - declaration of class nStateButton + * NStateButton.h - declaration of class nStateButton * * Copyright (c) 2005 Tobias Doerffel * @@ -30,15 +30,15 @@ #include #include -#include "tool_button.h" +#include "ToolButton.h" -class nStateButton : public toolButton +class NStateButton : public ToolButton { Q_OBJECT public: - nStateButton( QWidget * _parent ); - virtual ~nStateButton(); + NStateButton( QWidget * _parent ); + virtual ~NStateButton(); void addState( const QPixmap & _pixmap, const QString & _tooltip = "" ); inline void setGeneralToolTip( const QString & _tooltip ) diff --git a/include/PeakController.h b/include/PeakController.h index fc9ea92d8..2b87ff09a 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -33,7 +33,7 @@ #include "ControllerDialog.h" class automatableButtonGroup; -class knob; +class Knob; class PeakControllerEffect; typedef QVector PeakControllerEffectVector; diff --git a/include/PianoRoll.h b/include/PianoRoll.h index eec6ba2fb..bd27bda2e 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -35,7 +35,7 @@ #include "Note.h" #include "lmms_basics.h" #include "Song.h" -#include "tooltip.h" +#include "ToolTip.h" class QPainter; class QPixmap; @@ -44,11 +44,11 @@ class QString; class QMenu; class QSignalMapper; -class comboBox; +class ComboBox; class NotePlayHandle; class Pattern; class Timeline; -class toolButton; +class ToolButton; class PianoRoll : public QWidget, public SerializingObject { @@ -262,29 +262,29 @@ private: static PianoRollKeyTypes prKeyOrder[]; - static textFloat * s_textFloat; + static TextFloat * s_textFloat; QWidget * m_toolBar; - toolButton * m_playButton; - toolButton * m_recordButton; - toolButton * m_recordAccompanyButton; - toolButton * m_stopButton; + ToolButton * m_playButton; + ToolButton * m_recordButton; + ToolButton * m_recordAccompanyButton; + ToolButton * m_stopButton; - toolButton * m_drawButton; - toolButton * m_eraseButton; - toolButton * m_selectButton; - toolButton * m_detuneButton; + ToolButton * m_drawButton; + ToolButton * m_eraseButton; + ToolButton * m_selectButton; + ToolButton * m_detuneButton; - toolButton * m_cutButton; - toolButton * m_copyButton; - toolButton * m_pasteButton; + ToolButton * m_cutButton; + ToolButton * m_copyButton; + ToolButton * m_pasteButton; - comboBox * m_zoomingComboBox; - comboBox * m_quantizeComboBox; - comboBox * m_noteLenComboBox; - comboBox * m_scaleComboBox; - comboBox * m_chordComboBox; + ComboBox * m_zoomingComboBox; + ComboBox * m_quantizeComboBox; + ComboBox * m_noteLenComboBox; + ComboBox * m_scaleComboBox; + ComboBox * m_chordComboBox; ComboBoxModel m_zoomingModel; ComboBoxModel m_quantizeModel; diff --git a/include/pixmap_button.h b/include/PixmapButton.h similarity index 90% rename from include/pixmap_button.h rename to include/PixmapButton.h index 63095ab71..7e02c4047 100644 --- a/include/pixmap_button.h +++ b/include/PixmapButton.h @@ -1,5 +1,5 @@ /* - * pixmap_button.h - declaration of class pixmapButton + * PixmapButton.h - declaration of class pixmapButton * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -31,13 +31,13 @@ #include "AutomatableButton.h" -class EXPORT pixmapButton : public AutomatableButton +class EXPORT PixmapButton : public AutomatableButton { Q_OBJECT public: - pixmapButton( QWidget * _parent, + PixmapButton( QWidget * _parent, const QString & _name = QString::null ); - virtual ~pixmapButton(); + virtual ~PixmapButton(); void setActiveGraphic( const QPixmap & _pm ); void setInactiveGraphic( const QPixmap & _pm, bool _update = true ); diff --git a/include/project_notes.h b/include/ProjectNotes.h similarity index 92% rename from include/project_notes.h rename to include/ProjectNotes.h index 9833294c1..80a6748da 100644 --- a/include/project_notes.h +++ b/include/ProjectNotes.h @@ -1,5 +1,5 @@ /* - * project_notes.h - header for project-notes-editor + * ProjectNotes.h - header for project-notes-editor * * Copyright (c) 2005-2007 Tobias Doerffel * @@ -36,12 +36,12 @@ class QTextCharFormat; class QTextEdit; -class EXPORT projectNotes : public QMainWindow, public SerializingObject +class EXPORT ProjectNotes : public QMainWindow, public SerializingObject { Q_OBJECT public: - projectNotes(); - virtual ~projectNotes(); + ProjectNotes(); + virtual ~ProjectNotes(); void clear(); void setText( const QString & _text ); diff --git a/include/rename_dialog.h b/include/RenameDialog.h similarity index 88% rename from include/rename_dialog.h rename to include/RenameDialog.h index dbaea7216..8c857e15d 100644 --- a/include/rename_dialog.h +++ b/include/RenameDialog.h @@ -1,5 +1,5 @@ /* - * rename_dialog.h - declaration of class renameDialog, a simple dialog for + * RenameDialog.h - declaration of class renameDialog, a simple dialog for * changing the content of a string * * Copyright (c) 2004-2005 Tobias Doerffel @@ -33,12 +33,12 @@ class QLineEdit; -class renameDialog : public QDialog +class RenameDialog : public QDialog { Q_OBJECT public: - renameDialog( QString & _string ); - ~renameDialog(); + RenameDialog( QString & _string ); + ~RenameDialog(); protected: diff --git a/include/rubberband.h b/include/Rubberband.h similarity index 91% rename from include/rubberband.h rename to include/Rubberband.h index dc437340a..7c8454f76 100644 --- a/include/rubberband.h +++ b/include/Rubberband.h @@ -1,5 +1,5 @@ /* - * rubberband.h - rubberband - either own implementation for Qt3 or wrapper for + * Rubberband.h - rubberband - either own implementation for Qt3 or wrapper for * Qt4 * * Copyright (c) 2006 Tobias Doerffel @@ -72,11 +72,11 @@ private: -class rubberBand : public QRubberBand +class RubberBand : public QRubberBand { public: - rubberBand( QWidget * _parent ); - virtual ~rubberBand(); + RubberBand( QWidget * _parent ); + virtual ~RubberBand(); QVector selectedObjects() const; diff --git a/include/SampleTrack.h b/include/SampleTrack.h index a776f821a..4912f90e3 100644 --- a/include/SampleTrack.h +++ b/include/SampleTrack.h @@ -31,7 +31,7 @@ #include "Track.h" class EffectRackView; -class knob; +class Knob; class SampleBuffer; @@ -180,7 +180,7 @@ protected: private: EffectRackView * m_effectRack; QWidget * m_effWindow; - knob * m_volumeKnob; + Knob * m_volumeKnob; } ; diff --git a/include/SongEditor.h b/include/SongEditor.h index 5d876591b..bb40155eb 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -33,13 +33,13 @@ class QLabel; class QScrollBar; class AutomatableSlider; -class comboBox; +class ComboBox; class LcdSpinBox; class MeterDialog; class Song; -class textFloat; +class TextFloat; class Timeline; -class toolButton; +class ToolButton; class positionLine : public QWidget { @@ -104,10 +104,10 @@ private: QWidget * m_toolBar; - toolButton * m_playButton; - toolButton * m_recordButton; - toolButton * m_recordAccompanyButton; - toolButton * m_stopButton; + ToolButton * m_playButton; + ToolButton * m_recordButton; + ToolButton * m_recordAccompanyButton; + ToolButton * m_stopButton; LcdSpinBox * m_tempoSpinBox; Timeline * m_timeLine; @@ -116,17 +116,17 @@ private: AutomatableSlider * m_masterVolumeSlider; AutomatableSlider * m_masterPitchSlider; - textFloat * m_mvsStatus; - textFloat * m_mpsStatus; + TextFloat * m_mvsStatus; + TextFloat * m_mpsStatus; - toolButton * m_addBBTrackButton; - toolButton * m_addSampleTrackButton; - toolButton * m_addAutomationTrackButton; + ToolButton * m_addBBTrackButton; + ToolButton * m_addSampleTrackButton; + ToolButton * m_addAutomationTrackButton; - toolButton * m_drawModeButton; - toolButton * m_editModeButton; + ToolButton * m_drawModeButton; + ToolButton * m_editModeButton; - comboBox * m_zoomingComboBox; + ComboBox * m_zoomingComboBox; positionLine * m_positionLine; diff --git a/include/tab_bar.h b/include/TabBar.h similarity index 93% rename from include/tab_bar.h rename to include/TabBar.h index e5deceb16..9cfe1dd96 100644 --- a/include/tab_bar.h +++ b/include/TabBar.h @@ -1,5 +1,5 @@ /* - * tab_bar.h - class tabBar + * TabBar.h - class tabBar * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -36,13 +36,13 @@ class tabButton; -class EXPORT tabBar : public QWidget +class EXPORT TabBar : public QWidget { Q_OBJECT public: - tabBar( QWidget * _parent, + TabBar( QWidget * _parent, QBoxLayout::Direction _dir = QBoxLayout::LeftToRight ); - virtual ~tabBar(); + virtual ~TabBar(); tabButton * addTab( QWidget * _w, const QString & _text, int _id, bool _add_stretch = false, diff --git a/include/tab_widget.h b/include/TabWidget.h similarity index 91% rename from include/tab_widget.h rename to include/TabWidget.h index aca714a79..1d5635c95 100644 --- a/include/tab_widget.h +++ b/include/TabWidget.h @@ -1,5 +1,5 @@ /* - * tab_widget.h - LMMS-tabwidget + * TabWidget.h - LMMS-tabwidget * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -30,12 +30,12 @@ #include -class tabWidget : public QWidget +class TabWidget : public QWidget { Q_OBJECT public: - tabWidget( const QString & _caption, QWidget * _parent ); - virtual ~tabWidget(); + TabWidget( const QString & _caption, QWidget * _parent ); + virtual ~TabWidget(); void addTab( QWidget * _w, const QString & _name, int _idx = -1 ); diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h index 656e88dc5..a19069901 100644 --- a/include/TempoSyncKnob.h +++ b/include/TempoSyncKnob.h @@ -29,12 +29,12 @@ #include #include -#include "knob.h" +#include "Knob.h" #include "TempoSyncKnobModel.h" class MeterDialog; -class EXPORT TempoSyncKnob : public knob +class EXPORT TempoSyncKnob : public Knob { Q_OBJECT public: diff --git a/include/text_float.h b/include/TextFloat.h similarity index 87% rename from include/text_float.h rename to include/TextFloat.h index f216917ac..c89c346b4 100644 --- a/include/text_float.h +++ b/include/TextFloat.h @@ -1,5 +1,5 @@ /* - * text_float.h - class textFloat, a floating text-label + * TextFloat.h - class textFloat, a floating text-label * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -32,12 +32,12 @@ #include "export.h" -class EXPORT textFloat : public QWidget +class EXPORT TextFloat : public QWidget { Q_OBJECT public: - textFloat(); - virtual ~textFloat() + TextFloat(); + virtual ~TextFloat() { } @@ -48,11 +48,11 @@ public: void setVisibilityTimeOut( int _msecs ); - static textFloat * displayMessage( const QString & _msg, + static TextFloat * displayMessage( const QString & _msg, int _timeout = 2000, QWidget * _parent = NULL, int _add_y_margin = 0 ); - static textFloat * displayMessage( const QString & _title, + static TextFloat * displayMessage( const QString & _title, const QString & _msg, const QPixmap & _pixmap = QPixmap(), diff --git a/include/Timeline.h b/include/Timeline.h index b1811bb6a..78dc00ddc 100644 --- a/include/Timeline.h +++ b/include/Timeline.h @@ -32,8 +32,8 @@ class QPixmap; -class nStateButton; -class textFloat; +class NStateButton; +class TextFloat; class Timeline : public QWidget, public JournallingObject @@ -169,7 +169,7 @@ private: MidiTime m_savedPos; - textFloat * m_hint; + TextFloat * m_hint; enum actions diff --git a/include/tool_button.h b/include/ToolButton.h similarity index 88% rename from include/tool_button.h rename to include/ToolButton.h index 46f18569c..7e1183e14 100644 --- a/include/tool_button.h +++ b/include/ToolButton.h @@ -1,5 +1,5 @@ /* - * tool_button.h - declaration of class toolButton + * ToolButton.h - declaration of class toolButton * * Copyright (c) 2005-2006 Tobias Doerffel * @@ -30,15 +30,15 @@ #include -class toolButton : public QToolButton +class ToolButton : public QToolButton { Q_OBJECT public: - toolButton( const QPixmap & _pixmap, const QString & _tooltip, + ToolButton( const QPixmap & _pixmap, const QString & _tooltip, QObject * _receiver, const char * _slot, QWidget * _parent ); - inline toolButton( QWidget * _parent ) : + inline ToolButton( QWidget * _parent ) : QToolButton( _parent ), m_colorStandard( s_stdColor ), m_colorHighlighted( s_hlColor ) @@ -47,7 +47,7 @@ public: leaveEvent( NULL ); } - virtual ~toolButton(); + virtual ~ToolButton(); inline void setStandardColor( const QColor & _color ) { diff --git a/include/tooltip.h b/include/ToolTip.h similarity index 93% rename from include/tooltip.h rename to include/ToolTip.h index e0dfb735e..b543b3808 100644 --- a/include/tooltip.h +++ b/include/ToolTip.h @@ -1,5 +1,5 @@ /* - * tooltip.h - namespace toolTip, a tooltip-wrapper for LMMS + * ToolTip.h - namespace toolTip, a tooltip-wrapper for LMMS * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -33,7 +33,7 @@ class QWidget; -struct toolTip +struct ToolTip { static void EXPORT add( QWidget * _w, const QString & _txt ); } ; diff --git a/include/Track.h b/include/Track.h index 944e9bd32..778e422b2 100644 --- a/include/Track.h +++ b/include/Track.h @@ -34,7 +34,7 @@ #include "lmms_basics.h" #include "MidiTime.h" -#include "rubberband.h" +#include "Rubberband.h" #include "JournallingObject.h" #include "AutomatableModel.h" #include "ModelView.h" @@ -44,8 +44,8 @@ class QMenu; class QPushButton; -class pixmapButton; -class textFloat; +class PixmapButton; +class TextFloat; class Track; class trackContentObjectView; class TrackContainer; @@ -243,7 +243,7 @@ private: ToggleSelected } ; - static textFloat * s_textFloat; + static TextFloat * s_textFloat; trackContentObject * m_tco; trackView * m_trackView; @@ -252,7 +252,7 @@ private: QPoint m_initialMousePos; QPoint m_initialMouseGlobalPos; - textFloat * m_hint; + TextFloat * m_hint; MidiTime m_oldTime;// used for undo/redo while mouse-button is pressed @@ -388,8 +388,8 @@ private: trackView * m_trackView; QPushButton * m_trackOps; - pixmapButton * m_muteBtn; - pixmapButton * m_soloBtn; + PixmapButton * m_muteBtn; + PixmapButton * m_soloBtn; friend class trackView; @@ -658,7 +658,7 @@ private: Actions m_action; - friend class trackLabelButton; + friend class TrackLabelButton; private slots: diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index 09b128a47..f4762f873 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -172,7 +172,7 @@ private: float m_ppt; - rubberBand * m_rubberBand; + RubberBand * m_rubberBand; QPoint m_origin; diff --git a/include/track_label_button.h b/include/TrackLabelButton.h similarity index 88% rename from include/track_label_button.h rename to include/TrackLabelButton.h index a5e2a0acb..5dcb9ad13 100644 --- a/include/track_label_button.h +++ b/include/TrackLabelButton.h @@ -1,5 +1,5 @@ /* - * track_label_button.h - class trackLabelButton + * TrackLabelButton.h - class trackLabelButton * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -32,12 +32,12 @@ class trackView; -class trackLabelButton : public QToolButton +class TrackLabelButton : public QToolButton { Q_OBJECT public: - trackLabelButton( trackView * _tv, QWidget * _parent ); - virtual ~trackLabelButton(); + TrackLabelButton( trackView * _tv, QWidget * _parent ); + virtual ~TrackLabelButton(); public slots: diff --git a/include/visualization_widget.h b/include/VisualizationWidget.h similarity index 87% rename from include/visualization_widget.h rename to include/VisualizationWidget.h index b0a8e5edf..12922ffc6 100644 --- a/include/visualization_widget.h +++ b/include/VisualizationWidget.h @@ -1,5 +1,5 @@ /* - * visualization_widget.h - widget for visualization of sound-data + * VisualizationWidget.h - widget for visualization of sound-data * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -32,7 +32,7 @@ #include "Mixer.h" -class visualizationWidget : public QWidget +class VisualizationWidget : public QWidget { Q_OBJECT public: @@ -41,9 +41,9 @@ public: Simple // add more here } ; - visualizationWidget( const QPixmap & _bg, QWidget * _parent, + VisualizationWidget( const QPixmap & _bg, QWidget * _parent, visualizationTypes _vtype = Simple ); - virtual ~visualizationWidget(); + virtual ~VisualizationWidget(); void setActive( bool _active ); diff --git a/include/bb_editor.h b/include/bb_editor.h index 6d2100e84..adaf8600a 100644 --- a/include/bb_editor.h +++ b/include/bb_editor.h @@ -30,8 +30,8 @@ class BBTrackContainer; -class comboBox; -class toolButton; +class ComboBox; +class ToolButton; class bbEditor : public TrackContainerView @@ -67,10 +67,10 @@ private: BBTrackContainer * m_bbtc; QWidget * m_toolBar; - toolButton * m_playButton; - toolButton * m_stopButton; + ToolButton * m_playButton; + ToolButton * m_stopButton; - comboBox * m_bbComboBox; + ComboBox * m_bbComboBox; } ; diff --git a/include/bb_track.h b/include/bb_track.h index 25eb84c8e..6017e9bd5 100644 --- a/include/bb_track.h +++ b/include/bb_track.h @@ -32,7 +32,7 @@ #include "Track.h" -class trackLabelButton; +class TrackLabelButton; class TrackContainer; @@ -220,7 +220,7 @@ public slots: private: bbTrack * m_bbTrack; - trackLabelButton * m_trackLabel; + TrackLabelButton * m_trackLabel; } ; diff --git a/include/setup_dialog.h b/include/setup_dialog.h index 8eeb06988..fd726cf9b 100644 --- a/include/setup_dialog.h +++ b/include/setup_dialog.h @@ -38,7 +38,7 @@ class QLabel; class QLineEdit; class QSlider; -class tabBar; +class TabBar; class setupDialog : public QDialog @@ -114,7 +114,7 @@ private slots: private: - tabBar * m_tabBar; + TabBar * m_tabBar; QSlider * m_bufSizeSlider; QLabel * m_bufSizeLbl; diff --git a/plugins/Amplifier/AmplifierControlDialog.cpp b/plugins/Amplifier/AmplifierControlDialog.cpp index cf935c714..354760187 100644 --- a/plugins/Amplifier/AmplifierControlDialog.cpp +++ b/plugins/Amplifier/AmplifierControlDialog.cpp @@ -40,27 +40,27 @@ AmplifierControlDialog::AmplifierControlDialog( AmplifierControls* controls ) : setPalette( pal ); setFixedSize( 100, 125 ); - knob * volumeKnob = new knob( knobBright_26, this); + Knob * volumeKnob = new Knob( knobBright_26, this); volumeKnob -> move( 20, 30 ); volumeKnob -> setVolumeKnob( true ); volumeKnob->setModel( &controls->m_volumeModel ); volumeKnob->setLabel( tr( "VOL" ) ); volumeKnob->setHintText( tr( "Volume:" ) + " ", "%" ); - knob * panKnob = new knob( knobBright_26, this); + Knob * panKnob = new Knob( knobBright_26, this); panKnob -> move( 60, 30 ); panKnob->setModel( &controls->m_panModel ); panKnob->setLabel( tr( "PAN" ) ); panKnob->setHintText( tr( "Panning:" ) + " ", "" ); - knob * leftKnob = new knob( knobBright_26, this); + Knob * leftKnob = new Knob( knobBright_26, this); leftKnob -> move( 20, 80 ); leftKnob -> setVolumeKnob( true ); leftKnob->setModel( &controls->m_leftModel ); leftKnob->setLabel( tr( "LEFT" ) ); leftKnob->setHintText( tr( "Left gain:" ) + " ", "%" ); - knob * rightKnob = new knob( knobBright_26, this); + Knob * rightKnob = new Knob( knobBright_26, this); rightKnob -> move( 60, 80 ); rightKnob -> setVolumeKnob( true ); rightKnob->setModel( &controls->m_rightModel ); diff --git a/plugins/Amplifier/AmplifierControls.h b/plugins/Amplifier/AmplifierControls.h index d1b98659d..0d2f52dab 100644 --- a/plugins/Amplifier/AmplifierControls.h +++ b/plugins/Amplifier/AmplifierControls.h @@ -28,7 +28,7 @@ #include "EffectControls.h" #include "AmplifierControlDialog.h" -#include "knob.h" +#include "Knob.h" class AmplifierEffect; diff --git a/plugins/BassBooster/BassBoosterControlDialog.cpp b/plugins/BassBooster/BassBoosterControlDialog.cpp index 18917595e..9caca1bb8 100644 --- a/plugins/BassBooster/BassBoosterControlDialog.cpp +++ b/plugins/BassBooster/BassBoosterControlDialog.cpp @@ -44,17 +44,17 @@ BassBoosterControlDialog::BassBoosterControlDialog( BassBoosterControls* control QHBoxLayout * l = new QHBoxLayout; - knob * freqKnob = new knob( knobBright_26, this); + Knob * freqKnob = new Knob( knobBright_26, this); freqKnob->setModel( &controls->m_freqModel ); freqKnob->setLabel( tr( "FREQ" ) ); freqKnob->setHintText( tr( "Frequency:" ) + " ", "Hz" ); - knob * gainKnob = new knob( knobBright_26, this ); + Knob * gainKnob = new Knob( knobBright_26, this ); gainKnob->setModel( &controls->m_gainModel ); gainKnob->setLabel( tr( "GAIN" ) ); gainKnob->setHintText( tr( "Gain:" ) + " ", "" ); - knob * ratioKnob = new knob( knobBright_26, this ); + Knob * ratioKnob = new Knob( knobBright_26, this ); ratioKnob->setModel( &controls->m_ratioModel ); ratioKnob->setLabel( tr( "RATIO" ) ); ratioKnob->setHintText( tr( "Ratio:" ) + " ", "" ); diff --git a/plugins/BassBooster/BassBoosterControls.h b/plugins/BassBooster/BassBoosterControls.h index 5df888bc1..7a3bea3ce 100644 --- a/plugins/BassBooster/BassBoosterControls.h +++ b/plugins/BassBooster/BassBoosterControls.h @@ -27,7 +27,7 @@ #include "EffectControls.h" #include "BassBoosterControlDialog.h" -#include "knob.h" +#include "Knob.h" class BassBoosterEffect; diff --git a/plugins/DualFilter/DualFilterControlDialog.cpp b/plugins/DualFilter/DualFilterControlDialog.cpp index 9de81cf1b..13fed96db 100644 --- a/plugins/DualFilter/DualFilterControlDialog.cpp +++ b/plugins/DualFilter/DualFilterControlDialog.cpp @@ -28,13 +28,13 @@ #include "DualFilterControlDialog.h" #include "DualFilterControls.h" #include "embed.h" -#include "led_checkbox.h" -#include "combobox.h" -#include "tooltip.h" +#include "LedCheckbox.h" +#include "ComboBox.h" +#include "ToolTip.h" #include "gui_templates.h" #define makeknob( name, x, y, model, label, hint, unit ) \ - knob * name = new knob( knobBright_26, this); \ + Knob * name = new Knob( knobBright_26, this); \ name -> move( x, y ); \ name ->setModel( &controls-> model ); \ name ->setLabel( tr( label ) ); \ @@ -62,24 +62,24 @@ DualFilterControlDialog::DualFilterControlDialog( DualFilterControls* controls ) gain1Knob-> setVolumeKnob( true ); gain2Knob-> setVolumeKnob( true ); - ledCheckBox * enabled1Toggle = new ledCheckBox( "", this, - tr( "Filter 1 enabled" ), ledCheckBox::Green ); - ledCheckBox * enabled2Toggle = new ledCheckBox( "", this, - tr( "Filter 2 enabled" ), ledCheckBox::Green ); + LedCheckBox * enabled1Toggle = new LedCheckBox( "", this, + tr( "Filter 1 enabled" ), LedCheckBox::Green ); + LedCheckBox * enabled2Toggle = new LedCheckBox( "", this, + tr( "Filter 2 enabled" ), LedCheckBox::Green ); enabled1Toggle -> move( 5, 30 ); enabled1Toggle -> setModel( &controls -> m_enabled1Model ); - toolTip::add( enabled1Toggle, tr( "Click to enable/disable Filter 1" ) ); + ToolTip::add( enabled1Toggle, tr( "Click to enable/disable Filter 1" ) ); enabled2Toggle -> move( 5, 145 ); enabled2Toggle -> setModel( &controls -> m_enabled2Model ); - toolTip::add( enabled2Toggle, tr( "Click to enable/disable Filter 2" ) ); + ToolTip::add( enabled2Toggle, tr( "Click to enable/disable Filter 2" ) ); - comboBox * m_filter1ComboBox = new comboBox( this ); + ComboBox * m_filter1ComboBox = new ComboBox( this ); m_filter1ComboBox->setGeometry( 5, 70, 140, 22 ); m_filter1ComboBox->setFont( pointSize<8>( m_filter1ComboBox->font() ) ); m_filter1ComboBox->setModel( &controls->m_filter1Model ); - comboBox * m_filter2ComboBox = new comboBox( this ); + ComboBox * m_filter2ComboBox = new ComboBox( this ); m_filter2ComboBox->setGeometry( 5, 185, 140, 22 ); m_filter2ComboBox->setFont( pointSize<8>( m_filter2ComboBox->font() ) ); m_filter2ComboBox->setModel( &controls->m_filter2Model ); diff --git a/plugins/DualFilter/DualFilterControls.h b/plugins/DualFilter/DualFilterControls.h index 65953ba91..ad9d3915a 100644 --- a/plugins/DualFilter/DualFilterControls.h +++ b/plugins/DualFilter/DualFilterControls.h @@ -28,7 +28,7 @@ #include "EffectControls.h" #include "DualFilterControlDialog.h" -#include "knob.h" +#include "Knob.h" #include "ComboBoxModel.h" class DualFilterEffect; diff --git a/plugins/GigPlayer/GigPlayer.cpp b/plugins/GigPlayer/GigPlayer.cpp index b0ca74785..8d17b1f2e 100644 --- a/plugins/GigPlayer/GigPlayer.cpp +++ b/plugins/GigPlayer/GigPlayer.cpp @@ -41,13 +41,13 @@ #include "InstrumentTrack.h" #include "InstrumentPlayHandle.h" #include "NotePlayHandle.h" -#include "knob.h" +#include "Knob.h" #include "Song.h" #include "ConfigManager.h" #include "endian_handling.h" #include "PatchesDialog.h" -#include "tooltip.h" +#include "ToolTip.h" #include "LcdSpinBox.h" #include "embed.cpp" @@ -904,11 +904,11 @@ void GigInstrument::updateSampleRate() -class gigKnob : public knob +class gigKnob : public Knob { public: gigKnob( QWidget * _parent ) : - knob( knobBright_26, _parent ) + Knob( knobBright_26, _parent ) { setFixedSize( 31, 38 ); } @@ -926,7 +926,7 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren connect( &k->m_patchNum, SIGNAL( dataChanged() ), this, SLOT( updatePatchName() ) ); // File Button - m_fileDialogButton = new pixmapButton( this ); + m_fileDialogButton = new PixmapButton( this ); m_fileDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_fileDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_on" ) ); m_fileDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_off" ) ); @@ -934,12 +934,12 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren connect( m_fileDialogButton, SIGNAL( clicked() ), this, SLOT( showFileDialog() ) ); - toolTip::add( m_fileDialogButton, tr( "Open other GIG file" ) ); + ToolTip::add( m_fileDialogButton, tr( "Open other GIG file" ) ); m_fileDialogButton->setWhatsThis( tr( "Click here to open another GIG file" ) ); // Patch Button - m_patchDialogButton = new pixmapButton( this ); + m_patchDialogButton = new PixmapButton( this ); m_patchDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_patchDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_on" ) ); m_patchDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_off" ) ); @@ -948,7 +948,7 @@ GigInstrumentView::GigInstrumentView( Instrument * _instrument, QWidget * _paren connect( m_patchDialogButton, SIGNAL( clicked() ), this, SLOT( showPatchDialog() ) ); - toolTip::add( m_patchDialogButton, tr( "Choose the patch" ) ); + ToolTip::add( m_patchDialogButton, tr( "Choose the patch" ) ); m_patchDialogButton->setWhatsThis( tr( "Click here to change which patch of the GIG file to use" ) ); diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h index f302df622..e637fcd6a 100644 --- a/plugins/GigPlayer/GigPlayer.h +++ b/plugins/GigPlayer/GigPlayer.h @@ -32,11 +32,11 @@ #include #include "Instrument.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "InstrumentView.h" -#include "knob.h" +#include "Knob.h" #include "LcdSpinBox.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "SampleBuffer.h" #include "MemoryManager.h" #include "gig.h" @@ -345,8 +345,8 @@ public: private: virtual void modelChanged(); - pixmapButton * m_fileDialogButton; - pixmapButton * m_patchDialogButton; + PixmapButton * m_fileDialogButton; + PixmapButton * m_patchDialogButton; LcdSpinBox * m_bankNumLcd; LcdSpinBox * m_patchNumLcd; @@ -354,7 +354,7 @@ private: QLabel * m_filenameLabel; QLabel * m_patchLabel; - knob * m_gainKnob; + Knob * m_gainKnob; static PatchesDialog * s_patchDialog; diff --git a/plugins/LadspaEffect/LadspaControlDialog.cpp b/plugins/LadspaEffect/LadspaControlDialog.cpp index d2b02700b..b84fc9b0b 100644 --- a/plugins/LadspaEffect/LadspaControlDialog.cpp +++ b/plugins/LadspaEffect/LadspaControlDialog.cpp @@ -31,7 +31,7 @@ #include "LadspaEffect.h" #include "LadspaControlDialog.h" #include "LadspaControlView.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" @@ -52,7 +52,7 @@ LadspaControlDialog::LadspaControlDialog( LadspaControls * _ctl ) : mainLay->addSpacing( 3 ); QHBoxLayout * center = new QHBoxLayout(); mainLay->addLayout( center ); - m_stereoLink = new ledCheckBox( tr( "Link Channels" ), this ); + m_stereoLink = new LedCheckBox( tr( "Link Channels" ), this ); m_stereoLink->setModel( &_ctl->m_stereoLinkModel ); center->addWidget( m_stereoLink ); } diff --git a/plugins/LadspaEffect/LadspaControlDialog.h b/plugins/LadspaEffect/LadspaControlDialog.h index 87f9689d5..9c4f697d0 100644 --- a/plugins/LadspaEffect/LadspaControlDialog.h +++ b/plugins/LadspaEffect/LadspaControlDialog.h @@ -32,7 +32,7 @@ class QHBoxLayout; class LadspaControls; -class ledCheckBox; +class LedCheckBox; class LadspaControlDialog : public EffectControlDialog @@ -49,7 +49,7 @@ private slots: private: QHBoxLayout * m_effectLayout; - ledCheckBox * m_stereoLink; + LedCheckBox * m_stereoLink; } ; diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp index fc58d730a..08be1d0fb 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.cpp @@ -27,7 +27,7 @@ #include "SpectrumAnalyzer.h" #include "MainWindow.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "embed.h" @@ -157,11 +157,11 @@ SpectrumAnalyzerControlDialog::SpectrumAnalyzerControlDialog( SpectrumAnalyzerCo SpectrumView* v = new SpectrumView( controls->m_effect, this ); v->move( 27, 30 ); - ledCheckBox * lin_spec = new ledCheckBox( tr( "Linear spectrum" ), this ); + LedCheckBox * lin_spec = new LedCheckBox( tr( "Linear spectrum" ), this ); lin_spec->move( 24, 204 ); lin_spec->setModel( &controls->m_linearSpec ); - ledCheckBox * lin_y = new ledCheckBox( tr( "Linear Y axis" ), this ); + LedCheckBox * lin_y = new LedCheckBox( tr( "Linear Y axis" ), this ); lin_y->move( 24, 220 ); lin_y->setModel( &controls->m_linearYAxis ); diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h index 24c0faef4..6d43e29f0 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h @@ -27,7 +27,7 @@ #include "EffectControls.h" #include "SpectrumAnalyzerControlDialog.h" -#include "knob.h" +#include "Knob.h" class SpectrumAnalyzer; diff --git a/plugins/VstEffect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp index b440c6380..7d52e22c4 100644 --- a/plugins/VstEffect/VstEffect.cpp +++ b/plugins/VstEffect/VstEffect.cpp @@ -26,7 +26,7 @@ #include "VstEffect.h" #include "Song.h" -#include "text_float.h" +#include "TextFloat.h" #include "VstSubPluginFeatures.h" #include "embed.cpp" @@ -124,7 +124,7 @@ bool VstEffect::processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ) void VstEffect::openPlugin( const QString & _plugin ) { - textFloat * tf = textFloat::displayMessage( + TextFloat * tf = TextFloat::displayMessage( VstPlugin::tr( "Loading plugin" ), VstPlugin::tr( "Please wait while loading VST plugin..." ), PLUGIN_NAME::getIconPixmap( "logo", 24, 24 ), 0 ); diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp index 4b07a408c..e11bda2ab 100644 --- a/plugins/VstEffect/VstEffectControlDialog.cpp +++ b/plugins/VstEffect/VstEffectControlDialog.cpp @@ -30,9 +30,9 @@ #include "VstEffectControlDialog.h" #include "VstEffect.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "embed.h" -#include "tooltip.h" +#include "ToolTip.h" #include #include @@ -84,7 +84,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : btn->setMinimumHeight( 24 ); btn->setMaximumHeight( 24 ); - m_managePluginButton = new pixmapButton( this, "" ); + m_managePluginButton = new PixmapButton( this, "" ); m_managePluginButton->setCheckable( false ); m_managePluginButton->setCursor( Qt::PointingHandCursor ); m_managePluginButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -93,7 +93,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : "track_op_menu" ) ); connect( m_managePluginButton, SIGNAL( clicked() ), _ctl, SLOT( managePlugin() ) ); - toolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) ); + ToolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) ); m_managePluginButton->setWhatsThis( tr( "Click here, if you want to control VST-plugin from host." ) ); @@ -103,7 +103,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_managePluginButton->setMinimumHeight( 21 ); m_managePluginButton->setMaximumHeight( 21 ); - m_openPresetButton = new pixmapButton( this, "" ); + m_openPresetButton = new PixmapButton( this, "" ); m_openPresetButton->setCheckable( false ); m_openPresetButton->setCursor( Qt::PointingHandCursor ); m_openPresetButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -112,7 +112,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : "stepper-up" ) ); connect( m_openPresetButton, SIGNAL( clicked() ), _ctl, SLOT( openPreset() ) ); - toolTip::add( m_openPresetButton, tr( "Open VST-plugin preset" ) ); + ToolTip::add( m_openPresetButton, tr( "Open VST-plugin preset" ) ); m_openPresetButton->setWhatsThis( tr( "Click here, if you want to open another *.fxp, *.fxb VST-plugin preset." ) ); @@ -122,7 +122,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_openPresetButton->setMinimumHeight( 16 ); m_openPresetButton->setMaximumHeight( 16 ); - m_rolLPresetButton = new pixmapButton( this, "" ); + m_rolLPresetButton = new PixmapButton( this, "" ); m_rolLPresetButton->setCheckable( false ); m_rolLPresetButton->setCursor( Qt::PointingHandCursor ); m_rolLPresetButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -135,7 +135,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : connect( m_rolLPresetButton, SIGNAL( clicked() ), this, SLOT( update() ) ); - toolTip::add( m_rolLPresetButton, tr( "Previous (-)" ) ); + ToolTip::add( m_rolLPresetButton, tr( "Previous (-)" ) ); m_rolLPresetButton->setShortcut( Qt::Key_Minus ); @@ -147,7 +147,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : m_rolLPresetButton->setMinimumHeight( 16 ); m_rolLPresetButton->setMaximumHeight( 16 ); - m_rolRPresetButton = new pixmapButton( this, "" ); + m_rolRPresetButton = new PixmapButton( this, "" ); m_rolRPresetButton->setCheckable( false ); m_rolRPresetButton->setCursor( Qt::PointingHandCursor ); m_rolRPresetButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -160,7 +160,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : connect( m_rolRPresetButton, SIGNAL( clicked() ), this, SLOT( update() ) ); - toolTip::add( m_rolRPresetButton, tr( "Next (+)" ) ); + ToolTip::add( m_rolRPresetButton, tr( "Next (+)" ) ); m_rolRPresetButton->setShortcut( Qt::Key_Plus ); @@ -187,7 +187,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : _ctl->m_selPresetButton->setMinimumHeight( 16 ); _ctl->m_selPresetButton->setMaximumHeight( 16 ); - m_savePresetButton = new pixmapButton( this, "" ); + m_savePresetButton = new PixmapButton( this, "" ); m_savePresetButton->setCheckable( false ); m_savePresetButton->setCursor( Qt::PointingHandCursor ); m_savePresetButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -196,7 +196,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : "project_save", 21, 21 ) ); connect( m_savePresetButton, SIGNAL( clicked() ), _ctl, SLOT( savePreset() ) ); - toolTip::add( m_savePresetButton, tr( "Save preset" ) ); + ToolTip::add( m_savePresetButton, tr( "Save preset" ) ); m_savePresetButton->setWhatsThis( tr( "Click here, if you want to save current VST-plugin preset program." ) ); diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 574aa20c2..0539cf9d7 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -34,10 +34,10 @@ class VstEffectControls; -class pixmapButton; +class PixmapButton; class QPixmap; class QPushButton; -class pixmapButton; +class PixmapButton; class VstEffectControlDialog : public EffectControlDialog @@ -52,11 +52,11 @@ protected: private: QWidget * m_pluginWidget; - pixmapButton * m_openPresetButton; - pixmapButton * m_rolLPresetButton; - pixmapButton * m_rolRPresetButton; - pixmapButton * m_managePluginButton; - pixmapButton * m_savePresetButton; + PixmapButton * m_openPresetButton; + PixmapButton * m_rolLPresetButton; + PixmapButton * m_rolRPresetButton; + PixmapButton * m_managePluginButton; + PixmapButton * m_savePresetButton; VstPlugin * m_plugin; diff --git a/plugins/VstEffect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp index 0c68706ea..08f8e28ac 100644 --- a/plugins/VstEffect/VstEffectControls.cpp +++ b/plugins/VstEffect/VstEffectControls.cpp @@ -71,7 +71,7 @@ void VstEffectControls::loadSettings( const QDomElement & _this ) const QMap & dump = m_effect->m_plugin->parameterDump(); paramCount = dump.size(); char paramStr[35]; - vstKnobs = new knob *[ paramCount ]; + vstKnobs = new Knob *[ paramCount ]; knobFModel = new FloatModel *[ paramCount ]; QStringList s_dumpValues; QWidget * widget = new QWidget(); @@ -80,7 +80,7 @@ void VstEffectControls::loadSettings( const QDomElement & _this ) sprintf( paramStr, "param%d", i ); s_dumpValues = dump[ paramStr ].split( ":" ); - vstKnobs[i] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); + vstKnobs[i] = new Knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); vstKnobs[i]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); vstKnobs[i]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); @@ -361,7 +361,7 @@ manageVSTEffectView::manageVSTEffectView( VstEffect * _eff, VstEffectControls * if (m_vi->vstKnobs == NULL) { - m_vi->vstKnobs = new knob *[ m_vi->paramCount ]; + m_vi->vstKnobs = new Knob *[ m_vi->paramCount ]; isVstKnobs = false; } if (m_vi->knobFModel == NULL) { @@ -377,7 +377,7 @@ manageVSTEffectView::manageVSTEffectView( VstEffect * _eff, VstEffectControls * sprintf( paramStr, "param%d", i); s_dumpValues = dump[ paramStr ].split( ":" ); - m_vi->vstKnobs[ i ] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); + m_vi->vstKnobs[ i ] = new Knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); m_vi->vstKnobs[ i ]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); m_vi->vstKnobs[ i ]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); diff --git a/plugins/VstEffect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h index def875063..8c74d9bef 100644 --- a/plugins/VstEffect/VstEffectControls.h +++ b/plugins/VstEffect/VstEffectControls.h @@ -34,7 +34,7 @@ #include #include -#include "knob.h" +#include "Knob.h" #include #include #include @@ -87,7 +87,7 @@ private: QMdiSubWindow * m_subWindow; QScrollArea * m_scrollArea; FloatModel ** knobFModel; - knob ** vstKnobs; + Knob ** vstKnobs; int paramCount; QObject * ctrHandle; diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 2a764222b..dc56750e6 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -38,7 +38,7 @@ #include "NotePlayHandle.h" #include "interpolation.h" #include "gui_templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "string_pair_drag.h" #include "DataFile.h" @@ -447,7 +447,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, "artwork" ) ); } - m_openAudioFileButton = new pixmapButton( this ); + m_openAudioFileButton = new PixmapButton( this ); m_openAudioFileButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_openAudioFileButton->move( 227, 72 ); m_openAudioFileButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -456,7 +456,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, "select_file" ) ); connect( m_openAudioFileButton, SIGNAL( clicked() ), this, SLOT( openAudioFile() ) ); - toolTip::add( m_openAudioFileButton, tr( "Open other sample" ) ); + ToolTip::add( m_openAudioFileButton, tr( "Open other sample" ) ); m_openAudioFileButton->setWhatsThis( tr( "Click here, if you want to open another audio-file. " @@ -465,14 +465,14 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, "amplify-value, and so on are not reset. So, it may not " "sound like the original sample.") ); - m_reverseButton = new pixmapButton( this ); + m_reverseButton = new PixmapButton( this ); m_reverseButton->setCheckable( true ); m_reverseButton->move( 164, 105 ); m_reverseButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "reverse_on" ) ); m_reverseButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "reverse_off" ) ); - toolTip::add( m_reverseButton, tr( "Reverse sample" ) ); + ToolTip::add( m_reverseButton, tr( "Reverse sample" ) ); m_reverseButton->setWhatsThis( tr( "If you enable this button, the whole sample is reversed. " "This is useful for cool effects, e.g. a reversed " @@ -480,39 +480,39 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, // loop button group - pixmapButton * m_loopOffButton = new pixmapButton( this ); + PixmapButton * m_loopOffButton = new PixmapButton( this ); m_loopOffButton->setCheckable( true ); m_loopOffButton->move( 190, 105 ); m_loopOffButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_off_on" ) ); m_loopOffButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_off_off" ) ); - toolTip::add( m_loopOffButton, tr( "Disable loop" ) ); + ToolTip::add( m_loopOffButton, tr( "Disable loop" ) ); m_loopOffButton->setWhatsThis( tr( "This button disables looping. " "The sample plays only once from start to end. " ) ); - pixmapButton * m_loopOnButton = new pixmapButton( this ); + PixmapButton * m_loopOnButton = new PixmapButton( this ); m_loopOnButton->setCheckable( true ); m_loopOnButton->move( 190, 124 ); m_loopOnButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_on_on" ) ); m_loopOnButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_on_off" ) ); - toolTip::add( m_loopOnButton, tr( "Enable loop" ) ); + ToolTip::add( m_loopOnButton, tr( "Enable loop" ) ); m_loopOnButton->setWhatsThis( tr( "This button enables forwards-looping. " "The sample loops between the end point and the loop point." ) ); - pixmapButton * m_loopPingPongButton = new pixmapButton( this ); + PixmapButton * m_loopPingPongButton = new PixmapButton( this ); m_loopPingPongButton->setCheckable( true ); m_loopPingPongButton->move( 216, 124 ); m_loopPingPongButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_pingpong_on" ) ); m_loopPingPongButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_pingpong_off" ) ); - toolTip::add( m_loopPingPongButton, tr( "Enable loop" ) ); + ToolTip::add( m_loopPingPongButton, tr( "Enable loop" ) ); m_loopPingPongButton->setWhatsThis( tr( "This button enables ping-pong-looping. " "The sample loops backwards and forwards between the end point " @@ -523,14 +523,14 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, m_loopGroup->addButton( m_loopOnButton ); m_loopGroup->addButton( m_loopPingPongButton ); - m_stutterButton = new pixmapButton( this ); + m_stutterButton = new PixmapButton( this ); m_stutterButton->setCheckable( true ); m_stutterButton->move( 164, 124 ); m_stutterButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "stutter_on" ) ); m_stutterButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "stutter_off" ) ); - toolTip::add( m_stutterButton, + ToolTip::add( m_stutterButton, tr( "Continue sample playback across notes" ) ); m_stutterButton->setWhatsThis( tr( "Enabling this option makes the sample continue playing " @@ -540,7 +540,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, "playback to the start of the sample, insert a note at the bottom " "of the keyboard (< 20 Hz)") ); - m_ampKnob = new knob( knobBright_26, this ); + m_ampKnob = new Knob( knobBright_26, this ); m_ampKnob->setVolumeKnob( true ); m_ampKnob->move( 5, 108 ); m_ampKnob->setHintText( tr( "Amplify:" )+" ", "%" ); @@ -572,7 +572,7 @@ AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument, "the loop starts. " ) ); // interpolation selector - m_interpBox = new comboBox( this ); + m_interpBox = new ComboBox( this ); m_interpBox->setGeometry( 142, 62, 82, 22 ); m_interpBox->setFont( pointSize<8>( m_interpBox->font() ) ); @@ -1247,7 +1247,7 @@ float AudioFileProcessorWaveView::knob::getValue( const QPoint & _p ) const double dec_fact = ! m_waveView ? 1 : double( m_waveView->m_to - m_waveView->m_from ) / m_waveView->m_sampleBuffer.frames(); - const float inc = ::knob::getValue( _p ) * dec_fact; + const float inc = ::Knob::getValue( _p ) * dec_fact; return inc; } diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index 1889ced85..22f7a047d 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -32,10 +32,10 @@ #include "Instrument.h" #include "InstrumentView.h" #include "SampleBuffer.h" -#include "knob.h" -#include "pixmap_button.h" +#include "Knob.h" +#include "PixmapButton.h" #include "AutomatableButton.h" -#include "combobox.h" +#include "ComboBox.h" class audioFileProcessor : public Instrument @@ -136,16 +136,16 @@ private: static QPixmap * s_artwork; AudioFileProcessorWaveView * m_waveView; - knob * m_ampKnob; - knob * m_startKnob; - knob * m_endKnob; - knob * m_loopKnob; + Knob * m_ampKnob; + Knob * m_startKnob; + Knob * m_endKnob; + Knob * m_loopKnob; - pixmapButton * m_openAudioFileButton; - pixmapButton * m_reverseButton; + PixmapButton * m_openAudioFileButton; + PixmapButton * m_reverseButton; automatableButtonGroup * m_loopGroup; - pixmapButton * m_stutterButton; - comboBox * m_interpBox; + PixmapButton * m_stutterButton; + ComboBox * m_interpBox; } ; @@ -172,15 +172,15 @@ public: loop } ; - class knob : public ::knob + class knob : public ::Knob { const AudioFileProcessorWaveView * m_waveView; - const knob * m_relatedKnob; + const Knob * m_relatedKnob; public: knob( QWidget * _parent ) : - ::knob( knobBright_26, _parent ), + ::Knob( knobBright_26, _parent ), m_waveView( 0 ), m_relatedKnob( 0 ) { @@ -192,7 +192,7 @@ public: m_waveView = _wv; } - void setRelatedKnob( const knob * _knob ) + void setRelatedKnob( const Knob * _knob ) { m_relatedKnob = _knob; } @@ -258,7 +258,7 @@ private: public: AudioFileProcessorWaveView( QWidget * _parent, int _w, int _h, SampleBuffer& buf ); - void setKnobs( knob * _start, knob * _end, knob * _loop ); + void setKnobs(knob *_start, knob *_end, knob *_loop ); private: diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index 93a14bbda..9fc371ae9 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -28,15 +28,15 @@ #include "bit_invader.h" #include "base64.h" #include "Engine.h" -#include "graph.h" +#include "Graph.h" #include "InstrumentTrack.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "NotePlayHandle.h" #include "Oscillator.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "interpolation.h" @@ -333,16 +333,16 @@ bitInvaderView::bitInvaderView( Instrument * _instrument, "artwork" ) ); setPalette( pal ); - m_sampleLengthKnob = new knob( knobDark_28, this ); + m_sampleLengthKnob = new Knob( knobDark_28, this ); m_sampleLengthKnob->move( 6, 201 ); m_sampleLengthKnob->setHintText( tr( "Sample Length" ) + " ", "" ); - m_graph = new graph( this, graph::NearestStyle, 204, 134 ); + m_graph = new Graph( this, Graph::NearestStyle, 204, 134 ); m_graph->move(23,59); // 55,120 - 2px border m_graph->setAutoFillBackground( true ); m_graph->setGraphColor( QColor( 255, 255, 255 ) ); - toolTip::add( m_graph, tr ( "Draw your own waveform here " + ToolTip::add( m_graph, tr ( "Draw your own waveform here " "by dragging your mouse on this graph." )); @@ -353,78 +353,78 @@ bitInvaderView::bitInvaderView( Instrument * _instrument, m_graph->setPalette( pal ); - m_sinWaveBtn = new pixmapButton( this, tr( "Sine wave" ) ); + m_sinWaveBtn = new PixmapButton( this, tr( "Sine wave" ) ); m_sinWaveBtn->move( 131, 205 ); m_sinWaveBtn->setActiveGraphic( embed::getIconPixmap( "sin_wave_active" ) ); m_sinWaveBtn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); - toolTip::add( m_sinWaveBtn, + ToolTip::add( m_sinWaveBtn, tr( "Click for a sine-wave." ) ); - m_triangleWaveBtn = new pixmapButton( this, tr( "Triangle wave" ) ); + m_triangleWaveBtn = new PixmapButton( this, tr( "Triangle wave" ) ); m_triangleWaveBtn->move( 131 + 14, 205 ); m_triangleWaveBtn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); m_triangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); - toolTip::add( m_triangleWaveBtn, + ToolTip::add( m_triangleWaveBtn, tr( "Click here for a triangle-wave." ) ); - m_sawWaveBtn = new pixmapButton( this, tr( "Saw wave" ) ); + m_sawWaveBtn = new PixmapButton( this, tr( "Saw wave" ) ); m_sawWaveBtn->move( 131 + 14*2, 205 ); m_sawWaveBtn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); m_sawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); - toolTip::add( m_sawWaveBtn, + ToolTip::add( m_sawWaveBtn, tr( "Click here for a saw-wave." ) ); - m_sqrWaveBtn = new pixmapButton( this, tr( "Square wave" ) ); + m_sqrWaveBtn = new PixmapButton( this, tr( "Square wave" ) ); m_sqrWaveBtn->move( 131 + 14*3, 205 ); m_sqrWaveBtn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); m_sqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); - toolTip::add( m_sqrWaveBtn, + ToolTip::add( m_sqrWaveBtn, tr( "Click here for a square-wave." ) ); - m_whiteNoiseWaveBtn = new pixmapButton( this, + m_whiteNoiseWaveBtn = new PixmapButton( this, tr( "White noise wave" ) ); m_whiteNoiseWaveBtn->move( 131 + 14*4, 205 ); m_whiteNoiseWaveBtn->setActiveGraphic( embed::getIconPixmap( "white_noise_wave_active" ) ); m_whiteNoiseWaveBtn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); - toolTip::add( m_whiteNoiseWaveBtn, + ToolTip::add( m_whiteNoiseWaveBtn, tr( "Click here for white-noise." ) ); - m_usrWaveBtn = new pixmapButton( this, tr( "User defined wave" ) ); + m_usrWaveBtn = new PixmapButton( this, tr( "User defined wave" ) ); m_usrWaveBtn->move( 131 + 14*5, 205 ); m_usrWaveBtn->setActiveGraphic( embed::getIconPixmap( "usr_wave_active" ) ); m_usrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); - toolTip::add( m_usrWaveBtn, + ToolTip::add( m_usrWaveBtn, tr( "Click here for a user-defined shape." ) ); - m_smoothBtn = new pixmapButton( this, tr( "Smooth" ) ); + m_smoothBtn = new PixmapButton( this, tr( "Smooth" ) ); m_smoothBtn->move( 131 + 14*6, 205 ); m_smoothBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); m_smoothBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); - toolTip::add( m_smoothBtn, + ToolTip::add( m_smoothBtn, tr( "Click here to smooth waveform." ) ); - m_interpolationToggle = new ledCheckBox( "Interpolation", this, - tr( "Interpolation" ), ledCheckBox::Yellow ); + m_interpolationToggle = new LedCheckBox( "Interpolation", this, + tr( "Interpolation" ), LedCheckBox::Yellow ); m_interpolationToggle->move( 131, 221 ); - m_normalizeToggle = new ledCheckBox( "Normalize", this, - tr( "Normalize" ), ledCheckBox::Green ); + m_normalizeToggle = new LedCheckBox( "Normalize", this, + tr( "Normalize" ), LedCheckBox::Green ); m_normalizeToggle->move( 131, 236 ); @@ -517,7 +517,7 @@ void bitInvaderView::noiseWaveClicked() void bitInvaderView::usrWaveClicked() { QString fileName = m_graph->model()->setWaveToUser(); - toolTip::add( m_usrWaveBtn, fileName ); + ToolTip::add( m_usrWaveBtn, fileName ); Engine::getSong()->setModified(); /* m_graph->model()->setWaveToNoise(); @@ -562,7 +562,7 @@ void bitInvaderView::smoothClicked() void bitInvaderView::interpolationToggled( bool value ) { - m_graph->setGraphStyle( value ? graph::LinearStyle : graph::NearestStyle); + m_graph->setGraphStyle( value ? Graph::LinearStyle : Graph::NearestStyle); Engine::getSong()->setModified(); } diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index d4eae0352..475602f47 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -29,10 +29,10 @@ #include "Instrument.h" #include "InstrumentView.h" -#include "graph.h" -#include "knob.h" -#include "pixmap_button.h" -#include "led_checkbox.h" +#include "Graph.h" +#include "Knob.h" +#include "PixmapButton.h" +#include "LedCheckbox.h" #include "MemoryManager.h" class oscillator; @@ -135,20 +135,20 @@ protected slots: private: virtual void modelChanged(); - knob * m_sampleLengthKnob; - pixmapButton * m_sinWaveBtn; - pixmapButton * m_triangleWaveBtn; - pixmapButton * m_sqrWaveBtn; - pixmapButton * m_sawWaveBtn; - pixmapButton * m_whiteNoiseWaveBtn; - pixmapButton * m_smoothBtn; - pixmapButton * m_usrWaveBtn; + Knob * m_sampleLengthKnob; + PixmapButton * m_sinWaveBtn; + PixmapButton * m_triangleWaveBtn; + PixmapButton * m_sqrWaveBtn; + PixmapButton * m_sawWaveBtn; + PixmapButton * m_whiteNoiseWaveBtn; + PixmapButton * m_smoothBtn; + PixmapButton * m_usrWaveBtn; static QPixmap * s_artwork; - graph * m_graph; - ledCheckBox * m_interpolationToggle; - ledCheckBox * m_normalizeToggle; + Graph * m_graph; + LedCheckBox * m_interpolationToggle; + LedCheckBox * m_normalizeToggle; } ; diff --git a/plugins/delay/delaycontrols.h b/plugins/delay/delaycontrols.h index fe7b3c3e9..386f94b76 100644 --- a/plugins/delay/delaycontrols.h +++ b/plugins/delay/delaycontrols.h @@ -26,7 +26,7 @@ #define DELAYCONTROLS_H #include "EffectControls.h" -#include "knob.h" +#include "Knob.h" #include "delaycontrolsdialog.h" diff --git a/plugins/delay/delaycontrolsdialog.cpp b/plugins/delay/delaycontrolsdialog.cpp index 1f5746d02..1b712118f 100644 --- a/plugins/delay/delaycontrolsdialog.cpp +++ b/plugins/delay/delaycontrolsdialog.cpp @@ -46,7 +46,7 @@ DelayControlsDialog::DelayControlsDialog( DelayControls *controls ) : sampleDelayKnob->setLabel( tr( "Delay" ) ); sampleDelayKnob->setHintText( tr( "Delay Time Seconds:" ) + " ", "" ); - knob * feedbackKnob = new knob( knobBright_26, this ); + Knob * feedbackKnob = new Knob( knobBright_26, this ); feedbackKnob->move( 63,10 ); feedbackKnob->setVolumeKnob( true) ; feedbackKnob->setModel( &controls->m_feedbackModel); @@ -60,7 +60,7 @@ DelayControlsDialog::DelayControlsDialog( DelayControls *controls ) : lfoFreqKnob->setLabel( tr( "Rate" ) ); lfoFreqKnob->setHintText( tr ( "Lfo Seconds:" ) + " ", "" ); - knob * lfoAmtKnob = new knob( knobBright_26, this ); + Knob * lfoAmtKnob = new Knob( knobBright_26, this ); lfoAmtKnob->move( 150,10 ); lfoAmtKnob->setVolumeKnob( true ); lfoAmtKnob->setModel( &controls->m_lfoAmountModel ); diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp index 92948ef96..b0c66c79b 100644 --- a/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp +++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.cpp @@ -29,10 +29,10 @@ #include "dynamics_processor_control_dialog.h" #include "dynamics_processor_controls.h" #include "embed.h" -#include "graph.h" -#include "pixmap_button.h" -#include "tooltip.h" -#include "led_checkbox.h" +#include "Graph.h" +#include "PixmapButton.h" +#include "ToolTip.h" +#include "LedCheckbox.h" dynProcControlDialog::dynProcControlDialog( @@ -46,7 +46,7 @@ dynProcControlDialog::dynProcControlDialog( setPalette( pal ); setFixedSize( 224, 340 ); - graph * waveGraph = new graph( this, graph::LinearNonCyclicStyle, 204, 205 ); + Graph * waveGraph = new Graph( this, Graph::LinearNonCyclicStyle, 204, 205 ); waveGraph -> move( 10, 32 ); waveGraph -> setModel( &_controls -> m_wavegraphModel ); waveGraph -> setAutoFillBackground( true ); @@ -57,7 +57,7 @@ dynProcControlDialog::dynProcControlDialog( waveGraph->setGraphColor( QColor( 170, 255, 255 ) ); waveGraph -> setMaximumSize( 204, 205 ); - knob * inputKnob = new knob( knobBright_26, this); + Knob * inputKnob = new Knob( knobBright_26, this); inputKnob -> setVolumeKnob( true ); inputKnob -> setVolumeRatio( 1.0 ); inputKnob -> move( 14, 251 ); @@ -65,7 +65,7 @@ dynProcControlDialog::dynProcControlDialog( inputKnob->setLabel( tr( "INPUT" ) ); inputKnob->setHintText( tr( "Input gain:" ) + " ", "" ); - knob * outputKnob = new knob( knobBright_26, this ); + Knob * outputKnob = new Knob( knobBright_26, this ); outputKnob -> setVolumeKnob( true ); outputKnob -> setVolumeRatio( 1.0 ); outputKnob -> move( 54, 251 ); @@ -73,13 +73,13 @@ dynProcControlDialog::dynProcControlDialog( outputKnob->setLabel( tr( "OUTPUT" ) ); outputKnob->setHintText( tr( "Output gain:" ) + " ", "" ); - knob * attackKnob = new knob( knobBright_26, this); + Knob * attackKnob = new Knob( knobBright_26, this); attackKnob -> move( 11, 291 ); attackKnob->setModel( &_controls->m_attackModel ); attackKnob->setLabel( tr( "ATTACK" ) ); attackKnob->setHintText( tr( "Peak attack time:" ) + " ", "ms" ); - knob * releaseKnob = new knob( knobBright_26, this ); + Knob * releaseKnob = new Knob( knobBright_26, this ); releaseKnob -> move( 52, 291 ); releaseKnob->setModel( &_controls->m_releaseModel ); releaseKnob->setLabel( tr( "RELEASE" ) ); @@ -87,55 +87,55 @@ dynProcControlDialog::dynProcControlDialog( //waveform control buttons - pixmapButton * resetButton = new pixmapButton( this, tr("Reset waveform") ); + PixmapButton * resetButton = new PixmapButton( this, tr("Reset waveform") ); resetButton -> move( 164, 251 ); resetButton -> resize( 12, 48 ); resetButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_active" ) ); resetButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_inactive" ) ); - toolTip::add( resetButton, tr( "Click here to reset the wavegraph back to default" ) ); + ToolTip::add( resetButton, tr( "Click here to reset the wavegraph back to default" ) ); - pixmapButton * smoothButton = new pixmapButton( this, tr("Smooth waveform") ); + PixmapButton * smoothButton = new PixmapButton( this, tr("Smooth waveform") ); smoothButton -> move( 164, 267 ); smoothButton -> resize( 12, 48 ); smoothButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); smoothButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); - toolTip::add( smoothButton, tr( "Click here to apply smoothing to wavegraph" ) ); + ToolTip::add( smoothButton, tr( "Click here to apply smoothing to wavegraph" ) ); - pixmapButton * addOneButton = new pixmapButton( this, tr("Increase wavegraph amplitude by 1dB") ); + PixmapButton * addOneButton = new PixmapButton( this, tr("Increase wavegraph amplitude by 1dB") ); addOneButton -> move( 133, 251 ); addOneButton -> resize( 12, 29 ); addOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_active" ) ); addOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_inactive" ) ); - toolTip::add( addOneButton, tr( "Click here to increase wavegraph amplitude by 1dB" ) ); + ToolTip::add( addOneButton, tr( "Click here to increase wavegraph amplitude by 1dB" ) ); - pixmapButton * subOneButton = new pixmapButton( this, tr("Decrease wavegraph amplitude by 1dB") ); + PixmapButton * subOneButton = new PixmapButton( this, tr("Decrease wavegraph amplitude by 1dB") ); subOneButton -> move( 133, 267 ); subOneButton -> resize( 12, 29 ); subOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_active" ) ); subOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_inactive" ) ); - toolTip::add( subOneButton, tr( "Click here to decrease wavegraph amplitude by 1dB" ) ); + ToolTip::add( subOneButton, tr( "Click here to decrease wavegraph amplitude by 1dB" ) ); //stereomode switches - pixmapButton * smMaxButton = new pixmapButton( this, tr( "Stereomode Maximum" ) ); + PixmapButton * smMaxButton = new PixmapButton( this, tr( "Stereomode Maximum" ) ); smMaxButton -> move( 165, 290 ); smMaxButton -> resize( 48, 13 ); smMaxButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "max_active" ) ); smMaxButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "max_inactive" ) ); - toolTip::add( smMaxButton, tr( "Process based on the maximum of both stereo channels" ) ); + ToolTip::add( smMaxButton, tr( "Process based on the maximum of both stereo channels" ) ); - pixmapButton * smAvgButton = new pixmapButton( this, tr( "Stereomode Average" ) ); + PixmapButton * smAvgButton = new PixmapButton( this, tr( "Stereomode Average" ) ); smAvgButton -> move( 165, 290 + 13 ); smAvgButton -> resize( 48, 13 ); smAvgButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "avg_active" ) ); smAvgButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "avg_inactive" ) ); - toolTip::add( smAvgButton, tr( "Process based on the average of both stereo channels" ) ); + ToolTip::add( smAvgButton, tr( "Process based on the average of both stereo channels" ) ); - pixmapButton * smUnlButton = new pixmapButton( this, tr( "Stereomode Unlinked" ) ); + PixmapButton * smUnlButton = new PixmapButton( this, tr( "Stereomode Unlinked" ) ); smUnlButton -> move( 165, 290 + (13*2) ); smUnlButton -> resize( 48, 13 ); smUnlButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "unl_active" ) ); smUnlButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "unl_inactive" ) ); - toolTip::add( smUnlButton, tr( "Process each stereo channel independently" ) ); + ToolTip::add( smUnlButton, tr( "Process each stereo channel independently" ) ); automatableButtonGroup * smGroup = new automatableButtonGroup( this ); smGroup -> addButton( smMaxButton ); diff --git a/plugins/dynamics_processor/dynamics_processor_controls.cpp b/plugins/dynamics_processor/dynamics_processor_controls.cpp index ecd33eb16..5f76be707 100644 --- a/plugins/dynamics_processor/dynamics_processor_controls.cpp +++ b/plugins/dynamics_processor/dynamics_processor_controls.cpp @@ -29,7 +29,7 @@ #include "dynamics_processor_controls.h" #include "dynamics_processor.h" #include "base64.h" -#include "graph.h" +#include "Graph.h" #include "Engine.h" #include "Song.h" diff --git a/plugins/dynamics_processor/dynamics_processor_controls.h b/plugins/dynamics_processor/dynamics_processor_controls.h index 39e8acaec..f18c93d93 100644 --- a/plugins/dynamics_processor/dynamics_processor_controls.h +++ b/plugins/dynamics_processor/dynamics_processor_controls.h @@ -28,8 +28,8 @@ #include "EffectControls.h" #include "dynamics_processor_control_dialog.h" -#include "knob.h" -#include "graph.h" +#include "Knob.h" +#include "Graph.h" class dynProcEffect; diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp index 183772625..cbd0100a2 100644 --- a/plugins/flp_import/FlpImport.cpp +++ b/plugins/flp_import/FlpImport.cpp @@ -35,23 +35,23 @@ #include "basic_filters.h" #include "bb_track.h" #include "BBTrackContainer.h" -#include "combobox.h" +#include "ComboBox.h" #include "ConfigManager.h" #include "debug.h" #include "Effect.h" #include "Engine.h" #include "FxMixer.h" #include "FxMixerView.h" -#include "group_box.h" +#include "GroupBox.h" #include "Instrument.h" #include "InstrumentTrack.h" #include "EnvelopeAndLfoParameters.h" -#include "knob.h" +#include "Knob.h" #include "Oscillator.h" #include "Pattern.h" #include "Piano.h" #include "ProjectJournal.h" -#include "project_notes.h" +#include "ProjectNotes.h" #include "Song.h" #include "TrackContainer.h" #include "embed.h" diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 7738b6422..a3868a257 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -30,7 +30,7 @@ #include "kicker.h" #include "Engine.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" #include "KickerOsc.h" @@ -226,11 +226,11 @@ PluginView * kickerInstrument::instantiateView( QWidget * _parent ) -class kickerKnob : public knob +class kickerKnob : public Knob { public: kickerKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 29, 29 ); setObjectName( "smallKnob" ); @@ -250,11 +250,11 @@ public: }; -class kickerLargeKnob : public knob +class kickerLargeKnob : public Knob { public: kickerLargeKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 34, 34 ); setObjectName( "largeKnob" ); @@ -319,10 +319,10 @@ kickerInstrumentView::kickerInstrumentView( Instrument * _instrument, m_distEndKnob->setHintText( tr( "Distortion End:" ) + " ", "" ); m_distEndKnob->move( COL5, ROW2 ); - m_startNoteToggle = new ledCheckBox( "", this, "", ledCheckBox::Green ); + m_startNoteToggle = new LedCheckBox( "", this, "", LedCheckBox::Green ); m_startNoteToggle->move( COL1 + 8, LED_ROW ); - m_endNoteToggle = new ledCheckBox( "", this, "", ledCheckBox::Green ); + m_endNoteToggle = new LedCheckBox( "", this, "", LedCheckBox::Green ); m_endNoteToggle->move( END_COL + 8, LED_ROW ); setAutoFillBackground( true ); diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h index af4ce11d1..654aa5fba 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -30,8 +30,8 @@ #include #include "Instrument.h" #include "InstrumentView.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "TempoSyncKnob.h" @@ -103,19 +103,19 @@ public: private: virtual void modelChanged(); - knob * m_startFreqKnob; - knob * m_endFreqKnob; - knob * m_decayKnob; - knob * m_distKnob; - knob * m_distEndKnob; - knob * m_gainKnob; - knob * m_envKnob; - knob * m_noiseKnob; - knob * m_clickKnob; - knob * m_slopeKnob; + Knob * m_startFreqKnob; + Knob * m_endFreqKnob; + Knob * m_decayKnob; + Knob * m_distKnob; + Knob * m_distEndKnob; + Knob * m_gainKnob; + Knob * m_envKnob; + Knob * m_noiseKnob; + Knob * m_clickKnob; + Knob * m_slopeKnob; - ledCheckBox * m_startNoteToggle; - ledCheckBox * m_endNoteToggle; + LedCheckBox * m_startNoteToggle; + LedCheckBox * m_endNoteToggle; } ; diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index e9b410e3b..3f6e6cb9b 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -35,7 +35,7 @@ #include "gui_templates.h" #include "ladspa_description.h" #include "ladspa_port_dialog.h" -#include "tab_bar.h" +#include "TabBar.h" #include "tab_button.h" #include "embed.cpp" @@ -103,7 +103,7 @@ ladspaBrowserView::ladspaBrowserView( ToolPlugin * _tool ) : hlayout->setSpacing( 0 ); hlayout->setMargin( 0 ); - m_tabBar = new tabBar( this, QBoxLayout::TopToBottom ); + m_tabBar = new TabBar( this, QBoxLayout::TopToBottom ); m_tabBar->setExclusive( true ); m_tabBar->setFixedWidth( 72 ); diff --git a/plugins/ladspa_browser/ladspa_browser.h b/plugins/ladspa_browser/ladspa_browser.h index 2ca47af48..fe705b6b8 100644 --- a/plugins/ladspa_browser/ladspa_browser.h +++ b/plugins/ladspa_browser/ladspa_browser.h @@ -31,7 +31,7 @@ #include "ToolPlugin.h" #include "ToolPluginView.h" -class tabBar; +class TabBar; class ladspaBrowserView : public ToolPluginView @@ -47,7 +47,7 @@ public slots: private: - tabBar * m_tabBar; + TabBar * m_tabBar; QWidget * createTab( QWidget * _parent, const QString & _txt, ladspaPluginType _type ); diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index 3d9fbda3c..46e7be982 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -33,12 +33,12 @@ #include "Engine.h" #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" #include "Oscillator.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "BandLimitedWave.h" #include "embed.cpp" @@ -822,48 +822,48 @@ lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) : InstrumentView( _instrument, _parent ) { // GUI - m_vcfCutKnob = new knob( knobBright_26, this ); + m_vcfCutKnob = new Knob( knobBright_26, this ); m_vcfCutKnob->move( 75, 130 ); m_vcfCutKnob->setHintText( tr( "Cutoff Freq:" ) + " ", "" ); m_vcfCutKnob->setLabel( "" ); - m_vcfResKnob = new knob( knobBright_26, this ); + m_vcfResKnob = new Knob( knobBright_26, this ); m_vcfResKnob->move( 120, 130 ); m_vcfResKnob->setHintText( tr( "Resonance:" ) + " ", "" ); m_vcfResKnob->setLabel( "" ); - m_vcfModKnob = new knob( knobBright_26, this ); + m_vcfModKnob = new Knob( knobBright_26, this ); m_vcfModKnob->move( 165, 130 ); m_vcfModKnob->setHintText( tr( "Env Mod:" ) + " ", "" ); m_vcfModKnob->setLabel( "" ); - m_vcfDecKnob = new knob( knobBright_26, this ); + m_vcfDecKnob = new Knob( knobBright_26, this ); m_vcfDecKnob->move( 210, 130 ); m_vcfDecKnob->setHintText( tr( "Decay:" ) + " ", "" ); m_vcfDecKnob->setLabel( "" ); - m_slideToggle = new ledCheckBox( "", this ); + m_slideToggle = new LedCheckBox( "", this ); m_slideToggle->move( 10, 180 ); -/* m_accentToggle = new ledCheckBox( "", this ); +/* m_accentToggle = new LedCheckBox( "", this ); m_accentToggle->move( 10, 200 ); m_accentToggle->setDisabled(true);*/ // accent removed pending real implementation - no need for non-functional buttons - m_deadToggle = new ledCheckBox( "", this ); + m_deadToggle = new LedCheckBox( "", this ); m_deadToggle->move( 10, 200 ); - m_db24Toggle = new ledCheckBox( "", this ); + m_db24Toggle = new LedCheckBox( "", this ); m_db24Toggle->setWhatsThis( tr( "303-es-que, 24dB/octave, 3 pole filter" ) ); m_db24Toggle->move( 10, 150); - m_slideDecKnob = new knob( knobBright_26, this ); + m_slideDecKnob = new Knob( knobBright_26, this ); m_slideDecKnob->move( 210, 75 ); m_slideDecKnob->setHintText( tr( "Slide Decay:" ) + " ", "" ); m_slideDecKnob->setLabel( ""); - m_distKnob = new knob( knobBright_26, this ); + m_distKnob = new Knob( knobBright_26, this ); m_distKnob->move( 210, 190 ); m_distKnob->setHintText( tr( "DIST:" ) + " ", "" ); m_distKnob->setLabel( tr( "")); @@ -873,122 +873,122 @@ lb302SynthView::lb302SynthView( Instrument * _instrument, QWidget * _parent ) : // move to 120,75 const int waveBtnX = 10; const int waveBtnY = 96; - pixmapButton * sawWaveBtn = new pixmapButton( this, tr( "Saw wave" ) ); + PixmapButton * sawWaveBtn = new PixmapButton( this, tr( "Saw wave" ) ); sawWaveBtn->move( waveBtnX, waveBtnY ); sawWaveBtn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); sawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); - toolTip::add( sawWaveBtn, + ToolTip::add( sawWaveBtn, tr( "Click here for a saw-wave." ) ); - pixmapButton * triangleWaveBtn = - new pixmapButton( this, tr( "Triangle wave" ) ); + PixmapButton * triangleWaveBtn = + new PixmapButton( this, tr( "Triangle wave" ) ); triangleWaveBtn->move( waveBtnX+(16*1), waveBtnY ); triangleWaveBtn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); triangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); - toolTip::add( triangleWaveBtn, + ToolTip::add( triangleWaveBtn, tr( "Click here for a triangle-wave." ) ); - pixmapButton * sqrWaveBtn = new pixmapButton( this, tr( "Square wave" ) ); + PixmapButton * sqrWaveBtn = new PixmapButton( this, tr( "Square wave" ) ); sqrWaveBtn->move( waveBtnX+(16*2), waveBtnY ); sqrWaveBtn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); sqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); - toolTip::add( sqrWaveBtn, + ToolTip::add( sqrWaveBtn, tr( "Click here for a square-wave." ) ); - pixmapButton * roundSqrWaveBtn = - new pixmapButton( this, tr( "Rounded square wave" ) ); + PixmapButton * roundSqrWaveBtn = + new PixmapButton( this, tr( "Rounded square wave" ) ); roundSqrWaveBtn->move( waveBtnX+(16*3), waveBtnY ); roundSqrWaveBtn->setActiveGraphic( embed::getIconPixmap( "round_square_wave_active" ) ); roundSqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "round_square_wave_inactive" ) ); - toolTip::add( roundSqrWaveBtn, + ToolTip::add( roundSqrWaveBtn, tr( "Click here for a square-wave with a rounded end." ) ); - pixmapButton * moogWaveBtn = - new pixmapButton( this, tr( "Moog wave" ) ); + PixmapButton * moogWaveBtn = + new PixmapButton( this, tr( "Moog wave" ) ); moogWaveBtn->move( waveBtnX+(16*4), waveBtnY ); moogWaveBtn->setActiveGraphic( embed::getIconPixmap( "moog_saw_wave_active" ) ); moogWaveBtn->setInactiveGraphic( embed::getIconPixmap( "moog_saw_wave_inactive" ) ); - toolTip::add( moogWaveBtn, + ToolTip::add( moogWaveBtn, tr( "Click here for a moog-like wave." ) ); - pixmapButton * sinWaveBtn = new pixmapButton( this, tr( "Sine wave" ) ); + PixmapButton * sinWaveBtn = new PixmapButton( this, tr( "Sine wave" ) ); sinWaveBtn->move( waveBtnX+(16*5), waveBtnY ); sinWaveBtn->setActiveGraphic( embed::getIconPixmap( "sin_wave_active" ) ); sinWaveBtn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); - toolTip::add( sinWaveBtn, + ToolTip::add( sinWaveBtn, tr( "Click for a sine-wave." ) ); - pixmapButton * exponentialWaveBtn = - new pixmapButton( this, tr( "White noise wave" ) ); + PixmapButton * exponentialWaveBtn = + new PixmapButton( this, tr( "White noise wave" ) ); exponentialWaveBtn->move( waveBtnX+(16*6), waveBtnY ); exponentialWaveBtn->setActiveGraphic( embed::getIconPixmap( "exp_wave_active" ) ); exponentialWaveBtn->setInactiveGraphic( embed::getIconPixmap( "exp_wave_inactive" ) ); - toolTip::add( exponentialWaveBtn, + ToolTip::add( exponentialWaveBtn, tr( "Click here for an exponential wave." ) ); - pixmapButton * whiteNoiseWaveBtn = - new pixmapButton( this, tr( "White noise wave" ) ); + PixmapButton * whiteNoiseWaveBtn = + new PixmapButton( this, tr( "White noise wave" ) ); whiteNoiseWaveBtn->move( waveBtnX+(16*7), waveBtnY ); whiteNoiseWaveBtn->setActiveGraphic( embed::getIconPixmap( "white_noise_wave_active" ) ); whiteNoiseWaveBtn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); - toolTip::add( whiteNoiseWaveBtn, + ToolTip::add( whiteNoiseWaveBtn, tr( "Click here for white-noise." ) ); - pixmapButton * blSawWaveBtn = - new pixmapButton( this, tr( "Bandlimited saw wave" ) ); + PixmapButton * blSawWaveBtn = + new PixmapButton( this, tr( "Bandlimited saw wave" ) ); blSawWaveBtn->move( waveBtnX+(16*9)-8, waveBtnY ); blSawWaveBtn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); blSawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); - toolTip::add( blSawWaveBtn, + ToolTip::add( blSawWaveBtn, tr( "Click here for bandlimited saw wave." ) ); - pixmapButton * blSquareWaveBtn = - new pixmapButton( this, tr( "Bandlimited square wave" ) ); + PixmapButton * blSquareWaveBtn = + new PixmapButton( this, tr( "Bandlimited square wave" ) ); blSquareWaveBtn->move( waveBtnX+(16*10)-8, waveBtnY ); blSquareWaveBtn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); blSquareWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); - toolTip::add( blSquareWaveBtn, + ToolTip::add( blSquareWaveBtn, tr( "Click here for bandlimited square wave." ) ); - pixmapButton * blTriangleWaveBtn = - new pixmapButton( this, tr( "Bandlimited triangle wave" ) ); + PixmapButton * blTriangleWaveBtn = + new PixmapButton( this, tr( "Bandlimited triangle wave" ) ); blTriangleWaveBtn->move( waveBtnX+(16*11)-8, waveBtnY ); blTriangleWaveBtn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); blTriangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); - toolTip::add( blTriangleWaveBtn, + ToolTip::add( blTriangleWaveBtn, tr( "Click here for bandlimited triangle wave." ) ); - pixmapButton * blMoogWaveBtn = - new pixmapButton( this, tr( "Bandlimited moog saw wave" ) ); + PixmapButton * blMoogWaveBtn = + new PixmapButton( this, tr( "Bandlimited moog saw wave" ) ); blMoogWaveBtn->move( waveBtnX+(16*12)-8, waveBtnY ); blMoogWaveBtn->setActiveGraphic( embed::getIconPixmap( "moog_saw_wave_active" ) ); blMoogWaveBtn->setInactiveGraphic( embed::getIconPixmap( "moog_saw_wave_inactive" ) ); - toolTip::add( blMoogWaveBtn, + ToolTip::add( blMoogWaveBtn, tr( "Click here for bandlimited moog saw wave." ) ); diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h index 71e4d6dc3..d79e7c986 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -35,8 +35,8 @@ #include "DspEffectLibrary.h" #include "Instrument.h" #include "InstrumentView.h" -#include "led_checkbox.h" -#include "knob.h" +#include "LedCheckbox.h" +#include "Knob.h" #include "Mixer.h" #include "NotePlayHandle.h" #include @@ -260,19 +260,19 @@ public: private: virtual void modelChanged(); - knob * m_vcfCutKnob; - knob * m_vcfResKnob; - knob * m_vcfDecKnob; - knob * m_vcfModKnob; + Knob * m_vcfCutKnob; + Knob * m_vcfResKnob; + Knob * m_vcfDecKnob; + Knob * m_vcfModKnob; - knob * m_distKnob; - knob * m_slideDecKnob; + Knob * m_distKnob; + Knob * m_slideDecKnob; automatableButtonGroup * m_waveBtnGrp; - ledCheckBox * m_slideToggle; - /*ledCheckBox * m_accentToggle;*/ // removed pending accent implementation - ledCheckBox * m_deadToggle; - ledCheckBox * m_db24Toggle; + LedCheckBox * m_slideToggle; + /*LedCheckBox * m_accentToggle;*/ // removed pending accent implementation + LedCheckBox * m_deadToggle; + LedCheckBox * m_db24Toggle; } ; diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp index 94e859eaa..f4b7e3c6b 100644 --- a/plugins/lb303/lb303.cpp +++ b/plugins/lb303/lb303.cpp @@ -35,7 +35,7 @@ #include "engine.h" #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" #include "templates.h" #include "audio_port.h" @@ -739,54 +739,54 @@ lb303SynthView::lb303SynthView( Instrument * _instrument, QWidget * _parent ) : InstrumentView( _instrument, _parent ) { // GUI - m_vcfCutKnob = new knob( knobBright_26, this ); + m_vcfCutKnob = new Knob( knobBright_26, this ); m_vcfCutKnob->move( 75, 130 ); m_vcfCutKnob->setHintText( tr( "Cutoff Freq:" ) + " ", "" ); m_vcfCutKnob->setLabel( tr("CUT") ); - m_vcfResKnob = new knob( knobBright_26, this ); + m_vcfResKnob = new Knob( knobBright_26, this ); m_vcfResKnob->move( 120, 130 ); m_vcfResKnob->setHintText( tr( "Resonance:" ) + " ", "" ); m_vcfResKnob->setLabel( tr("RES") ); - m_vcfModKnob = new knob( knobBright_26, this ); + m_vcfModKnob = new Knob( knobBright_26, this ); m_vcfModKnob->move( 165, 130 ); m_vcfModKnob->setHintText( tr( "Env Mod:" ) + " ", "" ); m_vcfModKnob->setLabel( tr("ENV MOD") ); - m_vcfDecKnob = new knob( knobBright_26, this ); + m_vcfDecKnob = new Knob( knobBright_26, this ); m_vcfDecKnob->move( 210, 130 ); m_vcfDecKnob->setHintText( tr( "Decay:" ) + " ", "" ); m_vcfDecKnob->setLabel( tr("DEC") ); - m_slideToggle = new ledCheckBox( "Slide", this ); + m_slideToggle = new LedCheckBox( "Slide", this ); m_slideToggle->move( 10, 180 ); - m_accentToggle = new ledCheckBox( "Accent", this ); + m_accentToggle = new LedCheckBox( "Accent", this ); m_accentToggle->move( 10, 200 ); m_accentToggle->setDisabled(true); - m_deadToggle = new ledCheckBox( "Dead", this ); + m_deadToggle = new LedCheckBox( "Dead", this ); m_deadToggle->move( 10, 220 ); - m_db24Toggle = new ledCheckBox( "24dB/oct", this ); + m_db24Toggle = new LedCheckBox( "24dB/oct", this ); m_db24Toggle->setWhatsThis( tr( "303-es-que, 24dB/octave, 3 pole filter" ) ); m_db24Toggle->move( 10, 150); - m_slideDecKnob = new knob( knobBright_26, this ); + m_slideDecKnob = new Knob( knobBright_26, this ); m_slideDecKnob->move( 210, 75 ); m_slideDecKnob->setHintText( tr( "Slide Decay:" ) + " ", "" ); m_slideDecKnob->setLabel( tr( "SLIDE")); - m_distKnob = new knob( knobBright_26, this ); + m_distKnob = new Knob( knobBright_26, this ); m_distKnob->move( 210, 190 ); m_distKnob->setHintText( tr( "DIST:" ) + " ", "" ); m_distKnob->setLabel( tr( "DIST")); - m_waveKnob = new knob( knobBright_26, this ); + m_waveKnob = new Knob( knobBright_26, this ); m_waveKnob->move( 120, 75 ); m_waveKnob->setHintText( tr( "WAVE:" ) + " ", "" ); m_waveKnob->setLabel( tr( "WAVE")); diff --git a/plugins/lb303/lb303.h b/plugins/lb303/lb303.h index 3a7f347d0..22c089c22 100644 --- a/plugins/lb303/lb303.h +++ b/plugins/lb303/lb303.h @@ -35,8 +35,8 @@ #include "effect_lib.h" #include "Instrument.h" #include "InstrumentView.h" -#include "led_checkbox.h" -#include "knob.h" +#include "LedCheckbox.h" +#include "Knob.h" #include "Mixer.h" class lb303SynthView; @@ -249,21 +249,21 @@ public: private: virtual void modelChanged(); - knob * m_vcfCutKnob; - knob * m_vcfResKnob; - knob * m_vcfDecKnob; - knob * m_vcfModKnob; + Knob * m_vcfCutKnob; + Knob * m_vcfResKnob; + Knob * m_vcfDecKnob; + Knob * m_vcfModKnob; - knob * m_vcoFineDetuneKnob; + Knob * m_vcoFineDetuneKnob; - knob * m_distKnob; - knob * m_waveKnob; - knob * m_slideDecKnob; + Knob * m_distKnob; + Knob * m_waveKnob; + Knob * m_slideDecKnob; - ledCheckBox * m_slideToggle; - ledCheckBox * m_accentToggle; - ledCheckBox * m_deadToggle; - ledCheckBox * m_db24Toggle; + LedCheckBox * m_slideToggle; + LedCheckBox * m_accentToggle; + LedCheckBox * m_deadToggle; + LedCheckBox * m_db24Toggle; } ; diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp index 70717d9a6..3f0869b68 100644 --- a/plugins/monstro/Monstro.cpp +++ b/plugins/monstro/Monstro.cpp @@ -30,7 +30,7 @@ #include "InstrumentTrack.h" #include "templates.h" #include "gui_templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "lmms_math.h" #include "interpolation.h" @@ -1467,22 +1467,22 @@ MonstroView::MonstroView( Instrument * _instrument, // "tab buttons" - pixmapButton * m_opViewButton = new pixmapButton( this, NULL ); + PixmapButton * m_opViewButton = new PixmapButton( this, NULL ); m_opViewButton -> move( 0,0 ); m_opViewButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "opview_active" ) ); m_opViewButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "opview_inactive" ) ); - toolTip::add( m_opViewButton, tr( "Operators view" ) ); + ToolTip::add( m_opViewButton, tr( "Operators view" ) ); m_opViewButton -> setWhatsThis( tr( "The Operators view contains all the operators. These include both audible " "operators (oscillators) and inaudible operators, or modulators: " "Low-frequency oscillators and Envelopes. \n\n" "Knobs and other widgets in the Operators view have their own what's this -texts, " "so you can get more specific help for them that way. " ) ); - pixmapButton * m_matViewButton = new pixmapButton( this, NULL ); + PixmapButton * m_matViewButton = new PixmapButton( this, NULL ); m_matViewButton -> move( 125,0 ); m_matViewButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "matview_active" ) ); m_matViewButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "matview_inactive" ) ); - toolTip::add( m_matViewButton, tr( "Matrix view" ) ); + ToolTip::add( m_matViewButton, tr( "Matrix view" ) ); m_matViewButton -> setWhatsThis( tr( "The Matrix view contains the modulation matrix. Here you can define " "the modulation relationships between the various operators: Each " "audible operator (oscillators 1-3) has 3-4 properties that can be " @@ -1686,7 +1686,7 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent ) m_osc2VolKnob -> setVolumeKnob( true ); - m_osc2WaveBox = new comboBox( view ); + m_osc2WaveBox = new ComboBox( view ); m_osc2WaveBox -> setGeometry( 204, O2ROW + 7, 42, 22 ); m_osc2WaveBox->setFont( pointSize<8>( m_osc2WaveBox->font() ) ); @@ -1699,18 +1699,18 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent ) makeknob( m_osc3SpoKnob, KNOBCOL4, O3ROW, "Stereo phase offset", " deg", "osc3Knob" ) makeknob( m_osc3SubKnob, KNOBCOL5, O3ROW, "Sub-osc mix", "", "osc3Knob" ) - m_osc3Wave1Box = new comboBox( view ); + m_osc3Wave1Box = new ComboBox( view ); m_osc3Wave1Box -> setGeometry( 160, O3ROW + 7, 42, 22 ); m_osc3Wave1Box->setFont( pointSize<8>( m_osc3Wave1Box->font() ) ); - m_osc3Wave2Box = new comboBox( view ); + m_osc3Wave2Box = new ComboBox( view ); m_osc3Wave2Box -> setGeometry( 204, O3ROW + 7, 42, 22 ); m_osc3Wave2Box->setFont( pointSize<8>( m_osc3Wave2Box->font() ) ); maketinyled( m_osc3SyncHButton, 212, O3ROW - 3, "Hard sync oscillator 3" ) maketinyled( m_osc3SyncRButton, 191, O3ROW - 3, "Reverse sync oscillator 3" ) - m_lfo1WaveBox = new comboBox( view ); + m_lfo1WaveBox = new ComboBox( view ); m_lfo1WaveBox -> setGeometry( 2, LFOROW + 7, 42, 22 ); m_lfo1WaveBox->setFont( pointSize<8>( m_lfo1WaveBox->font() ) ); @@ -1718,7 +1718,7 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent ) maketsknob( m_lfo1RateKnob, LFOCOL2, LFOROW, "Rate", " ms", "lfoKnob" ) makeknob( m_lfo1PhsKnob, LFOCOL3, LFOROW, "Phase", " deg", "lfoKnob" ) - m_lfo2WaveBox = new comboBox( view ); + m_lfo2WaveBox = new ComboBox( view ); m_lfo2WaveBox -> setGeometry( 127, LFOROW + 7, 42, 22 ); m_lfo2WaveBox->setFont( pointSize<8>( m_lfo2WaveBox->font() ) ); @@ -1743,29 +1743,29 @@ QWidget * MonstroView::setupOperatorsView( QWidget * _parent ) makeknob( m_env2SlopeKnob, KNOBCOL7, E2ROW, "Slope", "", "envKnob" ) // mod selector - pixmapButton * m_mixButton = new pixmapButton( view, NULL ); + PixmapButton * m_mixButton = new PixmapButton( view, NULL ); m_mixButton -> move( 225, 185 ); m_mixButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_active" ) ); m_mixButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_inactive" ) ); - toolTip::add( m_mixButton, tr( "Mix Osc2 with Osc3" ) ); + ToolTip::add( m_mixButton, tr( "Mix Osc2 with Osc3" ) ); - pixmapButton * m_amButton = new pixmapButton( view, NULL ); + PixmapButton * m_amButton = new PixmapButton( view, NULL ); m_amButton -> move( 225, 185 + 15 ); m_amButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "am_active" ) ); m_amButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "am_inactive" ) ); - toolTip::add( m_amButton, tr( "Modulate amplitude of Osc3 with Osc2" ) ); + ToolTip::add( m_amButton, tr( "Modulate amplitude of Osc3 with Osc2" ) ); - pixmapButton * m_fmButton = new pixmapButton( view, NULL ); + PixmapButton * m_fmButton = new PixmapButton( view, NULL ); m_fmButton -> move( 225, 185 + 15*2 ); m_fmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_active" ) ); m_fmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_inactive" ) ); - toolTip::add( m_fmButton, tr( "Modulate frequency of Osc3 with Osc2" ) ); + ToolTip::add( m_fmButton, tr( "Modulate frequency of Osc3 with Osc2" ) ); - pixmapButton * m_pmButton = new pixmapButton( view, NULL ); + PixmapButton * m_pmButton = new PixmapButton( view, NULL ); m_pmButton -> move( 225, 185 + 15*3 ); m_pmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_active" ) ); m_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); - toolTip::add( m_pmButton, tr( "Modulate phase of Osc3 with Osc2" ) ); + ToolTip::add( m_pmButton, tr( "Modulate phase of Osc3 with Osc2" ) ); m_o23ModGroup = new automatableButtonGroup( view ); m_o23ModGroup-> addButton( m_mixButton ); diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h index 8b97df197..663ded670 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -33,8 +33,8 @@ #include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" -#include "combobox.h" +#include "PixmapButton.h" +#include "ComboBox.h" #include "Oscillator.h" #include "lmms_math.h" #include "BandLimitedWave.h" @@ -44,7 +44,7 @@ // #define makeknob( name, x, y, hint, unit, oname ) \ - name = new knob( knobStyled, view ); \ + name = new Knob( knobStyled, view ); \ name ->move( x, y ); \ name ->setHintText( tr( hint ) + " ", unit ); \ name ->setObjectName( oname ); \ @@ -58,12 +58,12 @@ name ->setFixedSize( 20, 20 ); #define maketinyled( name, x, y, ttip ) \ - name = new pixmapButton( view, NULL ); \ + name = new PixmapButton( view, NULL ); \ name -> setCheckable( true ); \ name -> move( x, y ); \ name -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "tinyled_on" ) ); \ name -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "tinyled_off" ) ); \ - toolTip::add( name, tr( ttip ) ); + ToolTip::add( name, tr( ttip ) ); #define setwavemodel( name ) \ name .addItem( tr( "Sine wave" ), static_cast( new PluginPixmapLoader( "sin" ) ) ); \ @@ -591,61 +591,61 @@ private: // // ////////////////////////////////////// - knob * m_osc1VolKnob; - knob * m_osc1PanKnob; - knob * m_osc1CrsKnob; - knob * m_osc1FtlKnob; - knob * m_osc1FtrKnob; - knob * m_osc1SpoKnob; - knob * m_osc1PwKnob; - pixmapButton * m_osc1SSRButton; - pixmapButton * m_osc1SSFButton; + Knob * m_osc1VolKnob; + Knob * m_osc1PanKnob; + Knob * m_osc1CrsKnob; + Knob * m_osc1FtlKnob; + Knob * m_osc1FtrKnob; + Knob * m_osc1SpoKnob; + Knob * m_osc1PwKnob; + PixmapButton * m_osc1SSRButton; + PixmapButton * m_osc1SSFButton; - knob * m_osc2VolKnob; - knob * m_osc2PanKnob; - knob * m_osc2CrsKnob; - knob * m_osc2FtlKnob; - knob * m_osc2FtrKnob; - knob * m_osc2SpoKnob; - comboBox * m_osc2WaveBox; - pixmapButton * m_osc2SyncHButton; - pixmapButton * m_osc2SyncRButton; + Knob * m_osc2VolKnob; + Knob * m_osc2PanKnob; + Knob * m_osc2CrsKnob; + Knob * m_osc2FtlKnob; + Knob * m_osc2FtrKnob; + Knob * m_osc2SpoKnob; + ComboBox * m_osc2WaveBox; + PixmapButton * m_osc2SyncHButton; + PixmapButton * m_osc2SyncRButton; - knob * m_osc3VolKnob; - knob * m_osc3PanKnob; - knob * m_osc3CrsKnob; - knob * m_osc3SpoKnob; - knob * m_osc3SubKnob; - comboBox * m_osc3Wave1Box; - comboBox * m_osc3Wave2Box; - pixmapButton * m_osc3SyncHButton; - pixmapButton * m_osc3SyncRButton; + Knob * m_osc3VolKnob; + Knob * m_osc3PanKnob; + Knob * m_osc3CrsKnob; + Knob * m_osc3SpoKnob; + Knob * m_osc3SubKnob; + ComboBox * m_osc3Wave1Box; + ComboBox * m_osc3Wave2Box; + PixmapButton * m_osc3SyncHButton; + PixmapButton * m_osc3SyncRButton; - comboBox * m_lfo1WaveBox; + ComboBox * m_lfo1WaveBox; TempoSyncKnob * m_lfo1AttKnob; TempoSyncKnob * m_lfo1RateKnob; - knob * m_lfo1PhsKnob; + Knob * m_lfo1PhsKnob; - comboBox * m_lfo2WaveBox; + ComboBox * m_lfo2WaveBox; TempoSyncKnob * m_lfo2AttKnob; TempoSyncKnob * m_lfo2RateKnob; - knob * m_lfo2PhsKnob; + Knob * m_lfo2PhsKnob; TempoSyncKnob * m_env1PreKnob; TempoSyncKnob * m_env1AttKnob; TempoSyncKnob * m_env1HoldKnob; TempoSyncKnob * m_env1DecKnob; - knob * m_env1SusKnob; + Knob * m_env1SusKnob; TempoSyncKnob * m_env1RelKnob; - knob * m_env1SlopeKnob; + Knob * m_env1SlopeKnob; TempoSyncKnob * m_env2PreKnob; TempoSyncKnob * m_env2AttKnob; TempoSyncKnob * m_env2HoldKnob; TempoSyncKnob * m_env2DecKnob; - knob * m_env2SusKnob; + Knob * m_env2SusKnob; TempoSyncKnob * m_env2RelKnob; - knob * m_env2SlopeKnob; + Knob * m_env2SlopeKnob; automatableButtonGroup * m_o23ModGroup; @@ -660,60 +660,60 @@ private: // // ///////////////////////////////// - knob * m_vol1env1Knob; - knob * m_vol1env2Knob; - knob * m_vol1lfo1Knob; - knob * m_vol1lfo2Knob; + Knob * m_vol1env1Knob; + Knob * m_vol1env2Knob; + Knob * m_vol1lfo1Knob; + Knob * m_vol1lfo2Knob; - knob * m_vol2env1Knob; - knob * m_vol2env2Knob; - knob * m_vol2lfo1Knob; - knob * m_vol2lfo2Knob; + Knob * m_vol2env1Knob; + Knob * m_vol2env2Knob; + Knob * m_vol2lfo1Knob; + Knob * m_vol2lfo2Knob; - knob * m_vol3env1Knob; - knob * m_vol3env2Knob; - knob * m_vol3lfo1Knob; - knob * m_vol3lfo2Knob; + Knob * m_vol3env1Knob; + Knob * m_vol3env2Knob; + Knob * m_vol3lfo1Knob; + Knob * m_vol3lfo2Knob; - knob * m_phs1env1Knob; - knob * m_phs1env2Knob; - knob * m_phs1lfo1Knob; - knob * m_phs1lfo2Knob; + Knob * m_phs1env1Knob; + Knob * m_phs1env2Knob; + Knob * m_phs1lfo1Knob; + Knob * m_phs1lfo2Knob; - knob * m_phs2env1Knob; - knob * m_phs2env2Knob; - knob * m_phs2lfo1Knob; - knob * m_phs2lfo2Knob; + Knob * m_phs2env1Knob; + Knob * m_phs2env2Knob; + Knob * m_phs2lfo1Knob; + Knob * m_phs2lfo2Knob; - knob * m_phs3env1Knob; - knob * m_phs3env2Knob; - knob * m_phs3lfo1Knob; - knob * m_phs3lfo2Knob; + Knob * m_phs3env1Knob; + Knob * m_phs3env2Knob; + Knob * m_phs3lfo1Knob; + Knob * m_phs3lfo2Knob; - knob * m_pit1env1Knob; - knob * m_pit1env2Knob; - knob * m_pit1lfo1Knob; - knob * m_pit1lfo2Knob; + Knob * m_pit1env1Knob; + Knob * m_pit1env2Knob; + Knob * m_pit1lfo1Knob; + Knob * m_pit1lfo2Knob; - knob * m_pit2env1Knob; - knob * m_pit2env2Knob; - knob * m_pit2lfo1Knob; - knob * m_pit2lfo2Knob; + Knob * m_pit2env1Knob; + Knob * m_pit2env2Knob; + Knob * m_pit2lfo1Knob; + Knob * m_pit2lfo2Knob; - knob * m_pit3env1Knob; - knob * m_pit3env2Knob; - knob * m_pit3lfo1Knob; - knob * m_pit3lfo2Knob; + Knob * m_pit3env1Knob; + Knob * m_pit3env2Knob; + Knob * m_pit3lfo1Knob; + Knob * m_pit3lfo2Knob; - knob * m_pw1env1Knob; - knob * m_pw1env2Knob; - knob * m_pw1lfo1Knob; - knob * m_pw1lfo2Knob; + Knob * m_pw1env1Knob; + Knob * m_pw1env2Knob; + Knob * m_pw1lfo1Knob; + Knob * m_pw1lfo2Knob; - knob * m_sub3env1Knob; - knob * m_sub3env2Knob; - knob * m_sub3lfo1Knob; - knob * m_sub3lfo2Knob; + Knob * m_sub3env1Knob; + Knob * m_sub3env2Knob; + Knob * m_sub3lfo1Knob; + Knob * m_sub3lfo2Knob; }; diff --git a/plugins/nes/Nes.cpp b/plugins/nes/Nes.cpp index 0180551ae..0fa288339 100644 --- a/plugins/nes/Nes.cpp +++ b/plugins/nes/Nes.cpp @@ -29,7 +29,7 @@ #include "Engine.h" #include "InstrumentTrack.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "lmms_math.h" #include "interpolation.h" diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index d76a90d2b..645a980dc 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -31,31 +31,31 @@ #include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "MemoryManager.h" #define makeknob( name, x, y, hint, unit, oname ) \ - name = new knob( knobStyled, this ); \ + name = new Knob( knobStyled, this ); \ name ->move( x, y ); \ name ->setHintText( tr( hint ) + " ", unit ); \ name ->setObjectName( oname ); \ name ->setFixedSize( 29, 29 ); #define makenesled( name, x, y, ttip ) \ - name = new pixmapButton( this, NULL ); \ + name = new PixmapButton( this, NULL ); \ name -> setCheckable( true ); \ name -> move( x, y ); \ name -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "nesled_on" ) ); \ name -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "nesled_off" ) ); \ - toolTip::add( name, tr( ttip ) ); + ToolTip::add( name, tr( ttip ) ); #define makedcled( name, x, y, ttip, active ) \ - pixmapButton * name = new pixmapButton( this, NULL ); \ + PixmapButton * name = new PixmapButton( this, NULL ); \ name -> move( x, y ); \ name -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( active ) ); \ name -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "nesdc_off" ) ); \ - toolTip::add( name, tr( ttip ) ); + ToolTip::add( name, tr( ttip ) ); const float NES_SIMPLE_FILTER = 1.0 / 20.0; // simulate nes analog audio output const float NFB = 895000.0f; @@ -304,58 +304,58 @@ private: virtual void modelChanged(); // channel 1 - pixmapButton * m_ch1EnabledBtn; - knob * m_ch1CrsKnob; - knob * m_ch1VolumeKnob; + PixmapButton * m_ch1EnabledBtn; + Knob * m_ch1CrsKnob; + Knob * m_ch1VolumeKnob; - pixmapButton * m_ch1EnvEnabledBtn; - pixmapButton * m_ch1EnvLoopedBtn; - knob * m_ch1EnvLenKnob; + PixmapButton * m_ch1EnvEnabledBtn; + PixmapButton * m_ch1EnvLoopedBtn; + Knob * m_ch1EnvLenKnob; automatableButtonGroup * m_ch1DutyCycleGrp; - pixmapButton * m_ch1SweepEnabledBtn; - knob * m_ch1SweepAmtKnob; - knob * m_ch1SweepRateKnob; + PixmapButton * m_ch1SweepEnabledBtn; + Knob * m_ch1SweepAmtKnob; + Knob * m_ch1SweepRateKnob; // channel 2 - pixmapButton * m_ch2EnabledBtn; - knob * m_ch2CrsKnob; - knob * m_ch2VolumeKnob; + PixmapButton * m_ch2EnabledBtn; + Knob * m_ch2CrsKnob; + Knob * m_ch2VolumeKnob; - pixmapButton * m_ch2EnvEnabledBtn; - pixmapButton * m_ch2EnvLoopedBtn; - knob * m_ch2EnvLenKnob; + PixmapButton * m_ch2EnvEnabledBtn; + PixmapButton * m_ch2EnvLoopedBtn; + Knob * m_ch2EnvLenKnob; automatableButtonGroup * m_ch2DutyCycleGrp; - pixmapButton * m_ch2SweepEnabledBtn; - knob * m_ch2SweepAmtKnob; - knob * m_ch2SweepRateKnob; + PixmapButton * m_ch2SweepEnabledBtn; + Knob * m_ch2SweepAmtKnob; + Knob * m_ch2SweepRateKnob; //channel 3 - pixmapButton * m_ch3EnabledBtn; - knob * m_ch3CrsKnob; - knob * m_ch3VolumeKnob; + PixmapButton * m_ch3EnabledBtn; + Knob * m_ch3CrsKnob; + Knob * m_ch3VolumeKnob; //channel 4 - pixmapButton * m_ch4EnabledBtn; - knob * m_ch4VolumeKnob; + PixmapButton * m_ch4EnabledBtn; + Knob * m_ch4VolumeKnob; - pixmapButton * m_ch4EnvEnabledBtn; - pixmapButton * m_ch4EnvLoopedBtn; - knob * m_ch4EnvLenKnob; + PixmapButton * m_ch4EnvEnabledBtn; + PixmapButton * m_ch4EnvLoopedBtn; + Knob * m_ch4EnvLenKnob; - pixmapButton * m_ch4NoiseModeBtn; - pixmapButton * m_ch4NoiseFreqModeBtn; - knob * m_ch4NoiseFreqKnob; + PixmapButton * m_ch4NoiseModeBtn; + PixmapButton * m_ch4NoiseFreqModeBtn; + Knob * m_ch4NoiseFreqKnob; - knob * m_ch4SweepKnob; - pixmapButton * m_ch4NoiseQuantizeBtn; + Knob * m_ch4SweepKnob; + PixmapButton * m_ch4NoiseQuantizeBtn; //master - knob * m_masterVolKnob; - knob * m_vibratoKnob; + Knob * m_masterVolKnob; + Knob * m_vibratoKnob; static QPixmap * s_artwork; }; diff --git a/plugins/opl2/opl2instrument.cpp b/plugins/opl2/opl2instrument.cpp index d5b7cacfc..f99c38296 100644 --- a/plugins/opl2/opl2instrument.cpp +++ b/plugins/opl2/opl2instrument.cpp @@ -57,10 +57,10 @@ #include "embed.cpp" #include "math.h" -#include "knob.h" +#include "Knob.h" #include "LcdSpinBox.h" -#include "pixmap_button.h" -#include "tooltip.h" +#include "PixmapButton.h" +#include "ToolTip.h" extern "C" { @@ -585,7 +585,7 @@ opl2instrumentView::opl2instrumentView( Instrument * _instrument, */ #define KNOB_GEN(knobname, hinttext, hintunit,xpos,ypos) \ - knobname = new knob( knobStyled, this );\ + knobname = new Knob( knobStyled, this );\ knobname->setHintText( tr(hinttext) + "", hintunit );\ knobname->setFixedSize(22,22);\ knobname->setCenterPointX(11.0);\ @@ -594,18 +594,18 @@ opl2instrumentView::opl2instrumentView( Instrument * _instrument, knobname->move(xpos,ypos); #define BUTTON_GEN(buttname, tooltip, xpos, ypos) \ - buttname = new pixmapButton( this, NULL );\ + buttname = new PixmapButton( this, NULL );\ buttname->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "opl2_led_on" ) );\ buttname->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "opl2_led_off" ) );\ buttname->setCheckable( true );\ - toolTip::add( buttname, tr( tooltip ) );\ + ToolTip::add( buttname, tr( tooltip ) );\ buttname->move( xpos, ypos ); #define WAVEBUTTON_GEN(buttname, tooltip, xpos, ypos, icon_on, icon_off, buttgroup) \ - buttname = new pixmapButton( this, NULL );\ + buttname = new PixmapButton( this, NULL );\ buttname->setActiveGraphic( PLUGIN_NAME::getIconPixmap( icon_on ) ); \ buttname->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( icon_off ) ); \ - toolTip::add( buttname, tr( tooltip ) );\ + ToolTip::add( buttname, tr( tooltip ) );\ buttname->move( xpos, ypos );\ buttgroup->addButton(buttname); diff --git a/plugins/opl2/opl2instrument.h b/plugins/opl2/opl2instrument.h index c837f1e04..7cd644942 100644 --- a/plugins/opl2/opl2instrument.h +++ b/plugins/opl2/opl2instrument.h @@ -30,8 +30,8 @@ #include "opl.h" #include "LcdSpinBox.h" -#include "knob.h" -#include "pixmap_button.h" +#include "Knob.h" +#include "PixmapButton.h" #define OPL2_VOICE_FREE 255 #define OPL2_NO_VOICE 255 @@ -146,46 +146,46 @@ public: LcdSpinBox *m_patch; void modelChanged(); - knob *op1_a_kn; - knob *op1_d_kn; - knob *op1_s_kn; - knob *op1_r_kn; - knob *op1_lvl_kn; - knob *op1_scale_kn; - knob *op1_mul_kn; - knob *feedback_kn; - pixmapButton *op1_ksr_btn; - pixmapButton *op1_perc_btn; - pixmapButton *op1_trem_btn; - pixmapButton *op1_vib_btn; - pixmapButton *op1_w0_btn; - pixmapButton *op1_w1_btn; - pixmapButton *op1_w2_btn; - pixmapButton *op1_w3_btn; + Knob *op1_a_kn; + Knob *op1_d_kn; + Knob *op1_s_kn; + Knob *op1_r_kn; + Knob *op1_lvl_kn; + Knob *op1_scale_kn; + Knob *op1_mul_kn; + Knob *feedback_kn; + PixmapButton *op1_ksr_btn; + PixmapButton *op1_perc_btn; + PixmapButton *op1_trem_btn; + PixmapButton *op1_vib_btn; + PixmapButton *op1_w0_btn; + PixmapButton *op1_w1_btn; + PixmapButton *op1_w2_btn; + PixmapButton *op1_w3_btn; automatableButtonGroup *op1_waveform; - knob *op2_a_kn; - knob *op2_d_kn; - knob *op2_s_kn; - knob *op2_r_kn; - knob *op2_lvl_kn; - knob *op2_scale_kn; - knob *op2_mul_kn; - pixmapButton *op2_ksr_btn; - pixmapButton *op2_perc_btn; - pixmapButton *op2_trem_btn; - pixmapButton *op2_vib_btn; - pixmapButton *op2_w0_btn; - pixmapButton *op2_w1_btn; - pixmapButton *op2_w2_btn; - pixmapButton *op2_w3_btn; + Knob *op2_a_kn; + Knob *op2_d_kn; + Knob *op2_s_kn; + Knob *op2_r_kn; + Knob *op2_lvl_kn; + Knob *op2_scale_kn; + Knob *op2_mul_kn; + PixmapButton *op2_ksr_btn; + PixmapButton *op2_perc_btn; + PixmapButton *op2_trem_btn; + PixmapButton *op2_vib_btn; + PixmapButton *op2_w0_btn; + PixmapButton *op2_w1_btn; + PixmapButton *op2_w2_btn; + PixmapButton *op2_w3_btn; automatableButtonGroup *op2_waveform; - pixmapButton *fm_btn; - pixmapButton *vib_depth_btn; - pixmapButton *trem_depth_btn; + PixmapButton *fm_btn; + PixmapButton *vib_depth_btn; + PixmapButton *trem_depth_btn; diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 5bfb2d863..08699d18d 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -32,12 +32,12 @@ #include "Engine.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" #include "Oscillator.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "embed.cpp" @@ -403,11 +403,11 @@ PluginView * organicInstrument::instantiateView( QWidget * _parent ) -class organicKnob : public knob +class organicKnob : public Knob { public: organicKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 21, 21 ); } @@ -448,7 +448,7 @@ organicInstrumentView::organicInstrumentView( Instrument * _instrument, "It is cumulative with the instrument window's volume control. " ) ); // randomise - m_randBtn = new pixmapButton( this, tr( "Randomise" ) ); + m_randBtn = new PixmapButton( this, tr( "Randomise" ) ); m_randBtn->move( 148, 224 ); m_randBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "randomise_pressed" ) ); @@ -501,14 +501,14 @@ void organicInstrumentView::modelChanged() for( int i = 0; i < m_numOscillators; ++i ) { // setup harmonic knob - knob * harmKnob = new organicKnob( this ); + Knob * harmKnob = new organicKnob( this ); harmKnob->move( x + i * colWidth, y - rowHeight ); harmKnob->setObjectName( "harmKnob" ); connect( &oi->m_osc[i]->m_harmModel, SIGNAL( dataChanged() ), this, SLOT( updateKnobHint() ) ); // setup waveform-knob - knob * oscKnob = new organicKnob( this ); + Knob * oscKnob = new organicKnob( this ); oscKnob->move( x + i * colWidth, y ); connect( &oi->m_osc[i]->m_oscModel, SIGNAL( dataChanged() ), this, SLOT( updateKnobHint() ) ); @@ -516,7 +516,7 @@ void organicInstrumentView::modelChanged() oscKnob->setHintText( tr( "Osc %1 waveform:" ).arg( i + 1 ) + " ", QString() ); // setup volume-knob - knob * volKnob = new knob( knobStyled, this ); + Knob * volKnob = new Knob( knobStyled, this ); volKnob->setVolumeKnob( true ); volKnob->move( x + i * colWidth, y + rowHeight*1 ); volKnob->setFixedSize( 21, 21 ); @@ -524,13 +524,13 @@ void organicInstrumentView::modelChanged() i + 1 ) + " ", "%" ); // setup panning-knob - knob * panKnob = new organicKnob( this ); + Knob * panKnob = new organicKnob( this ); panKnob->move( x + i * colWidth, y + rowHeight*2 ); panKnob->setHintText( tr("Osc %1 panning:").arg( i + 1 ) + " ", "" ); // setup knob for fine-detuning - knob * detuneKnob = new organicKnob( this ); + Knob * detuneKnob = new organicKnob( this ); detuneKnob->move( x + i * colWidth, y + rowHeight*3 ); detuneKnob->setHintText( tr( "Osc %1 stereo detuning" ).arg( i + 1 ) + " ", " " + diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h index e41349763..0cdd49ecd 100644 --- a/plugins/organic/organic.h +++ b/plugins/organic/organic.h @@ -35,9 +35,9 @@ class QPixmap; -class knob; +class Knob; class NotePlayHandle; -class pixmapButton; +class PixmapButton; const int NUM_HARMONICS = 18; const QString HARMONIC_NAMES[NUM_HARMONICS] = { @@ -184,11 +184,11 @@ private: { MM_OPERATORS OscillatorKnobs( - knob * h, - knob * v, - knob * o, - knob * p, - knob * dt ) : + Knob * h, + Knob * v, + Knob * o, + Knob * p, + Knob * dt ) : m_harmKnob( h ), m_volKnob( v ), m_oscKnob( o ), @@ -200,18 +200,18 @@ private: { } - knob * m_harmKnob; - knob * m_volKnob; - knob * m_oscKnob; - knob * m_panKnob; - knob * m_detuneKnob; + Knob * m_harmKnob; + Knob * m_volKnob; + Knob * m_oscKnob; + Knob * m_panKnob; + Knob * m_detuneKnob; } ; OscillatorKnobs * m_oscKnobs; - knob * m_fx1Knob; - knob * m_volKnob; - pixmapButton * m_randBtn; + Knob * m_fx1Knob; + Knob * m_volKnob; + PixmapButton * m_randBtn; int m_numOscillators; diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp index 9b4ad4bde..947c9d841 100644 --- a/plugins/papu/papu_instrument.cpp +++ b/plugins/papu/papu_instrument.cpp @@ -31,12 +31,12 @@ #include "papu_instrument.h" #include "base64.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" -#include "tooltip.h" +#include "PixmapButton.h" +#include "ToolTip.h" #include "Engine.h" -#include "graph.h" +#include "Graph.h" #include "embed.cpp" @@ -426,11 +426,11 @@ PluginView * papuInstrument::instantiateView( QWidget * _parent ) } -class papuKnob : public knob +class papuKnob : public Knob { public: papuKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 30, 30 ); setCenterPointX( 15.0 ); @@ -458,7 +458,7 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch1SweepTimeKnob = new papuKnob( this ); m_ch1SweepTimeKnob->setHintText( tr( "Sweep Time:" ) + " ", "" ); m_ch1SweepTimeKnob->move( 5 + 4*32, 106 ); - toolTip::add( m_ch1SweepTimeKnob, tr( "Sweep Time" ) ); + ToolTip::add( m_ch1SweepTimeKnob, tr( "Sweep Time" ) ); m_ch1SweepTimeKnob->setWhatsThis( tr( "The amount of increase or" " decrease in frequency" ) ); @@ -466,7 +466,7 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch1SweepRtShiftKnob->setHintText( tr( "Sweep RtShift amount:" ) + " ", "" ); m_ch1SweepRtShiftKnob->move( 5 + 3*32, 106 ); - toolTip::add( m_ch1SweepRtShiftKnob, tr( "Sweep RtShift amount" ) ); + ToolTip::add( m_ch1SweepRtShiftKnob, tr( "Sweep RtShift amount" ) ); m_ch1SweepRtShiftKnob->setWhatsThis( tr( "The rate at which increase or" " decrease in frequency occurs" ) ); @@ -474,7 +474,7 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch1WavePatternDutyKnob->setHintText( tr( "Wave pattern duty:" ) + " ", "" ); m_ch1WavePatternDutyKnob->move( 5 + 2*32, 106 ); - toolTip::add( m_ch1WavePatternDutyKnob, tr( "Wave Pattern Duty" ) ); + ToolTip::add( m_ch1WavePatternDutyKnob, tr( "Wave Pattern Duty" ) ); m_ch1WavePatternDutyKnob->setWhatsThis( tr( "The duty cycle is the ratio of" " the duration (time) that a signal is ON" " versus the total period of the signal." ) ); @@ -483,14 +483,14 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch1VolumeKnob->setHintText( tr( "Square Channel 1 Volume:" ) + " ", "" ); m_ch1VolumeKnob->move( 5, 106 ); - toolTip::add( m_ch1VolumeKnob, tr( "Square Channel 1 Volume:" ) ); + ToolTip::add( m_ch1VolumeKnob, tr( "Square Channel 1 Volume:" ) ); m_ch1VolumeKnob->setWhatsThis( tr( "Square Channel 1 Volume" ) ); m_ch1SweepStepLengthKnob = new papuKnob( this ); m_ch1SweepStepLengthKnob->setHintText( tr( "Length of each step in sweep:" ) + " ", "" ); m_ch1SweepStepLengthKnob->move( 5 + 32, 106 ); - toolTip::add( m_ch1SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); + ToolTip::add( m_ch1SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); m_ch1SweepStepLengthKnob->setWhatsThis( tr( "The delay between step change" ) ); @@ -499,7 +499,7 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch2WavePatternDutyKnob->setHintText( tr( "Wave pattern duty:" ) + " ", "" ); m_ch2WavePatternDutyKnob->move( 5 + 2*32, 155 ); - toolTip::add( m_ch2WavePatternDutyKnob, tr( "Wave pattern duty" ) ); + ToolTip::add( m_ch2WavePatternDutyKnob, tr( "Wave pattern duty" ) ); m_ch2WavePatternDutyKnob->setWhatsThis( tr( "The duty cycle is the ratio of" " the duration (time) that a signal is ON" " versus the total period of the signal." ) ); @@ -508,14 +508,14 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch2VolumeKnob->setHintText( tr( "Square Channel 2 Volume:" ) + " ", "" ); m_ch2VolumeKnob->move( 5, 155 ); - toolTip::add( m_ch2VolumeKnob, tr( "Square Channel 2 Volume" ) ); + ToolTip::add( m_ch2VolumeKnob, tr( "Square Channel 2 Volume" ) ); m_ch2VolumeKnob->setWhatsThis( tr( "Square Channel 2 Volume" ) ); m_ch2SweepStepLengthKnob = new papuKnob( this ); m_ch2SweepStepLengthKnob->setHintText( tr( "Length of each step in sweep:" ) + " ", "" ); m_ch2SweepStepLengthKnob->move( 5 + 32, 155 ); - toolTip::add( m_ch2SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); + ToolTip::add( m_ch2SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); m_ch2SweepStepLengthKnob->setWhatsThis( tr( "The delay between step change" ) ); @@ -523,7 +523,7 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch3VolumeKnob = new papuKnob( this ); m_ch3VolumeKnob->setHintText( tr( "Wave Channel Volume:" ) + " ", "" ); m_ch3VolumeKnob->move( 5, 204 ); - toolTip::add( m_ch3VolumeKnob, tr( "Wave Channel Volume" ) ); + ToolTip::add( m_ch3VolumeKnob, tr( "Wave Channel Volume" ) ); m_ch3VolumeKnob->setWhatsThis( tr( "Wave Channel Volume" ) ); @@ -531,14 +531,14 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_ch4VolumeKnob = new papuKnob( this ); m_ch4VolumeKnob->setHintText( tr( "Noise Channel Volume:" ) + " ", "" ); m_ch4VolumeKnob->move( 144, 155 ); - toolTip::add( m_ch4VolumeKnob, tr( "Noise Channel Volume" ) ); + ToolTip::add( m_ch4VolumeKnob, tr( "Noise Channel Volume" ) ); m_ch4VolumeKnob->setWhatsThis( tr( "Noise Channel Volume" ) ); m_ch4SweepStepLengthKnob = new papuKnob( this ); m_ch4SweepStepLengthKnob->setHintText( tr( "Length of each step in sweep:" ) + " ", "" ); m_ch4SweepStepLengthKnob->move( 144 + 32, 155 ); - toolTip::add( m_ch4SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); + ToolTip::add( m_ch4SweepStepLengthKnob, tr( "Length of each step in sweep" ) ); m_ch4SweepStepLengthKnob->setWhatsThis( tr( "The delay between step change" ) ); @@ -546,44 +546,44 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, m_so1VolumeKnob = new papuKnob( this ); m_so1VolumeKnob->setHintText( tr( "SO1 Volume (Right):" ) + " ", "" ); m_so1VolumeKnob->move( 5, 58 ); - toolTip::add( m_so1VolumeKnob, tr( "SO1 Volume (Right)" ) ); + ToolTip::add( m_so1VolumeKnob, tr( "SO1 Volume (Right)" ) ); m_so2VolumeKnob = new papuKnob( this ); m_so2VolumeKnob->setHintText( tr( "SO2 Volume (Left):" ) + " ", "" ); m_so2VolumeKnob->move( 5 + 32, 58 ); - toolTip::add( m_so2VolumeKnob, tr( "SO2 Volume (Left)" ) ); + ToolTip::add( m_so2VolumeKnob, tr( "SO2 Volume (Left)" ) ); m_trebleKnob = new papuKnob( this ); m_trebleKnob->setHintText( tr( "Treble:" ) + " ", "" ); m_trebleKnob->move( 5 + 2*32, 58 ); - toolTip::add( m_trebleKnob, tr( "Treble" ) ); + ToolTip::add( m_trebleKnob, tr( "Treble" ) ); m_bassKnob = new papuKnob( this ); m_bassKnob->setHintText( tr( "Bass:" ) + " ", "" ); m_bassKnob->move( 5 + 3*32, 58 ); - toolTip::add( m_bassKnob, tr( "Bass" ) ); + ToolTip::add( m_bassKnob, tr( "Bass" ) ); - m_ch1SweepDirButton = new pixmapButton( this, NULL ); + m_ch1SweepDirButton = new PixmapButton( this, NULL ); m_ch1SweepDirButton->setCheckable( true ); m_ch1SweepDirButton->move( 167, 108 ); m_ch1SweepDirButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_down" ) ); m_ch1SweepDirButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_up" ) ); - toolTip::add( m_ch1SweepDirButton, tr( "Sweep Direction" ) ); + ToolTip::add( m_ch1SweepDirButton, tr( "Sweep Direction" ) ); - m_ch1VolSweepDirButton = new pixmapButton( this, NULL ); + m_ch1VolSweepDirButton = new PixmapButton( this, NULL ); m_ch1VolSweepDirButton->setCheckable( true ); m_ch1VolSweepDirButton->move( 207, 108 ); m_ch1VolSweepDirButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_up" ) ); m_ch1VolSweepDirButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_down" ) ); - toolTip::add( m_ch1VolSweepDirButton, tr( "Volume Sweep Direction" ) ); + ToolTip::add( m_ch1VolSweepDirButton, tr( "Volume Sweep Direction" ) ); - m_ch2VolSweepDirButton = new pixmapButton( this, + m_ch2VolSweepDirButton = new PixmapButton( this, tr( "Volume Sweep Direction" ) ); m_ch2VolSweepDirButton->setCheckable( true ); m_ch2VolSweepDirButton->move( 102, 156 ); @@ -591,12 +591,12 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, PLUGIN_NAME::getIconPixmap( "btn_up" ) ); m_ch2VolSweepDirButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_down" ) ); - toolTip::add( m_ch2VolSweepDirButton, tr( "Volume Sweep Direction" ) ); + ToolTip::add( m_ch2VolSweepDirButton, tr( "Volume Sweep Direction" ) ); - //m_ch3OnButton = new pixmapButton( this, NULL ); + //m_ch3OnButton = new PixmapButton( this, NULL ); //m_ch3OnButton->move( 176, 53 ); - m_ch4VolSweepDirButton = new pixmapButton( this, + m_ch4VolSweepDirButton = new PixmapButton( this, tr( "Volume Sweep Direction" ) ); m_ch4VolSweepDirButton->setCheckable( true ); m_ch4VolSweepDirButton->move( 207, 157 ); @@ -604,85 +604,85 @@ papuInstrumentView::papuInstrumentView( Instrument * _instrument, PLUGIN_NAME::getIconPixmap( "btn_up" ) ); m_ch4VolSweepDirButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_down" ) ); - toolTip::add( m_ch4VolSweepDirButton, tr( "Volume Sweep Direction" ) ); + ToolTip::add( m_ch4VolSweepDirButton, tr( "Volume Sweep Direction" ) ); - m_ch4ShiftRegWidthButton = new pixmapButton( this, NULL ); + m_ch4ShiftRegWidthButton = new PixmapButton( this, NULL ); m_ch4ShiftRegWidthButton->setCheckable( true ); m_ch4ShiftRegWidthButton->move( 207, 171 ); m_ch4ShiftRegWidthButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_7" ) ); m_ch4ShiftRegWidthButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_15" ) ); - toolTip::add( m_ch4ShiftRegWidthButton, tr( "Shift Register Width" ) ); + ToolTip::add( m_ch4ShiftRegWidthButton, tr( "Shift Register Width" ) ); - m_ch1So1Button = new pixmapButton( this, NULL ); + m_ch1So1Button = new PixmapButton( this, NULL ); m_ch1So1Button->setCheckable( true ); m_ch1So1Button->move( 208, 51 ); m_ch1So1Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch1So1Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch1So1Button, tr( "Channel1 to SO1 (Right)" ) ); + ToolTip::add( m_ch1So1Button, tr( "Channel1 to SO1 (Right)" ) ); - m_ch2So1Button = new pixmapButton( this, NULL ); + m_ch2So1Button = new PixmapButton( this, NULL ); m_ch2So1Button->setCheckable( true ); m_ch2So1Button->move( 208, 51 + 12 ); m_ch2So1Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch2So1Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch2So1Button, tr( "Channel2 to SO1 (Right)" ) ); + ToolTip::add( m_ch2So1Button, tr( "Channel2 to SO1 (Right)" ) ); - m_ch3So1Button = new pixmapButton( this, NULL ); + m_ch3So1Button = new PixmapButton( this, NULL ); m_ch3So1Button->setCheckable( true ); m_ch3So1Button->move( 208, 51 + 2*12 ); m_ch3So1Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch3So1Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch3So1Button, tr( "Channel3 to SO1 (Right)" ) ); + ToolTip::add( m_ch3So1Button, tr( "Channel3 to SO1 (Right)" ) ); - m_ch4So1Button = new pixmapButton( this, NULL ); + m_ch4So1Button = new PixmapButton( this, NULL ); m_ch4So1Button->setCheckable( true ); m_ch4So1Button->setChecked( false ); m_ch4So1Button->move( 208, 51 + 3*12 ); m_ch4So1Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch4So1Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch4So1Button, tr( "Channel4 to SO1 (Right)" ) ); + ToolTip::add( m_ch4So1Button, tr( "Channel4 to SO1 (Right)" ) ); - m_ch1So2Button = new pixmapButton( this, NULL ); + m_ch1So2Button = new PixmapButton( this, NULL ); m_ch1So2Button->setCheckable( true ); m_ch1So2Button->move( 148, 51 ); m_ch1So2Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch1So2Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch1So2Button, tr( "Channel1 to SO2 (Left)" ) ); + ToolTip::add( m_ch1So2Button, tr( "Channel1 to SO2 (Left)" ) ); - m_ch2So2Button = new pixmapButton( this, NULL ); + m_ch2So2Button = new PixmapButton( this, NULL ); m_ch2So2Button->setCheckable( true ); m_ch2So2Button->move( 148, 51 + 12 ); m_ch2So2Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch2So2Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch2So2Button, tr( "Channel2 to SO2 (Left)" ) ); + ToolTip::add( m_ch2So2Button, tr( "Channel2 to SO2 (Left)" ) ); - m_ch3So2Button = new pixmapButton( this, NULL ); + m_ch3So2Button = new PixmapButton( this, NULL ); m_ch3So2Button->setCheckable( true ); m_ch3So2Button->move( 148, 51 + 2*12 ); m_ch3So2Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch3So2Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch3So2Button, tr( "Channel3 to SO2 (Left)" ) ); + ToolTip::add( m_ch3So2Button, tr( "Channel3 to SO2 (Left)" ) ); - m_ch4So2Button = new pixmapButton( this, NULL ); + m_ch4So2Button = new PixmapButton( this, NULL ); m_ch4So2Button->setCheckable( true ); m_ch4So2Button->setChecked( false ); m_ch4So2Button->move( 148, 51 + 3*12 ); m_ch4So2Button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "btn_on" ) ); m_ch4So2Button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap("btn_off") ); - toolTip::add( m_ch4So2Button, tr( "Channel4 to SO2 (Left)" ) ); + ToolTip::add( m_ch4So2Button, tr( "Channel4 to SO2 (Left)" ) ); - m_graph = new graph( this ); - m_graph->setGraphStyle( graph::NearestStyle ); + m_graph = new Graph( this ); + m_graph->setGraphStyle( Graph::NearestStyle ); m_graph->setGraphColor( QColor(0x4E, 0x83, 0x2B) ); m_graph->move( 37, 199 ); m_graph->resize(208, 47); - toolTip::add( m_graph, tr( "Wave Pattern" ) ); + ToolTip::add( m_graph, tr( "Wave Pattern" ) ); m_graph->setWhatsThis( tr( "Draw the wave here" ) ); } diff --git a/plugins/papu/papu_instrument.h b/plugins/papu/papu_instrument.h index ffbee3987..bf926a405 100644 --- a/plugins/papu/papu_instrument.h +++ b/plugins/papu/papu_instrument.h @@ -29,12 +29,12 @@ #include #include "Instrument.h" #include "InstrumentView.h" -#include "knob.h" -#include "graph.h" +#include "Knob.h" +#include "Graph.h" class papuInstrumentView; class NotePlayHandle; -class pixmapButton; +class PixmapButton; class papuInstrument : public Instrument { @@ -116,40 +116,40 @@ public: private: virtual void modelChanged(); - knob * m_ch1SweepTimeKnob; - pixmapButton * m_ch1SweepDirButton; - knob * m_ch1SweepRtShiftKnob; - knob * m_ch1WavePatternDutyKnob; - knob * m_ch1VolumeKnob; - pixmapButton * m_ch1VolSweepDirButton; - knob * m_ch1SweepStepLengthKnob; + Knob * m_ch1SweepTimeKnob; + PixmapButton * m_ch1SweepDirButton; + Knob * m_ch1SweepRtShiftKnob; + Knob * m_ch1WavePatternDutyKnob; + Knob * m_ch1VolumeKnob; + PixmapButton * m_ch1VolSweepDirButton; + Knob * m_ch1SweepStepLengthKnob; - knob * m_ch2WavePatternDutyKnob; - knob * m_ch2VolumeKnob; - pixmapButton * m_ch2VolSweepDirButton; - knob * m_ch2SweepStepLengthKnob; + Knob * m_ch2WavePatternDutyKnob; + Knob * m_ch2VolumeKnob; + PixmapButton * m_ch2VolSweepDirButton; + Knob * m_ch2SweepStepLengthKnob; - knob * m_ch3VolumeKnob; + Knob * m_ch3VolumeKnob; - knob * m_ch4VolumeKnob; - pixmapButton * m_ch4VolSweepDirButton; - knob * m_ch4SweepStepLengthKnob; - pixmapButton * m_ch4ShiftRegWidthButton; + Knob * m_ch4VolumeKnob; + PixmapButton * m_ch4VolSweepDirButton; + Knob * m_ch4SweepStepLengthKnob; + PixmapButton * m_ch4ShiftRegWidthButton; - knob * m_so1VolumeKnob; - knob * m_so2VolumeKnob; - pixmapButton * m_ch1So1Button; - pixmapButton * m_ch2So1Button; - pixmapButton * m_ch3So1Button; - pixmapButton * m_ch4So1Button; - pixmapButton * m_ch1So2Button; - pixmapButton * m_ch2So2Button; - pixmapButton * m_ch3So2Button; - pixmapButton * m_ch4So2Button; - knob * m_trebleKnob; - knob * m_bassKnob; + Knob * m_so1VolumeKnob; + Knob * m_so2VolumeKnob; + PixmapButton * m_ch1So1Button; + PixmapButton * m_ch2So1Button; + PixmapButton * m_ch3So1Button; + PixmapButton * m_ch4So1Button; + PixmapButton * m_ch1So2Button; + PixmapButton * m_ch2So2Button; + PixmapButton * m_ch3So2Button; + PixmapButton * m_ch4So2Button; + Knob * m_trebleKnob; + Knob * m_bassKnob; - graph * m_graph; + Graph * m_graph; /*protected slots: void updateKnobHint(); diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index 80dcb5f73..fc094f4e1 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -34,10 +34,10 @@ #include "gui_templates.h" #include "InstrumentTrack.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "Song.h" #include "string_pair_drag.h" -#include "tooltip.h" +#include "ToolTip.h" #include "FileDialog.h" #include "embed.cpp" @@ -448,7 +448,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) : setPalette( pal ); - m_openFileButton = new pixmapButton( this, NULL ); + m_openFileButton = new PixmapButton( this, NULL ); m_openFileButton->setObjectName( "openFileButton" ); m_openFileButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_openFileButton->move( 227, 86 ); @@ -458,13 +458,13 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) : "select_file" ) ); connect( m_openFileButton, SIGNAL( clicked() ), this, SLOT( openFile() ) ); - toolTip::add( m_openFileButton, tr( "Open other patch" ) ); + ToolTip::add( m_openFileButton, tr( "Open other patch" ) ); m_openFileButton->setWhatsThis( tr( "Click here to open another patch-file. Loop and Tune " "settings are not reset." ) ); - m_loopButton = new pixmapButton( this, tr( "Loop" ) ); + m_loopButton = new PixmapButton( this, tr( "Loop" ) ); m_loopButton->setObjectName("loopButton"); m_loopButton->setCheckable( true ); m_loopButton->move( 195, 138 ); @@ -472,13 +472,13 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) : "loop_on" ) ); m_loopButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_off" ) ); - toolTip::add( m_loopButton, tr( "Loop mode" ) ); + ToolTip::add( m_loopButton, tr( "Loop mode" ) ); m_loopButton->setWhatsThis( tr( "Here you can toggle the Loop mode. If enabled, PatMan " "will use the loop information available in the " "file." ) ); - m_tuneButton = new pixmapButton( this, tr( "Tune" ) ); + m_tuneButton = new PixmapButton( this, tr( "Tune" ) ); m_tuneButton->setObjectName("tuneButton"); m_tuneButton->setCheckable( true ); m_tuneButton->move( 223, 138 ); @@ -486,7 +486,7 @@ PatmanView::PatmanView( Instrument * _instrument, QWidget * _parent ) : "tune_on" ) ); m_tuneButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "tune_off" ) ); - toolTip::add( m_tuneButton, tr( "Tune mode" ) ); + ToolTip::add( m_tuneButton, tr( "Tune mode" ) ); m_tuneButton->setWhatsThis( tr( "Here you can toggle the Tune mode. If enabled, PatMan " "will tune the sample to match the note's " diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index 9bf61db8e..c5668262b 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -32,7 +32,7 @@ #include "AutomatableModel.h" #include "MemoryManager.h" -class pixmapButton; +class PixmapButton; #define MODES_16BIT ( 1 << 0 ) @@ -141,9 +141,9 @@ private: patmanInstrument * m_pi; QString m_displayFilename; - pixmapButton * m_openFileButton; - pixmapButton * m_loopButton; - pixmapButton * m_tuneButton; + PixmapButton * m_openFileButton; + PixmapButton * m_loopButton; + PixmapButton * m_tuneButton; } ; diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp index 359b23b9b..e1b76d31e 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp @@ -30,8 +30,8 @@ #include "peak_controller_effect_control_dialog.h" #include "peak_controller_effect_controls.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "embed.h" @@ -50,32 +50,32 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog( QHBoxLayout * l = new QHBoxLayout; l->setSpacing( 4 ); - m_baseKnob = new knob( knobBright_26, this ); + m_baseKnob = new Knob( knobBright_26, this ); m_baseKnob->setLabel( tr( "BASE" ) ); m_baseKnob->setModel( &_controls->m_baseModel ); m_baseKnob->setHintText( tr( "Base amount:" ) + " ", "" ); - m_amountKnob = new knob( knobBright_26, this ); + m_amountKnob = new Knob( knobBright_26, this ); m_amountKnob->setLabel( tr( "AMNT" ) ); m_amountKnob->setModel( &_controls->m_amountModel ); m_amountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" ); - m_amountMultKnob = new knob( knobBright_26, this ); + m_amountMultKnob = new Knob( knobBright_26, this ); m_amountMultKnob->setLabel( tr( "MULT" ) ); m_amountMultKnob->setModel( &_controls->m_amountMultModel ); m_amountMultKnob->setHintText( tr( "Amount Multiplicator:" ) + " ", "" ); - m_attackKnob = new knob( knobBright_26, this ); + m_attackKnob = new Knob( knobBright_26, this ); m_attackKnob->setLabel( tr( "ATCK" ) ); m_attackKnob->setModel( &_controls->m_attackModel ); m_attackKnob->setHintText( tr( "Attack:" ) + " ", "" ); - m_decayKnob = new knob( knobBright_26, this ); + m_decayKnob = new Knob( knobBright_26, this ); m_decayKnob->setLabel( tr( "DCAY" ) ); m_decayKnob->setModel( &_controls->m_decayModel ); m_decayKnob->setHintText( tr( "Release:" ) + " ", "" ); - m_tresholdKnob = new knob( knobBright_26, this ); + m_tresholdKnob = new Knob( knobBright_26, this ); m_tresholdKnob->setLabel( tr( "TRES" ) ); m_tresholdKnob->setModel( &_controls->m_tresholdModel ); m_tresholdKnob->setHintText( tr( "Treshold:" ) + " ", "" ); @@ -91,10 +91,10 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog( QVBoxLayout * l2 = new QVBoxLayout; // = 2nd vbox - m_muteLed = new ledCheckBox( "Mute Effect", this ); + m_muteLed = new LedCheckBox( "Mute Effect", this ); m_muteLed->setModel( &_controls->m_muteModel ); - m_absLed = new ledCheckBox( "Absolute Value", this ); + m_absLed = new LedCheckBox( "Absolute Value", this ); m_absLed->setModel( &_controls->m_absModel ); l2->addWidget( m_muteLed ); diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h index 64e876e37..fd859ada5 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h +++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h @@ -29,8 +29,8 @@ #include "EffectControlDialog.h" class PeakControllerEffectControls; -class knob; -class ledCheckBox; +class Knob; +class LedCheckBox; class PeakControllerEffectControlDialog : public EffectControlDialog @@ -44,15 +44,15 @@ public: protected: - knob * m_baseKnob; - knob * m_amountKnob; - knob * m_attackKnob; - knob * m_decayKnob; - knob * m_tresholdKnob; - ledCheckBox * m_muteLed; + Knob * m_baseKnob; + Knob * m_amountKnob; + Knob * m_attackKnob; + Knob * m_decayKnob; + Knob * m_tresholdKnob; + LedCheckBox * m_muteLed; - ledCheckBox * m_absLed; - knob * m_amountMultKnob; + LedCheckBox * m_absLed; + Knob * m_amountMultKnob; } ; diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.h b/plugins/peak_controller_effect/peak_controller_effect_controls.h index ad56fa99a..9bd671afb 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_controls.h +++ b/plugins/peak_controller_effect/peak_controller_effect_controls.h @@ -28,7 +28,7 @@ #include "EffectControls.h" #include "peak_controller_effect_control_dialog.h" -#include "knob.h" +#include "Knob.h" class PeakControllerEffect; diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index f6eb4c784..340759fd4 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -34,11 +34,11 @@ #include "InstrumentTrack.h" #include "InstrumentPlayHandle.h" #include "NotePlayHandle.h" -#include "knob.h" +#include "Knob.h" #include "Song.h" #include "patches_dialog.h" -#include "tooltip.h" +#include "ToolTip.h" #include "LcdSpinBox.h" #include "embed.cpp" @@ -788,11 +788,11 @@ PluginView * sf2Instrument::instantiateView( QWidget * _parent ) -class sf2Knob : public knob +class sf2Knob : public Knob { public: sf2Knob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 31, 38 ); } @@ -812,7 +812,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _paren connect( &k->m_patchNum, SIGNAL( dataChanged() ), this, SLOT( updatePatchName() ) ); // File Button - m_fileDialogButton = new pixmapButton( this ); + m_fileDialogButton = new PixmapButton( this ); m_fileDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_fileDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_on" ) ); m_fileDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fileselect_off" ) ); @@ -820,12 +820,12 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _paren connect( m_fileDialogButton, SIGNAL( clicked() ), this, SLOT( showFileDialog() ) ); - toolTip::add( m_fileDialogButton, tr( "Open other SoundFont file" ) ); + ToolTip::add( m_fileDialogButton, tr( "Open other SoundFont file" ) ); m_fileDialogButton->setWhatsThis( tr( "Click here to open another SF2 file" ) ); // Patch Button - m_patchDialogButton = new pixmapButton( this ); + m_patchDialogButton = new PixmapButton( this ); m_patchDialogButton->setCursor( QCursor( Qt::PointingHandCursor ) ); m_patchDialogButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_on" ) ); m_patchDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "patches_off" ) ); @@ -834,7 +834,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _paren connect( m_patchDialogButton, SIGNAL( clicked() ), this, SLOT( showPatchDialog() ) ); - toolTip::add( m_patchDialogButton, tr( "Choose the patch" ) ); + ToolTip::add( m_patchDialogButton, tr( "Choose the patch" ) ); // LCDs @@ -877,12 +877,12 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _paren // hl = new QHBoxLayout(); - m_reverbButton = new pixmapButton( this ); + m_reverbButton = new PixmapButton( this ); m_reverbButton->setCheckable( true ); m_reverbButton->move( 14, 180 ); m_reverbButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "reverb_on" ) ); m_reverbButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "reverb_off" ) ); - toolTip::add( m_reverbButton, tr( "Apply reverb (if supported)" ) ); + ToolTip::add( m_reverbButton, tr( "Apply reverb (if supported)" ) ); m_reverbButton->setWhatsThis( tr( "This button enables the reverb effect. " "This is useful for cool effects, but only works on " @@ -917,12 +917,12 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument, QWidget * _paren // Chorus // hl = new QHBoxLayout(); - m_chorusButton = new pixmapButton( this ); + m_chorusButton = new PixmapButton( this ); m_chorusButton->setCheckable( true ); m_chorusButton->move( 14, 226 ); m_chorusButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "chorus_on" ) ); m_chorusButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "chorus_off" ) ); - toolTip::add( m_reverbButton, tr( "Apply chorus (if supported)" ) ); + ToolTip::add( m_reverbButton, tr( "Apply chorus (if supported)" ) ); m_chorusButton->setWhatsThis( tr( "This button enables the chorus effect. " "This is useful for cool echo effects, but only works on " diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h index a7b9262b6..2a6995c01 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -30,11 +30,11 @@ #include #include "Instrument.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "InstrumentView.h" -#include "knob.h" +#include "Knob.h" #include "LcdSpinBox.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "fluidsynth.h" #include "SampleBuffer.h" #include "MemoryManager.h" @@ -198,8 +198,8 @@ public: private: virtual void modelChanged(); - pixmapButton * m_fileDialogButton; - pixmapButton * m_patchDialogButton; + PixmapButton * m_fileDialogButton; + PixmapButton * m_patchDialogButton; LcdSpinBox * m_bankNumLcd; LcdSpinBox * m_patchNumLcd; @@ -207,19 +207,19 @@ private: QLabel * m_filenameLabel; QLabel * m_patchLabel; - knob * m_gainKnob; + Knob * m_gainKnob; - pixmapButton * m_reverbButton; - knob * m_reverbRoomSizeKnob; - knob * m_reverbDampingKnob; - knob * m_reverbWidthKnob; - knob * m_reverbLevelKnob; + PixmapButton * m_reverbButton; + Knob * m_reverbRoomSizeKnob; + Knob * m_reverbDampingKnob; + Knob * m_reverbWidthKnob; + Knob * m_reverbLevelKnob; - pixmapButton * m_chorusButton; - knob * m_chorusNumKnob; - knob * m_chorusLevelKnob; - knob * m_chorusSpeedKnob; - knob * m_chorusDepthKnob; + PixmapButton * m_chorusButton; + Knob * m_chorusNumKnob; + Knob * m_chorusLevelKnob; + Knob * m_chorusSpeedKnob; + Knob * m_chorusDepthKnob; static patchesDialog * s_patchDialog; diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp index cd14af241..d06356c3e 100644 --- a/plugins/sfxr/sfxr.cpp +++ b/plugins/sfxr/sfxr.cpp @@ -41,11 +41,11 @@ float frnd(float range) #include "sfxr.h" #include "Engine.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "MidiEvent.h" #include "MidiTime.h" @@ -547,11 +547,11 @@ void sfxrInstrument::resetModels() -class sfxrKnob : public knob +class sfxrKnob : public Knob { public: sfxrKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 20, 20 ); setCenterPointX( 10.0 ); @@ -568,27 +568,27 @@ public: _knob = new sfxrKnob( this ); \ _knob->setHintText( tr( _name ":" ), "" ); \ _knob->move( _x, _y ); \ - toolTip::add( _knob, tr( _name ) ); + ToolTip::add( _knob, tr( _name ) ); #define createButton( _button, _x, _y, _name, _resName )\ - _button = new pixmapButton( this, tr( _name ) );\ + _button = new PixmapButton( this, tr( _name ) );\ _button->move( _x, _y );\ _button->setActiveGraphic( embed::getIconPixmap( _resName "_active" ) );\ _button->setInactiveGraphic( embed::getIconPixmap( _resName "_inactive" ) );\ - toolTip::add( _button, tr( _name ) ); + ToolTip::add( _button, tr( _name ) ); #define createButtonLocalGraphic( _button, _x, _y, _name, _resName )\ - _button = new pixmapButton( this, tr( _name ) );\ + _button = new PixmapButton( this, tr( _name ) );\ _button->move( _x, _y );\ _button->setActiveGraphic( PLUGIN_NAME::getIconPixmap( _resName "_active" ) );\ _button->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( _resName "_inactive" ) );\ - toolTip::add( _button, tr( _name ) ); + ToolTip::add( _button, tr( _name ) ); diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index d83c98283..c16b993fa 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -30,10 +30,10 @@ #include "Instrument.h" #include "InstrumentView.h" -#include "knob.h" -#include "graph.h" -#include "pixmap_button.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "Graph.h" +#include "PixmapButton.h" +#include "LedCheckbox.h" #include "MemoryManager.h" @@ -248,53 +248,53 @@ protected slots: private: virtual void modelChanged(); - knob * m_attKnob; //Attack Time - knob * m_holdKnob; //Sustain Time - knob * m_susKnob; //Sustain Punch - knob * m_decKnob; //Decay Time + Knob * m_attKnob; //Attack Time + Knob * m_holdKnob; //Sustain Time + Knob * m_susKnob; //Sustain Punch + Knob * m_decKnob; //Decay Time - knob * m_startFreqKnob; //Start Frequency - knob * m_minFreqKnob; //Min Frequency - knob * m_slideKnob; //Slide - knob * m_dSlideKnob; //Delta Slide - knob * m_vibDepthKnob; //Vibrato Depth - knob * m_vibSpeedKnob; //Vibrato Speed + Knob * m_startFreqKnob; //Start Frequency + Knob * m_minFreqKnob; //Min Frequency + Knob * m_slideKnob; //Slide + Knob * m_dSlideKnob; //Delta Slide + Knob * m_vibDepthKnob; //Vibrato Depth + Knob * m_vibSpeedKnob; //Vibrato Speed - knob * m_changeAmtKnob; //Change Amount - knob * m_changeSpeedKnob; //Change Speed + Knob * m_changeAmtKnob; //Change Amount + Knob * m_changeSpeedKnob; //Change Speed - knob * m_sqrDutyKnob; //Squre Duty - knob * m_sqrSweepKnob; //Squre Sweep + Knob * m_sqrDutyKnob; //Squre Duty + Knob * m_sqrSweepKnob; //Squre Sweep - knob * m_repeatSpeedKnob; //Repeat Speed + Knob * m_repeatSpeedKnob; //Repeat Speed - knob * m_phaserOffsetKnob; //Phaser Offset - knob * m_phaserSweepKnob; //Phaser Sweep + Knob * m_phaserOffsetKnob; //Phaser Offset + Knob * m_phaserSweepKnob; //Phaser Sweep - knob * m_lpFilCutKnob; //LP Filter Cutoff - knob * m_lpFilCutSweepKnob; //LP Filter Cutoff Sweep - knob * m_lpFilResoKnob; //LP Filter Resonance - knob * m_hpFilCutKnob; //HP Filter Cutoff - knob * m_hpFilCutSweepKnob; //HP Filter Cutoff Sweep + Knob * m_lpFilCutKnob; //LP Filter Cutoff + Knob * m_lpFilCutSweepKnob; //LP Filter Cutoff Sweep + Knob * m_lpFilResoKnob; //LP Filter Resonance + Knob * m_hpFilCutKnob; //HP Filter Cutoff + Knob * m_hpFilCutSweepKnob; //HP Filter Cutoff Sweep automatableButtonGroup * m_waveBtnGroup; - pixmapButton * m_sqrWaveBtn; //NOTE: This button has Squre Duty + PixmapButton * m_sqrWaveBtn; //NOTE: This button has Squre Duty //and Squre Speed configurable - pixmapButton * m_sawWaveBtn; - pixmapButton * m_sinWaveBtn; - pixmapButton * m_noiseWaveBtn; + PixmapButton * m_sawWaveBtn; + PixmapButton * m_sinWaveBtn; + PixmapButton * m_noiseWaveBtn; - pixmapButton * m_pickupBtn; - pixmapButton * m_laserBtn; - pixmapButton * m_explosionBtn; - pixmapButton * m_powerupBtn; - pixmapButton * m_hitBtn; - pixmapButton * m_jumpBtn; - pixmapButton * m_blipBtn; + PixmapButton * m_pickupBtn; + PixmapButton * m_laserBtn; + PixmapButton * m_explosionBtn; + PixmapButton * m_powerupBtn; + PixmapButton * m_hitBtn; + PixmapButton * m_jumpBtn; + PixmapButton * m_blipBtn; - pixmapButton * m_randomizeBtn; - pixmapButton * m_mutateBtn; + PixmapButton * m_randomizeBtn; + PixmapButton * m_mutateBtn; static QPixmap * s_artwork; }; diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 6942daa2d..0e64e83d7 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -34,10 +34,10 @@ #include "sid_instrument.h" #include "Engine.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" -#include "tooltip.h" +#include "PixmapButton.h" +#include "ToolTip.h" #include "embed.cpp" @@ -457,11 +457,11 @@ PluginView * sidInstrument::instantiateView( QWidget * _parent ) -class sidKnob : public knob +class sidKnob : public Knob { public: sidKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 16, 16 ); setCenterPointX( 7.5 ); @@ -498,47 +498,47 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, m_cutKnob->setHintText( tr( "Cutoff frequency:" ) + " ", "Hz" ); m_cutKnob->move( 7 + 2*28, 64 ); - pixmapButton * hp_btn = new pixmapButton( this, NULL ); + PixmapButton * hp_btn = new PixmapButton( this, NULL ); hp_btn->move( 140, 77 ); hp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "hpred" ) ); hp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "hp" ) ); - toolTip::add( hp_btn, tr( "High-Pass filter ") ); + ToolTip::add( hp_btn, tr( "High-Pass filter ") ); - pixmapButton * bp_btn = new pixmapButton( this, NULL ); + PixmapButton * bp_btn = new PixmapButton( this, NULL ); bp_btn->move( 164, 77 ); bp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "bpred" ) ); bp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bp" ) ); - toolTip::add( bp_btn, tr( "Band-Pass filter ") ); + ToolTip::add( bp_btn, tr( "Band-Pass filter ") ); - pixmapButton * lp_btn = new pixmapButton( this, NULL ); + PixmapButton * lp_btn = new PixmapButton( this, NULL ); lp_btn->move( 185, 77 ); lp_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "lpred" ) ); lp_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "lp" ) ); - toolTip::add( lp_btn, tr( "Low-Pass filter ") ); + ToolTip::add( lp_btn, tr( "Low-Pass filter ") ); m_passBtnGrp = new automatableButtonGroup( this ); m_passBtnGrp->addButton( hp_btn ); m_passBtnGrp->addButton( bp_btn ); m_passBtnGrp->addButton( lp_btn ); - m_offButton = new pixmapButton( this, NULL ); + m_offButton = new PixmapButton( this, NULL ); m_offButton->setCheckable( true ); m_offButton->move( 207, 77 ); m_offButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "3offred" ) ); m_offButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "3off" ) ); - toolTip::add( m_offButton, tr( "Voice3 Off ") ); + ToolTip::add( m_offButton, tr( "Voice3 Off ") ); - pixmapButton * mos6581_btn = new pixmapButton( this, NULL ); + PixmapButton * mos6581_btn = new PixmapButton( this, NULL ); mos6581_btn->move( 170, 59 ); mos6581_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "6581red" ) ); mos6581_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "6581" ) ); - toolTip::add( mos6581_btn, tr( "MOS6581 SID ") ); + ToolTip::add( mos6581_btn, tr( "MOS6581 SID ") ); - pixmapButton * mos8580_btn = new pixmapButton( this, NULL ); + PixmapButton * mos8580_btn = new PixmapButton( this, NULL ); mos8580_btn->move( 207, 59 ); mos8580_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "8580red" ) ); mos8580_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "8580" ) ); - toolTip::add( mos8580_btn, tr( "MOS8580 SID ") ); + ToolTip::add( mos8580_btn, tr( "MOS8580 SID ") ); m_sidTypeBtnGrp = new automatableButtonGroup( this ); m_sidTypeBtnGrp->addButton( mos6581_btn ); @@ -546,32 +546,32 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, for( int i = 0; i < 3; i++ ) { - knob *ak = new sidKnob( this ); + Knob *ak = new sidKnob( this ); ak->setHintText( tr("Attack:") + " ", "" ); ak->move( 7, 114 + i*50 ); ak->setWhatsThis( tr ( "Attack rate determines how rapidly the output " "of Voice %1 rises from zero to peak amplitude." ).arg( i+1 ) ); - knob *dk = new sidKnob( this ); + Knob *dk = new sidKnob( this ); dk->setHintText( tr("Decay:") + " ", "" ); dk->move( 7 + 28, 114 + i*50 ); dk->setWhatsThis( tr ( "Decay rate determines how rapidly the output " "falls from the peak amplitude to the selected Sustain level." ) ); - knob *sk = new sidKnob( this ); + Knob *sk = new sidKnob( this ); sk->setHintText( tr("Sustain:") + " ", "" ); sk->move( 7 + 2*28, 114 + i*50 ); sk->setWhatsThis( tr ( "Output of Voice %1 will remain at the selected " "Sustain amplitude as long as the note is held." ).arg( i+1 ) ); - knob *rk = new sidKnob( this ); + Knob *rk = new sidKnob( this ); rk->setHintText( tr("Release:") + " ", "" ); rk->move( 7 + 3*28, 114 + i*50 ); rk->setWhatsThis( tr ( "The output of of Voice %1 will fall from " "Sustain amplitude to zero amplitude at the selected Release " "rate." ).arg( i+1 ) ); - knob *pwk = new sidKnob( this ); + Knob *pwk = new sidKnob( this ); pwk->setHintText( tr("Pulse Width:") + " ", "" ); pwk->move( 7 + 4*28, 114 + i*50 ); pwk->setWhatsThis( tr ( "The Pulse Width resolution allows the width " @@ -579,43 +579,43 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, "waveform on Oscillator %1 must be selected to have any audible" " effect." ).arg( i+1 ) ); - knob *crsk = new sidKnob( this ); + Knob *crsk = new sidKnob( this ); crsk->setHintText( tr("Coarse:") + " ", " semitones" ); crsk->move( 147, 114 + i*50 ); crsk->setWhatsThis( tr ( "The Coarse detuning allows to detune Voice " "%1 one octave up or down." ).arg( i+1 ) ); - pixmapButton * pulse_btn = new pixmapButton( this, NULL ); + PixmapButton * pulse_btn = new PixmapButton( this, NULL ); pulse_btn->move( 187, 101 + i*50 ); pulse_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "pulsered" ) ); pulse_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pulse" ) ); - toolTip::add( pulse_btn, tr( "Pulse Wave" ) ); + ToolTip::add( pulse_btn, tr( "Pulse Wave" ) ); - pixmapButton * triangle_btn = new pixmapButton( this, NULL ); + PixmapButton * triangle_btn = new PixmapButton( this, NULL ); triangle_btn->move( 168, 101 + i*50 ); triangle_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "trianglered" ) ); triangle_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "triangle" ) ); - toolTip::add( triangle_btn, tr( "Triangle Wave" ) ); + ToolTip::add( triangle_btn, tr( "Triangle Wave" ) ); - pixmapButton * saw_btn = new pixmapButton( this, NULL ); + PixmapButton * saw_btn = new PixmapButton( this, NULL ); saw_btn->move( 207, 101 + i*50 ); saw_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sawred" ) ); saw_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "saw" ) ); - toolTip::add( saw_btn, tr( "SawTooth" ) ); + ToolTip::add( saw_btn, tr( "SawTooth" ) ); - pixmapButton * noise_btn = new pixmapButton( this, NULL ); + PixmapButton * noise_btn = new PixmapButton( this, NULL ); noise_btn->move( 226, 101 + i*50 ); noise_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "noisered" ) ); noise_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "noise" ) ); - toolTip::add( noise_btn, tr( "Noise" ) ); + ToolTip::add( noise_btn, tr( "Noise" ) ); automatableButtonGroup * wfbg = new automatableButtonGroup( this ); @@ -627,53 +627,53 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument, int syncRingWidth[] = { 3, 1, 2 }; - pixmapButton * sync_btn = new pixmapButton( this, NULL ); + PixmapButton * sync_btn = new PixmapButton( this, NULL ); sync_btn->setCheckable( true ); sync_btn->move( 207, 134 + i*50 ); sync_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "syncred" ) ); sync_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sync" ) ); - toolTip::add( sync_btn, tr( "Sync" ) ); + ToolTip::add( sync_btn, tr( "Sync" ) ); sync_btn->setWhatsThis( tr ( "Sync synchronizes the fundamental " "frequency of Oscillator %1 with the fundamental frequency of " "Oscillator %2 producing \"Hard Sync\" effects." ).arg( i+1 ) .arg( syncRingWidth[i] ) ); - pixmapButton * ringMod_btn = new pixmapButton( this, NULL ); + PixmapButton * ringMod_btn = new PixmapButton( this, NULL ); ringMod_btn->setCheckable( true ); ringMod_btn->move( 170, 116 + i*50 ); ringMod_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "ringred" ) ); ringMod_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "ring" ) ); - toolTip::add( ringMod_btn, tr( "Ring-Mod" ) ); + ToolTip::add( ringMod_btn, tr( "Ring-Mod" ) ); ringMod_btn->setWhatsThis( tr ( "Ring-mod replaces the Triangle " "Waveform output of Oscillator %1 with a \"Ring Modulated\" " "combination of Oscillators %1 and %2." ).arg( i+1 ) .arg( syncRingWidth[i] ) ); - pixmapButton * filter_btn = new pixmapButton( this, NULL ); + PixmapButton * filter_btn = new PixmapButton( this, NULL ); filter_btn->setCheckable( true ); filter_btn->move( 207, 116 + i*50 ); filter_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "filterred" ) ); filter_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "filter" ) ); - toolTip::add( filter_btn, tr( "Filtered" ) ); + ToolTip::add( filter_btn, tr( "Filtered" ) ); filter_btn->setWhatsThis( tr ( "When Filtered is on, Voice %1 will be " "processed through the Filter. When Filtered is off, Voice %1 " "appears directly at the output, and the Filter has no effect on " "it." ).arg( i+1 ) ); - pixmapButton * test_btn = new pixmapButton( this, NULL ); + PixmapButton * test_btn = new PixmapButton( this, NULL ); test_btn->setCheckable( true ); test_btn->move( 170, 134 + i*50 ); test_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "testred" ) ); test_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "test" ) ); - toolTip::add( test_btn, tr( "Test" ) ); + ToolTip::add( test_btn, tr( "Test" ) ); test_btn->setWhatsThis( tr ( "Test, when set, resets and locks " "Oscillator %1 at zero until Test is turned off." ).arg( i+1 ) ); @@ -696,32 +696,32 @@ void sidInstrumentView::updateKnobHint() m_voiceKnobs[i].m_attKnob->setHintText( tr( "Attack:" ) + " ", " (" + QString::fromLatin1( attackTime[(int)k->m_voice[i]-> m_attackModel.value()] ) + ")" ); - toolTip::add( m_voiceKnobs[i].m_attKnob, + ToolTip::add( m_voiceKnobs[i].m_attKnob, attackTime[(int)k->m_voice[i]->m_attackModel.value()] ); m_voiceKnobs[i].m_decKnob->setHintText( tr( "Decay:" ) + " ", " (" + QString::fromLatin1( decRelTime[(int)k->m_voice[i]-> m_decayModel.value()] ) + ")" ); - toolTip::add( m_voiceKnobs[i].m_decKnob, + ToolTip::add( m_voiceKnobs[i].m_decKnob, decRelTime[(int)k->m_voice[i]->m_decayModel.value()] ); m_voiceKnobs[i].m_relKnob->setHintText( tr( "Release:" ) + " ", " (" + QString::fromLatin1( decRelTime[(int)k->m_voice[i]-> m_releaseModel.value()] ) + ")" ); - toolTip::add( m_voiceKnobs[i].m_relKnob, + ToolTip::add( m_voiceKnobs[i].m_relKnob, decRelTime[(int)k->m_voice[i]->m_releaseModel.value()]); m_voiceKnobs[i].m_pwKnob->setHintText( tr( "Pulse Width:" )+ " ", " (" + QString::number( (double)k->m_voice[i]-> m_pulseWidthModel.value() / 40.95 ) + "%)" ); - toolTip::add( m_voiceKnobs[i].m_pwKnob, + ToolTip::add( m_voiceKnobs[i].m_pwKnob, QString::number( (double)k->m_voice[i]-> m_pulseWidthModel.value() / 40.95 ) + "%" ); } m_cutKnob->setHintText( tr( "Cutoff frequency:" ) + " ", " (" + QString::number ( (int) ( 9970.0 / 2047.0 * (double)k->m_filterFCModel.value() + 30.0 ) ) + "Hz)" ); - toolTip::add( m_cutKnob, QString::number( (int) ( 9970.0 / 2047.0 * + ToolTip::add( m_cutKnob, QString::number( (int) ( 9970.0 / 2047.0 * (double)k->m_filterFCModel.value() + 30.0 ) ) + "Hz" ); } @@ -733,15 +733,15 @@ void sidInstrumentView::updateKnobToolTip() sidInstrument * k = castModel(); for( int i = 0; i < 3; ++i ) { - toolTip::add( m_voiceKnobs[i].m_sustKnob, + ToolTip::add( m_voiceKnobs[i].m_sustKnob, QString::number( (int)k->m_voice[i]->m_sustainModel.value() ) ); - toolTip::add( m_voiceKnobs[i].m_crsKnob, + ToolTip::add( m_voiceKnobs[i].m_crsKnob, QString::number( (int)k->m_voice[i]->m_coarseModel.value() ) + " semitones" ); } - toolTip::add( m_volKnob, + ToolTip::add( m_volKnob, QString::number( (int)k->m_volumeModel.value() ) ); - toolTip::add( m_resKnob, + ToolTip::add( m_resKnob, QString::number( (int)k->m_filterResonanceModel.value() ) ); } diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index 45b6e7d4d..5e8770675 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -30,13 +30,13 @@ #include #include "Instrument.h" #include "InstrumentView.h" -#include "knob.h" +#include "Knob.h" class sidInstrumentView; class NotePlayHandle; class automatableButtonGroup; -class pixmapButton; +class PixmapButton; class voiceObject : public Model { @@ -147,17 +147,17 @@ private: struct voiceKnobs { - voiceKnobs( knob * a, - knob * d, - knob * s, - knob * r, - knob * pw, - knob * crs, + voiceKnobs( Knob * a, + Knob * d, + Knob * s, + Knob * r, + Knob * pw, + Knob * crs, automatableButtonGroup * wfbg, - pixmapButton * syncb, - pixmapButton * ringb, - pixmapButton * filterb, - pixmapButton * testb ) : + PixmapButton * syncb, + PixmapButton * ringb, + PixmapButton * filterb, + PixmapButton * testb ) : m_attKnob( a ), m_decKnob( d ), m_sustKnob( s ), @@ -174,25 +174,25 @@ private: voiceKnobs() { } - knob * m_attKnob; - knob * m_decKnob; - knob * m_sustKnob; - knob * m_relKnob; - knob * m_pwKnob; - knob * m_crsKnob; + Knob * m_attKnob; + Knob * m_decKnob; + Knob * m_sustKnob; + Knob * m_relKnob; + Knob * m_pwKnob; + Knob * m_crsKnob; automatableButtonGroup * m_waveFormBtnGrp; - pixmapButton * m_syncButton; - pixmapButton * m_ringModButton; - pixmapButton * m_filterButton; - pixmapButton * m_testButton; + PixmapButton * m_syncButton; + PixmapButton * m_ringModButton; + PixmapButton * m_filterButton; + PixmapButton * m_testButton; } ; voiceKnobs m_voiceKnobs[3]; - knob * m_volKnob; - knob * m_resKnob; - knob * m_cutKnob; - pixmapButton * m_offButton; + Knob * m_volKnob; + Knob * m_resKnob; + Knob * m_cutKnob; + PixmapButton * m_offButton; protected slots: void updateKnobHint(); diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp index 5013883d2..42fabf427 100644 --- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.cpp @@ -37,7 +37,7 @@ stereoEnhancerControlDialog::stereoEnhancerControlDialog( { QHBoxLayout * l = new QHBoxLayout( this ); - knob * widthKnob = new knob( knobBright_26, this ); + Knob * widthKnob = new Knob( knobBright_26, this ); widthKnob->setModel( &_controls->m_widthModel ); widthKnob->setLabel( tr( "WIDE" ) ); widthKnob->setHintText( tr( "Width:" ) + " ", "samples" ); diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.h b/plugins/stereo_enhancer/stereoenhancer_controls.h index 6616bf3e0..7448449cf 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.h +++ b/plugins/stereo_enhancer/stereoenhancer_controls.h @@ -27,7 +27,7 @@ #include "EffectControls.h" #include "stereoenhancer_control_dialog.h" -#include "knob.h" +#include "Knob.h" class stereoEnhancerEffect; diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp index 22ea484a4..3017973ea 100644 --- a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp +++ b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp @@ -47,22 +47,22 @@ stereoMatrixControlDialog::stereoMatrixControlDialog( setPalette( pal ); - knob * llKnob = new knob( knobSmall_17, this ); + Knob * llKnob = new Knob( knobSmall_17, this ); llKnob->setModel( &_controls->m_llModel ); llKnob->setHintText( tr( "Left to Left Vol:" ) + " ", "" ); llKnob->move( 40, 60 ); - knob * lrKnob = new knob( knobSmall_17, this ); + Knob * lrKnob = new Knob( knobSmall_17, this ); lrKnob->setModel( &_controls->m_lrModel ); lrKnob->setHintText( tr( "Left to Right Vol:" ) + " ", "" ); lrKnob->move( 40+28, 60); - knob * rlKnob = new knob( knobSmall_17, this ); + Knob * rlKnob = new Knob( knobSmall_17, this ); rlKnob->setModel( &_controls->m_rlModel ); rlKnob->setHintText( tr( "Right to Left Vol:" ) + " ", "" ); rlKnob->move( 40, 60+28 ); - knob * rrKnob = new knob( knobSmall_17, this ); + Knob * rrKnob = new Knob( knobSmall_17, this ); rrKnob->setModel( &_controls->m_rrModel ); rrKnob->setHintText( tr( "Right to Right Vol:" ) + " ", "" ); rrKnob->move( 40+28, 60+28 ); diff --git a/plugins/stereo_matrix/stereomatrix_controls.h b/plugins/stereo_matrix/stereomatrix_controls.h index 8604b4d34..8f5443fd1 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.h +++ b/plugins/stereo_matrix/stereomatrix_controls.h @@ -27,7 +27,7 @@ #include "EffectControls.h" #include "stereomatrix_control_dialog.h" -#include "knob.h" +#include "Knob.h" class stereoMatrixEffect; diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index d34bde876..433a6883b 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -324,14 +324,14 @@ malletsInstrumentView::malletsInstrumentView( malletsInstrument * _instrument, m_bandedWGWidget->hide(); m_bandedWGWidget->move( 0,0 ); - m_presetsCombo = new comboBox( this, tr( "Instrument" ) ); + m_presetsCombo = new ComboBox( this, tr( "Instrument" ) ); m_presetsCombo->setGeometry( 140, 50, 99, 22 ); m_presetsCombo->setFont( pointSize<8>( m_presetsCombo->font() ) ); connect( &_instrument->m_presetsModel, SIGNAL( dataChanged() ), this, SLOT( changePreset() ) ); - m_spreadKnob = new knob( knobVintage_32, this ); + m_spreadKnob = new Knob( knobVintage_32, this ); m_spreadKnob->setLabel( tr( "Spread" ) ); m_spreadKnob->move( 190, 140 ); m_spreadKnob->setHintText( tr( "Spread:" ) + " ", "" ); @@ -363,27 +363,27 @@ QWidget * malletsInstrumentView::setupModalBarControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_hardnessKnob = new knob( knobVintage_32, widget ); + m_hardnessKnob = new Knob( knobVintage_32, widget ); m_hardnessKnob->setLabel( tr( "Hardness" ) ); m_hardnessKnob->move( 30, 90 ); m_hardnessKnob->setHintText( tr( "Hardness:" ) + " ", "" ); - m_positionKnob = new knob( knobVintage_32, widget ); + m_positionKnob = new Knob( knobVintage_32, widget ); m_positionKnob->setLabel( tr( "Position" ) ); m_positionKnob->move( 110, 90 ); m_positionKnob->setHintText( tr( "Position:" ) + " ", "" ); - m_vibratoGainKnob = new knob( knobVintage_32, widget ); + m_vibratoGainKnob = new Knob( knobVintage_32, widget ); m_vibratoGainKnob->setLabel( tr( "Vib Gain" ) ); m_vibratoGainKnob->move( 30, 140 ); m_vibratoGainKnob->setHintText( tr( "Vib Gain:" ) + " ", "" ); - m_vibratoFreqKnob = new knob( knobVintage_32, widget ); + m_vibratoFreqKnob = new Knob( knobVintage_32, widget ); m_vibratoFreqKnob->setLabel( tr( "Vib Freq" ) ); m_vibratoFreqKnob->move( 110, 140 ); m_vibratoFreqKnob->setHintText( tr( "Vib Freq:" ) + " ", "" ); - m_stickKnob = new knob( knobVintage_32, widget ); + m_stickKnob = new Knob( knobVintage_32, widget ); m_stickKnob->setLabel( tr( "Stick Mix" ) ); m_stickKnob->move( 190, 90 ); m_stickKnob->setHintText( tr( "Stick Mix:" ) + " ", "" ); @@ -399,27 +399,27 @@ QWidget * malletsInstrumentView::setupTubeBellControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_modulatorKnob = new knob( knobVintage_32, widget ); + m_modulatorKnob = new Knob( knobVintage_32, widget ); m_modulatorKnob->setLabel( tr( "Modulator" ) ); m_modulatorKnob->move( 30, 90 ); m_modulatorKnob->setHintText( tr( "Modulator:" ) + " ", "" ); - m_crossfadeKnob = new knob( knobVintage_32, widget ); + m_crossfadeKnob = new Knob( knobVintage_32, widget ); m_crossfadeKnob->setLabel( tr( "Crossfade" ) ); m_crossfadeKnob->move( 110, 90 ); m_crossfadeKnob->setHintText( tr( "Crossfade:" ) + " ", "" ); - m_lfoSpeedKnob = new knob( knobVintage_32, widget ); + m_lfoSpeedKnob = new Knob( knobVintage_32, widget ); m_lfoSpeedKnob->setLabel( tr( "LFO Speed" ) ); m_lfoSpeedKnob->move( 30, 140 ); m_lfoSpeedKnob->setHintText( tr( "LFO Speed:" ) + " ", "" ); - m_lfoDepthKnob = new knob( knobVintage_32, widget ); + m_lfoDepthKnob = new Knob( knobVintage_32, widget ); m_lfoDepthKnob->setLabel( tr( "LFO Depth" ) ); m_lfoDepthKnob->move( 110, 140 ); m_lfoDepthKnob->setHintText( tr( "LFO Depth:" ) + " ", "" ); - m_adsrKnob = new knob( knobVintage_32, widget ); + m_adsrKnob = new Knob( knobVintage_32, widget ); m_adsrKnob->setLabel( tr( "ADSR" ) ); m_adsrKnob->move( 190, 90 ); m_adsrKnob->setHintText( tr( "ADSR:" ) + " ", "" ); @@ -436,25 +436,25 @@ QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent ) QWidget * widget = new QWidget( _parent ); widget->setFixedSize( 250, 250 ); - m_strikeLED = new ledCheckBox( tr( "Bowed" ), widget ); + m_strikeLED = new LedCheckBox( tr( "Bowed" ), widget ); m_strikeLED->move( 138, 25 ); - m_pressureKnob = new knob( knobVintage_32, widget ); + m_pressureKnob = new Knob( knobVintage_32, widget ); m_pressureKnob->setLabel( tr( "Pressure" ) ); m_pressureKnob->move( 30, 90 ); m_pressureKnob->setHintText( tr( "Pressure:" ) + " ", "" ); - m_motionKnob = new knob( knobVintage_32, widget ); + m_motionKnob = new Knob( knobVintage_32, widget ); m_motionKnob->setLabel( tr( "Motion" ) ); m_motionKnob->move( 110, 90 ); m_motionKnob->setHintText( tr( "Motion:" ) + " ", "" ); - m_velocityKnob = new knob( knobVintage_32, widget ); + m_velocityKnob = new Knob( knobVintage_32, widget ); m_velocityKnob->setLabel( tr( "Speed" ) ); m_velocityKnob->move( 30, 140 ); m_velocityKnob->setHintText( tr( "Speed:" ) + " ", "" ); - m_vibratoKnob = new knob( knobVintage_32, widget, tr( "Vibrato" ) ); + m_vibratoKnob = new Knob( knobVintage_32, widget, tr( "Vibrato" ) ); m_vibratoKnob->setLabel( tr( "Vibrato" ) ); m_vibratoKnob->move( 110, 140 ); m_vibratoKnob->setHintText( tr( "Vibrato:" ) + " ", "" ); diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h index 2213d9666..11311bfac 100644 --- a/plugins/stk/mallets/mallets.h +++ b/plugins/stk/mallets/mallets.h @@ -29,12 +29,12 @@ #include "Instrmnt.h" -#include "combobox.h" +#include "ComboBox.h" #include "Instrument.h" #include "InstrumentView.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" // As of Stk 4.4 all classes and types have been moved to the namespace "stk". // However in older versions this namespace does not exist, therefore declare it @@ -203,28 +203,28 @@ private: QWidget * setupBandedWGControls( QWidget * _parent ); QWidget * m_modalBarWidget; - knob * m_hardnessKnob; - knob * m_positionKnob; - knob * m_vibratoGainKnob; - knob * m_vibratoFreqKnob; - knob * m_stickKnob; + Knob * m_hardnessKnob; + Knob * m_positionKnob; + Knob * m_vibratoGainKnob; + Knob * m_vibratoFreqKnob; + Knob * m_stickKnob; QWidget * m_tubeBellWidget; - knob * m_modulatorKnob; - knob * m_crossfadeKnob; - knob * m_lfoSpeedKnob; - knob * m_lfoDepthKnob; - knob * m_adsrKnob; + Knob * m_modulatorKnob; + Knob * m_crossfadeKnob; + Knob * m_lfoSpeedKnob; + Knob * m_lfoDepthKnob; + Knob * m_adsrKnob; QWidget * m_bandedWGWidget; - knob * m_pressureKnob; - knob * m_motionKnob; - knob * m_vibratoKnob; - knob * m_velocityKnob; - ledCheckBox * m_strikeLED; + Knob * m_pressureKnob; + Knob * m_motionKnob; + Knob * m_vibratoKnob; + Knob * m_velocityKnob; + LedCheckBox * m_strikeLED; - comboBox * m_presetsCombo; - knob * m_spreadKnob; + ComboBox * m_presetsCombo; + Knob * m_spreadKnob; }; #endif diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index 154aeb666..360b7ad24 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -32,11 +32,11 @@ #include "debug.h" #include "Engine.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "SampleBuffer.h" -#include "tooltip.h" +#include "ToolTip.h" #include "embed.cpp" @@ -141,7 +141,7 @@ void OscillatorObject::oscUserDefWaveDblClick() if( af != "" ) { // TODO: - //toolTip::add( m_usrWaveBtn, m_sampleBuffer->audioFile() ); + //ToolTip::add( m_usrWaveBtn, m_sampleBuffer->audioFile() ); } } @@ -403,11 +403,11 @@ void TripleOscillator::updateAllDetuning() -class TripleOscKnob : public knob +class TripleOscKnob : public Knob { public: TripleOscKnob( QWidget * _parent ) : - knob( knobStyled, _parent ) + Knob( knobStyled, _parent ) { setFixedSize( 28, 35 ); } @@ -433,50 +433,50 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, const int osc_h = 52; // TODO: clean rewrite using layouts and all that... - pixmapButton * pm_osc1_btn = new pixmapButton( this, NULL ); + PixmapButton * pm_osc1_btn = new PixmapButton( this, NULL ); pm_osc1_btn->move( mod_x, mod1_y ); pm_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_active" ) ); pm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); - toolTip::add( pm_osc1_btn, tr( "Use phase modulation for " + ToolTip::add( pm_osc1_btn, tr( "Use phase modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); - pixmapButton * am_osc1_btn = new pixmapButton( this, NULL ); + PixmapButton * am_osc1_btn = new PixmapButton( this, NULL ); am_osc1_btn->move( mod_x + 35, mod1_y ); am_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "am_active" ) ); am_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "am_inactive" ) ); - toolTip::add( am_osc1_btn, tr( "Use amplitude modulation for " + ToolTip::add( am_osc1_btn, tr( "Use amplitude modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); - pixmapButton * mix_osc1_btn = new pixmapButton( this, NULL ); + PixmapButton * mix_osc1_btn = new PixmapButton( this, NULL ); mix_osc1_btn->move( mod_x + 70, mod1_y ); mix_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_active" ) ); mix_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_inactive" ) ); - toolTip::add( mix_osc1_btn, tr( "Mix output of oscillator 1 & 2" ) ); + ToolTip::add( mix_osc1_btn, tr( "Mix output of oscillator 1 & 2" ) ); - pixmapButton * sync_osc1_btn = new pixmapButton( this, NULL ); + PixmapButton * sync_osc1_btn = new PixmapButton( this, NULL ); sync_osc1_btn->move( mod_x + 105, mod1_y ); sync_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_active" ) ); sync_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_inactive" ) ); - toolTip::add( sync_osc1_btn, tr( "Synchronize oscillator 1 with " + ToolTip::add( sync_osc1_btn, tr( "Synchronize oscillator 1 with " "oscillator 2" ) ); - pixmapButton * fm_osc1_btn = new pixmapButton( this, NULL ); + PixmapButton * fm_osc1_btn = new PixmapButton( this, NULL ); fm_osc1_btn->move( mod_x + 140, mod1_y ); fm_osc1_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_active" ) ); fm_osc1_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_inactive" ) ); - toolTip::add( fm_osc1_btn, tr( "Use frequency modulation for " + ToolTip::add( fm_osc1_btn, tr( "Use frequency modulation for " "modulating oscillator 2 with " "oscillator 1" ) ); @@ -489,50 +489,50 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, - pixmapButton * pm_osc2_btn = new pixmapButton( this, NULL ); + PixmapButton * pm_osc2_btn = new PixmapButton( this, NULL ); pm_osc2_btn->move( mod_x, mod2_y ); pm_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_active" ) ); pm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "pm_inactive" ) ); - toolTip::add( pm_osc2_btn, tr( "Use phase modulation for " + ToolTip::add( pm_osc2_btn, tr( "Use phase modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); - pixmapButton * am_osc2_btn = new pixmapButton( this, NULL ); + PixmapButton * am_osc2_btn = new PixmapButton( this, NULL ); am_osc2_btn->move( mod_x + 35, mod2_y ); am_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "am_active" ) ); am_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "am_inactive" ) ); - toolTip::add( am_osc2_btn, tr( "Use amplitude modulation for " + ToolTip::add( am_osc2_btn, tr( "Use amplitude modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); - pixmapButton * mix_osc2_btn = new pixmapButton( this, NULL ); + PixmapButton * mix_osc2_btn = new PixmapButton( this, NULL ); mix_osc2_btn->move( mod_x + 70, mod2_y ); mix_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_active" ) ); mix_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "mix_inactive" ) ); - toolTip::add( mix_osc2_btn, tr("Mix output of oscillator 2 & 3" ) ); + ToolTip::add( mix_osc2_btn, tr("Mix output of oscillator 2 & 3" ) ); - pixmapButton * sync_osc2_btn = new pixmapButton( this, NULL ); + PixmapButton * sync_osc2_btn = new PixmapButton( this, NULL ); sync_osc2_btn->move( mod_x + 105, mod2_y ); sync_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_active" ) ); sync_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sync_inactive" ) ); - toolTip::add( sync_osc2_btn, tr( "Synchronize oscillator 2 with " + ToolTip::add( sync_osc2_btn, tr( "Synchronize oscillator 2 with " "oscillator 3" ) ); - pixmapButton * fm_osc2_btn = new pixmapButton( this, NULL ); + PixmapButton * fm_osc2_btn = new PixmapButton( this, NULL ); fm_osc2_btn->move( mod_x + 140, mod2_y ); fm_osc2_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_active" ) ); fm_osc2_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "fm_inactive" ) ); - toolTip::add( fm_osc2_btn, tr( "Use frequency modulation for " + ToolTip::add( fm_osc2_btn, tr( "Use frequency modulation for " "modulating oscillator 3 with " "oscillator 2" ) ); @@ -550,7 +550,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, int knob_y = osc_y + i * osc_h; // setup volume-knob - knob * vk = new knob( knobStyled, this ); + Knob * vk = new Knob( knobStyled, this ); vk->setVolumeKnob( true ); vk->setFixedSize( 28, 35 ); vk->move( 6, knob_y ); @@ -564,7 +564,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, "here.").arg( i+1 ) ); // setup panning-knob - knob * pk = new TripleOscKnob( this ); + Knob * pk = new TripleOscKnob( this ); pk->move( 35, knob_y ); pk->setHintText( tr("Osc %1 panning:").arg( i + 1 ) + " ", "" ); pk->setWhatsThis( @@ -574,7 +574,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, "output right.").arg( i+1 ) ); // setup coarse-knob - knob * ck = new TripleOscKnob( this ); + Knob * ck = new TripleOscKnob( this ); ck->move( 82, knob_y ); ck->setHintText( tr( "Osc %1 coarse detuning:" ).arg( i + 1 ) + " ", " " + tr( "semitones" ) ); @@ -587,7 +587,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, // setup knob for left fine-detuning - knob * flk = new TripleOscKnob( this ); + Knob * flk = new TripleOscKnob( this ); flk->move( 111, knob_y ); flk->setHintText( tr( "Osc %1 fine detuning left:" ). arg( i + 1 ) + " ", @@ -600,7 +600,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, "\"fat\" sounds." ).arg( i + 1 ) ); // setup knob for right fine-detuning - knob * frk = new TripleOscKnob( this ); + Knob * frk = new TripleOscKnob( this ); frk->move( 140, knob_y ); frk->setHintText( tr( "Osc %1 fine detuning right:" ). arg( i + 1 ) + " ", @@ -614,7 +614,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, // setup phase-offset-knob - knob * pok = new TripleOscKnob( this ); + Knob * pok = new TripleOscKnob( this ); pok->move( 188, knob_y ); pok->setHintText( tr( "Osc %1 phase-offset:" ). arg( i + 1 ) + " ", @@ -630,7 +630,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, ).arg( i+1 ) ); // setup stereo-phase-detuning-knob - knob * spdk = new TripleOscKnob( this ); + Knob * spdk = new TripleOscKnob( this ); spdk->move( 217, knob_y ); spdk->setHintText( tr("Osc %1 stereo phase-detuning:" ). arg( i + 1 ) + " ", @@ -645,85 +645,85 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, int btn_y = 96 + i * osc_h; - pixmapButton * sin_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * sin_wave_btn = new PixmapButton( this, NULL ); sin_wave_btn->move( 128, btn_y ); sin_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sin_shape_active" ) ); sin_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sin_shape_inactive" ) ); - toolTip::add( sin_wave_btn, + ToolTip::add( sin_wave_btn, tr( "Use a sine-wave for " "current oscillator." ) ); - pixmapButton * triangle_wave_btn = - new pixmapButton( this, NULL ); + PixmapButton * triangle_wave_btn = + new PixmapButton( this, NULL ); triangle_wave_btn->move( 143, btn_y ); triangle_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "triangle_shape_active" ) ); triangle_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "triangle_shape_inactive" ) ); - toolTip::add( triangle_wave_btn, + ToolTip::add( triangle_wave_btn, tr( "Use a triangle-wave " "for current oscillator." ) ); - pixmapButton * saw_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * saw_wave_btn = new PixmapButton( this, NULL ); saw_wave_btn->move( 158, btn_y ); saw_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "saw_shape_active" ) ); saw_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "saw_shape_inactive" ) ); - toolTip::add( saw_wave_btn, + ToolTip::add( saw_wave_btn, tr( "Use a saw-wave for " "current oscillator." ) ); - pixmapButton * sqr_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * sqr_wave_btn = new PixmapButton( this, NULL ); sqr_wave_btn->move( 173, btn_y ); sqr_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "square_shape_active" ) ); sqr_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "square_shape_inactive" ) ); - toolTip::add( sqr_wave_btn, + ToolTip::add( sqr_wave_btn, tr( "Use a square-wave for " "current oscillator." ) ); - pixmapButton * moog_saw_wave_btn = - new pixmapButton( this, NULL ); + PixmapButton * moog_saw_wave_btn = + new PixmapButton( this, NULL ); moog_saw_wave_btn->move( 188, btn_y ); moog_saw_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "moog_saw_shape_active" ) ); moog_saw_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "moog_saw_shape_inactive" ) ); - toolTip::add( moog_saw_wave_btn, + ToolTip::add( moog_saw_wave_btn, tr( "Use a moog-like saw-wave " "for current oscillator." ) ); - pixmapButton * exp_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * exp_wave_btn = new PixmapButton( this, NULL ); exp_wave_btn->move( 203, btn_y ); exp_wave_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "exp_shape_active" ) ); exp_wave_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "exp_shape_inactive" ) ); - toolTip::add( exp_wave_btn, + ToolTip::add( exp_wave_btn, tr( "Use an exponential " "wave for current oscillator." ) ); - pixmapButton * white_noise_btn = new pixmapButton( this, NULL ); + PixmapButton * white_noise_btn = new PixmapButton( this, NULL ); white_noise_btn->move( 218, btn_y ); white_noise_btn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "white_noise_shape_active" ) ); white_noise_btn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "white_noise_shape_inactive" ) ); - toolTip::add( white_noise_btn, + ToolTip::add( white_noise_btn, tr( "Use white-noise for " "current oscillator." ) ); - pixmapButton * uwb = new pixmapButton( this, NULL ); + PixmapButton * uwb = new PixmapButton( this, NULL ); uwb->move( 233, btn_y ); uwb->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "usr_shape_active" ) ); uwb->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "usr_shape_inactive" ) ); - toolTip::add( uwb, tr( "Use a user-defined " + ToolTip::add( uwb, tr( "Use a user-defined " "waveform for current oscillator." ) ); automatableButtonGroup * wsbg = diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h index 622472080..a339fe899 100644 --- a/plugins/triple_oscillator/TripleOscillator.h +++ b/plugins/triple_oscillator/TripleOscillator.h @@ -33,9 +33,9 @@ class automatableButtonGroup; -class knob; +class Knob; class NotePlayHandle; -class pixmapButton; +class PixmapButton; class SampleBuffer; const int NUM_OF_OSCILLATORS = 3; @@ -153,14 +153,14 @@ private: struct OscillatorKnobs { MM_OPERATORS - OscillatorKnobs( knob * v, - knob * p, - knob * c, - knob * fl, - knob * fr, - knob * po, - knob * spd, - pixmapButton * uwb, + OscillatorKnobs( Knob * v, + Knob * p, + Knob * c, + Knob * fl, + Knob * fr, + Knob * po, + Knob * spd, + PixmapButton * uwb, automatableButtonGroup * wsbg ) : m_volKnob( v ), m_panKnob( p ), @@ -176,14 +176,14 @@ private: OscillatorKnobs() { } - knob * m_volKnob; - knob * m_panKnob; - knob * m_coarseKnob; - knob * m_fineLeftKnob; - knob * m_fineRightKnob; - knob * m_phaseOffsetKnob; - knob * m_stereoPhaseDetuningKnob; - pixmapButton * m_userWaveButton; + Knob * m_volKnob; + Knob * m_panKnob; + Knob * m_coarseKnob; + Knob * m_fineLeftKnob; + Knob * m_fineRightKnob; + Knob * m_phaseOffsetKnob; + Knob * m_stereoPhaseDetuningKnob; + PixmapButton * m_userWaveButton; automatableButtonGroup * m_waveShapeBtnGrp; } ; diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 4b3f7b386..69349b3bf 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -38,10 +38,10 @@ #include "InstrumentTrack.h" #include "VstPlugin.h" #include "MainWindow.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "string_pair_drag.h" -#include "text_float.h" -#include "tooltip.h" +#include "TextFloat.h" +#include "ToolTip.h" #include "FileDialog.h" #include "embed.cpp" @@ -119,7 +119,7 @@ void vestigeInstrument::loadSettings( const QDomElement & _this ) const QMap & dump = m_plugin->parameterDump(); paramCount = dump.size(); char paramStr[35]; - vstKnobs = new knob *[ paramCount ]; + vstKnobs = new Knob *[ paramCount ]; knobFModel = new FloatModel *[ paramCount ]; QStringList s_dumpValues; QWidget * widget = new QWidget(); @@ -128,7 +128,7 @@ void vestigeInstrument::loadSettings( const QDomElement & _this ) sprintf( paramStr, "param%d", i ); s_dumpValues = dump[ paramStr ].split( ":" ); - vstKnobs[i] = new knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); + vstKnobs[i] = new Knob( knobBright_26, widget, s_dumpValues.at( 1 ) ); vstKnobs[i]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); vstKnobs[i]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); @@ -250,7 +250,7 @@ void vestigeInstrument::loadFile( const QString & _file ) } m_pluginDLL = _file; - textFloat * tf = textFloat::displayMessage( + TextFloat * tf = TextFloat::displayMessage( tr( "Loading plugin" ), tr( "Please wait while loading VST-plugin..." ), PLUGIN_NAME::getIconPixmap( "logo", 24, 24 ), 0 ); @@ -406,7 +406,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "artwork" ) ); } - m_openPluginButton = new pixmapButton( this, "" ); + m_openPluginButton = new PixmapButton( this, "" ); m_openPluginButton->setCheckable( false ); m_openPluginButton->setCursor( Qt::PointingHandCursor ); m_openPluginButton->move( 216, 81 ); @@ -416,14 +416,14 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "select_file" ) ); connect( m_openPluginButton, SIGNAL( clicked() ), this, SLOT( openPlugin() ) ); - toolTip::add( m_openPluginButton, tr( "Open other VST-plugin" ) ); + ToolTip::add( m_openPluginButton, tr( "Open other VST-plugin" ) ); m_openPluginButton->setWhatsThis( tr( "Click here, if you want to open another VST-plugin. After " "clicking on this button, a file-open-dialog appears " "and you can select your file." ) ); - m_managePluginButton = new pixmapButton( this, "" ); + m_managePluginButton = new PixmapButton( this, "" ); m_managePluginButton->setCheckable( false ); m_managePluginButton->setCursor( Qt::PointingHandCursor ); m_managePluginButton->move( 216, 101 ); @@ -433,13 +433,13 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "track_op_menu" ) ); connect( m_managePluginButton, SIGNAL( clicked() ), this, SLOT( managePlugin() ) ); - toolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) ); + ToolTip::add( m_managePluginButton, tr( "Control VST-plugin from LMMS host" ) ); m_managePluginButton->setWhatsThis( tr( "Click here, if you want to control VST-plugin from host." ) ); - m_openPresetButton = new pixmapButton( this, "" ); + m_openPresetButton = new PixmapButton( this, "" ); m_openPresetButton->setCheckable( false ); m_openPresetButton->setCursor( Qt::PointingHandCursor ); m_openPresetButton->move( 200, 224 ); @@ -449,13 +449,13 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "project_open", 20, 20 ) ); connect( m_openPresetButton, SIGNAL( clicked() ), this, SLOT( openPreset() ) ); - toolTip::add( m_openPresetButton, tr( "Open VST-plugin preset" ) ); + ToolTip::add( m_openPresetButton, tr( "Open VST-plugin preset" ) ); m_openPresetButton->setWhatsThis( tr( "Click here, if you want to open another *.fxp, *.fxb VST-plugin preset." ) ); - m_rolLPresetButton = new pixmapButton( this, "" ); + m_rolLPresetButton = new PixmapButton( this, "" ); m_rolLPresetButton->setCheckable( false ); m_rolLPresetButton->setCursor( Qt::PointingHandCursor ); m_rolLPresetButton->move( 190, 201 ); @@ -465,7 +465,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "stepper-left" ) ); connect( m_rolLPresetButton, SIGNAL( clicked() ), this, SLOT( previousProgram() ) ); - toolTip::add( m_rolLPresetButton, tr( "Previous (-)" ) ); + ToolTip::add( m_rolLPresetButton, tr( "Previous (-)" ) ); m_rolLPresetButton->setShortcut( Qt::Key_Minus ); @@ -473,7 +473,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, tr( "Click here, if you want to switch to another VST-plugin preset program." ) ); - m_savePresetButton = new pixmapButton( this, "" ); + m_savePresetButton = new PixmapButton( this, "" ); m_savePresetButton->setCheckable( false ); m_savePresetButton->setCursor( Qt::PointingHandCursor ); m_savePresetButton->move( 224, 224 ); @@ -483,13 +483,13 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "project_save", 20, 20 ) ); connect( m_savePresetButton, SIGNAL( clicked() ), this, SLOT( savePreset() ) ); - toolTip::add( m_savePresetButton, tr( "Save preset" ) ); + ToolTip::add( m_savePresetButton, tr( "Save preset" ) ); m_savePresetButton->setWhatsThis( tr( "Click here, if you want to save current VST-plugin preset program." ) ); - m_rolRPresetButton = new pixmapButton( this, "" ); + m_rolRPresetButton = new PixmapButton( this, "" ); m_rolRPresetButton->setCheckable( false ); m_rolRPresetButton->setCursor( Qt::PointingHandCursor ); m_rolRPresetButton->move( 209, 201 ); @@ -499,7 +499,7 @@ VestigeInstrumentView::VestigeInstrumentView( Instrument * _instrument, "stepper-right" ) ); connect( m_rolRPresetButton, SIGNAL( clicked() ), this, SLOT( nextProgram() ) ); - toolTip::add( m_rolRPresetButton, tr( "Next (+)" ) ); + ToolTip::add( m_rolRPresetButton, tr( "Next (+)" ) ); m_rolRPresetButton->setShortcut( Qt::Key_Plus ); @@ -934,7 +934,7 @@ manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrume bool isVstKnobs = true; if (m_vi->vstKnobs == NULL) { - m_vi->vstKnobs = new knob *[ m_vi->paramCount ]; + m_vi->vstKnobs = new Knob *[ m_vi->paramCount ]; isVstKnobs = false; } if (m_vi->knobFModel == NULL) { @@ -950,7 +950,7 @@ manageVestigeInstrumentView::manageVestigeInstrumentView( Instrument * _instrume sprintf( paramStr, "param%d", i); s_dumpValues = dump[ paramStr ].split( ":" ); - m_vi->vstKnobs[ i ] = new knob( knobBright_26, this, s_dumpValues.at( 1 ) ); + m_vi->vstKnobs[ i ] = new Knob( knobBright_26, this, s_dumpValues.at( 1 ) ); m_vi->vstKnobs[ i ]->setHintText( s_dumpValues.at( 1 ) + ":", "" ); m_vi->vstKnobs[ i ]->setLabel( s_dumpValues.at( 1 ).left( 15 ) ); diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 51265aaaf..328c5e4a5 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -35,7 +35,7 @@ #include "Instrument.h" #include "InstrumentView.h" #include "Note.h" -#include "knob.h" +#include "Knob.h" #include "AutomatableModel.h" @@ -43,7 +43,7 @@ class QPixmap; class QPushButton; -class pixmapButton; +class PixmapButton; class VstPlugin; @@ -85,7 +85,7 @@ private: QString m_pluginDLL; QMdiSubWindow * m_subWindow; QScrollArea * m_scrollArea; - knob ** vstKnobs; + Knob ** vstKnobs; FloatModel ** knobFModel; QObject * p_subWindow; int paramCount; @@ -168,14 +168,14 @@ private: int lastPosInMenu; - pixmapButton * m_openPluginButton; - pixmapButton * m_openPresetButton; - pixmapButton * m_rolLPresetButton; - pixmapButton * m_rolRPresetButton; + PixmapButton * m_openPluginButton; + PixmapButton * m_openPresetButton; + PixmapButton * m_rolLPresetButton; + PixmapButton * m_rolRPresetButton; QPushButton * m_selPresetButton; QPushButton * m_toggleGUIButton; - pixmapButton * m_managePluginButton; - pixmapButton * m_savePresetButton; + PixmapButton * m_managePluginButton; + PixmapButton * m_savePresetButton; Instrument * _instrument2; QWidget * _parent2; diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index 2bc9e1463..583151789 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -60,7 +60,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, setFixedSize( 50, 50 ); move( _x, _y ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 1, 1 ); m_button->setActiveGraphic( _button0_on ); m_button->setInactiveGraphic( _button0_off ); @@ -69,7 +69,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button0Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 18, 1 ); m_button->setActiveGraphic( _button1_on ); m_button->setInactiveGraphic( _button1_off ); @@ -78,7 +78,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button1Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 35, 1 ); m_button->setActiveGraphic( _button2_on ); m_button->setInactiveGraphic( _button2_off ); @@ -87,7 +87,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button2Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 1, 18 ); m_button->setActiveGraphic( _button3_on ); m_button->setInactiveGraphic( _button3_off ); @@ -96,7 +96,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button3Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 18, 18 ); m_button->setActiveGraphic( _button4_on ); m_button->setInactiveGraphic( _button4_off ); @@ -105,7 +105,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button4Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 35, 18 ); m_button->setActiveGraphic( _button5_on ); m_button->setInactiveGraphic( _button5_off ); @@ -114,7 +114,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button5Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 1, 35 ); m_button->setActiveGraphic( _button6_on ); m_button->setInactiveGraphic( _button6_off ); @@ -123,7 +123,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button6Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 18, 35 ); m_button->setActiveGraphic( _button7_on ); m_button->setInactiveGraphic( _button7_off ); @@ -132,7 +132,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, this, SLOT ( button7Clicked() ) ); m_buttons.append( m_button ); - m_button = new pixmapButton( this, NULL ); + m_button = new PixmapButton( this, NULL ); m_button->move( 35, 35 ); m_button->setActiveGraphic( _button8_on ); m_button->setInactiveGraphic( _button8_off ); diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h index e7e086271..6adc47b67 100644 --- a/plugins/vibed/nine_button_selector.h +++ b/plugins/vibed/nine_button_selector.h @@ -25,7 +25,7 @@ #ifndef _NINE_BUTTON_SELECTOR_H #define _NINE_BUTTON_SELECTOR_H -#include "pixmap_button.h" +#include "PixmapButton.h" class nineButtonSelector: public QWidget , public IntModelView @@ -83,9 +83,9 @@ private: virtual void modelChanged(); void updateButton( int ); - QList m_buttons; - pixmapButton * m_button; - pixmapButton * m_lastBtn; + QList m_buttons; + PixmapButton * m_button; + PixmapButton * m_lastBtn; } ; diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index 8d08e6acf..d48297779 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -30,7 +30,7 @@ #include "Engine.h" #include "InstrumentTrack.h" #include "NotePlayHandle.h" -#include "tooltip.h" +#include "ToolTip.h" #include "base64.h" #include "CaptionMenu.h" #include "Oscillator.h" @@ -358,14 +358,14 @@ vibedView::vibedView( Instrument * _instrument, "artwork" ) ); setPalette( pal ); - m_volumeKnob = new knob( knobBright_26, this ); + m_volumeKnob = new Knob( knobBright_26, this ); m_volumeKnob->setVolumeKnob( true ); m_volumeKnob->move( 103, 142 ); m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "" ); m_volumeKnob->setWhatsThis( tr( "The 'V' knob sets the volume " "of the selected string." ) ); - m_stiffnessKnob = new knob( knobBright_26, this ); + m_stiffnessKnob = new Knob( knobBright_26, this ); m_stiffnessKnob->move( 129, 142 ); m_stiffnessKnob->setHintText( tr( "String stiffness:" ) + " ", "" ); @@ -375,14 +375,14 @@ vibedView::vibedView( Instrument * _instrument, "the setting, the longer the string will ring." ) ); - m_pickKnob = new knob( knobBright_26, this ); + m_pickKnob = new Knob( knobBright_26, this ); m_pickKnob->move( 153, 142 ); m_pickKnob->setHintText( tr( "Pick position:" ) + " ", "" ); m_pickKnob->setWhatsThis( tr( "The 'P' knob sets the position where the selected string will be 'picked'. " "The lower the setting the closer the pick is to the bridge." ) ); - m_pickupKnob = new knob( knobBright_26, this ); + m_pickupKnob = new Knob( knobBright_26, this ); m_pickupKnob->move( 177, 142 ); m_pickupKnob->setHintText( tr( "Pickup position:" ) + " ", "" ); @@ -391,14 +391,14 @@ vibedView::vibedView( Instrument * _instrument, "for the selected string. The lower the setting, the closer the " "pickup is to the bridge." ) ); - m_panKnob = new knob( knobBright_26, this ); + m_panKnob = new Knob( knobBright_26, this ); m_panKnob->move( 105, 187 ); m_panKnob->setHintText( tr( "Pan:" ) + " ", "" ); m_panKnob->setWhatsThis( tr( "The Pan knob determines the location of the selected string in the stereo " "field." ) ); - m_detuneKnob = new knob( knobBright_26, this ); + m_detuneKnob = new Knob( knobBright_26, this ); m_detuneKnob->move( 150, 187 ); m_detuneKnob->setHintText( tr( "Detune:" ) + " ", "" ); m_detuneKnob->setWhatsThis( tr( @@ -406,7 +406,7 @@ vibedView::vibedView( Instrument * _instrument, "than zero will cause the string to sound flat. Settings greater than zero " "will cause the string to sound sharp." ) ); - m_randomKnob = new knob( knobBright_26, this ); + m_randomKnob = new Knob( knobBright_26, this ); m_randomKnob->move( 194, 187 ); m_randomKnob->setHintText( tr( "Fuzziness:" ) + " ", "" ); @@ -415,7 +415,7 @@ vibedView::vibedView( Instrument * _instrument, "apparent during the attack, though it can also be used to make the string " "sound more 'metallic'.") ); - m_lengthKnob = new knob( knobBright_26, this ); + m_lengthKnob = new Knob( knobBright_26, this ); m_lengthKnob->move( 23, 193 ); m_lengthKnob->setHintText( tr( "Length:" ) + " ", "" ); @@ -424,9 +424,9 @@ vibedView::vibedView( Instrument * _instrument, "will both ring longer and sound brighter, however, they will also eat up " "more CPU cycles." ) ); - m_impulse = new ledCheckBox( "", this ); + m_impulse = new LedCheckBox( "", this ); m_impulse->move( 23, 94 ); - toolTip::add( m_impulse, + ToolTip::add( m_impulse, tr( "Impulse or initial state" ) ); m_impulse->setWhatsThis( tr( "The 'Imp' selector determines whether the waveform in the graph is to be " @@ -488,7 +488,7 @@ vibedView::vibedView( Instrument * _instrument, 21, 39, this); - m_graph = new graph( this ); + m_graph = new Graph( this ); m_graph->setWindowTitle( tr( "Impulse Editor" ) ); m_graph->setForeground( PLUGIN_NAME::getIconPixmap( "wavegraph4" ) ); m_graph->move( 76, 21 ); @@ -530,9 +530,9 @@ vibedView::vibedView( Instrument * _instrument, "whether the string is active in the current instrument." ) ); - m_power = new ledCheckBox( "", this, tr( "Enable waveform" ) ); + m_power = new LedCheckBox( "", this, tr( "Enable waveform" ) ); m_power->move( 212, 130 ); - toolTip::add( m_power, + ToolTip::add( m_power, tr( "Click here to enable/disable waveform." ) ); @@ -549,104 +549,104 @@ vibedView::vibedView( Instrument * _instrument, showString( 0 ); - m_sinWaveBtn = new pixmapButton( this, tr( "Sine wave" ) ); + m_sinWaveBtn = new PixmapButton( this, tr( "Sine wave" ) ); m_sinWaveBtn->move( 212, 24 ); m_sinWaveBtn->setActiveGraphic( embed::getIconPixmap( "sin_wave_active" ) ); m_sinWaveBtn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); - toolTip::add( m_sinWaveBtn, + ToolTip::add( m_sinWaveBtn, tr( "Use a sine-wave for " "current oscillator." ) ); connect( m_sinWaveBtn, SIGNAL (clicked () ), this, SLOT ( sinWaveClicked() ) ); - m_triangleWaveBtn = new pixmapButton( this, tr( "Triangle wave" ) ); + m_triangleWaveBtn = new PixmapButton( this, tr( "Triangle wave" ) ); m_triangleWaveBtn->move( 212, 41 ); m_triangleWaveBtn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); m_triangleWaveBtn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); - toolTip::add( m_triangleWaveBtn, + ToolTip::add( m_triangleWaveBtn, tr( "Use a triangle-wave " "for current oscillator." ) ); connect( m_triangleWaveBtn, SIGNAL ( clicked () ), this, SLOT ( triangleWaveClicked( ) ) ); - m_sawWaveBtn = new pixmapButton( this, tr( "Saw wave" ) ); + m_sawWaveBtn = new PixmapButton( this, tr( "Saw wave" ) ); m_sawWaveBtn->move( 212, 58 ); m_sawWaveBtn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); m_sawWaveBtn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); - toolTip::add( m_sawWaveBtn, + ToolTip::add( m_sawWaveBtn, tr( "Use a saw-wave for " "current oscillator." ) ); connect( m_sawWaveBtn, SIGNAL (clicked () ), this, SLOT ( sawWaveClicked() ) ); - m_sqrWaveBtn = new pixmapButton( this, tr( "Square wave" ) ); + m_sqrWaveBtn = new PixmapButton( this, tr( "Square wave" ) ); m_sqrWaveBtn->move( 212, 75 ); m_sqrWaveBtn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); m_sqrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); - toolTip::add( m_sqrWaveBtn, + ToolTip::add( m_sqrWaveBtn, tr( "Use a square-wave for " "current oscillator." ) ); connect( m_sqrWaveBtn, SIGNAL ( clicked () ), this, SLOT ( sqrWaveClicked() ) ); - m_whiteNoiseWaveBtn = new pixmapButton( this, tr( "White noise wave" ) ); + m_whiteNoiseWaveBtn = new PixmapButton( this, tr( "White noise wave" ) ); m_whiteNoiseWaveBtn->move( 212, 92 ); m_whiteNoiseWaveBtn->setActiveGraphic( embed::getIconPixmap( "white_noise_wave_active" ) ); m_whiteNoiseWaveBtn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); - toolTip::add( m_whiteNoiseWaveBtn, + ToolTip::add( m_whiteNoiseWaveBtn, tr( "Use white-noise for " "current oscillator." ) ); connect( m_whiteNoiseWaveBtn, SIGNAL ( clicked () ), this, SLOT ( noiseWaveClicked() ) ); - m_usrWaveBtn = new pixmapButton( this, tr( "User defined wave" ) ); + m_usrWaveBtn = new PixmapButton( this, tr( "User defined wave" ) ); m_usrWaveBtn->move( 212, 109 ); m_usrWaveBtn->setActiveGraphic( embed::getIconPixmap( "usr_wave_active" ) ); m_usrWaveBtn->setInactiveGraphic( embed::getIconPixmap( "usr_wave_inactive" ) ); - toolTip::add( m_usrWaveBtn, + ToolTip::add( m_usrWaveBtn, tr( "Use a user-defined " "waveform for current oscillator." ) ); connect( m_usrWaveBtn, SIGNAL ( clicked () ), this, SLOT ( usrWaveClicked() ) ); - m_smoothBtn = new pixmapButton( this, tr( "Smooth" ) ); + m_smoothBtn = new PixmapButton( this, tr( "Smooth" ) ); m_smoothBtn->move( 79, 129 ); m_smoothBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); m_smoothBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); m_smoothBtn->setChecked( false ); - toolTip::add( m_smoothBtn, + ToolTip::add( m_smoothBtn, tr( "Click here to smooth waveform." ) ); connect( m_smoothBtn, SIGNAL ( clicked () ), this, SLOT ( smoothClicked() ) ); - m_normalizeBtn = new pixmapButton( this, tr( "Normalize" ) ); + m_normalizeBtn = new PixmapButton( this, tr( "Normalize" ) ); m_normalizeBtn->move( 96, 129 ); m_normalizeBtn->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "normalize_active" ) ); m_normalizeBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "normalize_inactive" ) ); m_normalizeBtn->setChecked( false ); - toolTip::add( m_normalizeBtn, + ToolTip::add( m_normalizeBtn, tr( "Click here to normalize waveform." ) ); connect( m_normalizeBtn, SIGNAL ( clicked () ), @@ -730,7 +730,7 @@ void vibedView::noiseWaveClicked() void vibedView::usrWaveClicked() { QString fileName = m_graph->model()->setWaveToUser(); - toolTip::add( m_usrWaveBtn, fileName ); + ToolTip::add( m_usrWaveBtn, fileName ); Engine::getSong()->setModified(); } diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index 3df8b1b1c..e4c8e4a14 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -26,10 +26,10 @@ #include "Instrument.h" #include "InstrumentView.h" -#include "graph.h" -#include "knob.h" -#include "pixmap_button.h" -#include "led_checkbox.h" +#include "Graph.h" +#include "Knob.h" +#include "PixmapButton.h" +#include "LedCheckbox.h" #include "nine_button_selector.h" class vibedView; @@ -110,31 +110,31 @@ private: // String-related - knob * m_pickKnob; - knob * m_pickupKnob; - knob * m_stiffnessKnob; - knob * m_volumeKnob; - knob * m_panKnob; - knob * m_detuneKnob; - knob * m_randomKnob; - knob * m_lengthKnob; - graph * m_graph; + Knob * m_pickKnob; + Knob * m_pickupKnob; + Knob * m_stiffnessKnob; + Knob * m_volumeKnob; + Knob * m_panKnob; + Knob * m_detuneKnob; + Knob * m_randomKnob; + Knob * m_lengthKnob; + Graph * m_graph; nineButtonSelector * m_harmonic; - ledCheckBox * m_impulse; - ledCheckBox * m_power; + LedCheckBox * m_impulse; + LedCheckBox * m_power; // Not in model nineButtonSelector * m_stringSelector; - pixmapButton * m_smoothBtn; - pixmapButton * m_normalizeBtn; + PixmapButton * m_smoothBtn; + PixmapButton * m_normalizeBtn; // From impulse editor - pixmapButton * m_sinWaveBtn; - pixmapButton * m_triangleWaveBtn; - pixmapButton * m_sqrWaveBtn; - pixmapButton * m_sawWaveBtn; - pixmapButton * m_whiteNoiseWaveBtn; - pixmapButton * m_usrWaveBtn; + PixmapButton * m_sinWaveBtn; + PixmapButton * m_triangleWaveBtn; + PixmapButton * m_sqrWaveBtn; + PixmapButton * m_sawWaveBtn; + PixmapButton * m_whiteNoiseWaveBtn; + PixmapButton * m_usrWaveBtn; }; diff --git a/plugins/watsyn/Watsyn.cpp b/plugins/watsyn/Watsyn.cpp index 1d2f8e59b..a29a410a9 100644 --- a/plugins/watsyn/Watsyn.cpp +++ b/plugins/watsyn/Watsyn.cpp @@ -29,7 +29,7 @@ #include "Engine.h" #include "InstrumentTrack.h" #include "templates.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "lmms_math.h" #include "interpolation.h" @@ -721,29 +721,29 @@ WatsynView::WatsynView( Instrument * _instrument, // button groups next. // graph select buttons - pixmapButton * a1_selectButton = new pixmapButton( this, NULL ); + PixmapButton * a1_selectButton = new PixmapButton( this, NULL ); a1_selectButton -> move( 4, 121 ); a1_selectButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "a1_active" ) ); a1_selectButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "a1_inactive" ) ); - toolTip::add( a1_selectButton, tr( "Select oscillator A1") ); + ToolTip::add( a1_selectButton, tr( "Select oscillator A1") ); - pixmapButton * a2_selectButton = new pixmapButton( this, NULL ); + PixmapButton * a2_selectButton = new PixmapButton( this, NULL ); a2_selectButton -> move( 44, 121 ); a2_selectButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "a2_active" ) ); a2_selectButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "a2_inactive" ) ); - toolTip::add( a2_selectButton, tr( "Select oscillator A2") ); + ToolTip::add( a2_selectButton, tr( "Select oscillator A2") ); - pixmapButton * b1_selectButton = new pixmapButton( this, NULL ); + PixmapButton * b1_selectButton = new PixmapButton( this, NULL ); b1_selectButton -> move( 84, 121 ); b1_selectButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "b1_active" ) ); b1_selectButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "b1_inactive" ) ); - toolTip::add( b1_selectButton, tr( "Select oscillator B1") ); + ToolTip::add( b1_selectButton, tr( "Select oscillator B1") ); - pixmapButton * b2_selectButton = new pixmapButton( this, NULL ); + PixmapButton * b2_selectButton = new PixmapButton( this, NULL ); b2_selectButton -> move( 124, 121 ); b2_selectButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "b2_active" ) ); b2_selectButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "b2_inactive" ) ); - toolTip::add( b2_selectButton, tr( "Select oscillator B2") ); + ToolTip::add( b2_selectButton, tr( "Select oscillator B2") ); m_selectedGraphGroup = new automatableButtonGroup( this ); m_selectedGraphGroup -> addButton( a1_selectButton ); @@ -752,29 +752,29 @@ WatsynView::WatsynView( Instrument * _instrument, m_selectedGraphGroup -> addButton( b2_selectButton ); // A-modulation button group - pixmapButton * amod_mixButton = new pixmapButton( this, NULL ); + PixmapButton * amod_mixButton = new PixmapButton( this, NULL ); amod_mixButton -> move( 4, 50 ); amod_mixButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "amix_active" ) ); amod_mixButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "amix_inactive" ) ); - toolTip::add( amod_mixButton, tr( "Mix output of A2 to A1" ) ); + ToolTip::add( amod_mixButton, tr( "Mix output of A2 to A1" ) ); - pixmapButton * amod_amButton = new pixmapButton( this, NULL ); + PixmapButton * amod_amButton = new PixmapButton( this, NULL ); amod_amButton -> move( 4, 66 ); amod_amButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "aam_active" ) ); amod_amButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "aam_inactive" ) ); - toolTip::add( amod_amButton, tr( "Modulate amplitude of A1 with output of A2" ) ); + ToolTip::add( amod_amButton, tr( "Modulate amplitude of A1 with output of A2" ) ); - pixmapButton * amod_rmButton = new pixmapButton( this, NULL ); + PixmapButton * amod_rmButton = new PixmapButton( this, NULL ); amod_rmButton -> move( 4, 82 ); amod_rmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "arm_active" ) ); amod_rmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "arm_inactive" ) ); - toolTip::add( amod_rmButton, tr( "Ring-modulate A1 and A2" ) ); + ToolTip::add( amod_rmButton, tr( "Ring-modulate A1 and A2" ) ); - pixmapButton * amod_pmButton = new pixmapButton( this, NULL ); + PixmapButton * amod_pmButton = new PixmapButton( this, NULL ); amod_pmButton -> move( 4, 98 ); amod_pmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "apm_active" ) ); amod_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "apm_inactive" ) ); - toolTip::add( amod_pmButton, tr( "Modulate phase of A1 with output of A2" ) ); + ToolTip::add( amod_pmButton, tr( "Modulate phase of A1 with output of A2" ) ); m_aModGroup = new automatableButtonGroup( this ); m_aModGroup -> addButton( amod_mixButton ); @@ -783,29 +783,29 @@ WatsynView::WatsynView( Instrument * _instrument, m_aModGroup -> addButton( amod_pmButton ); // B-modulation button group - pixmapButton * bmod_mixButton = new pixmapButton( this, NULL ); + PixmapButton * bmod_mixButton = new PixmapButton( this, NULL ); bmod_mixButton -> move( 44, 50 ); bmod_mixButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "bmix_active" ) ); bmod_mixButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bmix_inactive" ) ); - toolTip::add( bmod_mixButton, tr( "Mix output of B2 to B1" ) ); + ToolTip::add( bmod_mixButton, tr( "Mix output of B2 to B1" ) ); - pixmapButton * bmod_amButton = new pixmapButton( this, NULL ); + PixmapButton * bmod_amButton = new PixmapButton( this, NULL ); bmod_amButton -> move( 44, 66 ); bmod_amButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "bam_active" ) ); bmod_amButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bam_inactive" ) ); - toolTip::add( bmod_amButton, tr( "Modulate amplitude of B1 with output of B2" ) ); + ToolTip::add( bmod_amButton, tr( "Modulate amplitude of B1 with output of B2" ) ); - pixmapButton * bmod_rmButton = new pixmapButton( this, NULL ); + PixmapButton * bmod_rmButton = new PixmapButton( this, NULL ); bmod_rmButton -> move( 44, 82 ); bmod_rmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "brm_active" ) ); bmod_rmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "brm_inactive" ) ); - toolTip::add( bmod_rmButton, tr( "Ring-modulate B1 and B2" ) ); + ToolTip::add( bmod_rmButton, tr( "Ring-modulate B1 and B2" ) ); - pixmapButton * bmod_pmButton = new pixmapButton( this, NULL ); + PixmapButton * bmod_pmButton = new PixmapButton( this, NULL ); bmod_pmButton -> move( 44, 98 ); bmod_pmButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "bpm_active" ) ); bmod_pmButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "bpm_inactive" ) ); - toolTip::add( bmod_pmButton, tr( "Modulate phase of B1 with output of B2" ) ); + ToolTip::add( bmod_pmButton, tr( "Modulate phase of B1 with output of B2" ) ); m_bModGroup = new automatableButtonGroup( this ); m_bModGroup -> addButton( bmod_mixButton ); @@ -818,103 +818,103 @@ WatsynView::WatsynView( Instrument * _instrument, pal = QPalette(); pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap("wavegraph") ); // a1 graph - a1_graph = new graph( this, graph::LinearStyle, 224, 105 ); + a1_graph = new Graph( this, Graph::LinearStyle, 224, 105 ); a1_graph->move( 4, 141 ); a1_graph->setAutoFillBackground( true ); a1_graph->setGraphColor( QColor( 0x43, 0xb2, 0xff ) ); - toolTip::add( a1_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); + ToolTip::add( a1_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); a1_graph->setPalette( pal ); // a2 graph - a2_graph = new graph( this, graph::LinearStyle, 224, 105 ); + a2_graph = new Graph( this, Graph::LinearStyle, 224, 105 ); a2_graph->move( 4, 141 ); a2_graph->setAutoFillBackground( true ); a2_graph->setGraphColor( QColor( 0x43, 0xb2, 0xff ) ); - toolTip::add( a2_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); + ToolTip::add( a2_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); a2_graph->setPalette( pal ); // b1 graph - b1_graph = new graph( this, graph::LinearStyle, 224, 105 ); + b1_graph = new Graph( this, Graph::LinearStyle, 224, 105 ); b1_graph->move( 4, 141 ); b1_graph->setAutoFillBackground( true ); b1_graph->setGraphColor( QColor( 0xfc, 0x54, 0x31 ) ); - toolTip::add( b1_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); + ToolTip::add( b1_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); b1_graph->setPalette( pal ); // b2 graph - b2_graph = new graph( this, graph::LinearStyle, 224, 105 ); + b2_graph = new Graph( this, Graph::LinearStyle, 224, 105 ); b2_graph->move( 4, 141 ); b2_graph->setAutoFillBackground( true ); b2_graph->setGraphColor( QColor( 0xfc, 0x54, 0x31 ) ); - toolTip::add( b2_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); + ToolTip::add( b2_graph, tr ( "Draw your own waveform here by dragging your mouse on this graph." ) ); b2_graph->setPalette( pal ); // misc pushbuttons // waveform modifications - m_loadButton = new pixmapButton( this, tr( "Load waveform" ) ); + m_loadButton = new PixmapButton( this, tr( "Load waveform" ) ); m_loadButton -> move ( 173, 121 ); m_loadButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "load_active" ) ); m_loadButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "load_inactive" ) ); - toolTip::add( m_loadButton, tr( "Click to load a waveform from a sample file" ) ); + ToolTip::add( m_loadButton, tr( "Click to load a waveform from a sample file" ) ); - m_phaseLeftButton = new pixmapButton( this, tr( "Phase left" ) ); + m_phaseLeftButton = new PixmapButton( this, tr( "Phase left" ) ); m_phaseLeftButton -> move ( 193, 121 ); m_phaseLeftButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "phl_active" ) ); m_phaseLeftButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "phl_inactive" ) ); - toolTip::add( m_phaseLeftButton, tr( "Click to shift phase by -15 degrees" ) ); + ToolTip::add( m_phaseLeftButton, tr( "Click to shift phase by -15 degrees" ) ); - m_phaseRightButton = new pixmapButton( this, tr( "Phase right" ) ); + m_phaseRightButton = new PixmapButton( this, tr( "Phase right" ) ); m_phaseRightButton -> move ( 210, 121 ); m_phaseRightButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "phr_active" ) ); m_phaseRightButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "phr_inactive" ) ); - toolTip::add( m_phaseRightButton, tr( "Click to shift phase by +15 degrees" ) ); + ToolTip::add( m_phaseRightButton, tr( "Click to shift phase by +15 degrees" ) ); - m_normalizeButton = new pixmapButton( this, tr( "Normalize" ) ); + m_normalizeButton = new PixmapButton( this, tr( "Normalize" ) ); m_normalizeButton -> move ( 230, 121 ); m_normalizeButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "norm_active" ) ); m_normalizeButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "norm_inactive" ) ); - toolTip::add( m_normalizeButton, tr( "Click to normalize" ) ); + ToolTip::add( m_normalizeButton, tr( "Click to normalize" ) ); - m_invertButton = new pixmapButton( this, tr( "Invert" ) ); + m_invertButton = new PixmapButton( this, tr( "Invert" ) ); m_invertButton -> move ( 230, 138 ); m_invertButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "inv_active" ) ); m_invertButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "inv_inactive" ) ); - toolTip::add( m_invertButton, tr( "Click to invert" ) ); + ToolTip::add( m_invertButton, tr( "Click to invert" ) ); - m_smoothButton = new pixmapButton( this, tr( "Smooth" ) ); + m_smoothButton = new PixmapButton( this, tr( "Smooth" ) ); m_smoothButton -> move ( 230, 155 ); m_smoothButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); m_smoothButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); - toolTip::add( m_smoothButton, tr( "Click to smooth" ) ); + ToolTip::add( m_smoothButton, tr( "Click to smooth" ) ); // waveforms - m_sinWaveButton = new pixmapButton( this, tr( "Sine wave" ) ); + m_sinWaveButton = new PixmapButton( this, tr( "Sine wave" ) ); m_sinWaveButton -> move ( 230, 176 ); m_sinWaveButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sin_active" ) ); m_sinWaveButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sin_inactive" ) ); - toolTip::add( m_sinWaveButton, tr( "Click for sine wave" ) ); + ToolTip::add( m_sinWaveButton, tr( "Click for sine wave" ) ); - m_triWaveButton = new pixmapButton( this, tr( "Triangle wave" ) ); + m_triWaveButton = new PixmapButton( this, tr( "Triangle wave" ) ); m_triWaveButton -> move ( 230, 194 ); m_triWaveButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "tri_active" ) ); m_triWaveButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "tri_inactive" ) ); - toolTip::add( m_triWaveButton, tr( "Click for triangle wave" ) ); + ToolTip::add( m_triWaveButton, tr( "Click for triangle wave" ) ); - m_sawWaveButton = new pixmapButton( this, tr( "Triangle wave" ) ); + m_sawWaveButton = new PixmapButton( this, tr( "Triangle wave" ) ); m_sawWaveButton -> move ( 230, 212 ); m_sawWaveButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "saw_active" ) ); m_sawWaveButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "saw_inactive" ) ); - toolTip::add( m_sawWaveButton, tr( "Click for saw wave" ) ); + ToolTip::add( m_sawWaveButton, tr( "Click for saw wave" ) ); - m_sqrWaveButton = new pixmapButton( this, tr( "Square wave" ) ); + m_sqrWaveButton = new PixmapButton( this, tr( "Square wave" ) ); m_sqrWaveButton -> move ( 230, 230 ); m_sqrWaveButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sqr_active" ) ); m_sqrWaveButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sqr_inactive" ) ); - toolTip::add( m_sqrWaveButton, tr( "Click for square wave" ) ); + ToolTip::add( m_sqrWaveButton, tr( "Click for square wave" ) ); diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index 8f1a92098..b8413f7f8 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -28,18 +28,18 @@ #include "Instrument.h" #include "InstrumentView.h" -#include "graph.h" +#include "Graph.h" #include "AutomatableModel.h" #include "AutomatableButton.h" #include "TempoSyncKnob.h" #include "NotePlayHandle.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include #include "MemoryManager.h" #define makeknob( name, x, y, hint, unit, oname ) \ - name = new knob( knobStyled, this ); \ + name = new Knob( knobStyled, this ); \ name ->move( x, y ); \ name ->setHintText( tr( hint ) + " ", unit ); \ name ->setObjectName( oname ); \ @@ -320,60 +320,60 @@ private: virtual void modelChanged(); // knobs - knob * a1_volKnob; - knob * a2_volKnob; - knob * b1_volKnob; - knob * b2_volKnob; + Knob * a1_volKnob; + Knob * a2_volKnob; + Knob * b1_volKnob; + Knob * b2_volKnob; - knob * a1_panKnob; - knob * a2_panKnob; - knob * b1_panKnob; - knob * b2_panKnob; + Knob * a1_panKnob; + Knob * a2_panKnob; + Knob * b1_panKnob; + Knob * b2_panKnob; - knob * a1_multKnob; - knob * a2_multKnob; - knob * b1_multKnob; - knob * b2_multKnob; + Knob * a1_multKnob; + Knob * a2_multKnob; + Knob * b1_multKnob; + Knob * b2_multKnob; - knob * a1_ltuneKnob; - knob * a2_ltuneKnob; - knob * b1_ltuneKnob; - knob * b2_ltuneKnob; + Knob * a1_ltuneKnob; + Knob * a2_ltuneKnob; + Knob * b1_ltuneKnob; + Knob * b2_ltuneKnob; - knob * a1_rtuneKnob; - knob * a2_rtuneKnob; - knob * b1_rtuneKnob; - knob * b2_rtuneKnob; + Knob * a1_rtuneKnob; + Knob * a2_rtuneKnob; + Knob * b1_rtuneKnob; + Knob * b2_rtuneKnob; - knob * m_abmixKnob; + Knob * m_abmixKnob; - knob * m_envAmtKnob; + Knob * m_envAmtKnob; TempoSyncKnob * m_envAttKnob; TempoSyncKnob * m_envHoldKnob; TempoSyncKnob * m_envDecKnob; - knob * m_xtalkKnob; + Knob * m_xtalkKnob; automatableButtonGroup * m_selectedGraphGroup; automatableButtonGroup * m_aModGroup; automatableButtonGroup * m_bModGroup; - graph * a1_graph; - graph * a2_graph; - graph * b1_graph; - graph * b2_graph; + Graph * a1_graph; + Graph * a2_graph; + Graph * b1_graph; + Graph * b2_graph; - pixmapButton * m_sinWaveButton; - pixmapButton * m_triWaveButton; - pixmapButton * m_sawWaveButton; - pixmapButton * m_sqrWaveButton; - pixmapButton * m_normalizeButton; - pixmapButton * m_invertButton; - pixmapButton * m_smoothButton; - pixmapButton * m_phaseLeftButton; - pixmapButton * m_phaseRightButton; - pixmapButton * m_loadButton; + PixmapButton * m_sinWaveButton; + PixmapButton * m_triWaveButton; + PixmapButton * m_sawWaveButton; + PixmapButton * m_sqrWaveButton; + PixmapButton * m_normalizeButton; + PixmapButton * m_invertButton; + PixmapButton * m_smoothButton; + PixmapButton * m_phaseLeftButton; + PixmapButton * m_phaseRightButton; + PixmapButton * m_loadButton; }; diff --git a/plugins/waveshaper/waveshaper_control_dialog.cpp b/plugins/waveshaper/waveshaper_control_dialog.cpp index fd808d592..f7cfd22ee 100644 --- a/plugins/waveshaper/waveshaper_control_dialog.cpp +++ b/plugins/waveshaper/waveshaper_control_dialog.cpp @@ -29,10 +29,10 @@ #include "waveshaper_control_dialog.h" #include "waveshaper_controls.h" #include "embed.h" -#include "graph.h" -#include "pixmap_button.h" -#include "tooltip.h" -#include "led_checkbox.h" +#include "Graph.h" +#include "PixmapButton.h" +#include "ToolTip.h" +#include "LedCheckbox.h" waveShaperControlDialog::waveShaperControlDialog( @@ -46,7 +46,7 @@ waveShaperControlDialog::waveShaperControlDialog( setPalette( pal ); setFixedSize( 224, 300 ); - graph * waveGraph = new graph( this, graph::LinearNonCyclicStyle, 204, 205 ); + Graph * waveGraph = new Graph( this, Graph::LinearNonCyclicStyle, 204, 205 ); waveGraph -> move( 10, 32 ); waveGraph -> setModel( &_controls -> m_wavegraphModel ); waveGraph -> setAutoFillBackground( true ); @@ -57,7 +57,7 @@ waveShaperControlDialog::waveShaperControlDialog( waveGraph->setGraphColor( QColor( 170, 255, 255 ) ); waveGraph -> setMaximumSize( 204, 205 ); - knob * inputKnob = new knob( knobBright_26, this); + Knob * inputKnob = new Knob( knobBright_26, this); inputKnob -> setVolumeKnob( true ); inputKnob -> setVolumeRatio( 1.0 ); inputKnob -> move( 14, 251 ); @@ -65,7 +65,7 @@ waveShaperControlDialog::waveShaperControlDialog( inputKnob->setLabel( tr( "INPUT" ) ); inputKnob->setHintText( tr( "Input gain:" ) + " ", "" ); - knob * outputKnob = new knob( knobBright_26, this ); + Knob * outputKnob = new Knob( knobBright_26, this ); outputKnob -> setVolumeKnob( true ); outputKnob -> setVolumeRatio( 1.0 ); outputKnob -> move( 54, 251 ); @@ -73,39 +73,39 @@ waveShaperControlDialog::waveShaperControlDialog( outputKnob->setLabel( tr( "OUTPUT" ) ); outputKnob->setHintText( tr( "Output gain:" ) + " ", "" ); - pixmapButton * resetButton = new pixmapButton( this, tr("Reset waveform") ); + PixmapButton * resetButton = new PixmapButton( this, tr("Reset waveform") ); resetButton -> move( 164, 251 ); resetButton -> resize( 12, 48 ); resetButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_active" ) ); resetButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_inactive" ) ); - toolTip::add( resetButton, tr( "Click here to reset the wavegraph back to default" ) ); + ToolTip::add( resetButton, tr( "Click here to reset the wavegraph back to default" ) ); - pixmapButton * smoothButton = new pixmapButton( this, tr("Smooth waveform") ); + PixmapButton * smoothButton = new PixmapButton( this, tr("Smooth waveform") ); smoothButton -> move( 164, 267 ); smoothButton -> resize( 12, 48 ); smoothButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); smoothButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); - toolTip::add( smoothButton, tr( "Click here to apply smoothing to wavegraph" ) ); + ToolTip::add( smoothButton, tr( "Click here to apply smoothing to wavegraph" ) ); - pixmapButton * addOneButton = new pixmapButton( this, tr("Increase graph amplitude by 1dB") ); + PixmapButton * addOneButton = new PixmapButton( this, tr("Increase graph amplitude by 1dB") ); addOneButton -> move( 133, 251 ); addOneButton -> resize( 12, 29 ); addOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_active" ) ); addOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_inactive" ) ); - toolTip::add( addOneButton, tr( "Click here to increase wavegraph amplitude by 1dB" ) ); + ToolTip::add( addOneButton, tr( "Click here to increase wavegraph amplitude by 1dB" ) ); - pixmapButton * subOneButton = new pixmapButton( this, tr("Decrease graph amplitude by 1dB") ); + PixmapButton * subOneButton = new PixmapButton( this, tr("Decrease graph amplitude by 1dB") ); subOneButton -> move( 133, 267 ); subOneButton -> resize( 12, 29 ); subOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_active" ) ); subOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_inactive" ) ); - toolTip::add( subOneButton, tr( "Click here to decrease wavegraph amplitude by 1dB" ) ); + ToolTip::add( subOneButton, tr( "Click here to decrease wavegraph amplitude by 1dB" ) ); - ledCheckBox * clipInputToggle = new ledCheckBox( "Clip input", this, - tr( "Clip input" ), ledCheckBox::Green ); + LedCheckBox * clipInputToggle = new LedCheckBox( "Clip input", this, + tr( "Clip input" ), LedCheckBox::Green ); clipInputToggle -> move( 133, 283 ); clipInputToggle -> setModel( &_controls -> m_clipModel ); - toolTip::add( clipInputToggle, tr( "Clip input signal to 0dB" ) ); + ToolTip::add( clipInputToggle, tr( "Clip input signal to 0dB" ) ); connect( resetButton, SIGNAL (clicked () ), _controls, SLOT ( resetClicked() ) ); diff --git a/plugins/waveshaper/waveshaper_controls.cpp b/plugins/waveshaper/waveshaper_controls.cpp index 5091861a6..acc010004 100644 --- a/plugins/waveshaper/waveshaper_controls.cpp +++ b/plugins/waveshaper/waveshaper_controls.cpp @@ -29,7 +29,7 @@ #include "waveshaper_controls.h" #include "waveshaper.h" #include "base64.h" -#include "graph.h" +#include "Graph.h" #include "Engine.h" #include "Song.h" diff --git a/plugins/waveshaper/waveshaper_controls.h b/plugins/waveshaper/waveshaper_controls.h index 3828f1a8b..db54e5273 100644 --- a/plugins/waveshaper/waveshaper_controls.h +++ b/plugins/waveshaper/waveshaper_controls.h @@ -28,8 +28,8 @@ #include "EffectControls.h" #include "waveshaper_control_dialog.h" -#include "knob.h" -#include "graph.h" +#include "Knob.h" +#include "Graph.h" class waveShaperEffect; diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 52f6f2a01..4ba6876c9 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -33,8 +33,8 @@ #include "ZynAddSubFx.h" #include "Engine.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "DataFile.h" #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" @@ -497,35 +497,35 @@ ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent ) l->setVerticalSpacing( 16 ); l->setHorizontalSpacing( 10 ); - m_portamento = new knob( knobBright_26, this ); + m_portamento = new Knob( knobBright_26, this ); m_portamento->setHintText( tr( "Portamento:" ) + "", "" ); m_portamento->setLabel( tr( "PORT" ) ); - m_filterFreq = new knob( knobBright_26, this ); + m_filterFreq = new Knob( knobBright_26, this ); m_filterFreq->setHintText( tr( "Filter Frequency:" ) + "", "" ); m_filterFreq->setLabel( tr( "FREQ" ) ); - m_filterQ = new knob( knobBright_26, this ); + m_filterQ = new Knob( knobBright_26, this ); m_filterQ->setHintText( tr( "Filter Resonance:" ) + "", "" ); m_filterQ->setLabel( tr( "RES" ) ); - m_bandwidth = new knob( knobBright_26, this ); + m_bandwidth = new Knob( knobBright_26, this ); m_bandwidth->setHintText( tr( "Bandwidth:" ) + "", "" ); m_bandwidth->setLabel( tr( "BW" ) ); - m_fmGain = new knob( knobBright_26, this ); + m_fmGain = new Knob( knobBright_26, this ); m_fmGain->setHintText( tr( "FM Gain:" ) + "", "" ); m_fmGain->setLabel( tr( "FM GAIN" ) ); - m_resCenterFreq = new knob( knobBright_26, this ); + m_resCenterFreq = new Knob( knobBright_26, this ); m_resCenterFreq->setHintText( tr( "Resonance center frequency:" ) + "", "" ); m_resCenterFreq->setLabel( tr( "RES CF" ) ); - m_resBandwidth = new knob( knobBright_26, this ); + m_resBandwidth = new Knob( knobBright_26, this ); m_resBandwidth->setHintText( tr( "Resonance bandwidth:" ) + "", "" ); m_resBandwidth->setLabel( tr( "RES BW" ) ); - m_forwardMidiCC = new ledCheckBox( tr( "Forward MIDI Control Changes" ), this ); + m_forwardMidiCC = new LedCheckBox( tr( "Forward MIDI Control Changes" ), this ); m_toggleUIButton = new QPushButton( tr( "Show GUI" ), this ); m_toggleUIButton->setCheckable( true ); diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h index 4f501c1b3..76073ce23 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.h +++ b/plugins/zynaddsubfx/ZynAddSubFx.h @@ -40,8 +40,8 @@ class QPushButton; class LocalZynAddSubFx; class ZynAddSubFxView; class NotePlayHandle; -class knob; -class ledCheckBox; +class Knob; +class LedCheckBox; class ZynAddSubFxRemotePlugin : public QObject, public RemotePlugin @@ -149,14 +149,14 @@ private: void modelChanged(); QPushButton * m_toggleUIButton; - knob * m_portamento; - knob * m_filterFreq; - knob * m_filterQ; - knob * m_bandwidth; - knob * m_fmGain; - knob * m_resCenterFreq; - knob * m_resBandwidth; - ledCheckBox * m_forwardMidiCC; + Knob * m_portamento; + Knob * m_filterFreq; + Knob * m_filterQ; + Knob * m_bandwidth; + Knob * m_fmGain; + Knob * m_resCenterFreq; + Knob * m_resBandwidth; + LedCheckBox * m_forwardMidiCC; private slots: diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp index 68ca7882b..514dce55c 100644 --- a/src/core/AutomationPattern.cpp +++ b/src/core/AutomationPattern.cpp @@ -35,7 +35,7 @@ #include "ProjectJournal.h" #include "BBTrackContainer.h" #include "Song.h" -#include "text_float.h" +#include "TextFloat.h" #include "embed.h" @@ -98,7 +98,7 @@ void AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup ) { if( *it == _obj ) { - textFloat::displayMessage( _obj->displayName(), tr( "Model is already connected " + TextFloat::displayMessage( _obj->displayName(), tr( "Model is already connected " "to this pattern." ), embed::getIconPixmap( "automation" ), 2000 ); return; } diff --git a/src/core/BBTrackContainer.cpp b/src/core/BBTrackContainer.cpp index a2e78e6e4..e7d0f3246 100644 --- a/src/core/BBTrackContainer.cpp +++ b/src/core/BBTrackContainer.cpp @@ -25,7 +25,7 @@ #include "BBTrackContainer.h" #include "bb_track.h" -#include "combobox.h" +#include "ComboBox.h" #include "embed.h" #include "Engine.h" #include "Song.h" diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp index d36c5e486..1d0057fad 100644 --- a/src/core/Engine.cpp +++ b/src/core/Engine.cpp @@ -39,7 +39,7 @@ #include "PianoRoll.h" #include "PresetPreviewPlayHandle.h" #include "ProjectJournal.h" -#include "project_notes.h" +#include "ProjectNotes.h" #include "Plugin.h" #include "SongEditor.h" #include "Song.h" @@ -59,7 +59,7 @@ SongEditor* Engine::s_songEditor = NULL; AutomationEditor * Engine::s_automationEditor = NULL; bbEditor * Engine::s_bbEditor = NULL; PianoRoll* Engine::s_pianoRoll = NULL; -projectNotes * Engine::s_projectNotes = NULL; +ProjectNotes * Engine::s_projectNotes = NULL; ProjectJournal * Engine::s_projectJournal = NULL; Ladspa2LMMS * Engine::s_ladspaManager = NULL; DummyTrackContainer * Engine::s_dummyTC = NULL; @@ -96,7 +96,7 @@ void Engine::init( const bool _has_gui ) s_songEditor = new SongEditor( s_song ); s_fxMixerView = new FxMixerView; s_controllerRackView = new ControllerRackView; - s_projectNotes = new projectNotes; + s_projectNotes = new ProjectNotes; s_bbEditor = new bbEditor( s_bbTrackContainer ); s_pianoRoll = new PianoRoll; s_automationEditor = new AutomationEditor; diff --git a/src/core/Song.cpp b/src/core/Song.cpp index f150129a2..42800c7f0 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -54,12 +54,12 @@ #include "Pattern.h" #include "PianoRoll.h" #include "ProjectJournal.h" -#include "project_notes.h" +#include "ProjectNotes.h" #include "ProjectRenderer.h" -#include "rename_dialog.h" +#include "RenameDialog.h" #include "SongEditor.h" #include "templates.h" -#include "text_float.h" +#include "TextFloat.h" #include "Timeline.h" #include "PeakController.h" @@ -1043,7 +1043,7 @@ bool Song::guiSaveProject() m_fileName = dataFile.nameWithExtension( m_fileName ); if( saveProjectFile( m_fileName ) && Engine::hasGUI() ) { - textFloat::displayMessage( tr( "Project saved" ), + TextFloat::displayMessage( tr( "Project saved" ), tr( "The project %1 is now saved." ).arg( m_fileName ), embed::getIconPixmap( "project_save", 24, 24 ), @@ -1054,7 +1054,7 @@ bool Song::guiSaveProject() } else if( Engine::hasGUI() ) { - textFloat::displayMessage( tr( "Project NOT saved." ), + TextFloat::displayMessage( tr( "Project NOT saved." ), tr( "The project %1 was not saved!" ).arg( m_fileName ), embed::getIconPixmap( "error" ), 4000 ); diff --git a/src/core/Timeline.cpp b/src/core/Timeline.cpp index c48571c6a..46377e661 100644 --- a/src/core/Timeline.cpp +++ b/src/core/Timeline.cpp @@ -35,9 +35,9 @@ #include "embed.h" #include "Engine.h" #include "templates.h" -#include "nstate_button.h" +#include "NStateButton.h" #include "MainWindow.h" -#include "text_float.h" +#include "TextFloat.h" #if QT_VERSION < 0x040800 @@ -123,14 +123,14 @@ Timeline::~Timeline() void Timeline::addToolButtons( QWidget * _tool_bar ) { - nStateButton * autoScroll = new nStateButton( _tool_bar ); + NStateButton * autoScroll = new NStateButton( _tool_bar ); autoScroll->setGeneralToolTip( tr( "Enable/disable auto-scrolling" ) ); autoScroll->addState( embed::getIconPixmap( "autoscroll_on" ) ); autoScroll->addState( embed::getIconPixmap( "autoscroll_off" ) ); connect( autoScroll, SIGNAL( changedState( int ) ), this, SLOT( toggleAutoScroll( int ) ) ); - nStateButton * loopPoints = new nStateButton( _tool_bar ); + NStateButton * loopPoints = new NStateButton( _tool_bar ); loopPoints->setGeneralToolTip( tr( "Enable/disable loop-points" ) ); loopPoints->addState( embed::getIconPixmap( "loop_points_off" ) ); loopPoints->addState( embed::getIconPixmap( "loop_points_on" ) ); @@ -139,7 +139,7 @@ void Timeline::addToolButtons( QWidget * _tool_bar ) connect( this, SIGNAL( loopPointStateLoaded( int ) ), loopPoints, SLOT( changeState( int ) ) ); - nStateButton * behaviourAtStop = new nStateButton( _tool_bar ); + NStateButton * behaviourAtStop = new NStateButton( _tool_bar ); behaviourAtStop->addState( embed::getIconPixmap( "back_to_zero" ), tr( "After stopping go back to begin" ) ); @@ -313,14 +313,14 @@ void Timeline::mousePressEvent( QMouseEvent* event ) if( m_action == MoveLoopBegin ) { delete m_hint; - m_hint = textFloat::displayMessage( tr( "Hint" ), + m_hint = TextFloat::displayMessage( tr( "Hint" ), tr( "Press to disable magnetic loop points." ), embed::getIconPixmap( "hint" ), 0 ); } else if( m_action == MoveLoopEnd ) { delete m_hint; - m_hint = textFloat::displayMessage( tr( "Hint" ), + m_hint = TextFloat::displayMessage( tr( "Hint" ), tr( "Hold to move the begin loop point; Press to disable magnetic loop points." ), embed::getIconPixmap( "hint" ), 0 ); } diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 923c8f792..e9a0e7e9e 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -60,14 +60,14 @@ #include "InstrumentTrack.h" #include "MainWindow.h" #include "DataFile.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "ProjectJournal.h" #include "SampleTrack.h" #include "Song.h" #include "string_pair_drag.h" #include "templates.h" -#include "text_float.h" -#include "tooltip.h" +#include "TextFloat.h" +#include "ToolTip.h" #include "TrackContainer.h" @@ -87,7 +87,7 @@ const int TRACK_OP_BTN_HEIGHT = 14; * beside the cursor as you move or resize elements of a track about. * This pointer keeps track of it, as you only ever need one at a time. */ -textFloat * trackContentObjectView::s_textFloat = NULL; +TextFloat * trackContentObjectView::s_textFloat = NULL; // =========================================================================== @@ -257,7 +257,7 @@ trackContentObjectView::trackContentObjectView( trackContentObject * _tco, { if( s_textFloat == NULL ) { - s_textFloat = new textFloat; + s_textFloat = new TextFloat; s_textFloat->setPixmap( embed::getIconPixmap( "clock" ) ); } @@ -651,7 +651,7 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me ) QApplication::setOverrideCursor( c ); s_textFloat->setTitle( tr( "Current position" ) ); delete m_hint; - m_hint = textFloat::displayMessage( tr( "Hint" ), + m_hint = TextFloat::displayMessage( tr( "Hint" ), tr( "Press and drag to make " "a copy." ), embed::getIconPixmap( "hint" ), 0 ); @@ -664,7 +664,7 @@ void trackContentObjectView::mousePressEvent( QMouseEvent * _me ) QApplication::setOverrideCursor( c ); s_textFloat->setTitle( tr( "Current length" ) ); delete m_hint; - m_hint = textFloat::displayMessage( tr( "Hint" ), + m_hint = TextFloat::displayMessage( tr( "Hint" ), tr( "Press for free " "resizing." ), embed::getIconPixmap( "hint" ), 0 ); @@ -1559,7 +1559,7 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) : "track_op_grip" ) ); } - toolTip::add( this, tr( "Press while clicking on move-grip " + ToolTip::add( this, tr( "Press while clicking on move-grip " "to begin a new drag'n'drop-action." ) ); QMenu * to_menu = new QMenu( this ); @@ -1574,15 +1574,15 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) : m_trackOps->move( 12, 1 ); m_trackOps->setFocusPolicy( Qt::NoFocus ); m_trackOps->setMenu( to_menu ); - toolTip::add( m_trackOps, tr( "Actions for this track" ) ); + ToolTip::add( m_trackOps, tr( "Actions for this track" ) ); - m_muteBtn = new pixmapButton( this, tr( "Mute" ) ); + m_muteBtn = new PixmapButton( this, tr( "Mute" ) ); m_muteBtn->setActiveGraphic( embed::getIconPixmap( "led_off" ) ); m_muteBtn->setInactiveGraphic( embed::getIconPixmap( "led_green" ) ); m_muteBtn->setCheckable( true ); - m_soloBtn = new pixmapButton( this, tr( "Solo" ) ); + m_soloBtn = new PixmapButton( this, tr( "Solo" ) ); m_soloBtn->setActiveGraphic( embed::getIconPixmap( "led_red" ) ); m_soloBtn->setInactiveGraphic( embed::getIconPixmap( "led_off" ) ); m_soloBtn->setCheckable( true ); @@ -1600,10 +1600,10 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) : } m_muteBtn->show(); - toolTip::add( m_muteBtn, tr( "Mute this track" ) ); + ToolTip::add( m_muteBtn, tr( "Mute this track" ) ); m_soloBtn->show(); - toolTip::add( m_soloBtn, tr( "Solo" ) ); + ToolTip::add( m_soloBtn, tr( "Solo" ) ); connect( this, SIGNAL( trackRemovalScheduled( trackView * ) ), m_trackView->trackContainerView(), @@ -2661,7 +2661,7 @@ void trackView::mouseMoveEvent( QMouseEvent * _me ) if( height() < DEFAULT_TRACK_HEIGHT ) { - toolTip::add( this, m_track->m_name ); + ToolTip::add( this, m_track->m_name ); } } diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index b67ddab0c..d23baf277 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -46,7 +46,7 @@ void AudioPortAudioSetupUtil::updateChannels() #include "ConfigManager.h" #include "gui_templates.h" #include "templates.h" -#include "combobox.h" +#include "ComboBox.h" #include "LcdSpinBox.h" @@ -391,14 +391,14 @@ void AudioPortAudioSetupUtil::updateChannels() AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) : AudioDevice::setupWidget( AudioPortAudio::name(), _parent ) { - m_backend = new comboBox( this, "BACKEND" ); + m_backend = new ComboBox( this, "BACKEND" ); m_backend->setGeometry( 64, 15, 260, 20 ); QLabel * backend_lbl = new QLabel( tr( "BACKEND" ), this ); backend_lbl->setFont( pointSize<7>( backend_lbl->font() ) ); backend_lbl->move( 8, 18 ); - m_device = new comboBox( this, "DEVICE" ); + m_device = new ComboBox( this, "DEVICE" ); m_device->setGeometry( 64, 35, 260, 20 ); QLabel * dev_lbl = new QLabel( tr( "DEVICE" ), this ); diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp index 1357dca3e..f47d8165b 100644 --- a/src/gui/AutomationEditor.cpp +++ b/src/gui/AutomationEditor.cpp @@ -51,14 +51,14 @@ #include "MainWindow.h" #include "embed.h" #include "Engine.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "templates.h" #include "gui_templates.h" #include "Timeline.h" -#include "tooltip.h" -#include "tool_button.h" -#include "text_float.h" -#include "combobox.h" +#include "ToolTip.h" +#include "ToolButton.h" +#include "TextFloat.h" +#include "ComboBox.h" #include "BBTrackContainer.h" #include "PianoRoll.h" #include "debug.h" @@ -158,12 +158,12 @@ AutomationEditor::AutomationEditor() : // init control-buttons at the top - m_playButton = new toolButton( embed::getIconPixmap( "play" ), + m_playButton = new ToolButton( embed::getIconPixmap( "play" ), tr( "Play/pause current pattern (Space)" ), this, SLOT( play() ), m_toolBar ); - m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), + m_stopButton = new ToolButton( embed::getIconPixmap( "stop" ), tr( "Stop playing of current pattern (Space)" ), this, SLOT( stop() ), m_toolBar ); @@ -193,14 +193,14 @@ AutomationEditor::AutomationEditor() : SLOT( verScrolled( int ) ) ); // init edit-buttons at the top - m_drawButton = new toolButton( embed::getIconPixmap( "edit_draw" ), + m_drawButton = new ToolButton( embed::getIconPixmap( "edit_draw" ), tr( "Draw mode (Shift+D)" ), this, SLOT( drawButtonToggled() ), m_toolBar ); m_drawButton->setCheckable( true ); m_drawButton->setChecked( true ); - m_eraseButton = new toolButton( embed::getIconPixmap( "edit_erase" ), + m_eraseButton = new ToolButton( embed::getIconPixmap( "edit_erase" ), tr( "Erase mode (Shift+E)" ), this, SLOT( eraseButtonToggled() ), m_toolBar ); @@ -249,7 +249,7 @@ AutomationEditor::AutomationEditor() : "mode. You can also press 'Shift+M' on your keyboard " "to activate this mode." ) );*/ - m_discreteButton = new toolButton( embed::getIconPixmap( + m_discreteButton = new ToolButton( embed::getIconPixmap( "progression_discrete" ), tr( "Discrete progression" ), this, SLOT( discreteButtonToggled() ), @@ -257,14 +257,14 @@ AutomationEditor::AutomationEditor() : m_discreteButton->setCheckable( true ); m_discreteButton->setChecked( true ); - m_linearButton = new toolButton( embed::getIconPixmap( + m_linearButton = new ToolButton( embed::getIconPixmap( "progression_linear" ), tr( "Linear progression" ), this, SLOT( linearButtonToggled() ), m_toolBar ); m_linearButton->setCheckable( true ); - m_cubicHermiteButton = new toolButton( embed::getIconPixmap( + m_cubicHermiteButton = new ToolButton( embed::getIconPixmap( "progression_cubic_hermite" ), tr( "Cubic Hermite progression" ), this, SLOT( @@ -273,7 +273,7 @@ AutomationEditor::AutomationEditor() : m_cubicHermiteButton->setCheckable( true ); // setup tension-stuff - m_tensionKnob = new knob( knobSmall_17, this, "Tension" ); + m_tensionKnob = new Knob( knobSmall_17, this, "Tension" ); m_tensionModel = new FloatModel(1.0, 0.0, 1.0, 0.01); connect( m_tensionModel, SIGNAL( dataChanged() ), this, SLOT( tensionChanged() ) ); @@ -305,17 +305,17 @@ AutomationEditor::AutomationEditor() : "object will change in a smooth curve and ease in to " "the peaks and valleys." ) ); - m_cutButton = new toolButton( embed::getIconPixmap( "edit_cut" ), + m_cutButton = new ToolButton( embed::getIconPixmap( "edit_cut" ), tr( "Cut selected values (Ctrl+X)" ), this, SLOT( cutSelectedValues() ), m_toolBar ); - m_copyButton = new toolButton( embed::getIconPixmap( "edit_copy" ), + m_copyButton = new ToolButton( embed::getIconPixmap( "edit_copy" ), tr( "Copy selected values (Ctrl+C)" ), this, SLOT( copySelectedValues() ), m_toolBar ); - m_pasteButton = new toolButton( embed::getIconPixmap( "edit_paste" ), + m_pasteButton = new ToolButton( embed::getIconPixmap( "edit_paste" ), tr( "Paste values from clipboard " "(Ctrl+V)" ), this, SLOT( pasteValues() ), @@ -338,7 +338,7 @@ AutomationEditor::AutomationEditor() : QLabel * zoom_x_lbl = new QLabel( m_toolBar ); zoom_x_lbl->setPixmap( embed::getIconPixmap( "zoom_x" ) ); - m_zoomingXComboBox = new comboBox( m_toolBar ); + m_zoomingXComboBox = new ComboBox( m_toolBar ); m_zoomingXComboBox->setFixedSize( 80, 22 ); for( int i = 0; i < 6; ++i ) @@ -356,7 +356,7 @@ AutomationEditor::AutomationEditor() : QLabel * zoom_y_lbl = new QLabel( m_toolBar ); zoom_y_lbl->setPixmap( embed::getIconPixmap( "zoom_y" ) ); - m_zoomingYComboBox = new comboBox( m_toolBar ); + m_zoomingYComboBox = new ComboBox( m_toolBar ); m_zoomingYComboBox->setFixedSize( 80, 22 ); m_zoomingYModel.addItem( "Auto" ); @@ -376,7 +376,7 @@ AutomationEditor::AutomationEditor() : QLabel * quantize_lbl = new QLabel( m_toolBar ); quantize_lbl->setPixmap( embed::getIconPixmap( "quantize" ) ); - m_quantizeComboBox = new comboBox( m_toolBar ); + m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setFixedSize( 60, 22 ); for( int i = 0; i < 7; ++i ) @@ -2088,7 +2088,7 @@ void AutomationEditor::cubicHermiteButtonToggled() { m_tensionKnob->setModel( m_tensionModel ); m_tensionKnob->setEnabled( true ); - toolTip::add( m_tensionKnob, tr( "Tension value for spline" ) ); + ToolTip::add( m_tensionKnob, tr( "Tension value for spline" ) ); m_tensionKnob->setWhatsThis( tr( "A higher tension value may make a smoother curve " "but overshoot some values. A low tension " @@ -2210,7 +2210,7 @@ void AutomationEditor::copySelectedValues() { m_valuesToCopy[it.key()] = it.value(); } - textFloat::displayMessage( tr( "Values copied" ), + TextFloat::displayMessage( tr( "Values copied" ), tr( "All selected values were copied to the " "clipboard." ), embed::getIconPixmap( "edit_copy" ), 2000 ); diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index ad90a92e9..17c1c6fc1 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -33,9 +33,9 @@ #include "Engine.h" #include "gui_templates.h" #include "ProjectJournal.h" -#include "rename_dialog.h" +#include "RenameDialog.h" #include "string_pair_drag.h" -#include "tooltip.h" +#include "ToolTip.h" QPixmap * AutomationPatternView::s_pat_rec = NULL; @@ -56,7 +56,7 @@ AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern, setFixedHeight( parentWidget()->height() - 2 ); setAutoResizeEnabled( false ); - toolTip::add( this, tr( "double-click to open this pattern in " + ToolTip::add( this, tr( "double-click to open this pattern in " "automation editor" ) ); setStyle( QApplication::style() ); @@ -99,7 +99,7 @@ void AutomationPatternView::resetName() void AutomationPatternView::changeName() { QString s = m_pat->name(); - renameDialog rename_dlg( s ); + RenameDialog rename_dlg( s ); rename_dlg.exec(); m_pat->setName( s ); update(); diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp index 0a31cf075..d4485519a 100644 --- a/src/gui/ControllerConnectionDialog.cpp +++ b/src/gui/ControllerConnectionDialog.cpp @@ -35,12 +35,12 @@ #include "MidiClient.h" #include "MidiPortMenu.h" #include "LcdSpinBox.h" -#include "led_checkbox.h" -#include "combobox.h" -#include "tab_widget.h" -#include "group_box.h" +#include "LedCheckbox.h" +#include "ComboBox.h" +#include "TabWidget.h" +#include "GroupBox.h" #include "Song.h" -#include "tool_button.h" +#include "ToolButton.h" #include "gui_templates.h" #include "embed.h" @@ -137,7 +137,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, setModal( true ); // Midi stuff - m_midiGroupBox = new groupBox( tr( "MIDI CONTROLLER" ), this ); + m_midiGroupBox = new GroupBox( tr( "MIDI CONTROLLER" ), this ); m_midiGroupBox->setGeometry( 8, 10, 240, 80 ); connect( m_midiGroupBox->model(), SIGNAL( dataChanged() ), this, SLOT( midiToggled() ) ); @@ -156,7 +156,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, m_midiAutoDetectCheckBox = - new ledCheckBox( tr("Auto Detect"), + new LedCheckBox( tr("Auto Detect"), m_midiGroupBox, tr("Auto Detect") ); m_midiAutoDetectCheckBox->setModel( &m_midiAutoDetect ); m_midiAutoDetectCheckBox->move( 8, 60 ); @@ -170,7 +170,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, m_readablePorts = new MidiPortMenu( MidiPort::Input ); connect( m_readablePorts, SIGNAL( triggered( QAction * ) ), this, SLOT( enableAutoDetect( QAction * ) ) ); - toolButton * rp_btn = new toolButton( m_midiGroupBox ); + ToolButton * rp_btn = new ToolButton( m_midiGroupBox ); rp_btn->setText( tr( "MIDI-devices to receive " "MIDI-events from" ) ); rp_btn->setIcon( embed::getIconPixmap( "piano" ) ); @@ -181,12 +181,12 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, // User stuff - m_userGroupBox = new groupBox( tr( "USER CONTROLLER" ), this ); + m_userGroupBox = new GroupBox( tr( "USER CONTROLLER" ), this ); m_userGroupBox->setGeometry( 8, 100, 240, 60 ); connect( m_userGroupBox->model(), SIGNAL( dataChanged() ), this, SLOT( userToggled() ) ); - m_userController = new comboBox( m_userGroupBox, "Controller" ); + m_userController = new ComboBox( m_userGroupBox, "Controller" ); m_userController->setGeometry( 10, 24, 200, 22 ); for( int i = 0; i < Engine::getSong()->controllers().size(); ++i ) @@ -197,7 +197,7 @@ ControllerConnectionDialog::ControllerConnectionDialog( QWidget * _parent, // Mapping functions - m_mappingBox = new tabWidget( tr( "MAPPING FUNCTION" ), this ); + m_mappingBox = new TabWidget( tr( "MAPPING FUNCTION" ), this ); m_mappingBox->setGeometry( 8, 170, 240, 64 ); m_mappingFunction = new QLineEdit( m_mappingBox ); m_mappingFunction->setGeometry( 10, 20, 170, 16 ); diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index 117ad8000..23e37dae9 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -48,7 +48,7 @@ #include "SamplePlayHandle.h" #include "Song.h" #include "string_pair_drag.h" -#include "text_float.h" +#include "TextFloat.h" @@ -424,7 +424,7 @@ void FileBrowserTreeWidget::mousePressEvent(QMouseEvent * me ) // handling() rather than directly creating a SamplePlayHandle if( f->type() == FileItem::SampleFile ) { - textFloat * tf = textFloat::displayMessage( + TextFloat * tf = TextFloat::displayMessage( tr( "Loading sample" ), tr( "Please wait, loading sample for " "preview..." ), diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index 4f1cb0f7f..407c0bd59 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -38,7 +38,7 @@ #include #include "FxMixerView.h" -#include "knob.h" +#include "Knob.h" #include "Engine.h" #include "embed.h" #include "MainWindow.h" @@ -268,13 +268,13 @@ FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv, m_fxLine = new FxLine(_parent, _mv, _chIndex); FxMixer * m = Engine::fxMixer(); - m_fader = new fader( &m->effectChannel(_chIndex)->m_volumeModel, + m_fader = new Fader( &m->effectChannel(_chIndex)->m_volumeModel, tr( "FX Fader %1" ).arg( _chIndex ), m_fxLine ); m_fader->move( 16-m_fader->width()/2, m_fxLine->height()- m_fader->height()-5 ); - m_muteBtn = new pixmapButton( m_fxLine, tr( "Mute" ) ); + m_muteBtn = new PixmapButton( m_fxLine, tr( "Mute" ) ); m_muteBtn->setModel( &m->effectChannel(_chIndex)->m_muteModel ); m_muteBtn->setActiveGraphic( embed::getIconPixmap( "led_off" ) ); @@ -282,9 +282,9 @@ FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv, embed::getIconPixmap( "led_green" ) ); m_muteBtn->setCheckable( true ); m_muteBtn->move( 9, m_fader->y()-11); - toolTip::add( m_muteBtn, tr( "Mute this FX channel" ) ); + ToolTip::add( m_muteBtn, tr( "Mute this FX channel" ) ); - m_soloBtn = new pixmapButton( m_fxLine, tr( "Solo" ) ); + m_soloBtn = new PixmapButton( m_fxLine, tr( "Solo" ) ); m_soloBtn->setModel( &m->effectChannel(_chIndex)->m_soloModel ); m_soloBtn->setActiveGraphic( embed::getIconPixmap( "led_red" ) ); @@ -294,7 +294,7 @@ FxMixerView::FxChannelView::FxChannelView(QWidget * _parent, FxMixerView * _mv, m_soloBtn->move( 9, m_fader->y()-21); connect(&m->effectChannel(_chIndex)->m_soloModel, SIGNAL( dataChanged() ), _mv, SLOT ( toggledSolo() ) ); - toolTip::add( m_soloBtn, tr( "Solo FX channel" ) ); + ToolTip::add( m_soloBtn, tr( "Solo FX channel" ) ); // Create EffectRack for the channel m_rackView = new EffectRackView( &m->effectChannel(_chIndex)->m_fxChain, _mv->m_racksWidget ); diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index 693207bd9..f604fd93a 100644 --- a/src/gui/LfoControllerDialog.cpp +++ b/src/gui/LfoControllerDialog.cpp @@ -33,16 +33,16 @@ #include "gui_templates.h" #include "embed.h" #include "Engine.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "MainWindow.h" -#include "tooltip.h" +#include "ToolTip.h" #include "LfoController.h" #include "ControllerDialog.h" -#include "knob.h" +#include "Knob.h" #include "TempoSyncKnob.h" -#include "pixmap_button.h" +#include "PixmapButton.h" const int CD_ENV_KNOBS_LBL_Y = 20; const int CD_KNOB_X_SPACING = 32; @@ -70,9 +70,9 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent setWindowIcon( embed::getIconPixmap( "controller" ) ); setFixedSize( 240, 80 ); - toolTip::add( this, tr( "LFO Controller" ) ); + ToolTip::add( this, tr( "LFO Controller" ) ); - m_baseKnob = new knob( knobBright_26, this ); + m_baseKnob = new Knob( knobBright_26, this ); m_baseKnob->setLabel( tr( "BASE" ) ); m_baseKnob->move( CD_LFO_BASE_CD_KNOB_X, CD_LFO_CD_KNOB_Y ); m_baseKnob->setHintText( tr( "Base amount:" ) + " ", "" ); @@ -89,7 +89,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent "the faster the effect." ) ); - m_amountKnob = new knob( knobBright_26, this ); + m_amountKnob = new Knob( knobBright_26, this ); m_amountKnob->setLabel( tr( "AMT" ) ); m_amountKnob->move( CD_LFO_AMOUNT_CD_KNOB_X, CD_LFO_CD_KNOB_Y ); m_amountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" ); @@ -99,7 +99,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent "control (e.g. volume or cutoff-frequency) will " "be influenced by the LFO." ) ); - m_phaseKnob = new knob( knobBright_26, this ); + m_phaseKnob = new Knob( knobBright_26, this ); m_phaseKnob->setLabel( tr( "PHS" ) ); m_phaseKnob->move( CD_LFO_PHASE_CD_KNOB_X, CD_LFO_CD_KNOB_Y ); m_phaseKnob->setHintText( tr( "Phase offset:" ) + " ", "" + tr( "degrees" ) ); @@ -113,72 +113,72 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent "down. It's the same with a square-wave." ) ); - pixmapButton * sin_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * sin_wave_btn = new PixmapButton( this, NULL ); sin_wave_btn->move( CD_LFO_SHAPES_X, CD_LFO_SHAPES_Y ); sin_wave_btn->setActiveGraphic( embed::getIconPixmap( "sin_wave_active" ) ); sin_wave_btn->setInactiveGraphic( embed::getIconPixmap( "sin_wave_inactive" ) ); - toolTip::add( sin_wave_btn, + ToolTip::add( sin_wave_btn, tr( "Click here for a sine-wave." ) ); - pixmapButton * triangle_wave_btn = - new pixmapButton( this, NULL ); + PixmapButton * triangle_wave_btn = + new PixmapButton( this, NULL ); triangle_wave_btn->move( CD_LFO_SHAPES_X + 15, CD_LFO_SHAPES_Y ); triangle_wave_btn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); triangle_wave_btn->setInactiveGraphic( embed::getIconPixmap( "triangle_wave_inactive" ) ); - toolTip::add( triangle_wave_btn, + ToolTip::add( triangle_wave_btn, tr( "Click here for a triangle-wave." ) ); - pixmapButton * saw_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * saw_wave_btn = new PixmapButton( this, NULL ); saw_wave_btn->move( CD_LFO_SHAPES_X + 30, CD_LFO_SHAPES_Y ); saw_wave_btn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); saw_wave_btn->setInactiveGraphic( embed::getIconPixmap( "saw_wave_inactive" ) ); - toolTip::add( saw_wave_btn, + ToolTip::add( saw_wave_btn, tr( "Click here for a saw-wave." ) ); - pixmapButton * sqr_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * sqr_wave_btn = new PixmapButton( this, NULL ); sqr_wave_btn->move( CD_LFO_SHAPES_X + 45, CD_LFO_SHAPES_Y ); sqr_wave_btn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); sqr_wave_btn->setInactiveGraphic( embed::getIconPixmap( "square_wave_inactive" ) ); - toolTip::add( sqr_wave_btn, + ToolTip::add( sqr_wave_btn, tr( "Click here for a square-wave." ) ); - pixmapButton * moog_saw_wave_btn = - new pixmapButton( this, NULL ); + PixmapButton * moog_saw_wave_btn = + new PixmapButton( this, NULL ); moog_saw_wave_btn->move( CD_LFO_SHAPES_X, CD_LFO_SHAPES_Y + 15 ); moog_saw_wave_btn->setActiveGraphic( embed::getIconPixmap( "moog_saw_wave_active" ) ); moog_saw_wave_btn->setInactiveGraphic( embed::getIconPixmap( "moog_saw_wave_inactive" ) ); - toolTip::add( moog_saw_wave_btn, + ToolTip::add( moog_saw_wave_btn, tr( "Click here for a a moog saw-wave." ) ); - pixmapButton * exp_wave_btn = new pixmapButton( this, NULL ); + PixmapButton * exp_wave_btn = new PixmapButton( this, NULL ); exp_wave_btn->move( CD_LFO_SHAPES_X + 15, CD_LFO_SHAPES_Y + 15 ); exp_wave_btn->setActiveGraphic( embed::getIconPixmap( "exp_wave_active" ) ); exp_wave_btn->setInactiveGraphic( embed::getIconPixmap( "exp_wave_inactive" ) ); - toolTip::add( exp_wave_btn, + ToolTip::add( exp_wave_btn, tr( "Click here for an exponential wave." ) ); - pixmapButton * white_noise_btn = new pixmapButton( this, NULL ); + PixmapButton * white_noise_btn = new PixmapButton( this, NULL ); white_noise_btn->move( CD_LFO_SHAPES_X + 30, CD_LFO_SHAPES_Y + 15 ); white_noise_btn->setActiveGraphic( embed::getIconPixmap( "white_noise_wave_active" ) ); white_noise_btn->setInactiveGraphic( embed::getIconPixmap( "white_noise_wave_inactive" ) ); - toolTip::add( white_noise_btn, + ToolTip::add( white_noise_btn, tr( "Click here for white-noise." ) ); - m_userWaveBtn = new pixmapButton( this, NULL ); + m_userWaveBtn = new PixmapButton( this, NULL ); m_userWaveBtn->move( CD_LFO_SHAPES_X + 45, CD_LFO_SHAPES_Y + 15 ); m_userWaveBtn->setActiveGraphic( embed::getIconPixmap( "usr_wave_active" ) ); @@ -187,7 +187,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent connect( m_userWaveBtn, SIGNAL( doubleClicked() ), this, SLOT( askUserDefWave() ) ); - toolTip::add( m_userWaveBtn, + ToolTip::add( m_userWaveBtn, tr( "Click here for a user-defined shape.\nDouble click to pick a file." ) ); m_waveBtnGrp = new automatableButtonGroup( this ); @@ -201,21 +201,21 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent m_waveBtnGrp->addButton( m_userWaveBtn ); - pixmapButton * x1 = new pixmapButton( this, NULL ); + PixmapButton * x1 = new PixmapButton( this, NULL ); x1->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y ); x1->setActiveGraphic( embed::getIconPixmap( "lfo_x1_active" ) ); x1->setInactiveGraphic( embed::getIconPixmap( "lfo_x1_inactive" ) ); - pixmapButton * x100 = new pixmapButton( this, NULL ); + PixmapButton * x100 = new PixmapButton( this, NULL ); x100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y - 15 ); x100->setActiveGraphic( embed::getIconPixmap( "lfo_x100_active" ) ); x100->setInactiveGraphic( embed::getIconPixmap( "lfo_x100_inactive" ) ); - pixmapButton * d100 = new pixmapButton( this, NULL ); + PixmapButton * d100 = new PixmapButton( this, NULL ); d100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y + 15 ); d100->setActiveGraphic( embed::getIconPixmap( "lfo_d100_active" ) ); @@ -256,7 +256,7 @@ void LfoControllerDialog::askUserDefWave() if( fileName.isEmpty() == false ) { // TODO: - toolTip::add( m_userWaveBtn, sampleBuffer->audioFile() ); + ToolTip::add( m_userWaveBtn, sampleBuffer->audioFile() ); } } diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 1c6394f6e..2a6c1195b 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -54,11 +54,11 @@ #include "ConfigManager.h" #include "Mixer.h" #include "PluginView.h" -#include "project_notes.h" +#include "ProjectNotes.h" #include "setup_dialog.h" #include "AudioDummy.h" #include "ToolPlugin.h" -#include "tool_button.h" +#include "ToolButton.h" #include "ProjectJournal.h" #include "AutomationEditor.h" #include "templates.h" @@ -348,13 +348,13 @@ void MainWindow::finalize() this, SLOT( aboutLMMS() ) ); // create tool-buttons - toolButton * project_new = new toolButton( + ToolButton * project_new = new ToolButton( embed::getIconPixmap( "project_new" ), tr( "Create new project" ), this, SLOT( createNewProject() ), m_toolBar ); - toolButton * project_new_from_template = new toolButton( + ToolButton * project_new_from_template = new ToolButton( embed::getIconPixmap( "project_new_from_template" ), tr( "Create new project from template" ), this, SLOT( emptySlot() ), @@ -366,37 +366,37 @@ void MainWindow::finalize() connect( m_templatesMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( createNewProjectFromTemplate( QAction * ) ) ); project_new_from_template->setMenu( m_templatesMenu ); - project_new_from_template->setPopupMode( toolButton::InstantPopup ); + project_new_from_template->setPopupMode( ToolButton::InstantPopup ); - toolButton * project_open = new toolButton( + ToolButton * project_open = new ToolButton( embed::getIconPixmap( "project_open" ), tr( "Open existing project" ), this, SLOT( openProject() ), m_toolBar ); - toolButton * project_open_recent = new toolButton( + ToolButton * project_open_recent = new ToolButton( embed::getIconPixmap( "project_open_recent" ), tr( "Recently opened project" ), this, SLOT( emptySlot() ), m_toolBar ); project_open_recent->setMenu( m_recentlyOpenedProjectsMenu ); - project_open_recent->setPopupMode( toolButton::InstantPopup ); + project_open_recent->setPopupMode( ToolButton::InstantPopup ); - toolButton * project_save = new toolButton( + ToolButton * project_save = new ToolButton( embed::getIconPixmap( "project_save" ), tr( "Save current project" ), this, SLOT( saveProject() ), m_toolBar ); - toolButton * project_export = new toolButton( + ToolButton * project_export = new ToolButton( embed::getIconPixmap( "project_export" ), tr( "Export current project" ), Engine::getSong(), SLOT( exportProject() ), m_toolBar ); - toolButton * whatsthis = new toolButton( + ToolButton * whatsthis = new ToolButton( embed::getIconPixmap( "whatsthis" ), tr( "What's this?" ), this, SLOT( enterWhatsThisMode() ), @@ -414,7 +414,7 @@ void MainWindow::finalize() // window-toolbar - toolButton * song_editor_window = new toolButton( + ToolButton * song_editor_window = new ToolButton( embed::getIconPixmap( "songeditor" ), tr( "Show/hide Song-Editor" ) + " (F5)", this, SLOT( toggleSongEditorWin() ), @@ -429,7 +429,7 @@ void MainWindow::finalize() "rap samples) directly into the playlist." ) ); - toolButton * bb_editor_window = new toolButton( + ToolButton * bb_editor_window = new ToolButton( embed::getIconPixmap( "bb_track_btn" ), tr( "Show/hide Beat+Bassline Editor" ) + " (F6)", @@ -445,7 +445,7 @@ void MainWindow::finalize() "that." ) ); - toolButton * piano_roll_window = new toolButton( + ToolButton * piano_roll_window = new ToolButton( embed::getIconPixmap( "piano" ), tr( "Show/hide Piano-Roll" ) + " (F7)", @@ -458,7 +458,7 @@ void MainWindow::finalize() "you can edit melodies in an easy way." ) ); - toolButton * automation_editor_window = new toolButton( + ToolButton * automation_editor_window = new ToolButton( embed::getIconPixmap( "automation" ), tr( "Show/hide Automation Editor" ) + " (F8)", @@ -473,7 +473,7 @@ void MainWindow::finalize() "in an easy way." ) ); - toolButton * fx_mixer_window = new toolButton( + ToolButton * fx_mixer_window = new ToolButton( embed::getIconPixmap( "fx_mixer" ), tr( "Show/hide FX Mixer" ) + " (F9)", this, SLOT( toggleFxMixerWin() ), @@ -485,7 +485,7 @@ void MainWindow::finalize() "for managing effects for your song. You can insert " "effects into different effect-channels." ) ); - toolButton * project_notes_window = new toolButton( + ToolButton * project_notes_window = new ToolButton( embed::getIconPixmap( "project_notes" ), tr( "Show/hide project notes" ) + " (F10)", @@ -497,7 +497,7 @@ void MainWindow::finalize() "project notes window. In this window you can put " "down your project notes.") ); - toolButton * controllers_window = new toolButton( + ToolButton * controllers_window = new ToolButton( embed::getIconPixmap( "controller" ), tr( "Show/hide controller rack" ) + " (F11)", diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp index add8eb529..4403a7baa 100644 --- a/src/gui/PeakControllerDialog.cpp +++ b/src/gui/PeakControllerDialog.cpp @@ -35,13 +35,13 @@ #include "embed.h" #include "Engine.h" #include "MainWindow.h" -#include "tooltip.h" +#include "ToolTip.h" #include "PeakController.h" #include "ControllerDialog.h" -#include "knob.h" +#include "Knob.h" #include "TempoSyncKnob.h" -#include "pixmap_button.h" +#include "PixmapButton.h" PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) : @@ -51,7 +51,7 @@ PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _pare setWindowIcon( embed::getIconPixmap( "controller" ) ); setFixedSize( 256, 64 ); - toolTip::add( this, tr( "LFO Controller" ) ); + ToolTip::add( this, tr( "LFO Controller" ) ); QLabel * l = new QLabel( this ); l->setText( "Use FX's controls" ); diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp index 1300aa72f..56bc5b6a0 100644 --- a/src/gui/PianoRoll.cpp +++ b/src/gui/PianoRoll.cpp @@ -49,7 +49,7 @@ #include "PianoRoll.h" #include "BBTrackContainer.h" #include "Clipboard.h" -#include "combobox.h" +#include "ComboBox.h" #include "debug.h" #include "DetuningHelper.h" #include "embed.h" @@ -60,14 +60,14 @@ #include "DataFile.h" #include "Pattern.h" #include "Piano.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "Song.h" #include "SongEditor.h" #include "templates.h" -#include "text_float.h" +#include "TextFloat.h" #include "Timeline.h" -#include "tool_button.h" -#include "text_float.h" +#include "ToolButton.h" +#include "TextFloat.h" typedef AutomationPattern::timeMap timeMap; @@ -126,7 +126,7 @@ QPixmap * PianoRoll::s_toolSelect = NULL; QPixmap * PianoRoll::s_toolMove = NULL; QPixmap * PianoRoll::s_toolOpen = NULL; -textFloat * PianoRoll::s_textFloat = NULL; +TextFloat * PianoRoll::s_textFloat = NULL; // used for drawing of piano PianoRoll::PianoRollKeyTypes PianoRoll::prKeyOrder[] = @@ -285,7 +285,7 @@ PianoRoll::PianoRoll() : // init text-float if( s_textFloat == NULL ) { - s_textFloat = new textFloat; + s_textFloat = new TextFloat; } setAttribute( Qt::WA_OpaquePaintEvent, true ); @@ -328,19 +328,19 @@ PianoRoll::PianoRoll() : // init control-buttons at the top - m_playButton = new toolButton( embed::getIconPixmap( "play" ), + m_playButton = new ToolButton( embed::getIconPixmap( "play" ), tr( "Play/pause current pattern (Space)" ), this, SLOT( play() ), m_toolBar ); - m_recordButton = new toolButton( embed::getIconPixmap( "record" ), + m_recordButton = new ToolButton( embed::getIconPixmap( "record" ), tr( "Record notes from MIDI-device/channel-piano" ), this, SLOT( record() ), m_toolBar ); - m_recordAccompanyButton = new toolButton( + m_recordAccompanyButton = new ToolButton( embed::getIconPixmap( "record_accompany" ), tr( "Record notes from MIDI-device/channel-piano while playing song or BB track" ), this, SLOT( recordAccompany() ), m_toolBar ); - m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), + m_stopButton = new ToolButton( embed::getIconPixmap( "stop" ), tr( "Stop playing of current pattern (Space)" ), this, SLOT( stop() ), m_toolBar ); @@ -384,27 +384,27 @@ PianoRoll::PianoRoll() : SLOT( verScrolled( int ) ) ); // init edit-buttons at the top - m_drawButton = new toolButton( embed::getIconPixmap( "edit_draw" ), + m_drawButton = new ToolButton( embed::getIconPixmap( "edit_draw" ), tr( "Draw mode (Shift+D)" ), this, SLOT( drawButtonToggled() ), m_toolBar ); m_drawButton->setCheckable( true ); m_drawButton->setChecked( true ); - m_eraseButton = new toolButton( embed::getIconPixmap( "edit_erase" ), + m_eraseButton = new ToolButton( embed::getIconPixmap( "edit_erase" ), tr( "Erase mode (Shift+E)" ), this, SLOT( eraseButtonToggled() ), m_toolBar ); m_eraseButton->setCheckable( true ); - m_selectButton = new toolButton( embed::getIconPixmap( + m_selectButton = new ToolButton( embed::getIconPixmap( "edit_select" ), tr( "Select mode (Shift+S)" ), this, SLOT( selectButtonToggled() ), m_toolBar ); m_selectButton->setCheckable( true ); - m_detuneButton = new toolButton( embed::getIconPixmap( "automation"), + m_detuneButton = new ToolButton( embed::getIconPixmap( "automation"), tr( "Detune mode (Shift+T)" ), this, SLOT( detuneButtonToggled() ), m_toolBar ); @@ -440,17 +440,17 @@ PianoRoll::PianoRoll() : "notes from one to another. You can also press " "'Shift+T' on your keyboard to activate this mode." ) ); - m_cutButton = new toolButton( embed::getIconPixmap( "edit_cut" ), + m_cutButton = new ToolButton( embed::getIconPixmap( "edit_cut" ), tr( "Cut selected notes (Ctrl+X)" ), this, SLOT( cutSelectedNotes() ), m_toolBar ); - m_copyButton = new toolButton( embed::getIconPixmap( "edit_copy" ), + m_copyButton = new ToolButton( embed::getIconPixmap( "edit_copy" ), tr( "Copy selected notes (Ctrl+C)" ), this, SLOT( copySelectedNotes() ), m_toolBar ); - m_pasteButton = new toolButton( embed::getIconPixmap( "edit_paste" ), + m_pasteButton = new ToolButton( embed::getIconPixmap( "edit_paste" ), tr( "Paste notes from clipboard " "(Ctrl+V)" ), this, SLOT( pasteNotes() ), @@ -479,7 +479,7 @@ PianoRoll::PianoRoll() : m_zoomingModel.setValue( m_zoomingModel.findText( "100%" ) ); connect( &m_zoomingModel, SIGNAL( dataChanged() ), this, SLOT( zoomingChanged() ) ); - m_zoomingComboBox = new comboBox( m_toolBar ); + m_zoomingComboBox = new ComboBox( m_toolBar ); m_zoomingComboBox->setModel( &m_zoomingModel ); m_zoomingComboBox->setFixedSize( 64, 22 ); @@ -498,7 +498,7 @@ PianoRoll::PianoRoll() : } m_quantizeModel.addItem( "1/192" ); m_quantizeModel.setValue( m_quantizeModel.findText( "1/16" ) ); - m_quantizeComboBox = new comboBox( m_toolBar ); + m_quantizeComboBox = new ComboBox( m_toolBar ); m_quantizeComboBox->setModel( &m_quantizeModel ); m_quantizeComboBox->setFixedSize( 64, 22 ); connect( &m_quantizeModel, SIGNAL( dataChanged() ), @@ -527,7 +527,7 @@ PianoRoll::PianoRoll() : new PixmapLoader( "note_" + pixmaps[i+NUM_EVEN_LENGTHS] ) ); } m_noteLenModel.setValue( 0 ); - m_noteLenComboBox = new comboBox( m_toolBar ); + m_noteLenComboBox = new ComboBox( m_toolBar ); m_noteLenComboBox->setModel( &m_noteLenModel ); m_noteLenComboBox->setFixedSize( 105, 22 ); // Note length change can cause a redraw if Q is set to lock @@ -551,7 +551,7 @@ PianoRoll::PianoRoll() : } m_scaleModel.setValue( 0 ); - m_scaleComboBox = new comboBox( m_toolBar ); + m_scaleComboBox = new ComboBox( m_toolBar ); m_scaleComboBox->setModel( &m_scaleModel ); m_scaleComboBox->setFixedSize( 105, 22 ); // change can update m_semiToneMarkerMenu @@ -573,7 +573,7 @@ PianoRoll::PianoRoll() : } m_chordModel.setValue( 0 ); - m_chordComboBox = new comboBox( m_toolBar ); + m_chordComboBox = new ComboBox( m_toolBar ); m_chordComboBox->setModel( &m_chordModel ); m_chordComboBox->setFixedSize( 105, 22 ); // change can update m_semiToneMarkerMenu diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp index 64423c036..ece836420 100644 --- a/src/gui/PianoView.cpp +++ b/src/gui/PianoView.cpp @@ -50,7 +50,7 @@ #include "Engine.h" #include "gui_templates.h" #include "InstrumentTrack.h" -#include "knob.h" +#include "Knob.h" #include "string_pair_drag.h" #include "MainWindow.h" #include "MidiEvent.h" diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp index 26db6beac..24d00d922 100644 --- a/src/gui/SongEditor.cpp +++ b/src/gui/SongEditor.cpp @@ -37,18 +37,18 @@ #include "SongEditor.h" #include "AutomatableSlider.h" -#include "combobox.h" +#include "ComboBox.h" #include "ConfigManager.h" -#include "cpuload_widget.h" +#include "CPULoadWidget.h" #include "embed.h" #include "LcdSpinBox.h" #include "MainWindow.h" #include "MeterDialog.h" -#include "text_float.h" +#include "TextFloat.h" #include "Timeline.h" -#include "tool_button.h" -#include "tooltip.h" -#include "visualization_widget.h" +#include "ToolButton.h" +#include "ToolTip.h" +#include "VisualizationWidget.h" #include "TimeDisplayWidget.h" #include "AudioDevice.h" #include "PianoRoll.h" @@ -117,7 +117,7 @@ SongEditor::SongEditor( Song * _song ) : m_tempoSpinBox = new LcdSpinBox( 3, tb, tr( "Tempo" ) ); m_tempoSpinBox->setModel( &m_song->m_tempoModel ); m_tempoSpinBox->setLabel( tr( "TEMPO/BPM" ) ); - toolTip::add( m_tempoSpinBox, tr( "tempo of song" ) ); + ToolTip::add( m_tempoSpinBox, tr( "tempo of song" ) ); m_tempoSpinBox->setWhatsThis( tr( "The tempo of a song is specified in beats per minute " @@ -162,7 +162,7 @@ SongEditor::SongEditor( Song * _song ) : m_masterVolumeSlider->setTickPosition( QSlider::TicksLeft ); m_masterVolumeSlider->setFixedSize( 26, 60 ); m_masterVolumeSlider->setTickInterval( 50 ); - toolTip::add( m_masterVolumeSlider, tr( "master volume" ) ); + ToolTip::add( m_masterVolumeSlider, tr( "master volume" ) ); connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this, SLOT( masterVolumeChanged( int ) ) ); @@ -173,7 +173,7 @@ SongEditor::SongEditor( Song * _song ) : connect( m_masterVolumeSlider, SIGNAL( sliderReleased() ), this, SLOT( masterVolumeReleased() ) ); - m_mvsStatus = new textFloat; + m_mvsStatus = new TextFloat; m_mvsStatus->setTitle( tr( "Master volume" ) ); m_mvsStatus->setPixmap( embed::getIconPixmap( "master_volume" ) ); @@ -195,7 +195,7 @@ SongEditor::SongEditor( Song * _song ) : m_masterPitchSlider->setTickPosition( QSlider::TicksLeft ); m_masterPitchSlider->setFixedSize( 26, 60 ); m_masterPitchSlider->setTickInterval( 12 ); - toolTip::add( m_masterPitchSlider, tr( "master pitch" ) ); + ToolTip::add( m_masterPitchSlider, tr( "master pitch" ) ); connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this, SLOT( masterPitchChanged( int ) ) ); connect( m_masterPitchSlider, SIGNAL( sliderPressed() ), this, @@ -205,7 +205,7 @@ SongEditor::SongEditor( Song * _song ) : connect( m_masterPitchSlider, SIGNAL( sliderReleased() ), this, SLOT( masterPitchReleased() ) ); - m_mpsStatus = new textFloat; + m_mpsStatus = new TextFloat; m_mpsStatus->setTitle( tr( "Master pitch" ) ); m_mpsStatus->setPixmap( embed::getIconPixmap( "master_pitch" ) ); @@ -221,10 +221,10 @@ SongEditor::SongEditor( Song * _song ) : vcw_layout->setSpacing( 0 ); //vcw_layout->addStretch(); - vcw_layout->addWidget( new visualizationWidget( + vcw_layout->addWidget( new VisualizationWidget( embed::getIconPixmap( "output_graph" ), vc_w ) ); - vcw_layout->addWidget( new cpuloadWidget( vc_w ) ); + vcw_layout->addWidget( new CPULoadWidget( vc_w ) ); vcw_layout->addStretch(); Engine::mainWindow()->addWidgetToToolBar( vc_w ); @@ -248,17 +248,17 @@ SongEditor::SongEditor( Song * _song ) : // fill own tool-bar - m_playButton = new toolButton( embed::getIconPixmap( "play" ), + m_playButton = new ToolButton( embed::getIconPixmap( "play" ), tr( "Play song (Space)" ), this, SLOT( play() ), m_toolBar ); m_playButton->setObjectName( "playButton" ); - m_recordButton = new toolButton( embed::getIconPixmap( "record" ), + m_recordButton = new ToolButton( embed::getIconPixmap( "record" ), tr( "Record samples from Audio-device" ), this, SLOT( record() ), m_toolBar ); m_recordButton->setObjectName( "recordButton" ); - m_recordAccompanyButton = new toolButton( + m_recordAccompanyButton = new ToolButton( embed::getIconPixmap( "record_accompany" ), tr( "Record samples from Audio-device while playing " "song or BB track" ), @@ -275,37 +275,37 @@ SongEditor::SongEditor( Song * _song ) : m_recordAccompanyButton->setDisabled( true ); } - m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), + m_stopButton = new ToolButton( embed::getIconPixmap( "stop" ), tr( "Stop song (Space)" ), this, SLOT( stop() ), m_toolBar ); m_stopButton->setObjectName( "stopButton" ); - m_addBBTrackButton = new toolButton( embed::getIconPixmap( + m_addBBTrackButton = new ToolButton( embed::getIconPixmap( "add_bb_track" ), tr( "Add beat/bassline" ), m_song, SLOT( addBBTrack() ), m_toolBar ); - m_addSampleTrackButton = new toolButton( embed::getIconPixmap( + m_addSampleTrackButton = new ToolButton( embed::getIconPixmap( "add_sample_track" ), tr( "Add sample-track" ), m_song, SLOT( addSampleTrack() ), m_toolBar ); - m_addAutomationTrackButton = new toolButton( embed::getIconPixmap( + m_addAutomationTrackButton = new ToolButton( embed::getIconPixmap( "add_automation" ), tr( "Add automation-track" ), m_song, SLOT( addAutomationTrack() ), m_toolBar ); - m_drawModeButton = new toolButton( embed::getIconPixmap( + m_drawModeButton = new ToolButton( embed::getIconPixmap( "edit_draw" ), tr( "Draw mode" ), NULL, NULL, m_toolBar ); m_drawModeButton->setCheckable( true ); m_drawModeButton->setChecked( true ); - m_editModeButton = new toolButton( embed::getIconPixmap( + m_editModeButton = new ToolButton( embed::getIconPixmap( "edit_select" ), tr( "Edit mode (select and move)" ), NULL, NULL, m_toolBar ); @@ -343,7 +343,7 @@ SongEditor::SongEditor( Song * _song ) : zoom_lbl->setPixmap( embed::getIconPixmap( "zoom" ) ); // setup zooming-stuff - m_zoomingComboBox = new comboBox( m_toolBar ); + m_zoomingComboBox = new ComboBox( m_toolBar ); m_zoomingComboBox->setFixedSize( 80, 22 ); m_zoomingComboBox->move( 580, 4 ); for( int i = 0; i < 7; ++i ) diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp index 13b585106..364a517d5 100644 --- a/src/gui/TrackContainerView.cpp +++ b/src/gui/TrackContainerView.cpp @@ -41,7 +41,7 @@ #include "Instrument.h" #include "InstrumentTrack.h" #include "DataFile.h" -#include "rubberband.h" +#include "Rubberband.h" #include "Song.h" #include "string_pair_drag.h" #include "Track.h" @@ -57,7 +57,7 @@ TrackContainerView::TrackContainerView( TrackContainer * _tc ) : m_trackViews(), m_scrollArea( new scrollArea( this ) ), m_ppt( DEFAULT_PIXELS_PER_TACT ), - m_rubberBand( new rubberBand( m_scrollArea ) ), + m_rubberBand( new RubberBand( m_scrollArea ) ), m_origin() { m_tc->setHook( this ); diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index 3aa0365f3..f95c2513e 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -33,7 +33,7 @@ #include "embed.h" #include "MainWindow.h" #include "Song.h" -#include "tool_button.h" +#include "ToolButton.h" #include "ConfigManager.h" #include "DataFile.h" #include "string_pair_drag.h" @@ -79,34 +79,34 @@ bbEditor::bbEditor( BBTrackContainer* tc ) : } - m_playButton = new toolButton( embed::getIconPixmap( "play" ), + m_playButton = new ToolButton( embed::getIconPixmap( "play" ), tr( "Play/pause current beat/bassline (Space)" ), this, SLOT( play() ), m_toolBar ); - m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), + m_stopButton = new ToolButton( embed::getIconPixmap( "stop" ), tr( "Stop playback of current beat/bassline (Space)" ), this, SLOT( stop() ), m_toolBar ); m_playButton->setObjectName( "playButton" ); m_stopButton->setObjectName( "stopButton" ); - toolButton * add_bb_track = new toolButton( + ToolButton * add_bb_track = new ToolButton( embed::getIconPixmap( "add_bb_track" ), tr( "Add beat/bassline" ), Engine::getSong(), SLOT( addBBTrack() ), m_toolBar ); - toolButton * add_automation_track = new toolButton( + ToolButton * add_automation_track = new ToolButton( embed::getIconPixmap( "add_automation" ), tr( "Add automation-track" ), this, SLOT( addAutomationTrack() ), m_toolBar ); - toolButton * remove_bar = new toolButton( + ToolButton * remove_bar = new ToolButton( embed::getIconPixmap( "step_btn_remove" ), tr( "Remove steps" ), this, SLOT( removeSteps() ), m_toolBar ); - toolButton * add_bar = new toolButton( + ToolButton * add_bar = new ToolButton( embed::getIconPixmap( "step_btn_add" ), tr( "Add steps" ), this, SLOT( addSteps() ), m_toolBar ); @@ -121,7 +121,7 @@ bbEditor::bbEditor( BBTrackContainer* tc ) : tr( "Click here to stop playing of current " "beat/bassline." ) ); - m_bbComboBox = new comboBox( m_toolBar ); + m_bbComboBox = new ComboBox( m_toolBar ); m_bbComboBox->setFixedSize( 200, 22 ); m_bbComboBox->setModel( &tc->m_bbComboBoxModel ); diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index 3fd6b8750..d79ee1ba6 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -32,9 +32,9 @@ #include #include "setup_dialog.h" -#include "tab_bar.h" +#include "TabBar.h" #include "tab_button.h" -#include "tab_widget.h" +#include "TabWidget.h" #include "gui_templates.h" #include "Mixer.h" #include "ProjectJournal.h" @@ -42,8 +42,8 @@ #include "embed.h" #include "Engine.h" #include "debug.h" -#include "tooltip.h" -#include "led_checkbox.h" +#include "ToolTip.h" +#include "LedCheckbox.h" #include "LcdSpinBox.h" #include "FileDialog.h" @@ -139,7 +139,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : hlayout->setSpacing( 0 ); hlayout->setMargin( 0 ); - m_tabBar = new tabBar( settings, QBoxLayout::TopToBottom ); + m_tabBar = new TabBar( settings, QBoxLayout::TopToBottom ); m_tabBar->setExclusive( true ); m_tabBar->setFixedWidth( 72 ); @@ -159,7 +159,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : gen_layout->setMargin( 0 ); labelWidget( general, tr( "General settings" ) ); - tabWidget * bufsize_tw = new tabWidget( tr( "BUFFER SIZE" ), general ); + TabWidget * bufsize_tw = new TabWidget( tr( "BUFFER SIZE" ), general ); bufsize_tw->setFixedHeight( 80 ); m_bufSizeSlider = new QSlider( Qt::Horizontal, bufsize_tw ); @@ -182,7 +182,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : bufsize_reset_btn->setGeometry( 290, 40, 28, 28 ); connect( bufsize_reset_btn, SIGNAL( clicked() ), this, SLOT( resetBufSize() ) ); - toolTip::add( bufsize_reset_btn, tr( "Reset to default-value" ) ); + ToolTip::add( bufsize_reset_btn, tr( "Reset to default-value" ) ); QPushButton * bufsize_help_btn = new QPushButton( embed::getIconPixmap( "help" ), "", bufsize_tw ); @@ -191,14 +191,14 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : SLOT( displayBufSizeHelp() ) ); - tabWidget * misc_tw = new tabWidget( tr( "MISC" ), general ); + TabWidget * misc_tw = new TabWidget( tr( "MISC" ), general ); const int XDelta = 10; const int YDelta = 18; const int HeaderSize = 30; int labelNumber = 0; - ledCheckBox * enable_tooltips = new ledCheckBox( + LedCheckBox * enable_tooltips = new LedCheckBox( tr( "Enable tooltips" ), misc_tw ); labelNumber++; @@ -208,7 +208,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleToolTips( bool ) ) ); - ledCheckBox * restart_msg = new ledCheckBox( + LedCheckBox * restart_msg = new LedCheckBox( tr( "Show restart warning after changing settings" ), misc_tw ); labelNumber++; @@ -218,7 +218,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleWarnAfterSetup( bool ) ) ); - ledCheckBox * dbv = new ledCheckBox( tr( "Display volume as dBV " ), + LedCheckBox * dbv = new LedCheckBox( tr( "Display volume as dBV " ), misc_tw ); labelNumber++; dbv->move( XDelta, YDelta*labelNumber ); @@ -227,7 +227,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleDisplaydBV( bool ) ) ); - ledCheckBox * mmpz = new ledCheckBox( + LedCheckBox * mmpz = new LedCheckBox( tr( "Compress project files per default" ), misc_tw ); labelNumber++; @@ -236,7 +236,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( mmpz, SIGNAL( toggled( bool ) ), this, SLOT( toggleMMPZ( bool ) ) ); - ledCheckBox * oneitw = new ledCheckBox( + LedCheckBox * oneitw = new LedCheckBox( tr( "One instrument track window mode" ), misc_tw ); labelNumber++; @@ -245,7 +245,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( oneitw, SIGNAL( toggled( bool ) ), this, SLOT( toggleOneInstrumentTrackWindow( bool ) ) ); - ledCheckBox * hqaudio = new ledCheckBox( + LedCheckBox * hqaudio = new LedCheckBox( tr( "HQ-mode for output audio-device" ), misc_tw ); labelNumber++; @@ -254,7 +254,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( hqaudio, SIGNAL( toggled( bool ) ), this, SLOT( toggleHQAudioDev( bool ) ) ); - ledCheckBox * compacttracks = new ledCheckBox( + LedCheckBox * compacttracks = new LedCheckBox( tr( "Compact track buttons" ), misc_tw ); labelNumber++; @@ -264,7 +264,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleCompactTrackButtons( bool ) ) ); - ledCheckBox * syncVST = new ledCheckBox( + LedCheckBox * syncVST = new LedCheckBox( tr( "Sync VST plugins to host playback" ), misc_tw ); labelNumber++; @@ -273,7 +273,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( syncVST, SIGNAL( toggled( bool ) ), this, SLOT( toggleSyncVSTPlugins( bool ) ) ); - ledCheckBox * noteLabels = new ledCheckBox( + LedCheckBox * noteLabels = new LedCheckBox( tr( "Enable note labels in piano roll" ), misc_tw ); labelNumber++; @@ -282,7 +282,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( noteLabels, SIGNAL( toggled( bool ) ), this, SLOT( toggleNoteLabels( bool ) ) ); - ledCheckBox * displayWaveform = new ledCheckBox( + LedCheckBox * displayWaveform = new LedCheckBox( tr( "Enable waveform display by default" ), misc_tw ); labelNumber++; @@ -291,7 +291,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( displayWaveform, SIGNAL( toggled( bool ) ), this, SLOT( toggleDisplayWaveform( bool ) ) ); - ledCheckBox * disableAutoquit = new ledCheckBox( + LedCheckBox * disableAutoquit = new LedCheckBox( tr( "Keep effects running even without input" ), misc_tw ); labelNumber++; @@ -325,7 +325,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : labelWidget( paths, tr( "Paths" ) ); // working-dir - tabWidget * lmms_wd_tw = new tabWidget( tr( + TabWidget * lmms_wd_tw = new TabWidget( tr( "LMMS working directory" ).toUpper(), paths ); lmms_wd_tw->setFixedHeight( 48 ); @@ -344,7 +344,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : SLOT( openWorkingDir() ) ); // vst-dir - tabWidget * vst_tw = new tabWidget( tr( + TabWidget * vst_tw = new TabWidget( tr( "VST-plugin directory" ).toUpper(), paths ); vst_tw->setFixedHeight( 48 ); @@ -363,7 +363,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : SLOT( openVSTDir() ) ); // artwork-dir - tabWidget * artwork_tw = new tabWidget( tr( + TabWidget * artwork_tw = new TabWidget( tr( "Artwork directory" ).toUpper(), paths ); artwork_tw->setFixedHeight( 48 ); @@ -384,7 +384,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : // background artwork file - tabWidget * backgroundArtwork_tw = new tabWidget( tr( + TabWidget * backgroundArtwork_tw = new TabWidget( tr( "Background artwork" ).toUpper(), paths ); backgroundArtwork_tw->setFixedHeight( 48 ); @@ -407,7 +407,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : // FL Studio-dir - tabWidget * fl_tw = new tabWidget( tr( + TabWidget * fl_tw = new TabWidget( tr( "FL Studio installation directory" ).toUpper(), paths ); fl_tw->setFixedHeight( 48 ); @@ -425,7 +425,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : connect( fldir_select_btn, SIGNAL( clicked() ), this, SLOT( openFLDir() ) ); // LADSPA-dir - tabWidget * lad_tw = new tabWidget( tr( + TabWidget * lad_tw = new TabWidget( tr( "LADSPA plugin paths" ).toUpper(), paths ); lad_tw->setFixedHeight( 48 ); @@ -445,7 +445,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : #ifdef LMMS_HAVE_STK // STK-dir - tabWidget * stk_tw = new tabWidget( tr( + TabWidget * stk_tw = new TabWidget( tr( "STK rawwave directory" ).toUpper(), paths ); stk_tw->setFixedHeight( 48 ); @@ -466,7 +466,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : #ifdef LMMS_HAVE_FLUIDSYNTH // Soundfont - tabWidget * sf_tw = new tabWidget( tr( + TabWidget * sf_tw = new TabWidget( tr( "Default Soundfont File" ).toUpper(), paths ); sf_tw->setFixedHeight( 48 ); @@ -517,12 +517,12 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : perf_layout->setMargin( 0 ); labelWidget( performance, tr( "Performance settings" ) ); - tabWidget * ui_fx_tw = new tabWidget( tr( "UI effects vs. " + TabWidget * ui_fx_tw = new TabWidget( tr( "UI effects vs. " "performance" ).toUpper(), performance ); ui_fx_tw->setFixedHeight( 80 ); - ledCheckBox * smoothScroll = new ledCheckBox( + LedCheckBox * smoothScroll = new LedCheckBox( tr( "Smooth scroll in Song Editor" ), ui_fx_tw ); smoothScroll->move( 10, 20 ); smoothScroll->setChecked( m_smoothScroll ); @@ -530,7 +530,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleSmoothScroll( bool ) ) ); - ledCheckBox * autoSave = new ledCheckBox( + LedCheckBox * autoSave = new LedCheckBox( tr( "Enable auto save feature" ), ui_fx_tw ); autoSave->move( 10, 40 ); autoSave->setChecked( m_enableAutoSave ); @@ -538,7 +538,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : this, SLOT( toggleAutoSave( bool ) ) ); - ledCheckBox * animAFP = new ledCheckBox( + LedCheckBox * animAFP = new LedCheckBox( tr( "Show playback cursor in AudioFileProcessor" ), ui_fx_tw ); animAFP->move( 10, 60 ); @@ -560,7 +560,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : audio_layout->setMargin( 0 ); labelWidget( audio, tr( "Audio settings" ) ); - tabWidget * audioiface_tw = new tabWidget( tr( "AUDIO INTERFACE" ), + TabWidget * audioiface_tw = new TabWidget( tr( "AUDIO INTERFACE" ), audio ); audioiface_tw->setFixedHeight( 60 ); @@ -652,7 +652,7 @@ setupDialog::setupDialog( ConfigTabs _tab_to_open ) : midi_layout->setMargin( 0 ); labelWidget( midi, tr( "MIDI settings" ) ); - tabWidget * midiiface_tw = new tabWidget( tr( "MIDI INTERFACE" ), + TabWidget * midiiface_tw = new TabWidget( tr( "MIDI INTERFACE" ), midi ); midiiface_tw->setFixedHeight( 60 ); diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/CPULoadWidget.cpp similarity index 89% rename from src/gui/widgets/cpuload_widget.cpp rename to src/gui/widgets/CPULoadWidget.cpp index 522c9e5b8..949107542 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/CPULoadWidget.cpp @@ -1,5 +1,5 @@ /* - * cpuload_widget.cpp - widget for displaying CPU-load (partly based on + * CPULoadWidget.cpp - widget for displaying CPU-load (partly based on * Hydrogen's CPU-load-widget) * * Copyright (c) 2005-2014 Tobias Doerffel @@ -26,13 +26,13 @@ #include -#include "cpuload_widget.h" +#include "CPULoadWidget.h" #include "embed.h" #include "Engine.h" #include "Mixer.h" -cpuloadWidget::cpuloadWidget( QWidget * _parent ) : +CPULoadWidget::CPULoadWidget( QWidget * _parent ) : QWidget( _parent ), m_currentLoad( 0 ), m_temp(), @@ -55,14 +55,14 @@ cpuloadWidget::cpuloadWidget( QWidget * _parent ) : -cpuloadWidget::~cpuloadWidget() +CPULoadWidget::~CPULoadWidget() { } -void cpuloadWidget::paintEvent( QPaintEvent * ) +void CPULoadWidget::paintEvent( QPaintEvent * ) { if( m_changed == true ) { @@ -89,7 +89,7 @@ void cpuloadWidget::paintEvent( QPaintEvent * ) -void cpuloadWidget::updateCpuLoad() +void CPULoadWidget::updateCpuLoad() { // smooth load-values a bit int new_load = ( m_currentLoad + Engine::mixer()->cpuLoad() ) / 2; diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/ComboBox.cpp similarity index 90% rename from src/gui/widgets/combobox.cpp rename to src/gui/widgets/ComboBox.cpp index 18322ad02..950dbf70f 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/ComboBox.cpp @@ -1,5 +1,5 @@ /* - * combobox.cpp - implementation of LMMS combobox + * Combobox.cpp - implementation of LMMS combobox * * Copyright (c) 2006-2014 Tobias Doerffel * Copyright (c) 2008-2009 Paul Giblock @@ -24,7 +24,7 @@ */ -#include "combobox.h" +#include "ComboBox.h" #include #include @@ -41,14 +41,14 @@ #include "MainWindow.h" -QPixmap * comboBox::s_background = NULL; -QPixmap * comboBox::s_arrow = NULL; -QPixmap * comboBox::s_arrowSelected = NULL; +QPixmap * ComboBox::s_background = NULL; +QPixmap * ComboBox::s_arrow = NULL; +QPixmap * ComboBox::s_arrowSelected = NULL; const int CB_ARROW_BTN_WIDTH = 20; -comboBox::comboBox( QWidget * _parent, const QString & _name ) : +ComboBox::ComboBox( QWidget * _parent, const QString & _name ) : QWidget( _parent ), IntModelView( new ComboBoxModel( NULL, QString::null, true ), this ), m_menu( this ), @@ -82,13 +82,13 @@ comboBox::comboBox( QWidget * _parent, const QString & _name ) : -comboBox::~comboBox() +ComboBox::~ComboBox() { } -QSize comboBox::sizeHint() const +QSize ComboBox::sizeHint() const { int maxTextWidth = 0; for( int i = 0; model() && i < model()->size(); ++i ) @@ -105,7 +105,7 @@ QSize comboBox::sizeHint() const -void comboBox::contextMenuEvent( QContextMenuEvent * event ) +void ComboBox::contextMenuEvent( QContextMenuEvent * event ) { if( model() == NULL || event->x() <= width() - CB_ARROW_BTN_WIDTH ) { @@ -121,7 +121,7 @@ void comboBox::contextMenuEvent( QContextMenuEvent * event ) -void comboBox::mousePressEvent( QMouseEvent* event ) +void ComboBox::mousePressEvent( QMouseEvent* event ) { if( model() == NULL ) { @@ -175,7 +175,7 @@ void comboBox::mousePressEvent( QMouseEvent* event ) -void comboBox::paintEvent( QPaintEvent * _pe ) +void ComboBox::paintEvent( QPaintEvent * _pe ) { QPainter p( this ); @@ -231,7 +231,7 @@ void comboBox::paintEvent( QPaintEvent * _pe ) -void comboBox::wheelEvent( QWheelEvent* event ) +void ComboBox::wheelEvent( QWheelEvent* event ) { if( model() ) { @@ -244,7 +244,7 @@ void comboBox::wheelEvent( QWheelEvent* event ) -void comboBox::setItem( QAction* item ) +void ComboBox::setItem( QAction* item ) { if( model() ) { diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp index 945c0f65a..7ec3ab711 100644 --- a/src/gui/widgets/ControllerRackView.cpp +++ b/src/gui/widgets/ControllerRackView.cpp @@ -35,7 +35,7 @@ #include "Song.h" #include "embed.h" #include "MainWindow.h" -#include "group_box.h" +#include "GroupBox.h" #include "ControllerRackView.h" #include "ControllerView.h" #include "LfoController.h" diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp index 0be6df17a..aaaa3ef1a 100644 --- a/src/gui/widgets/ControllerView.cpp +++ b/src/gui/widgets/ControllerView.cpp @@ -39,9 +39,9 @@ #include "gui_templates.h" #include "embed.h" #include "Engine.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "MainWindow.h" -#include "tooltip.h" +#include "ToolTip.h" ControllerView::ControllerView( Controller * _model, QWidget * _parent ) : diff --git a/src/gui/widgets/EffectRackView.cpp b/src/gui/widgets/EffectRackView.cpp index 6b0192317..b136b16f7 100644 --- a/src/gui/widgets/EffectRackView.cpp +++ b/src/gui/widgets/EffectRackView.cpp @@ -32,7 +32,7 @@ #include "EffectRackView.h" #include "EffectSelectDialog.h" #include "EffectView.h" -#include "group_box.h" +#include "GroupBox.h" EffectRackView::EffectRackView( EffectChain* model, QWidget* parent ) : @@ -42,7 +42,7 @@ EffectRackView::EffectRackView( EffectChain* model, QWidget* parent ) : QVBoxLayout* mainLayout = new QVBoxLayout( this ); mainLayout->setMargin( 5 ); - m_effectsGroupBox = new groupBox( tr( "EFFECTS CHAIN" ) ); + m_effectsGroupBox = new GroupBox( tr( "EFFECTS CHAIN" ) ); mainLayout->addWidget( m_effectsGroupBox ); QVBoxLayout* effectsLayout = new QVBoxLayout( m_effectsGroupBox ); diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp index 7bf1560fc..466b2b0fa 100644 --- a/src/gui/widgets/EffectView.cpp +++ b/src/gui/widgets/EffectView.cpp @@ -38,11 +38,11 @@ #include "embed.h" #include "Engine.h" #include "gui_templates.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "MainWindow.h" #include "TempoSyncKnob.h" -#include "tooltip.h" +#include "ToolTip.h" EffectView::EffectView( Effect * _model, QWidget * _parent ) : @@ -55,15 +55,15 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) : // Disable effects that are of type "DummyEffect" bool isEnabled = !dynamic_cast( effect() ); - m_bypass = new ledCheckBox( this, "", isEnabled ? ledCheckBox::Green : ledCheckBox::Red ); + m_bypass = new LedCheckBox( this, "", isEnabled ? LedCheckBox::Green : LedCheckBox::Red ); m_bypass->move( 3, 3 ); m_bypass->setEnabled( isEnabled ); m_bypass->setWhatsThis( tr( "Toggles the effect on or off." ) ); - toolTip::add( m_bypass, tr( "On/Off" ) ); + ToolTip::add( m_bypass, tr( "On/Off" ) ); - m_wetDry = new knob( knobBright_26, this ); + m_wetDry = new Knob( knobBright_26, this ); m_wetDry->setLabel( tr( "W/D" ) ); m_wetDry->move( 27, 5 ); m_wetDry->setEnabled( isEnabled ); @@ -84,7 +84,7 @@ EffectView::EffectView( Effect * _model, QWidget * _parent ) : "run the risk of clipping the tail on delay and reverb effects." ) ); - m_gate = new knob( knobBright_26, this ); + m_gate = new Knob( knobBright_26, this ); m_gate->setLabel( tr( "GATE" ) ); m_gate->move( 93, 5 ); m_gate->setEnabled( isEnabled ); diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 44cbf2fbb..3571c7455 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -31,16 +31,16 @@ #include "embed.h" #include "Engine.h" #include "gui_templates.h" -#include "knob.h" -#include "led_checkbox.h" +#include "Knob.h" +#include "LedCheckbox.h" #include "Mixer.h" #include "DataFile.h" #include "Oscillator.h" -#include "pixmap_button.h" +#include "PixmapButton.h" #include "string_pair_drag.h" #include "TempoSyncKnob.h" -#include "text_float.h" -#include "tooltip.h" +#include "TextFloat.h" +#include "ToolTip.h" #include "Track.h" @@ -94,7 +94,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : s_lfoGraph = new QPixmap( embed::getIconPixmap( "lfo_graph" ) ); } - m_predelayKnob = new knob( knobBright_26, this ); + m_predelayKnob = new Knob( knobBright_26, this ); m_predelayKnob->setLabel( tr( "DEL" ) ); m_predelayKnob->move( PREDELAY_KNOB_X, ENV_KNOBS_Y ); m_predelayKnob->setHintText( tr( "Predelay:" ) + " ", "" ); @@ -104,7 +104,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "before start of actual envelope." ) ); - m_attackKnob = new knob( knobBright_26, this ); + m_attackKnob = new Knob( knobBright_26, this ); m_attackKnob->setLabel( tr( "ATT" ) ); m_attackKnob->move( ATTACK_KNOB_X, ENV_KNOBS_Y ); m_attackKnob->setHintText( tr( "Attack:" )+" ", "" ); @@ -115,7 +115,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "Choose a small value for instruments like pianos " "and a big value for strings." ) ); - m_holdKnob = new knob( knobBright_26, this ); + m_holdKnob = new Knob( knobBright_26, this ); m_holdKnob->setLabel( tr( "HOLD" ) ); m_holdKnob->move( HOLD_KNOB_X, ENV_KNOBS_Y ); m_holdKnob->setHintText( tr( "Hold:" ) + " ", "" ); @@ -125,7 +125,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "envelope holds attack-level before it begins to " "decrease to sustain-level." ) ); - m_decayKnob = new knob( knobBright_26, this ); + m_decayKnob = new Knob( knobBright_26, this ); m_decayKnob->setLabel( tr( "DEC" ) ); m_decayKnob->move( DECAY_KNOB_X, ENV_KNOBS_Y ); m_decayKnob->setHintText( tr( "Decay:" ) + " ", "" ); @@ -137,7 +137,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "like pianos." ) ); - m_sustainKnob = new knob( knobBright_26, this ); + m_sustainKnob = new Knob( knobBright_26, this ); m_sustainKnob->setLabel( tr( "SUST" ) ); m_sustainKnob->move( SUSTAIN_KNOB_X, ENV_KNOBS_Y ); m_sustainKnob->setHintText( tr( "Sustain:" ) + " ", "" ); @@ -148,7 +148,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "zero." ) ); - m_releaseKnob = new knob( knobBright_26, this ); + m_releaseKnob = new Knob( knobBright_26, this ); m_releaseKnob->setLabel( tr( "REL" ) ); m_releaseKnob->move( RELEASE_KNOB_X, ENV_KNOBS_Y ); m_releaseKnob->setHintText( tr( "Release:" ) + " ", "" ); @@ -160,7 +160,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "strings." ) ); - m_amountKnob = new knob( knobBright_26, this ); + m_amountKnob = new Knob( knobBright_26, this ); m_amountKnob->setLabel( tr( "AMT" ) ); m_amountKnob->move( AMOUNT_KNOB_X, ENV_GRAPH_Y ); m_amountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" ); @@ -173,7 +173,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : - m_lfoPredelayKnob = new knob( knobBright_26, this ); + m_lfoPredelayKnob = new Knob( knobBright_26, this ); m_lfoPredelayKnob->setLabel( tr( "DEL" ) ); m_lfoPredelayKnob->move( LFO_PREDELAY_KNOB_X, LFO_KNOB_Y ); m_lfoPredelayKnob->setHintText( tr( "LFO predelay:" ) + " ", "" ); @@ -183,7 +183,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "LFO starts to oscillate." ) ); - m_lfoAttackKnob = new knob( knobBright_26, this ); + m_lfoAttackKnob = new Knob( knobBright_26, this ); m_lfoAttackKnob->setLabel( tr( "ATT" ) ); m_lfoAttackKnob->move( LFO_ATTACK_KNOB_X, LFO_KNOB_Y ); m_lfoAttackKnob->setHintText( tr( "LFO- attack:" ) + " ", "" ); @@ -203,7 +203,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "the faster will be your effect." ) ); - m_lfoAmountKnob = new knob( knobBright_26, this ); + m_lfoAmountKnob = new Knob( knobBright_26, this ); m_lfoAmountKnob->setLabel( tr( "AMT" ) ); m_lfoAmountKnob->move( LFO_AMOUNT_KNOB_X, LFO_KNOB_Y ); m_lfoAmountKnob->setHintText( tr( "Modulation amount:" ) + " ", "" ); @@ -214,7 +214,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : "be influenced by this LFO." ) ); - pixmapButton * sin_lfo_btn = new pixmapButton( this, NULL ); + PixmapButton * sin_lfo_btn = new PixmapButton( this, NULL ); sin_lfo_btn->move( LFO_SHAPES_X, LFO_SHAPES_Y ); sin_lfo_btn->setActiveGraphic( embed::getIconPixmap( "sin_wave_active" ) ); @@ -223,7 +223,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : sin_lfo_btn->setWhatsThis( tr( "Click here for a sine-wave." ) ); - pixmapButton * triangle_lfo_btn = new pixmapButton( this, NULL ); + PixmapButton * triangle_lfo_btn = new PixmapButton( this, NULL ); triangle_lfo_btn->move( LFO_SHAPES_X+15, LFO_SHAPES_Y ); triangle_lfo_btn->setActiveGraphic( embed::getIconPixmap( "triangle_wave_active" ) ); @@ -232,7 +232,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : triangle_lfo_btn->setWhatsThis( tr( "Click here for a triangle-wave." ) ); - pixmapButton * saw_lfo_btn = new pixmapButton( this, NULL ); + PixmapButton * saw_lfo_btn = new PixmapButton( this, NULL ); saw_lfo_btn->move( LFO_SHAPES_X+30, LFO_SHAPES_Y ); saw_lfo_btn->setActiveGraphic( embed::getIconPixmap( "saw_wave_active" ) ); @@ -241,7 +241,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : saw_lfo_btn->setWhatsThis( tr( "Click here for a saw-wave for current." ) ); - pixmapButton * sqr_lfo_btn = new pixmapButton( this, NULL ); + PixmapButton * sqr_lfo_btn = new PixmapButton( this, NULL ); sqr_lfo_btn->move( LFO_SHAPES_X+45, LFO_SHAPES_Y ); sqr_lfo_btn->setActiveGraphic( embed::getIconPixmap( "square_wave_active" ) ); @@ -250,7 +250,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : sqr_lfo_btn->setWhatsThis( tr( "Click here for a square-wave." ) ); - m_userLfoBtn = new pixmapButton( this, NULL ); + m_userLfoBtn = new PixmapButton( this, NULL ); m_userLfoBtn->move( LFO_SHAPES_X+75, LFO_SHAPES_Y ); m_userLfoBtn->setActiveGraphic( embed::getIconPixmap( "usr_wave_active" ) ); @@ -264,7 +264,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : connect( m_userLfoBtn, SIGNAL( toggled( bool ) ), this, SLOT( lfoUserWaveChanged() ) ); - pixmapButton * random_lfo_btn = new pixmapButton( this, NULL ); + PixmapButton * random_lfo_btn = new PixmapButton( this, NULL ); random_lfo_btn->move( LFO_SHAPES_X+60, LFO_SHAPES_Y ); random_lfo_btn->setActiveGraphic( embed::getIconPixmap( "random_wave_active" ) ); @@ -281,23 +281,23 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : m_lfoWaveBtnGrp->addButton( m_userLfoBtn ); m_lfoWaveBtnGrp->addButton( random_lfo_btn ); - m_x100Cb = new ledCheckBox( tr( "FREQ x 100" ), this ); + m_x100Cb = new LedCheckBox( tr( "FREQ x 100" ), this ); m_x100Cb->setFont( pointSizeF( m_x100Cb->font(), 6.5 ) ); m_x100Cb->move( LFO_PREDELAY_KNOB_X, LFO_GRAPH_Y + 36 ); m_x100Cb->setWhatsThis( tr( "Click here if the frequency of this LFO should be " "multiplied by 100." ) ); - toolTip::add( m_x100Cb, tr( "multiply LFO-frequency by 100" ) ); + ToolTip::add( m_x100Cb, tr( "multiply LFO-frequency by 100" ) ); - m_controlEnvAmountCb = new ledCheckBox( tr( "MODULATE ENV-AMOUNT" ), + m_controlEnvAmountCb = new LedCheckBox( tr( "MODULATE ENV-AMOUNT" ), this ); m_controlEnvAmountCb->move( LFO_PREDELAY_KNOB_X, LFO_GRAPH_Y + 54 ); m_controlEnvAmountCb->setFont( pointSizeF( m_controlEnvAmountCb->font(), 6.5 ) ); m_controlEnvAmountCb ->setWhatsThis( tr( "Click here to make the envelope-amount controlled by this " "LFO." ) ); - toolTip::add( m_controlEnvAmountCb, + ToolTip::add( m_controlEnvAmountCb, tr( "control envelope-amount by this LFO" ) ); @@ -580,7 +580,7 @@ void EnvelopeAndLfoView::lfoUserWaveChanged() { if( m_params->m_userWave.frames() <= 1 ) { - textFloat::displayMessage( tr( "Hint" ), + TextFloat::displayMessage( tr( "Hint" ), tr( "Drag a sample from somewhere and drop " "it in this window." ), embed::getIconPixmap( "hint" ), 3000 ); diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/FadeButton.cpp similarity index 88% rename from src/gui/widgets/fade_button.cpp rename to src/gui/widgets/FadeButton.cpp index 7d7550d92..3495ae959 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/FadeButton.cpp @@ -1,5 +1,5 @@ /* - * fade_button.cpp - implementation of fade-button + * FadeButton.cpp - implementation of fade-button * * Copyright (c) 2005-2009 Tobias Doerffel * @@ -29,14 +29,14 @@ #include #include "embed.h" -#include "fade_button.h" +#include "FadeButton.h" #include "update_event.h" const float FadeDuration = 300; -fadeButton::fadeButton( const QColor & _normal_color, +FadeButton::FadeButton( const QColor & _normal_color, const QColor & _activated_color, QWidget * _parent ) : QAbstractButton( _parent ), m_stateTimer(), @@ -51,14 +51,14 @@ fadeButton::fadeButton( const QColor & _normal_color, -fadeButton::~fadeButton() +FadeButton::~FadeButton() { } -void fadeButton::activate() +void FadeButton::activate() { m_stateTimer.restart(); signalUpdate(); @@ -67,7 +67,7 @@ void fadeButton::activate() -void fadeButton::customEvent( QEvent * ) +void FadeButton::customEvent( QEvent * ) { update(); } @@ -75,7 +75,7 @@ void fadeButton::customEvent( QEvent * ) -void fadeButton::paintEvent( QPaintEvent * _pe ) +void FadeButton::paintEvent( QPaintEvent * _pe ) { QColor col = m_normalColor; if( m_stateTimer.elapsed() < FadeDuration ) @@ -110,7 +110,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe ) -void fadeButton::signalUpdate() +void FadeButton::signalUpdate() { QApplication::postEvent( this, new updateEvent() ); } diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/Fader.cpp similarity index 86% rename from src/gui/widgets/fader.cpp rename to src/gui/widgets/Fader.cpp index 69c2b023d..3015d976f 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -1,5 +1,5 @@ /* - * fader.cpp - fader-widget used in mixer - partly taken from Hydrogen + * Fader.cpp - fader-widget used in mixer - partly taken from Hydrogen * * Copyright (c) 2008-2012 Tobias Doerffel * @@ -50,21 +50,21 @@ #include #include -#include "fader.h" +#include "Fader.h" #include "embed.h" #include "Engine.h" #include "CaptionMenu.h" #include "ConfigManager.h" -#include "text_float.h" +#include "TextFloat.h" #include "MainWindow.h" -textFloat * fader::s_textFloat = NULL; -QPixmap * fader::s_back = NULL; -QPixmap * fader::s_leds = NULL; -QPixmap * fader::s_knob = NULL; +TextFloat * Fader::s_textFloat = NULL; +QPixmap * Fader::s_back = NULL; +QPixmap * Fader::s_leds = NULL; +QPixmap * Fader::s_knob = NULL; -fader::fader( FloatModel * _model, const QString & _name, QWidget * _parent ) : +Fader::Fader( FloatModel * _model, const QString & _name, QWidget * _parent ) : QWidget( _parent ), FloatModelView( _model, this ), m_model( _model ), @@ -81,7 +81,7 @@ fader::fader( FloatModel * _model, const QString & _name, QWidget * _parent ) : { if( s_textFloat == NULL ) { - s_textFloat = new textFloat; + s_textFloat = new TextFloat; } if( ! s_back ) { @@ -106,14 +106,14 @@ fader::fader( FloatModel * _model, const QString & _name, QWidget * _parent ) : -fader::~fader() +Fader::~Fader() { } -void fader::contextMenuEvent( QContextMenuEvent * _ev ) +void Fader::contextMenuEvent( QContextMenuEvent * _ev ) { CaptionMenu contextMenu( windowTitle() ); addDefaultActions( &contextMenu ); @@ -124,7 +124,7 @@ void fader::contextMenuEvent( QContextMenuEvent * _ev ) -void fader::mouseMoveEvent( QMouseEvent *mouseEvent ) +void Fader::mouseMoveEvent( QMouseEvent *mouseEvent ) { if( m_moveStartPoint >= 0 ) { @@ -141,7 +141,7 @@ void fader::mouseMoveEvent( QMouseEvent *mouseEvent ) -void fader::mousePressEvent( QMouseEvent* mouseEvent ) +void Fader::mousePressEvent( QMouseEvent* mouseEvent ) { if( mouseEvent->button() == Qt::LeftButton && ! ( mouseEvent->modifiers() & Qt::ControlModifier ) ) @@ -169,7 +169,7 @@ void fader::mousePressEvent( QMouseEvent* mouseEvent ) -void fader::mouseDoubleClickEvent( QMouseEvent* mouseEvent ) +void Fader::mouseDoubleClickEvent( QMouseEvent* mouseEvent ) { bool ok; @@ -190,13 +190,13 @@ void fader::mouseDoubleClickEvent( QMouseEvent* mouseEvent ) -void fader::mouseReleaseEvent( QMouseEvent * _me ) +void Fader::mouseReleaseEvent( QMouseEvent * _me ) { s_textFloat->hide(); } -void fader::wheelEvent ( QWheelEvent *ev ) +void Fader::wheelEvent ( QWheelEvent *ev ) { ev->accept(); @@ -217,7 +217,7 @@ void fader::wheelEvent ( QWheelEvent *ev ) /// /// Set peak value (0.0 .. 1.0) /// -void fader::setPeak( float fPeak, float &targetPeak, float &persistentPeak, QTime &lastPeakTime ) +void Fader::setPeak( float fPeak, float &targetPeak, float &persistentPeak, QTime &lastPeakTime ) { if( fPeak < m_fMinPeak ) { @@ -248,14 +248,14 @@ void fader::setPeak( float fPeak, float &targetPeak, float &persistentPeak, QTim -void fader::setPeak_L( float fPeak ) +void Fader::setPeak_L( float fPeak ) { setPeak( fPeak, m_fPeakValue_L, m_persistentPeak_L, m_lastPeakTime_L ); } -void fader::setPeak_R( float fPeak ) +void Fader::setPeak_R( float fPeak ) { setPeak( fPeak, m_fPeakValue_R, m_persistentPeak_R, m_lastPeakTime_R ); } @@ -263,7 +263,7 @@ void fader::setPeak_R( float fPeak ) // update tooltip showing value and adjust position while changing fader value -void fader::updateTextFloat() +void Fader::updateTextFloat() { if( ConfigManager::inst()->value( "app", "displaydbv" ).toInt() ) { @@ -278,7 +278,7 @@ void fader::updateTextFloat() } -inline int fader::calculateDisplayPeak( float fPeak ) +inline int Fader::calculateDisplayPeak( float fPeak ) { int peak = (int)( 116 - ( fPeak / ( m_fMaxPeak - m_fMinPeak ) ) * 116.0 ); @@ -286,7 +286,7 @@ inline int fader::calculateDisplayPeak( float fPeak ) else return peak; } -void fader::paintEvent( QPaintEvent * ev) +void Fader::paintEvent( QPaintEvent * ev) { QPainter painter(this); @@ -324,22 +324,22 @@ void fader::paintEvent( QPaintEvent * ev) } -QColor fader::peakGreen() const +QColor Fader::peakGreen() const { return m_peakGreen; } -QColor fader::peakRed() const +QColor Fader::peakRed() const { return m_peakRed; } -void fader::setPeakGreen( const QColor & c ) +void Fader::setPeakGreen( const QColor & c ) { m_peakGreen = c; } -void fader::setPeakRed( const QColor & c ) +void Fader::setPeakRed( const QColor & c ) { m_peakRed = c; } diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index cc394acd9..36baa782f 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -62,7 +62,7 @@ FxLine::FxLine( QWidget * _parent, FxMixerView * _mv, int _channelIndex) : setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) ); // mixer sends knob - m_sendKnob = new knob( knobBright_26, this, tr("Channel send amount") ); + m_sendKnob = new Knob( knobBright_26, this, tr("Channel send amount") ); m_sendKnob->move( 3, 22 ); m_sendKnob->setVisible(false); diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/Graph.cpp similarity index 94% rename from src/gui/widgets/graph.cpp rename to src/gui/widgets/Graph.cpp index fcab26f1c..fa3607906 100644 --- a/src/gui/widgets/graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -1,5 +1,5 @@ /* - * graph.cpp - a QT widget for displaying and manipulating waveforms + * Graph.cpp - a QT widget for displaying and manipulating waveforms * * Copyright (c) 2006-2007 Andreas Brandmaier * 2008 Paul Giblock @@ -27,14 +27,14 @@ #include #include -#include "graph.h" +#include "Graph.h" #include "string_pair_drag.h" #include "SampleBuffer.h" #include "Oscillator.h" #include "Engine.h" -graph::graph( QWidget * _parent, graphStyle _style, int _width, +Graph::Graph( QWidget * _parent, graphStyle _style, int _width, int _height ) : QWidget( _parent ), /* TODO: size, background? */ @@ -58,18 +58,18 @@ graph::graph( QWidget * _parent, graphStyle _style, int _width, } -graph::~graph() +Graph::~Graph() { } -void graph::setForeground( const QPixmap &_pixmap ) +void Graph::setForeground( const QPixmap &_pixmap ) { m_foreground = _pixmap; } -void graph::setGraphColor( QColor _graphcol ) +void Graph::setGraphColor( QColor _graphcol ) { m_graphColor = _graphcol; } @@ -102,7 +102,7 @@ void graph::loadSampleFromFile( const QString & _filename ) -void graph::mouseMoveEvent ( QMouseEvent * _me ) +void Graph::mouseMoveEvent ( QMouseEvent * _me ) { // get position int x = _me->x(); @@ -155,7 +155,7 @@ void graph::mouseMoveEvent ( QMouseEvent * _me ) -void graph::mousePressEvent( QMouseEvent * _me ) +void Graph::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton ) { @@ -189,7 +189,7 @@ void graph::mousePressEvent( QMouseEvent * _me ) } } -void graph::drawLineAt( int _x, int _y, int _lastx ) +void Graph::drawLineAt( int _x, int _y, int _lastx ) { float minVal = model()->minValue(); float maxVal = model()->maxValue(); @@ -228,7 +228,7 @@ void graph::drawLineAt( int _x, int _y, int _lastx ) model()->samplesChanged( start, end ); } -void graph::changeSampleAt( int _x, int _y ) +void Graph::changeSampleAt( int _x, int _y ) { float minVal = model()->minValue(); float maxVal = model()->maxValue(); @@ -255,7 +255,7 @@ void graph::changeSampleAt( int _x, int _y ) -void graph::mouseReleaseEvent( QMouseEvent * _me ) +void Graph::mouseReleaseEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton ) { @@ -268,7 +268,7 @@ void graph::mouseReleaseEvent( QMouseEvent * _me ) -void graph::paintEvent( QPaintEvent * ) +void Graph::paintEvent( QPaintEvent * ) { QPainter p( this ); @@ -289,7 +289,7 @@ void graph::paintEvent( QPaintEvent * ) switch( m_graphStyle ) { - case graph::LinearStyle: + case Graph::LinearStyle: p.setRenderHints( QPainter::Antialiasing, true ); for( int i=0; i < length; i++ ) @@ -313,7 +313,7 @@ void graph::paintEvent( QPaintEvent * ) break; - case graph::NearestStyle: + case Graph::NearestStyle: for( int i=0; i < length; i++ ) { p.drawLine(2+static_cast(i*xscale), @@ -334,7 +334,7 @@ void graph::paintEvent( QPaintEvent * ) 2+static_cast( ( (*samps)[length] - maxVal ) * yscale ) ); break; - case graph::LinearNonCyclicStyle: + case Graph::LinearNonCyclicStyle: p.setRenderHints( QPainter::Antialiasing, true ); for( int i=0; i < length; i++ ) @@ -353,7 +353,7 @@ void graph::paintEvent( QPaintEvent * ) p.setRenderHints( QPainter::Antialiasing, false ); break; - case graph::BarStyle: + case Graph::BarStyle: for( int i=0; i <= length; i++ ) { p.fillRect( 2+static_cast( i*xscale ), @@ -391,7 +391,7 @@ void graph::paintEvent( QPaintEvent * ) -void graph::dropEvent( QDropEvent * _de ) +void Graph::dropEvent( QDropEvent * _de ) { QString type = stringPairDrag::decodeKey( _de ); QString value = stringPairDrag::decodeValue( _de ); @@ -404,7 +404,7 @@ void graph::dropEvent( QDropEvent * _de ) } } -void graph::dragEnterEvent( QDragEnterEvent * _dee ) +void Graph::dragEnterEvent( QDragEnterEvent * _dee ) { if( stringPairDrag::processDragEnterEvent( _dee, QString( "samplefile" ) ) == false ) @@ -415,7 +415,7 @@ void graph::dragEnterEvent( QDragEnterEvent * _dee ) -void graph::modelChanged() +void Graph::modelChanged() { graphModel * gModel = castModel(); @@ -427,14 +427,14 @@ void graph::modelChanged() } -void graph::updateGraph( int _startPos, int _endPos ) +void Graph::updateGraph( int _startPos, int _endPos ) { // Can optimize by only drawing changed position update(); } -void graph::updateGraph() +void Graph::updateGraph() { updateGraph( 0, model()->length() - 1 ); } diff --git a/src/gui/widgets/group_box.cpp b/src/gui/widgets/GroupBox.cpp similarity index 89% rename from src/gui/widgets/group_box.cpp rename to src/gui/widgets/GroupBox.cpp index e5200b923..b6145076f 100644 --- a/src/gui/widgets/group_box.cpp +++ b/src/gui/widgets/GroupBox.cpp @@ -1,5 +1,5 @@ /* - * group_box.cpp - groupbox for LMMS + * GroupBox.cpp - groupbox for LMMS * * Copyright (c) 2005-2009 Tobias Doerffel * @@ -31,13 +31,13 @@ #include -#include "group_box.h" +#include "GroupBox.h" #include "embed.h" #include "gui_templates.h" -groupBox::groupBox( const QString & _caption, QWidget * _parent ) : +GroupBox::GroupBox( const QString & _caption, QWidget * _parent ) : QWidget( _parent ), BoolModelView( NULL, this ), m_caption( _caption ), @@ -45,7 +45,7 @@ groupBox::groupBox( const QString & _caption, QWidget * _parent ) : { updatePixmap(); - m_led = new pixmapButton( this, _caption ); + m_led = new PixmapButton( this, _caption ); m_led->setCheckable( true ); m_led->move( 3, 0 ); m_led->setActiveGraphic( embed::getIconPixmap( "led_green" ) ); @@ -59,7 +59,7 @@ groupBox::groupBox( const QString & _caption, QWidget * _parent ) : -groupBox::~groupBox() +GroupBox::~GroupBox() { delete m_led; } @@ -67,7 +67,7 @@ groupBox::~groupBox() -void groupBox::modelChanged() +void GroupBox::modelChanged() { m_led->setModel( model() ); } @@ -75,7 +75,7 @@ void groupBox::modelChanged() -void groupBox::mousePressEvent( QMouseEvent * _me ) +void GroupBox::mousePressEvent( QMouseEvent * _me ) { if( _me->y() > 1 && _me->y() < 13 && _me->button() == Qt::LeftButton ) { @@ -86,7 +86,7 @@ void groupBox::mousePressEvent( QMouseEvent * _me ) -void groupBox::resizeEvent( QResizeEvent * _ev ) +void GroupBox::resizeEvent( QResizeEvent * _ev ) { updatePixmap(); QWidget::resizeEvent( _ev ); @@ -94,7 +94,7 @@ void groupBox::resizeEvent( QResizeEvent * _ev ) -void groupBox::updatePixmap() +void GroupBox::updatePixmap() { QColor bg_color = QApplication::palette().color( QPalette::Active, QPalette::Background ); diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp index c93e4160c..d0f55f2c3 100644 --- a/src/gui/widgets/InstrumentFunctionViews.cpp +++ b/src/gui/widgets/InstrumentFunctionViews.cpp @@ -27,24 +27,24 @@ #include "InstrumentFunctions.h" #include "InstrumentFunctionViews.h" -#include "combobox.h" +#include "ComboBox.h" #include "embed.h" #include "Engine.h" -#include "group_box.h" +#include "GroupBox.h" #include "gui_templates.h" -#include "knob.h" -#include "pixmap_button.h" +#include "Knob.h" +#include "PixmapButton.h" #include "TempoSyncKnob.h" -#include "tooltip.h" +#include "ToolTip.h" InstrumentFunctionNoteStackingView::InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ), m_cc( cc ), - m_chordsGroupBox( new groupBox( tr( "STACKING" ) ) ), - m_chordsComboBox( new comboBox() ), - m_chordRangeKnob( new knob( knobBright_26 ) ) + m_chordsGroupBox( new GroupBox( tr( "STACKING" ) ) ), + m_chordsComboBox( new ComboBox() ), + m_chordRangeKnob( new Knob( knobBright_26 ) ) { QHBoxLayout* topLayout = new QHBoxLayout( this ); topLayout->setMargin( 0 ); @@ -100,13 +100,13 @@ InstrumentFunctionArpeggioView::InstrumentFunctionArpeggioView( InstrumentFuncti QWidget( parent ), ModelView( NULL, this ), m_a( arp ), - m_arpGroupBox( new groupBox( tr( "ARPEGGIO" ) ) ), - m_arpComboBox( new comboBox() ), - m_arpRangeKnob( new knob( knobBright_26 ) ), + m_arpGroupBox( new GroupBox( tr( "ARPEGGIO" ) ) ), + m_arpComboBox( new ComboBox() ), + m_arpRangeKnob( new Knob( knobBright_26 ) ), m_arpTimeKnob( new TempoSyncKnob( knobBright_26 ) ), - m_arpGateKnob( new knob( knobBright_26 ) ), - m_arpDirectionComboBox( new comboBox() ), - m_arpModeComboBox( new comboBox() ) + m_arpGateKnob( new Knob( knobBright_26 ) ), + m_arpDirectionComboBox( new ComboBox() ), + m_arpModeComboBox( new ComboBox() ) { QHBoxLayout* topLayout = new QHBoxLayout( this ); topLayout->setMargin( 0 ); diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp index c741b4751..e312b8096 100644 --- a/src/gui/widgets/InstrumentMidiIOView.cpp +++ b/src/gui/widgets/InstrumentMidiIOView.cpp @@ -31,12 +31,12 @@ #include "MidiPortMenu.h" #include "Engine.h" #include "embed.h" -#include "group_box.h" +#include "GroupBox.h" #include "gui_templates.h" #include "LcdSpinBox.h" #include "MidiClient.h" #include "Mixer.h" -#include "tooltip.h" +#include "ToolTip.h" @@ -48,7 +48,7 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : { QVBoxLayout* layout = new QVBoxLayout( this ); layout->setMargin( 5 ); - m_midiInputGroupBox = new groupBox( tr( "ENABLE MIDI INPUT" ) ); + m_midiInputGroupBox = new GroupBox( tr( "ENABLE MIDI INPUT" ) ); layout->addWidget( m_midiInputGroupBox ); QHBoxLayout* midiInputLayout = new QHBoxLayout( m_midiInputGroupBox ); @@ -76,7 +76,7 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : - m_midiOutputGroupBox = new groupBox( tr( "ENABLE MIDI OUTPUT" ) ); + m_midiOutputGroupBox = new GroupBox( tr( "ENABLE MIDI OUTPUT" ) ); layout->addWidget( m_midiOutputGroupBox ); QHBoxLayout* midiOutputLayout = new QHBoxLayout( m_midiOutputGroupBox ); @@ -138,7 +138,7 @@ InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : #define PROVIDE_CUSTOM_BASE_VELOCITY_UI #ifdef PROVIDE_CUSTOM_BASE_VELOCITY_UI - groupBox* baseVelocityGroupBox = new groupBox( tr( "CUSTOM BASE VELOCITY" ) ); + GroupBox* baseVelocityGroupBox = new GroupBox( tr( "CUSTOM BASE VELOCITY" ) ); layout->addWidget( baseVelocityGroupBox ); QVBoxLayout* baseVelocityLayout = new QVBoxLayout( baseVelocityGroupBox ); diff --git a/src/gui/widgets/InstrumentSoundShapingView.cpp b/src/gui/widgets/InstrumentSoundShapingView.cpp index ffc794711..b5c923e21 100644 --- a/src/gui/widgets/InstrumentSoundShapingView.cpp +++ b/src/gui/widgets/InstrumentSoundShapingView.cpp @@ -27,11 +27,11 @@ #include "InstrumentSoundShapingView.h" #include "EnvelopeAndLfoParameters.h" #include "EnvelopeAndLfoView.h" -#include "combobox.h" -#include "group_box.h" +#include "ComboBox.h" +#include "GroupBox.h" #include "gui_templates.h" -#include "knob.h" -#include "tab_widget.h" +#include "Knob.h" +#include "TabWidget.h" @@ -52,7 +52,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) : ModelView( NULL, this ), m_ss( NULL ) { - m_targetsTabWidget = new tabWidget( tr( "TARGET" ), this ); + m_targetsTabWidget = new TabWidget( tr( "TARGET" ), this ); m_targetsTabWidget->setGeometry( TARGETS_TABWIDGET_X, TARGETS_TABWIDGET_Y, TARGETS_TABWIDGET_WIDTH, @@ -80,13 +80,13 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) : } - m_filterGroupBox = new groupBox( tr( "FILTER" ), this ); + m_filterGroupBox = new GroupBox( tr( "FILTER" ), this ); m_filterGroupBox->setGeometry( FILTER_GROUPBOX_X, FILTER_GROUPBOX_Y, FILTER_GROUPBOX_WIDTH, FILTER_GROUPBOX_HEIGHT ); - m_filterComboBox = new comboBox( m_filterGroupBox ); + m_filterComboBox = new ComboBox( m_filterGroupBox ); m_filterComboBox->setGeometry( 14, 22, 120, 22 ); m_filterComboBox->setFont( pointSize<8>( m_filterComboBox->font() ) ); @@ -96,7 +96,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) : "for changing the characteristics of a sound." ) ); - m_filterCutKnob = new knob( knobBright_26, m_filterGroupBox ); + m_filterCutKnob = new Knob( knobBright_26, m_filterGroupBox ); m_filterCutKnob->setLabel( tr( "FREQ" ) ); m_filterCutKnob->move( 140, 18 ); m_filterCutKnob->setHintText( tr( "cutoff frequency:" ) + " ", " " + tr( "Hz" ) ); @@ -109,7 +109,7 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) : "frequencies below cutoff frequency, and so on..." ) ); - m_filterResKnob = new knob( knobBright_26, m_filterGroupBox ); + m_filterResKnob = new Knob( knobBright_26, m_filterGroupBox ); m_filterResKnob->setLabel( tr( "RESO" ) ); m_filterResKnob->move( 196, 18 ); m_filterResKnob->setHintText( tr( "Resonance:" ) + " ", "" ); diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/Knob.cpp similarity index 87% rename from src/gui/widgets/knob.cpp rename to src/gui/widgets/Knob.cpp index 8fda84463..da2670302 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/Knob.cpp @@ -1,5 +1,5 @@ /* - * knob.cpp - powerful knob-widget + * Knob.cpp - powerful knob-widget * * Copyright (c) 2004-2014 Tobias Doerffel * @@ -36,7 +36,7 @@ #endif #include "lmms_math.h" -#include "knob.h" +#include "Knob.h" #include "CaptionMenu.h" #include "ConfigManager.h" #include "ControllerConnection.h" @@ -48,10 +48,10 @@ #include "Song.h" #include "string_pair_drag.h" #include "templates.h" -#include "text_float.h" +#include "TextFloat.h" -textFloat * knob::s_textFloat = NULL; +TextFloat * Knob::s_textFloat = NULL; @@ -66,14 +66,14 @@ textFloat * knob::s_textFloat = NULL; m_buttonPressed( false ), \ m_angle( -10 ) -knob::knob( knobTypes _knob_num, QWidget * _parent, const QString & _name ) : +Knob::Knob( knobTypes _knob_num, QWidget * _parent, const QString & _name ) : DEFAULT_KNOB_INITIALIZER_LIST, m_knobNum( _knob_num ) { initUi( _name ); } -knob::knob( QWidget * _parent, const QString & _name ) : +Knob::Knob( QWidget * _parent, const QString & _name ) : DEFAULT_KNOB_INITIALIZER_LIST, m_knobNum( knobBright_26 ) { @@ -85,11 +85,11 @@ knob::knob( QWidget * _parent, const QString & _name ) : -void knob::initUi( const QString & _name ) +void Knob::initUi( const QString & _name ) { if( s_textFloat == NULL ) { - s_textFloat = new textFloat; + s_textFloat = new TextFloat; } setWindowTitle( _name ); @@ -105,7 +105,7 @@ void knob::initUi( const QString & _name ) -void knob::onKnobNumUpdated() +void Knob::onKnobNumUpdated() { if( m_knobNum != knobStyled ) { @@ -119,7 +119,7 @@ void knob::onKnobNumUpdated() -knob::~knob() +Knob::~Knob() { if( m_knobPixmap ) { @@ -130,7 +130,7 @@ knob::~knob() -void knob::setLabel( const QString & _txt ) +void Knob::setLabel( const QString & _txt ) { m_label = _txt; if( m_knobPixmap ) @@ -145,7 +145,7 @@ void knob::setLabel( const QString & _txt ) -void knob::setTotalAngle( float _angle ) +void Knob::setTotalAngle( float _angle ) { if( _angle < 10.0 ) { @@ -162,28 +162,28 @@ void knob::setTotalAngle( float _angle ) -float knob::innerRadius() const +float Knob::innerRadius() const { return m_innerRadius; } -void knob::setInnerRadius( float _r ) +void Knob::setInnerRadius( float _r ) { m_innerRadius = _r; } -float knob::outerRadius() const +float Knob::outerRadius() const { return m_outerRadius; } -void knob::setOuterRadius( float _r ) +void Knob::setOuterRadius( float _r ) { m_outerRadius = _r; } @@ -191,7 +191,7 @@ void knob::setOuterRadius( float _r ) -knobTypes knob::knobNum() const +knobTypes Knob::knobNum() const { return m_knobNum; } @@ -199,7 +199,7 @@ knobTypes knob::knobNum() const -void knob::setknobNum( knobTypes _k ) +void Knob::setknobNum( knobTypes _k ) { if( m_knobNum != _k ) { @@ -211,91 +211,91 @@ void knob::setknobNum( knobTypes _k ) -QPointF knob::centerPoint() const +QPointF Knob::centerPoint() const { return m_centerPoint; } -float knob::centerPointX() const +float Knob::centerPointX() const { return m_centerPoint.x(); } -void knob::setCenterPointX( float _c ) +void Knob::setCenterPointX( float _c ) { m_centerPoint.setX( _c ); } -float knob::centerPointY() const +float Knob::centerPointY() const { return m_centerPoint.y(); } -void knob::setCenterPointY( float _c ) +void Knob::setCenterPointY( float _c ) { m_centerPoint.setY( _c ); } -float knob::lineWidth() const +float Knob::lineWidth() const { return m_lineWidth; } -void knob::setLineWidth( float _w ) +void Knob::setLineWidth( float _w ) { m_lineWidth = _w; } -QColor knob::outerColor() const +QColor Knob::outerColor() const { return m_outerColor; } -void knob::setOuterColor( const QColor & _c ) +void Knob::setOuterColor( const QColor & _c ) { m_outerColor = _c; } -QColor knob::lineColor() const +QColor Knob::lineColor() const { return m_lineColor; } -void knob::setlineColor( const QColor & _c ) +void Knob::setlineColor( const QColor & _c ) { m_lineColor = _c; } -QColor knob::arcColor() const +QColor Knob::arcColor() const { return m_arcColor; } -void knob::setarcColor( const QColor & _c ) +void Knob::setarcColor( const QColor & _c ) { m_arcColor = _c; } @@ -303,7 +303,7 @@ void knob::setarcColor( const QColor & _c ) -QLineF knob::calculateLine( const QPointF & _mid, float _radius, float _innerRadius ) const +QLineF Knob::calculateLine( const QPointF & _mid, float _radius, float _innerRadius ) const { const float rarc = m_angle * F_PI / 180.0; const float ca = cos( rarc ); @@ -315,7 +315,7 @@ QLineF knob::calculateLine( const QPointF & _mid, float _radius, float _innerRad -bool knob::updateAngle() +bool Knob::updateAngle() { int angle = 0; if( model() && model()->maxValue() != model()->minValue() ) @@ -333,7 +333,7 @@ bool knob::updateAngle() -void knob::drawKnob( QPainter * _p ) +void Knob::drawKnob( QPainter * _p ) { if( updateAngle() == false && !m_cache.isNull() ) { @@ -454,7 +454,7 @@ void knob::drawKnob( QPainter * _p ) _p->drawImage( 0, 0, m_cache ); } -float knob::getValue( const QPoint & _p ) +float Knob::getValue( const QPoint & _p ) { float value; @@ -473,7 +473,7 @@ float knob::getValue( const QPoint & _p ) -void knob::contextMenuEvent( QContextMenuEvent * ) +void Knob::contextMenuEvent( QContextMenuEvent * ) { // for the case, the user clicked right while pressing left mouse- // button, the context-menu appears while mouse-cursor is still hidden @@ -492,14 +492,14 @@ void knob::contextMenuEvent( QContextMenuEvent * ) } -void knob::toggleScale() +void Knob::toggleScale() { model()->setScaleLogarithmic( ! model()->isScaleLogarithmic() ); } -void knob::dragEnterEvent( QDragEnterEvent * _dee ) +void Knob::dragEnterEvent( QDragEnterEvent * _dee ) { stringPairDrag::processDragEnterEvent( _dee, "float_value," "automatable_model" ); @@ -508,7 +508,7 @@ void knob::dragEnterEvent( QDragEnterEvent * _dee ) -void knob::dropEvent( QDropEvent * _de ) +void Knob::dropEvent( QDropEvent * _de ) { QString type = stringPairDrag::decodeKey( _de ); QString val = stringPairDrag::decodeValue( _de ); @@ -533,7 +533,7 @@ void knob::dropEvent( QDropEvent * _de ) -void knob::mousePressEvent( QMouseEvent * _me ) +void Knob::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton && ! ( _me->modifiers() & Qt::ControlModifier ) && @@ -576,7 +576,7 @@ void knob::mousePressEvent( QMouseEvent * _me ) -void knob::mouseMoveEvent( QMouseEvent * _me ) +void Knob::mouseMoveEvent( QMouseEvent * _me ) { if( m_buttonPressed && _me->pos() != m_origMousePos ) { @@ -592,7 +592,7 @@ void knob::mouseMoveEvent( QMouseEvent * _me ) -void knob::mouseReleaseEvent( QMouseEvent* event ) +void Knob::mouseReleaseEvent( QMouseEvent* event ) { if( event && event->button() == Qt::LeftButton ) { @@ -615,7 +615,7 @@ void knob::mouseReleaseEvent( QMouseEvent* event ) -void knob::focusOutEvent( QFocusEvent * _fe ) +void Knob::focusOutEvent( QFocusEvent * _fe ) { // make sure we don't loose mouse release event mouseReleaseEvent( NULL ); @@ -625,7 +625,7 @@ void knob::focusOutEvent( QFocusEvent * _fe ) -void knob::mouseDoubleClickEvent( QMouseEvent * ) +void Knob::mouseDoubleClickEvent( QMouseEvent * ) { enterValue(); } @@ -633,7 +633,7 @@ void knob::mouseDoubleClickEvent( QMouseEvent * ) -void knob::paintEvent( QPaintEvent * _me ) +void Knob::paintEvent( QPaintEvent * _me ) { QPainter p( this ); @@ -655,7 +655,7 @@ void knob::paintEvent( QPaintEvent * _me ) -void knob::wheelEvent( QWheelEvent * _we ) +void Knob::wheelEvent( QWheelEvent * _we ) { _we->accept(); const int inc = ( _we->delta() > 0 ) ? 1 : -1; @@ -672,7 +672,7 @@ void knob::wheelEvent( QWheelEvent * _we ) -void knob::setPosition( const QPoint & _p ) +void Knob::setPosition( const QPoint & _p ) { const float value = getValue( _p ) + m_leftOver; const float step = model()->step(); @@ -715,7 +715,7 @@ void knob::setPosition( const QPoint & _p ) -void knob::enterValue() +void Knob::enterValue() { bool ok; float new_val; @@ -759,7 +759,7 @@ void knob::enterValue() -void knob::friendlyUpdate() +void Knob::friendlyUpdate() { if( model()->controllerConnection() == NULL || model()->controllerConnection()->getController()->frequentUpdates() == false || @@ -772,7 +772,7 @@ void knob::friendlyUpdate() -QString knob::displayValue() const +QString Knob::displayValue() const { if( isVolumeKnob() && ConfigManager::inst()->value( "app", "displaydbv" ).toInt() ) @@ -788,7 +788,7 @@ QString knob::displayValue() const -void knob::doConnections() +void Knob::doConnections() { if( model() != NULL ) { @@ -803,7 +803,7 @@ void knob::doConnections() -void knob::displayHelp() +void Knob::displayHelp() { QWhatsThis::showText( mapToGlobal( rect().bottomRight() ), whatsThis() ); diff --git a/src/gui/widgets/LadspaControlView.cpp b/src/gui/widgets/LadspaControlView.cpp index c782712f5..558237ba6 100644 --- a/src/gui/widgets/LadspaControlView.cpp +++ b/src/gui/widgets/LadspaControlView.cpp @@ -28,9 +28,9 @@ #include "LadspaControl.h" #include "LadspaControlView.h" #include "LadspaBase.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "TempoSyncKnob.h" -#include "tooltip.h" +#include "ToolTip.h" LadspaControlView::LadspaControlView( QWidget * _parent, @@ -43,24 +43,24 @@ LadspaControlView::LadspaControlView( QWidget * _parent, layout->setMargin( 0 ); layout->setSpacing( 0 ); - ledCheckBox * link = NULL; + LedCheckBox * link = NULL; if( m_ctl->m_link ) { - link = new ledCheckBox( "", this ); + link = new LedCheckBox( "", this ); link->setModel( &m_ctl->m_linkEnabledModel ); - toolTip::add( link, tr( "Link channels" ) ); + ToolTip::add( link, tr( "Link channels" ) ); layout->addWidget( link ); } - knob * knb = NULL; + Knob * knb = NULL; switch( m_ctl->port()->data_type ) { case TOGGLED: { - ledCheckBox * toggle = new ledCheckBox( - m_ctl->port()->name, this, QString::null, ledCheckBox::Green ); + LedCheckBox * toggle = new LedCheckBox( + m_ctl->port()->name, this, QString::null, LedCheckBox::Green ); toggle->setModel( m_ctl->toggledModel() ); layout->addWidget( toggle ); if( link != NULL ) @@ -78,7 +78,7 @@ LadspaControlView::LadspaControlView( QWidget * _parent, case INTEGER: case FLOATING: - knb = new knob( knobBright_26, this, m_ctl->port()->name ); + knb = new Knob( knobBright_26, this, m_ctl->port()->name ); break; case TIME: diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/LedCheckbox.cpp similarity index 84% rename from src/gui/widgets/led_checkbox.cpp rename to src/gui/widgets/LedCheckbox.cpp index ec97c447f..cce0b975b 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/LedCheckbox.cpp @@ -1,5 +1,5 @@ /* - * led_checkbox.cpp - class ledCheckBox, an improved QCheckBox + * LedCheckbox.cpp - class LedCheckBox, an improved QCheckBox * * Copyright (c) 2005-2014 Tobias Doerffel * @@ -26,12 +26,12 @@ #include #include -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "embed.h" #include "gui_templates.h" -static const QString names[ledCheckBox::NumColors] = +static const QString names[LedCheckBox::NumColors] = { "led_yellow", "led_green", "led_red" } ; @@ -43,7 +43,7 @@ static const QString names[ledCheckBox::NumColors] = #define DEFAULT_LEDCHECKBOX_INITIALIZER_LIST \ AutomatableButton( _parent, _name ) -ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent, +LedCheckBox::LedCheckBox( const QString & _text, QWidget * _parent, const QString & _name, LedColors _color ) : DEFAULT_LEDCHECKBOX_INITIALIZER_LIST, m_text( _text ) @@ -54,7 +54,7 @@ ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent, -ledCheckBox::ledCheckBox( QWidget * _parent, +LedCheckBox::LedCheckBox( QWidget * _parent, const QString & _name, LedColors _color ) : DEFAULT_LEDCHECKBOX_INITIALIZER_LIST { @@ -65,7 +65,7 @@ ledCheckBox::ledCheckBox( QWidget * _parent, -ledCheckBox::~ledCheckBox() +LedCheckBox::~LedCheckBox() { delete m_ledOnPixmap; delete m_ledOffPixmap; @@ -74,7 +74,7 @@ ledCheckBox::~ledCheckBox() -void ledCheckBox::setText( const QString &s ) +void LedCheckBox::setText( const QString &s ) { m_text = s; onTextUpdated(); @@ -83,7 +83,7 @@ void ledCheckBox::setText( const QString &s ) -void ledCheckBox::paintEvent( QPaintEvent * ) +void LedCheckBox::paintEvent( QPaintEvent * ) { QPainter p( this ); p.setFont( pointSize<7>( font() ) ); @@ -106,7 +106,7 @@ void ledCheckBox::paintEvent( QPaintEvent * ) -void ledCheckBox::initUi( LedColors _color ) +void LedCheckBox::initUi( LedColors _color ) { setCheckable( true ); @@ -125,7 +125,7 @@ void ledCheckBox::initUi( LedColors _color ) -void ledCheckBox::onTextUpdated() +void LedCheckBox::onTextUpdated() { setFixedSize( m_ledOffPixmap->width() + 5 + QFontMetrics( font() ).width( text() ), m_ledOffPixmap->height() ); } diff --git a/src/gui/widgets/nstate_button.cpp b/src/gui/widgets/NStateButton.cpp similarity index 79% rename from src/gui/widgets/nstate_button.cpp rename to src/gui/widgets/NStateButton.cpp index 22de066e1..c05f311a5 100644 --- a/src/gui/widgets/nstate_button.cpp +++ b/src/gui/widgets/NStateButton.cpp @@ -1,5 +1,5 @@ /* - * nstate_button.cpp - implementation of n-state-button + * NStateButton.cpp - implementation of n-state-button * * Copyright (c) 2005-2006 Tobias Doerffel * @@ -25,14 +25,14 @@ #include -#include "nstate_button.h" +#include "NStateButton.h" #include "embed.h" -#include "tooltip.h" +#include "ToolTip.h" -nStateButton::nStateButton( QWidget * _parent ) : - toolButton( _parent ), +NStateButton::NStateButton( QWidget * _parent ) : + ToolButton( _parent ), m_generalToolTip( "" ), m_curState( -1 ) { @@ -41,7 +41,7 @@ nStateButton::nStateButton( QWidget * _parent ) : -nStateButton::~nStateButton() +NStateButton::~NStateButton() { while( m_states.size() ) { @@ -52,7 +52,7 @@ nStateButton::~nStateButton() -void nStateButton::addState( const QPixmap & _pm, const QString & _tooltip ) +void NStateButton::addState( const QPixmap & _pm, const QString & _tooltip ) { m_states.push_back( qMakePair( _pm, _tooltip ) ); // first inserted pixmap? @@ -68,7 +68,7 @@ void nStateButton::addState( const QPixmap & _pm, const QString & _tooltip ) -void nStateButton::changeState( int _n ) +void NStateButton::changeState( int _n ) { if( _n >= 0 && _n < (int) m_states.size() ) { @@ -78,7 +78,7 @@ void nStateButton::changeState( int _n ) ( m_states[m_curState].second != "" ) ? m_states[m_curState].second : m_generalToolTip; - toolTip::add( this, _tooltip ); + ToolTip::add( this, _tooltip ); setIcon( m_states[m_curState].first ); @@ -88,13 +88,13 @@ void nStateButton::changeState( int _n ) -void nStateButton::mousePressEvent( QMouseEvent * _me ) +void NStateButton::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton && m_states.size() ) { changeState( ( ++m_curState ) % m_states.size() ); } - toolButton::mousePressEvent( _me ); + ToolButton::mousePressEvent( _me ); } diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/PixmapButton.cpp similarity index 78% rename from src/gui/widgets/pixmap_button.cpp rename to src/gui/widgets/PixmapButton.cpp index 3f1d0f4fb..e647c5e23 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/PixmapButton.cpp @@ -1,5 +1,5 @@ /* - * pixmap_button.cpp - implementation of pixmap-button (often used as "themed" + * PixmapButton.cpp - implementation of pixmap-button (often used as "themed" * checkboxes/radiobuttons etc) * * Copyright (c) 2004-2013 Tobias Doerffel @@ -27,13 +27,13 @@ #include #include -#include "pixmap_button.h" +#include "PixmapButton.h" #include "MainWindow.h" #include "embed.h" -pixmapButton::pixmapButton( QWidget * _parent, const QString & _name ) : +PixmapButton::PixmapButton( QWidget * _parent, const QString & _name ) : AutomatableButton( _parent, _name ), m_activePixmap(), m_inactivePixmap(), @@ -46,14 +46,14 @@ pixmapButton::pixmapButton( QWidget * _parent, const QString & _name ) : -pixmapButton::~pixmapButton() +PixmapButton::~PixmapButton() { } -void pixmapButton::paintEvent( QPaintEvent * ) +void PixmapButton::paintEvent( QPaintEvent * ) { QPainter p( this ); @@ -74,7 +74,7 @@ void pixmapButton::paintEvent( QPaintEvent * ) -void pixmapButton::mousePressEvent( QMouseEvent * _me ) +void PixmapButton::mousePressEvent( QMouseEvent * _me ) { // Show pressing graphics if this isn't checkable if( !isCheckable() ) @@ -89,7 +89,7 @@ void pixmapButton::mousePressEvent( QMouseEvent * _me ) -void pixmapButton::mouseReleaseEvent( QMouseEvent * _me ) +void PixmapButton::mouseReleaseEvent( QMouseEvent * _me ) { AutomatableButton::mouseReleaseEvent( _me ); @@ -103,7 +103,7 @@ void pixmapButton::mouseReleaseEvent( QMouseEvent * _me ) -void pixmapButton::mouseDoubleClickEvent( QMouseEvent * _me ) +void PixmapButton::mouseDoubleClickEvent( QMouseEvent * _me ) { emit doubleClicked(); _me->accept(); @@ -112,7 +112,7 @@ void pixmapButton::mouseDoubleClickEvent( QMouseEvent * _me ) -void pixmapButton::setActiveGraphic( const QPixmap & _pm ) +void PixmapButton::setActiveGraphic( const QPixmap & _pm ) { m_activePixmap = _pm; resize( m_activePixmap.width(), m_activePixmap.height() ); @@ -121,7 +121,7 @@ void pixmapButton::setActiveGraphic( const QPixmap & _pm ) -void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update ) +void PixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update ) { m_inactivePixmap = _pm; if( _update ) diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/ProjectNotes.cpp similarity index 92% rename from src/gui/widgets/project_notes.cpp rename to src/gui/widgets/ProjectNotes.cpp index e94b0f549..bc6908f50 100644 --- a/src/gui/widgets/project_notes.cpp +++ b/src/gui/widgets/ProjectNotes.cpp @@ -1,5 +1,5 @@ /* - * project_notes.cpp - implementation of project-notes-editor + * ProjectNotes.cpp - implementation of project-notes-editor * * Copyright (c) 2005-2008 Tobias Doerffel * @@ -23,7 +23,7 @@ */ -#include "project_notes.h" +#include "ProjectNotes.h" #include #include @@ -44,7 +44,7 @@ -projectNotes::projectNotes() : +ProjectNotes::ProjectNotes() : QMainWindow( Engine::mainWindow()->workspace() ) { m_edit = new QTextEdit( this ); @@ -80,14 +80,14 @@ projectNotes::projectNotes() : -projectNotes::~projectNotes() +ProjectNotes::~ProjectNotes() { } -void projectNotes::clear() +void ProjectNotes::clear() { m_edit->setHtml( tr( "Put down your project notes here." ) ); m_edit->selectAll(); @@ -100,7 +100,7 @@ void projectNotes::clear() -void projectNotes::setText( const QString & _text ) +void ProjectNotes::setText( const QString & _text ) { m_edit->setHtml( _text ); } @@ -108,7 +108,7 @@ void projectNotes::setText( const QString & _text ) -void projectNotes::setupActions() +void ProjectNotes::setupActions() { QToolBar * tb = addToolBar( tr( "Edit Actions" ) ); QAction * a; @@ -246,7 +246,7 @@ void projectNotes::setupActions() -void projectNotes::textBold() +void ProjectNotes::textBold() { m_edit->setFontWeight( m_actionTextBold->isChecked() ? QFont::Bold : QFont::Normal ); @@ -256,7 +256,7 @@ void projectNotes::textBold() -void projectNotes::textUnderline() +void ProjectNotes::textUnderline() { m_edit->setFontUnderline( m_actionTextUnderline->isChecked() ); Engine::getSong()->setModified(); @@ -265,7 +265,7 @@ void projectNotes::textUnderline() -void projectNotes::textItalic() +void ProjectNotes::textItalic() { m_edit->setFontItalic( m_actionTextItalic->isChecked() ); Engine::getSong()->setModified(); @@ -274,7 +274,7 @@ void projectNotes::textItalic() -void projectNotes::textFamily( const QString & _f ) +void ProjectNotes::textFamily( const QString & _f ) { m_edit->setFontFamily( _f ); m_edit->viewport()->setFocus(); @@ -284,7 +284,7 @@ void projectNotes::textFamily( const QString & _f ) -void projectNotes::textSize( const QString & _p ) +void ProjectNotes::textSize( const QString & _p ) { m_edit->setFontPointSize( _p.toInt() ); m_edit->viewport()->setFocus(); @@ -294,7 +294,7 @@ void projectNotes::textSize( const QString & _p ) -void projectNotes::textColor() +void ProjectNotes::textColor() { QColor col = QColorDialog::getColor( m_edit->textColor(), this ); if ( !col.isValid() ) @@ -310,7 +310,7 @@ void projectNotes::textColor() -void projectNotes::textAlign( QAction * _a ) +void ProjectNotes::textAlign( QAction * _a ) { if( _a == m_actionAlignLeft ) { @@ -333,7 +333,7 @@ void projectNotes::textAlign( QAction * _a ) -void projectNotes::formatChanged( const QTextCharFormat & _f ) +void ProjectNotes::formatChanged( const QTextCharFormat & _f ) { QFont font = _f.font(); m_comboFont->lineEdit()->setText( font.family() ); @@ -352,7 +352,7 @@ void projectNotes::formatChanged( const QTextCharFormat & _f ) -void projectNotes::alignmentChanged( int _a ) +void ProjectNotes::alignmentChanged( int _a ) { if ( _a & Qt::AlignLeft ) { @@ -376,7 +376,7 @@ void projectNotes::alignmentChanged( int _a ) -void projectNotes::saveSettings( QDomDocument & _doc, QDomElement & _this ) +void ProjectNotes::saveSettings( QDomDocument & _doc, QDomElement & _this ) { MainWindow::saveWidgetState( this, _this ); @@ -387,7 +387,7 @@ void projectNotes::saveSettings( QDomDocument & _doc, QDomElement & _this ) -void projectNotes::loadSettings( const QDomElement & _this ) +void ProjectNotes::loadSettings( const QDomElement & _this ) { MainWindow::restoreWidgetState( this, _this ); m_edit->setHtml( _this.text() ); diff --git a/src/gui/widgets/rename_dialog.cpp b/src/gui/widgets/RenameDialog.cpp similarity index 83% rename from src/gui/widgets/rename_dialog.cpp rename to src/gui/widgets/RenameDialog.cpp index 965c7507e..2e443f241 100644 --- a/src/gui/widgets/rename_dialog.cpp +++ b/src/gui/widgets/RenameDialog.cpp @@ -1,5 +1,5 @@ /* - * rename_dialog.cpp - implementation of dialog for renaming something + * RenameDialog.cpp - implementation of dialog for renaming something * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -26,11 +26,11 @@ #include #include -#include "rename_dialog.h" +#include "RenameDialog.h" -renameDialog::renameDialog( QString & _string ) : +RenameDialog::RenameDialog( QString & _string ) : QDialog(), m_stringToEdit( _string ), m_originalString( _string ) @@ -49,14 +49,14 @@ renameDialog::renameDialog( QString & _string ) : -renameDialog::~renameDialog() +RenameDialog::~RenameDialog() { } -void renameDialog::keyPressEvent( QKeyEvent * _ke ) +void RenameDialog::keyPressEvent( QKeyEvent * _ke ) { if( _ke->key() == Qt::Key_Escape ) { @@ -68,7 +68,7 @@ void renameDialog::keyPressEvent( QKeyEvent * _ke ) -void renameDialog::textChanged( const QString & _new_string ) +void RenameDialog::textChanged( const QString & _new_string ) { m_stringToEdit = _new_string; } diff --git a/src/gui/widgets/rubberband.cpp b/src/gui/widgets/Rubberband.cpp similarity index 85% rename from src/gui/widgets/rubberband.cpp rename to src/gui/widgets/Rubberband.cpp index 7de558cf4..eedec42d3 100644 --- a/src/gui/widgets/rubberband.cpp +++ b/src/gui/widgets/Rubberband.cpp @@ -1,5 +1,5 @@ /* - * rubberband.cpp - rubberband - either own implementation for Qt3 or wrapper + * Rubberband.cpp - rubberband - either own implementation for Qt3 or wrapper * for Qt4 * * Copyright (c) 2006-2011 Tobias Doerffel @@ -24,10 +24,10 @@ */ -#include "rubberband.h" +#include "Rubberband.h" -rubberBand::rubberBand( QWidget * _parent ) : +RubberBand::RubberBand( QWidget * _parent ) : QRubberBand( Rectangle, _parent ) { } @@ -35,14 +35,14 @@ rubberBand::rubberBand( QWidget * _parent ) : -rubberBand::~rubberBand() +RubberBand::~RubberBand() { } -QVector rubberBand::selectedObjects() const +QVector RubberBand::selectedObjects() const { QVector so = selectableObjects(); for( QVector::iterator it = so.begin(); @@ -63,7 +63,7 @@ QVector rubberBand::selectedObjects() const -void rubberBand::resizeEvent( QResizeEvent * _re ) +void RubberBand::resizeEvent( QResizeEvent * _re ) { QRubberBand::resizeEvent( _re ); if( isEnabled() ) @@ -83,7 +83,7 @@ void rubberBand::resizeEvent( QResizeEvent * _re ) -QVector rubberBand::selectableObjects() const +QVector RubberBand::selectableObjects() const { QVector so; if( parentWidget() == NULL ) diff --git a/src/gui/widgets/SideBar.cpp b/src/gui/widgets/SideBar.cpp index 8e92dfbf9..409fbf771 100644 --- a/src/gui/widgets/SideBar.cpp +++ b/src/gui/widgets/SideBar.cpp @@ -28,7 +28,7 @@ #include "SideBar.h" #include "SideBarWidget.h" -#include "tooltip.h" +#include "ToolTip.h" // internal helper class allowing to create QToolButtons with @@ -120,7 +120,7 @@ void SideBar::appendTab( SideBarWidget * _sbw ) _sbw->hide(); _sbw->setMinimumWidth( 200 ); - toolTip::add( btn, _sbw->title() ); + ToolTip::add( btn, _sbw->title() ); } diff --git a/src/gui/widgets/tab_bar.cpp b/src/gui/widgets/TabBar.cpp similarity index 88% rename from src/gui/widgets/tab_bar.cpp rename to src/gui/widgets/TabBar.cpp index 065b7541c..e5bcf3db2 100644 --- a/src/gui/widgets/tab_bar.cpp +++ b/src/gui/widgets/TabBar.cpp @@ -1,5 +1,5 @@ /* - * tab_bar.cpp - implementation of tab-bar + * TabBar.cpp - implementation of tab-bar * * Copyright (c) 2004-2014 Tobias Doerffel * @@ -23,14 +23,14 @@ */ -#include "tab_bar.h" +#include "TabBar.h" #include "tab_button.h" #include "gui_templates.h" -#include "tooltip.h" +#include "ToolTip.h" -tabBar::tabBar( QWidget * _parent, QBoxLayout::Direction _dir ) : +TabBar::TabBar( QWidget * _parent, QBoxLayout::Direction _dir ) : QWidget( _parent ), m_layout( new QBoxLayout( _dir, this ) ), m_exclusive( false ) @@ -44,14 +44,14 @@ tabBar::tabBar( QWidget * _parent, QBoxLayout::Direction _dir ) : -tabBar::~tabBar() +TabBar::~TabBar() { } -tabButton * tabBar::addTab( QWidget * _w, const QString & _text, int _id, +tabButton * TabBar::addTab( QWidget * _w, const QString & _text, int _id, bool _add_stretch, bool _text_is_tooltip ) { // already tab with id? @@ -69,7 +69,7 @@ tabButton * tabBar::addTab( QWidget * _w, const QString & _text, int _id, b->show(); if( _text_is_tooltip ) { - toolTip::add( b, _text ); + ToolTip::add( b, _text ); } // small workaround, because QBoxLayout::addWidget(...) doesn't @@ -104,7 +104,7 @@ tabButton * tabBar::addTab( QWidget * _w, const QString & _text, int _id, -void tabBar::removeTab( int _id ) +void TabBar::removeTab( int _id ) { // find tab-button and delete it if( m_tabs.find( _id ) != m_tabs.end() ) @@ -117,7 +117,7 @@ void tabBar::removeTab( int _id ) -void tabBar::setActiveTab( int _id ) +void TabBar::setActiveTab( int _id ) { setTabState( _id, true ); hideAll( _id ); @@ -134,7 +134,7 @@ void tabBar::setActiveTab( int _id ) -int tabBar::activeTab() +int TabBar::activeTab() { QMap >::iterator it; for( it = m_tabs.begin(); it != m_tabs.end(); ++it ) @@ -150,7 +150,7 @@ int tabBar::activeTab() -bool tabBar::tabState( int _id ) +bool TabBar::tabState( int _id ) { if( m_tabs.find( _id ) == m_tabs.end() ) { @@ -162,7 +162,7 @@ bool tabBar::tabState( int _id ) -void tabBar::setTabState( int _id, bool _checked ) +void TabBar::setTabState( int _id, bool _checked ) { if( m_tabs.find( _id ) != m_tabs.end() ) { @@ -173,7 +173,7 @@ void tabBar::setTabState( int _id, bool _checked ) -void tabBar::hideAll( int _exception ) +void TabBar::hideAll( int _exception ) { QMap >::iterator it; for( it = m_tabs.begin(); it != m_tabs.end(); ++it ) @@ -200,7 +200,7 @@ void tabBar::hideAll( int _exception ) -void tabBar::tabClicked( int _id ) +void TabBar::tabClicked( int _id ) { if( m_exclusive == true && activeTab() == -1 ) { @@ -226,7 +226,7 @@ void tabBar::tabClicked( int _id ) -bool tabBar::allHidden() +bool TabBar::allHidden() { QMap >::iterator it; for( it = m_tabs.begin(); it != m_tabs.end(); ++it ) diff --git a/src/gui/widgets/tab_widget.cpp b/src/gui/widgets/TabWidget.cpp similarity index 91% rename from src/gui/widgets/tab_widget.cpp rename to src/gui/widgets/TabWidget.cpp index 56a53da9a..b29b27c70 100644 --- a/src/gui/widgets/tab_widget.cpp +++ b/src/gui/widgets/TabWidget.cpp @@ -1,5 +1,5 @@ /* - * tab_widget.cpp - tabwidget for LMMS + * TabWidget.cpp - tabwidget for LMMS * * Copyright (c) 2005-2014 Tobias Doerffel * @@ -23,7 +23,7 @@ */ -#include "tab_widget.h" +#include "TabWidget.h" #include #include @@ -34,7 +34,7 @@ -tabWidget::tabWidget( const QString & _caption, QWidget * _parent ) : +TabWidget::TabWidget( const QString & _caption, QWidget * _parent ) : QWidget( _parent ), m_activeTab( 0 ), m_caption( _caption ), @@ -54,14 +54,14 @@ tabWidget::tabWidget( const QString & _caption, QWidget * _parent ) : -tabWidget::~tabWidget() +TabWidget::~TabWidget() { } -void tabWidget::addTab( QWidget * _w, const QString & _name, int _idx ) +void TabWidget::addTab( QWidget * _w, const QString & _name, int _idx ) { setFont( pointSize<8>( font() ) ); widgetDesc d = { _w, _name, fontMetrics().width( _name ) + 10 } ; @@ -87,7 +87,7 @@ void tabWidget::addTab( QWidget * _w, const QString & _name, int _idx ) -void tabWidget::setActiveTab( int _idx ) +void TabWidget::setActiveTab( int _idx ) { if( m_widgets.contains( _idx ) ) { @@ -106,7 +106,7 @@ void tabWidget::setActiveTab( int _idx ) -void tabWidget::mousePressEvent( QMouseEvent * _me ) +void TabWidget::mousePressEvent( QMouseEvent * _me ) { if( _me->y() > 1 && _me->y() < 13 ) { @@ -130,7 +130,7 @@ void tabWidget::mousePressEvent( QMouseEvent * _me ) -void tabWidget::resizeEvent( QResizeEvent * ) +void TabWidget::resizeEvent( QResizeEvent * ) { for( widgetStack::iterator it = m_widgets.begin(); it != m_widgets.end(); ++it ) @@ -143,7 +143,7 @@ void tabWidget::resizeEvent( QResizeEvent * ) -void tabWidget::paintEvent( QPaintEvent * _pe ) +void TabWidget::paintEvent( QPaintEvent * _pe ) { setFont( pointSize<8>( font() ) ); QPainter p( this ); @@ -210,7 +210,7 @@ void tabWidget::paintEvent( QPaintEvent * _pe ) -void tabWidget::wheelEvent( QWheelEvent * _we ) +void TabWidget::wheelEvent( QWheelEvent * _we ) { if (_we->y() > m_tabheight) return; diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/TempoSyncKnob.cpp similarity index 99% rename from src/gui/widgets/tempo_sync_knob.cpp rename to src/gui/widgets/TempoSyncKnob.cpp index b08961421..0022691e0 100644 --- a/src/gui/widgets/tempo_sync_knob.cpp +++ b/src/gui/widgets/TempoSyncKnob.cpp @@ -38,7 +38,7 @@ TempoSyncKnob::TempoSyncKnob( knobTypes _knob_num, QWidget * _parent, const QString & _name ) : - knob( _knob_num, _parent, _name ), + Knob( _knob_num, _parent, _name ), m_tempoSyncIcon( embed::getIconPixmap( "tempo_sync" ) ), m_tempoSyncDescription( tr( "Tempo Sync" ) ), m_custom( NULL ) diff --git a/src/gui/widgets/text_float.cpp b/src/gui/widgets/TextFloat.cpp similarity index 84% rename from src/gui/widgets/text_float.cpp rename to src/gui/widgets/TextFloat.cpp index cd063c580..9947b09cd 100644 --- a/src/gui/widgets/text_float.cpp +++ b/src/gui/widgets/TextFloat.cpp @@ -1,5 +1,5 @@ /* - * text_float.cpp - class textFloat, a floating text-label + * TextFloat.cpp - class textFloat, a floating text-label * * Copyright (c) 2005-2010 Tobias Doerffel * @@ -26,14 +26,14 @@ #include #include -#include "text_float.h" +#include "TextFloat.h" #include "gui_templates.h" #include "MainWindow.h" #include "Engine.h" -textFloat::textFloat() : +TextFloat::TextFloat() : QWidget( Engine::mainWindow(), Qt::ToolTip ), m_title(), m_text(), @@ -50,7 +50,7 @@ textFloat::textFloat() : -void textFloat::setTitle( const QString & _title ) +void TextFloat::setTitle( const QString & _title ) { m_title = _title; updateSize(); @@ -59,7 +59,7 @@ void textFloat::setTitle( const QString & _title ) -void textFloat::setText( const QString & _text ) +void TextFloat::setText( const QString & _text ) { m_text = _text; updateSize(); @@ -68,7 +68,7 @@ void textFloat::setText( const QString & _text ) -void textFloat::setPixmap( const QPixmap & _pixmap ) +void TextFloat::setPixmap( const QPixmap & _pixmap ) { m_pixmap = _pixmap; updateSize(); @@ -77,7 +77,7 @@ void textFloat::setPixmap( const QPixmap & _pixmap ) -void textFloat::setVisibilityTimeOut( int _msecs ) +void TextFloat::setVisibilityTimeOut( int _msecs ) { QTimer::singleShot( _msecs, this, SLOT( hide() ) ); show(); @@ -86,11 +86,11 @@ void textFloat::setVisibilityTimeOut( int _msecs ) -textFloat * textFloat::displayMessage( const QString & _msg, int _timeout, +TextFloat * TextFloat::displayMessage( const QString & _msg, int _timeout, QWidget * _parent, int _add_y_margin ) { QWidget * mw = Engine::mainWindow(); - textFloat * tf = new textFloat; + TextFloat * tf = new TextFloat; if( _parent != NULL ) { tf->moveGlobal( _parent, QPoint( _parent->width() + 2, 0 ) ); @@ -112,12 +112,12 @@ textFloat * textFloat::displayMessage( const QString & _msg, int _timeout, -textFloat * textFloat::displayMessage( const QString & _title, +TextFloat * TextFloat::displayMessage( const QString & _title, const QString & _msg, const QPixmap & _pixmap, int _timeout, QWidget * _parent ) { - textFloat * tf = displayMessage( _msg, _timeout, _parent, 16 ); + TextFloat * tf = displayMessage( _msg, _timeout, _parent, 16 ); tf->setTitle( _title ); tf->setPixmap( _pixmap ); return( tf ); @@ -126,7 +126,7 @@ textFloat * textFloat::displayMessage( const QString & _title, -void textFloat::paintEvent( QPaintEvent * _pe ) +void TextFloat::paintEvent( QPaintEvent * _pe ) { QStyleOption opt; opt.init( this ); @@ -166,7 +166,7 @@ void textFloat::paintEvent( QPaintEvent * _pe ) -void textFloat::mousePressEvent( QMouseEvent * ) +void TextFloat::mousePressEvent( QMouseEvent * ) { close(); } @@ -174,7 +174,7 @@ void textFloat::mousePressEvent( QMouseEvent * ) -void textFloat::updateSize() +void TextFloat::updateSize() { QFontMetrics metrics( pointSize<8>( font() ) ); QRect textBound = metrics.boundingRect( m_text ); diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp index 93375f0b9..d2afe9240 100644 --- a/src/gui/widgets/TimeDisplayWidget.cpp +++ b/src/gui/widgets/TimeDisplayWidget.cpp @@ -27,7 +27,7 @@ #include "TimeDisplayWidget.h" #include "MainWindow.h" #include "Engine.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" @@ -48,7 +48,7 @@ TimeDisplayWidget::TimeDisplayWidget() : setMaximumHeight( 32 ); - toolTip::add( this, tr( "click to change time units" ) ); + ToolTip::add( this, tr( "click to change time units" ) ); // update labels of LCD spinboxes setDisplayMode( m_displayMode ); diff --git a/src/gui/widgets/tool_button.cpp b/src/gui/widgets/ToolButton.cpp similarity index 80% rename from src/gui/widgets/tool_button.cpp rename to src/gui/widgets/ToolButton.cpp index 437bdb4ff..d2031abc6 100644 --- a/src/gui/widgets/tool_button.cpp +++ b/src/gui/widgets/ToolButton.cpp @@ -1,5 +1,5 @@ /* - * tool_button.cpp - implementation of LMMS-tool-button for common (cool) look + * ToolButton.cpp - implementation of LMMS-tool-button for common (cool) look * * Copyright (c) 2005-2006 Tobias Doerffel * @@ -23,16 +23,16 @@ */ -#include "tool_button.h" -#include "tooltip.h" +#include "ToolButton.h" +#include "ToolTip.h" -const QColor toolButton::s_stdColor = QColor( 216, 216, 216 ); -const QColor toolButton::s_hlColor = QColor( 240, 240, 240 ); +const QColor ToolButton::s_stdColor = QColor( 216, 216, 216 ); +const QColor ToolButton::s_hlColor = QColor( 240, 240, 240 ); -toolButton::toolButton( const QPixmap & _pixmap, const QString & _tooltip, +ToolButton::ToolButton( const QPixmap & _pixmap, const QString & _tooltip, QObject * _receiver, const char * _slot, QWidget * _parent ) : QToolButton( _parent ), @@ -50,7 +50,7 @@ toolButton::toolButton( const QPixmap & _pixmap, const QString & _tooltip, { connect( this, SIGNAL( clicked() ), _receiver, _slot ); } - toolTip::add( this, _tooltip ); + ToolTip::add( this, _tooltip ); setFixedSize( 30, 30 ); setIcon( _pixmap ); leaveEvent( NULL ); @@ -61,14 +61,14 @@ toolButton::toolButton( const QPixmap & _pixmap, const QString & _tooltip, -toolButton::~toolButton() +ToolButton::~ToolButton() { } -void toolButton::enterEvent( QEvent * ) +void ToolButton::enterEvent( QEvent * ) { QPalette pal = palette(); pal.setColor( backgroundRole(), m_colorHighlighted ); @@ -80,7 +80,7 @@ void toolButton::enterEvent( QEvent * ) -void toolButton::leaveEvent( QEvent * ) +void ToolButton::leaveEvent( QEvent * ) { QPalette pal = palette(); pal.setColor( backgroundRole(), m_colorStandard ); @@ -92,7 +92,7 @@ void toolButton::leaveEvent( QEvent * ) -void toolButton::toggledBool( bool _on ) +void ToolButton::toggledBool( bool _on ) { if( _on == true ) { diff --git a/src/gui/widgets/tooltip.cpp b/src/gui/widgets/ToolTip.cpp similarity index 88% rename from src/gui/widgets/tooltip.cpp rename to src/gui/widgets/ToolTip.cpp index 9014803db..e51b72e69 100644 --- a/src/gui/widgets/tooltip.cpp +++ b/src/gui/widgets/ToolTip.cpp @@ -1,5 +1,5 @@ /* - * tooltip.cpp - namespace toolTip, a tooltip-wrapper for LMMS + * ToolTip.cpp - namespace toolTip, a tooltip-wrapper for LMMS * * Copyright (c) 2005-2006 Tobias Doerffel * @@ -25,11 +25,11 @@ #include -#include "tooltip.h" +#include "ToolTip.h" #include "ConfigManager.h" -void toolTip::add( QWidget * _w, const QString & _txt ) +void ToolTip::add( QWidget * _w, const QString & _txt ) { if( !ConfigManager::inst()->value( "tooltips", "disabled" ).toInt() ) { diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/TrackLabelButton.cpp similarity index 82% rename from src/gui/widgets/track_label_button.cpp rename to src/gui/widgets/TrackLabelButton.cpp index 53ff02bcd..5f3e359ba 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/TrackLabelButton.cpp @@ -1,5 +1,5 @@ /* - * track_label_button.cpp - implementation of class trackLabelButton, a label + * TrackLabelButton.cpp - implementation of class trackLabelButton, a label * which is renamable by double-clicking it * * Copyright (c) 2004-2008 Tobias Doerffel @@ -28,9 +28,9 @@ #include -#include "track_label_button.h" +#include "TrackLabelButton.h" #include "embed.h" -#include "rename_dialog.h" +#include "RenameDialog.h" #include "InstrumentTrack.h" #include "Instrument.h" #include "ConfigManager.h" @@ -38,7 +38,7 @@ -trackLabelButton::trackLabelButton( trackView * _tv, QWidget * _parent ) : +TrackLabelButton::TrackLabelButton( trackView * _tv, QWidget * _parent ) : QToolButton( _parent ), m_trackView( _tv ), m_iconName() @@ -68,17 +68,17 @@ trackLabelButton::trackLabelButton( trackView * _tv, QWidget * _parent ) : -trackLabelButton::~trackLabelButton() +TrackLabelButton::~TrackLabelButton() { } -void trackLabelButton::rename() +void TrackLabelButton::rename() { QString txt = m_trackView->getTrack()->name(); - renameDialog rename_dlg( txt ); + RenameDialog rename_dlg( txt ); rename_dlg.exec(); if( txt != text() ) { @@ -89,7 +89,7 @@ void trackLabelButton::rename() -void trackLabelButton::dragEnterEvent( QDragEnterEvent * _dee ) +void TrackLabelButton::dragEnterEvent( QDragEnterEvent * _dee ) { m_trackView->dragEnterEvent( _dee ); } @@ -97,7 +97,7 @@ void trackLabelButton::dragEnterEvent( QDragEnterEvent * _dee ) -void trackLabelButton::dropEvent( QDropEvent * _de ) +void TrackLabelButton::dropEvent( QDropEvent * _de ) { m_trackView->dropEvent( _de ); setChecked( true ); @@ -106,7 +106,7 @@ void trackLabelButton::dropEvent( QDropEvent * _de ) -void trackLabelButton::mousePressEvent( QMouseEvent * _me ) +void TrackLabelButton::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::RightButton ) { @@ -121,7 +121,7 @@ void trackLabelButton::mousePressEvent( QMouseEvent * _me ) -void trackLabelButton::mouseDoubleClickEvent( QMouseEvent * _me ) +void TrackLabelButton::mouseDoubleClickEvent( QMouseEvent * _me ) { rename(); } @@ -129,7 +129,7 @@ void trackLabelButton::mouseDoubleClickEvent( QMouseEvent * _me ) -void trackLabelButton::paintEvent( QPaintEvent * _pe ) +void TrackLabelButton::paintEvent( QPaintEvent * _pe ) { if( m_trackView->getTrack()->type() == Track::InstrumentTrack ) { diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/VisualizationWidget.cpp similarity index 88% rename from src/gui/widgets/visualization_widget.cpp rename to src/gui/widgets/VisualizationWidget.cpp index c6a738b1c..e7e21d589 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/VisualizationWidget.cpp @@ -1,5 +1,5 @@ /* - * visualization_widget.cpp - widget for visualization of sound-data + * VisualizationWidget.cpp - widget for visualization of sound-data * * Copyright (c) 2005-2009 Tobias Doerffel * @@ -26,19 +26,19 @@ #include #include -#include "visualization_widget.h" +#include "VisualizationWidget.h" #include "gui_templates.h" #include "MainWindow.h" #include "embed.h" #include "Engine.h" -#include "tooltip.h" +#include "ToolTip.h" #include "Song.h" #include "ConfigManager.h" -visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p, +VisualizationWidget::VisualizationWidget( const QPixmap & _bg, QWidget * _p, visualizationTypes _vtype ) : QWidget( _p ), s_background( _bg ), @@ -55,14 +55,14 @@ visualizationWidget::visualizationWidget( const QPixmap & _bg, QWidget * _p, Engine::mixer()->clearAudioBuffer( m_buffer, frames ); - toolTip::add( this, tr( "click to enable/disable visualization of " + ToolTip::add( this, tr( "click to enable/disable visualization of " "master-output" ) ); } -visualizationWidget::~visualizationWidget() +VisualizationWidget::~VisualizationWidget() { delete[] m_buffer; delete[] m_points; @@ -71,7 +71,7 @@ visualizationWidget::~visualizationWidget() -void visualizationWidget::updateAudioBuffer() +void VisualizationWidget::updateAudioBuffer() { if( !Engine::getSong()->isExporting() ) { @@ -85,7 +85,7 @@ void visualizationWidget::updateAudioBuffer() -void visualizationWidget::setActive( bool _active ) +void VisualizationWidget::setActive( bool _active ) { m_active = _active; if( m_active ) @@ -114,7 +114,7 @@ void visualizationWidget::setActive( bool _active ) -void visualizationWidget::paintEvent( QPaintEvent * ) +void VisualizationWidget::paintEvent( QPaintEvent * ) { QPainter p( this ); @@ -181,7 +181,7 @@ void visualizationWidget::paintEvent( QPaintEvent * ) -void visualizationWidget::mousePressEvent( QMouseEvent * _me ) +void VisualizationWidget::mousePressEvent( QMouseEvent * _me ) { if( _me->button() == Qt::LeftButton ) { diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp index 9d6a22e89..e82a310f0 100644 --- a/src/tracks/AutomationTrack.cpp +++ b/src/tracks/AutomationTrack.cpp @@ -31,7 +31,7 @@ #include "ProjectJournal.h" #include "string_pair_drag.h" #include "TrackContainerView.h" -#include "track_label_button.h" +#include "TrackLabelButton.h" AutomationTrack::AutomationTrack( TrackContainer* tc, bool _hidden ) : @@ -131,7 +131,7 @@ AutomationTrackView::AutomationTrackView( AutomationTrack * _at, TrackContainerV trackView( _at, tcv ) { setFixedHeight( 32 ); - trackLabelButton * tlb = new trackLabelButton( this, + TrackLabelButton * tlb = new TrackLabelButton( this, getTrackSettingsWidget() ); tlb->setIcon( embed::getIconPixmap( "automation_track" ) ); tlb->move( 3, 1 ); diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 01d6a8b9e..0d288603d 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -54,14 +54,14 @@ #include "FxMixerView.h" #include "InstrumentSoundShaping.h" #include "InstrumentSoundShapingView.h" -#include "fade_button.h" +#include "FadeButton.h" #include "gui_templates.h" #include "Instrument.h" #include "InstrumentFunctionViews.h" #include "InstrumentMidiIOView.h" -#include "knob.h" +#include "Knob.h" #include "LcdSpinBox.h" -#include "led_checkbox.h" +#include "LedCheckbox.h" #include "MainWindow.h" #include "MidiClient.h" #include "MidiPortMenu.h" @@ -73,9 +73,9 @@ #include "SamplePlayHandle.h" #include "Song.h" #include "string_pair_drag.h" -#include "tab_widget.h" -#include "tooltip.h" -#include "track_label_button.h" +#include "TabWidget.h" +#include "ToolTip.h" +#include "TrackLabelButton.h" #include "ValueBuffer.h" #include "volume.h" @@ -821,7 +821,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV setAcceptDrops( true ); setFixedHeight( 32 ); - m_tlb = new trackLabelButton( this, getTrackSettingsWidget() ); + m_tlb = new TrackLabelButton( this, getTrackSettingsWidget() ); m_tlb->setCheckable( true ); m_tlb->setIcon( embed::getIconPixmap( "instrument_track" ) ); m_tlb->move( 3, 1 ); @@ -845,7 +845,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV widgetWidth = DEFAULT_SETTINGS_WIDGET_WIDTH; } - m_volumeKnob = new knob( knobSmall_17, getTrackSettingsWidget(), + m_volumeKnob = new Knob( knobSmall_17, getTrackSettingsWidget(), tr( "Volume" ) ); m_volumeKnob->setVolumeKnob( true ); m_volumeKnob->setModel( &_it->m_volumeModel ); @@ -855,7 +855,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV m_volumeKnob->show(); m_volumeKnob->setWhatsThis( tr( volume_help ) ); - m_panningKnob = new knob( knobSmall_17, getTrackSettingsWidget(), + m_panningKnob = new Knob( knobSmall_17, getTrackSettingsWidget(), tr( "Panning" ) ); m_panningKnob->setModel( &_it->m_panningModel ); m_panningKnob->setHintText( tr( "Panning:" ) + " ", "%" ); @@ -898,7 +898,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV m_midiInputAction->setText( tr( "Input" ) ); m_midiOutputAction->setText( tr( "Output" ) ); - m_activityIndicator = new fadeButton( QApplication::palette().color( QPalette::Active, + m_activityIndicator = new FadeButton( QApplication::palette().color( QPalette::Active, QPalette::Background), QApplication::palette().color( QPalette::Active, QPalette::BrightText ), @@ -1155,7 +1155,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : vlayout->setMargin( 0 ); vlayout->setSpacing( 0 ); - tabWidget* generalSettingsWidget = new tabWidget( tr( "GENERAL SETTINGS" ), this ); + TabWidget* generalSettingsWidget = new TabWidget( tr( "GENERAL SETTINGS" ), this ); QVBoxLayout* generalSettingsLayout = new QVBoxLayout( generalSettingsWidget ); @@ -1174,7 +1174,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : basicControlsLayout->setSpacing( 3 ); // set up volume knob - m_volumeKnob = new knob( knobBright_26, NULL, tr( "Instrument volume" ) ); + m_volumeKnob = new Knob( knobBright_26, NULL, tr( "Instrument volume" ) ); m_volumeKnob->setVolumeKnob( true ); m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "%" ); m_volumeKnob->setLabel( tr( "VOL" ) ); @@ -1184,7 +1184,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : basicControlsLayout->addWidget( m_volumeKnob ); // set up panning knob - m_panningKnob = new knob( knobBright_26, NULL, tr( "Panning" ) ); + m_panningKnob = new Knob( knobBright_26, NULL, tr( "Panning" ) ); m_panningKnob->setHintText( tr( "Panning:" ) + " ", "" ); m_panningKnob->setLabel( tr( "PAN" ) ); @@ -1192,7 +1192,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : basicControlsLayout->addStretch(); // set up pitch knob - m_pitchKnob = new knob( knobBright_26, NULL, tr( "Pitch" ) ); + m_pitchKnob = new Knob( knobBright_26, NULL, tr( "Pitch" ) ); m_pitchKnob->setHintText( tr( "Pitch:" ) + " ", " " + tr( "cents" ) ); m_pitchKnob->setLabel( tr( "PITCH" ) ); @@ -1219,7 +1219,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : connect( saveSettingsBtn, SIGNAL( clicked() ), this, SLOT( saveSettingsBtnClicked() ) ); - toolTip::add( saveSettingsBtn, tr( "Save current instrument track settings in a preset file" ) ); + ToolTip::add( saveSettingsBtn, tr( "Save current instrument track settings in a preset file" ) ); saveSettingsBtn->setWhatsThis( tr( "Click here, if you want to save current instrument track settings in a preset file. " "Later you can load this preset by double-clicking it in the preset-browser." ) ); @@ -1229,7 +1229,7 @@ InstrumentTrackWindow::InstrumentTrackWindow( InstrumentTrackView * _itv ) : generalSettingsLayout->addLayout( basicControlsLayout ); - m_tabWidget = new tabWidget( "", this ); + m_tabWidget = new TabWidget( "", this ); m_tabWidget->setFixedHeight( INSTRUMENT_HEIGHT + 10 ); diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp index da8060313..0752e8eed 100644 --- a/src/tracks/Pattern.cpp +++ b/src/tracks/Pattern.cpp @@ -41,11 +41,11 @@ #include "Engine.h" #include "PianoRoll.h" #include "TrackContainer.h" -#include "rename_dialog.h" +#include "RenameDialog.h" #include "SampleBuffer.h" #include "AudioSampleRecorder.h" #include "Song.h" -#include "tooltip.h" +#include "ToolTip.h" #include "BBTrackContainer.h" #include "string_pair_drag.h" #include "MainWindow.h" @@ -637,7 +637,7 @@ PatternView::PatternView( Pattern* pattern, trackView* parent ) : setFixedHeight( parentWidget()->height() - 2 ); setAutoResizeEnabled( false ); - toolTip::add( this, + ToolTip::add( this, tr( "double-click to open this pattern in piano-roll\n" "use mouse wheel to set volume of a step" ) ); setStyle( QApplication::style() ); @@ -687,7 +687,7 @@ void PatternView::resetName() void PatternView::changeName() { QString s = m_pat->name(); - renameDialog rename_dlg( s ); + RenameDialog rename_dlg( s ); rename_dlg.exec(); m_pat->setName( s ); } diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 802ce00a2..2f90c960d 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -37,15 +37,15 @@ #include "Song.h" #include "embed.h" #include "Engine.h" -#include "tooltip.h" +#include "ToolTip.h" #include "AudioPort.h" #include "SamplePlayHandle.h" #include "SampleRecordHandle.h" #include "string_pair_drag.h" -#include "knob.h" +#include "Knob.h" #include "MainWindow.h" #include "EffectRackView.h" -#include "track_label_button.h" +#include "TrackLabelButton.h" #include "ConfigManager.h" @@ -221,7 +221,7 @@ void SampleTCOView::updateSample() update(); // set tooltip to filename so that user can see what sample this // sample-tco contains - toolTip::add( this, ( m_tco->m_sampleBuffer->audioFile() != "" ) ? + ToolTip::add( this, ( m_tco->m_sampleBuffer->audioFile() != "" ) ? m_tco->m_sampleBuffer->audioFile() : tr( "double-click to select sample" ) ); } @@ -525,7 +525,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) : { setFixedHeight( 32 ); - trackLabelButton * tlb = new trackLabelButton( this, + TrackLabelButton * tlb = new TrackLabelButton( this, getTrackSettingsWidget() ); connect( tlb, SIGNAL( clicked( bool ) ), this, SLOT( showEffects() ) ); @@ -533,7 +533,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) : tlb->move( 3, 1 ); tlb->show(); - m_volumeKnob = new knob( knobSmall_17, getTrackSettingsWidget(), + m_volumeKnob = new Knob( knobSmall_17, getTrackSettingsWidget(), tr( "Track volume" ) ); m_volumeKnob->setVolumeKnob( true ); m_volumeKnob->setModel( &_t->m_volumeModel ); diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index d537cc62e..53f35511a 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -35,11 +35,11 @@ #include "gui_templates.h" #include "MainWindow.h" #include "Mixer.h" -#include "rename_dialog.h" +#include "RenameDialog.h" #include "Song.h" #include "SongEditor.h" #include "templates.h" -#include "track_label_button.h" +#include "TrackLabelButton.h" @@ -292,7 +292,7 @@ void bbTCOView::resetName() void bbTCOView::changeName() { QString s = m_bbTCO->name(); - renameDialog rename_dlg( s ); + RenameDialog rename_dlg( s ); rename_dlg.exec(); m_bbTCO->setName( s ); } @@ -585,7 +585,7 @@ bbTrackView::bbTrackView( bbTrack * _bbt, TrackContainerView* tcv ) : // too), so disable it setAcceptDrops( false ); - m_trackLabel = new trackLabelButton( this, getTrackSettingsWidget() ); + m_trackLabel = new TrackLabelButton( this, getTrackSettingsWidget() ); m_trackLabel->setIcon( embed::getIconPixmap( "bb_track" ) ); m_trackLabel->move( 3, 1 ); m_trackLabel->show();