Skip to content

Commit

Permalink
Merge pull request #1353 from LMMS/rename
Browse files Browse the repository at this point in the history
Rename old style classes and files [wip]
  • Loading branch information
diizy committed Nov 26, 2014
2 parents ed11ccb + 5f4cdac commit bdbedad
Show file tree
Hide file tree
Showing 308 changed files with 4,377 additions and 4,296 deletions.
6 changes: 3 additions & 3 deletions include/about_dialog.h → include/AboutDialog.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* about_dialog.h - declaration of class aboutDialog
* AboutDialog.h - declaration of class AboutDialog
*
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
Expand Down Expand Up @@ -31,10 +31,10 @@
#include "ui_about_dialog.h"


class aboutDialog : public QDialog, public Ui::AboutDialog
class AboutDialog : public QDialog, public Ui::AboutDialog
{
public:
aboutDialog( void );
AboutDialog( void );

} ;

Expand Down
8 changes: 4 additions & 4 deletions include/AudioDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <QtCore/QThread>

#include "Mixer.h"
#include "tab_widget.h"
#include "TabWidget.h"


class AudioPort;
Expand Down Expand Up @@ -90,12 +90,12 @@ class AudioDevice



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 )
{
}
Expand Down
6 changes: 3 additions & 3 deletions include/AudioPortAudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public slots:
#endif


class comboBox;
class ComboBox;
class LcdSpinBox;


Expand Down Expand Up @@ -86,8 +86,8 @@ class AudioPortAudio : public AudioDevice
virtual void saveSettings();

private:
comboBox * m_backend;
comboBox * m_device;
ComboBox * m_backend;
ComboBox * m_device;
AudioPortAudioSetupUtil m_setupUtil;

} ;
Expand Down
16 changes: 8 additions & 8 deletions include/automatable_button.h → include/AutomatableButton.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* automatable_button.h - class automatableButton, the base for all buttons
* AutomatableButton.h - class automatableButton, the base for all buttons
*
* Copyright (c) 2006-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
Expand Down Expand Up @@ -34,13 +34,13 @@
class automatableButtonGroup;


class EXPORT automatableButton : public QPushButton, public BoolModelView
class EXPORT AutomatableButton : public QPushButton, public BoolModelView
{
Q_OBJECT
public:
automatableButton( QWidget * _parent, const QString & _name
AutomatableButton( QWidget * _parent, const QString & _name
= QString::null );
virtual ~automatableButton();
virtual ~AutomatableButton();

inline void setCheckable( bool _on )
{
Expand Down Expand Up @@ -87,10 +87,10 @@ class EXPORT automatableButtonGroup : public QWidget, public IntModelView
= QString::null );
virtual ~automatableButtonGroup();

void addButton( automatableButton * _btn );
void removeButton( automatableButton * _btn );
void addButton( AutomatableButton * _btn );
void removeButton( AutomatableButton * _btn );

void activateButton( automatableButton * _btn );
void activateButton( AutomatableButton * _btn );

virtual void modelChanged();

Expand All @@ -100,7 +100,7 @@ private slots:


private:
QList<automatableButton *> m_buttons;
QList<AutomatableButton *> m_buttons;

} ;

Expand Down
8 changes: 4 additions & 4 deletions include/automatable_slider.h → include/AutomatableSlider.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* automatable_slider.h - class automatableSlider, a QSlider with automation
* AutomatableSlider.h - class automatableSlider, a QSlider with automation
*
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
Expand Down Expand Up @@ -32,12 +32,12 @@



class automatableSlider : public QSlider, public IntModelView
class AutomatableSlider : public QSlider, public IntModelView
{
Q_OBJECT
public:
automatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~automatableSlider();
AutomatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~AutomatableSlider();

bool showStatus()
{
Expand Down
44 changes: 22 additions & 22 deletions include/AutomationEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 Timeline;
class ToolButton;


class AutomationEditor : public QWidget, public JournallingObject
Expand Down Expand Up @@ -191,27 +191,27 @@ protected slots:

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;
Expand Down Expand Up @@ -258,7 +258,7 @@ protected slots:
editModes m_editMode;


timeLine * m_timeLine;
Timeline * m_timeLine;
bool m_scrollBack;

void drawCross( QPainter & _p );
Expand All @@ -270,7 +270,7 @@ protected slots:
QColor m_vertexColor;
QBrush m_scaleColor;

friend class engine;
friend class Engine;


signals:
Expand Down
4 changes: 2 additions & 2 deletions include/AutomationPattern.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class MidiTime;



class EXPORT AutomationPattern : public trackContentObject
class EXPORT AutomationPattern : public TrackContentObject
{
Q_OBJECT
public:
Expand Down Expand Up @@ -148,7 +148,7 @@ class EXPORT AutomationPattern : public trackContentObject

void processMidiTime( const MidiTime & _time );

virtual trackContentObjectView * createView( trackView * _tv );
virtual TrackContentObjectView * createView( TrackView * _tv );


static bool isAutomated( const AutomatableModel * _m );
Expand Down
6 changes: 3 additions & 3 deletions include/AutomationPatternView.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
class AutomationPattern;


class AutomationPatternView : public trackContentObjectView
class AutomationPatternView : public TrackContentObjectView
{
Q_OBJECT

Expand All @@ -39,7 +39,7 @@ class AutomationPatternView : public trackContentObjectView
Q_PROPERTY( QColor textColor READ textColor WRITE setTextColor )

public:
AutomationPatternView( AutomationPattern * _pat, trackView * _parent );
AutomationPatternView( AutomationPattern * _pat, TrackView * _parent );
virtual ~AutomationPatternView();

public slots:
Expand All @@ -59,7 +59,7 @@ protected slots:
virtual void resizeEvent( QResizeEvent * _re )
{
m_needsUpdate = true;
trackContentObjectView::resizeEvent( _re );
TrackContentObjectView::resizeEvent( _re );
}
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );
Expand Down
6 changes: 3 additions & 3 deletions include/AutomationTrack.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class AutomationTrack : public Track
return "automationtrack";
}

virtual trackView * createView( TrackContainerView* );
virtual trackContentObject * createTCO( const MidiTime & _pos );
virtual TrackView * createView( TrackContainerView* );
virtual TrackContentObject * createTCO( const MidiTime & _pos );

virtual void saveTrackSpecificSettings( QDomDocument & _doc,
QDomElement & _parent );
Expand All @@ -59,7 +59,7 @@ class AutomationTrack : public Track



class AutomationTrackView : public trackView
class AutomationTrackView : public TrackView
{
public:
AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
Expand Down
22 changes: 11 additions & 11 deletions include/bb_editor.h → include/BBEditor.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* bb_editor.h - view-component of BB-Editor
* BBEditor.h - view-component of BB-Editor
*
* Copyright (c) 2004-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
Expand Down Expand Up @@ -29,17 +29,17 @@
#include "TrackContainerView.h"


class bbTrackContainer;
class comboBox;
class toolButton;
class BBTrackContainer;
class ComboBox;
class ToolButton;


class bbEditor : public TrackContainerView
class BBEditor : public TrackContainerView
{
Q_OBJECT
public:
bbEditor( bbTrackContainer * _tc );
virtual ~bbEditor();
BBEditor( BBTrackContainer * _tc );
virtual ~BBEditor();

virtual inline bool fixedTCOs() const
{
Expand All @@ -64,13 +64,13 @@ public slots:
private:
virtual void keyPressEvent( QKeyEvent * _ke );

bbTrackContainer * m_bbtc;
BBTrackContainer * m_bbtc;
QWidget * m_toolBar;

toolButton * m_playButton;
toolButton * m_stopButton;
ToolButton * m_playButton;
ToolButton * m_stopButton;

comboBox * m_bbComboBox;
ComboBox * m_bbComboBox;

} ;

Expand Down
Loading

0 comments on commit bdbedad

Please sign in to comment.