diff --git a/data/locale/ca.ts b/data/locale/ca.ts
index d1c3c09a5..54936274e 100644
--- a/data/locale/ca.ts
+++ b/data/locale/ca.ts
@@ -6101,7 +6101,7 @@ Latència: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
Pica aquí si vols aturar la reproducció de la cançó. El marcador de posició de cançó serà col·locat a l'inici de la cançó.
diff --git a/data/locale/cs.ts b/data/locale/cs.ts
index 5f8bce501..c31bb0953 100644
--- a/data/locale/cs.ts
+++ b/data/locale/cs.ts
@@ -6102,7 +6102,7 @@ Zpoždění %2 ms
- songEditor
+ SongEditor
Song-Editor
Editor skladby
diff --git a/data/locale/de.ts b/data/locale/de.ts
index 26a0a5b57..dd11a5f2a 100644
--- a/data/locale/de.ts
+++ b/data/locale/de.ts
@@ -6091,7 +6091,7 @@ Latenz: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
Klicken Sie hier, wenn Sie das Abspielen des Songs stoppen wollen. Der Song-Positions-Marker wird automatisch auf den Song-Anfang zurückgesetzt.
diff --git a/data/locale/en.ts b/data/locale/en.ts
index cd160f1af..f2aca61f0 100644
--- a/data/locale/en.ts
+++ b/data/locale/en.ts
@@ -6081,7 +6081,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Song-Editor
diff --git a/data/locale/es.ts b/data/locale/es.ts
index d73635f56..4bb9f5e1e 100644
--- a/data/locale/es.ts
+++ b/data/locale/es.ts
@@ -6082,7 +6082,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
Click aquí si usted desea detener la reproducción de su canción. El marcador de posición de la canción va a ser puesta al inicio de la canción.
diff --git a/data/locale/fa.ts b/data/locale/fa.ts
index 6ff08c5c7..24fee5a2a 100644
--- a/data/locale/fa.ts
+++ b/data/locale/fa.ts
@@ -6081,7 +6081,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
اگر می خواهید پخش ترانه ی خود را متوقف کنید اینجا را کلیک کنید.سازنده موقعیت ترانه به شروع ترانه تنظیم خواهد شد.
diff --git a/data/locale/fr.ts b/data/locale/fr.ts
index f5b60e696..e6ccb95fd 100644
--- a/data/locale/fr.ts
+++ b/data/locale/fr.ts
@@ -6114,7 +6114,7 @@ Latence : %2 ms
- songEditor
+ SongEditor
Song-Editor
Éditeur de morceau
diff --git a/data/locale/gl.ts b/data/locale/gl.ts
index 55b5983eb..d830c5586 100644
--- a/data/locale/gl.ts
+++ b/data/locale/gl.ts
@@ -6116,7 +6116,7 @@ Latencia: %2 ms
- songEditor
+ SongEditor
Song-Editor
Editor de cancións
diff --git a/data/locale/it.ts b/data/locale/it.ts
index 6a95d92c8..f00ceea3c 100644
--- a/data/locale/it.ts
+++ b/data/locale/it.ts
@@ -6115,7 +6115,7 @@ Latenza: %2 ms
- songEditor
+ SongEditor
Song-Editor
Song-Editor
diff --git a/data/locale/ja.ts b/data/locale/ja.ts
index 24379e4cb..0298ffba6 100644
--- a/data/locale/ja.ts
+++ b/data/locale/ja.ts
@@ -6114,7 +6114,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Song-Editor
ソングエディタ
diff --git a/data/locale/ko.ts b/data/locale/ko.ts
index 6013094d9..423a25fe3 100644
--- a/data/locale/ko.ts
+++ b/data/locale/ko.ts
@@ -6086,7 +6086,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Song-Editor
노래-편집기
diff --git a/data/locale/nl.ts b/data/locale/nl.ts
index ea4e59a97..b9605d9cd 100644
--- a/data/locale/nl.ts
+++ b/data/locale/nl.ts
@@ -6086,7 +6086,7 @@ Vertraging: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
Klik hier, wanneer je het afspelen van de song wilt stoppen. De song-position-marker zal weer naar het begin van je song worden gezet.
diff --git a/data/locale/pl.ts b/data/locale/pl.ts
index f5bd68aef..fee00bae0 100644
--- a/data/locale/pl.ts
+++ b/data/locale/pl.ts
@@ -6122,7 +6122,7 @@ Latencja: %2 ms
- songEditor
+ SongEditor
Song-Editor
Edytor Kompozycji
diff --git a/data/locale/pt_br.ts b/data/locale/pt_br.ts
index 84b23a3d9..ebccd075b 100644
--- a/data/locale/pt_br.ts
+++ b/data/locale/pt_br.ts
@@ -6083,7 +6083,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Song-Editor
Editor de música
diff --git a/data/locale/ru.ts b/data/locale/ru.ts
index c4dd37af3..811d01749 100644
--- a/data/locale/ru.ts
+++ b/data/locale/ru.ts
@@ -6119,7 +6119,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song.
Нажмите сюда, если вы хотите остановить воспроизведение мелодии. Курсор при этом будет установлен на начало композиции.
diff --git a/data/locale/sv.ts b/data/locale/sv.ts
index 94bf7bf86..f33000c02 100644
--- a/data/locale/sv.ts
+++ b/data/locale/sv.ts
@@ -6084,7 +6084,7 @@ Latency: %2 ms
- songEditor
+ SongEditor
Song-Editor
Sång-Editor
diff --git a/include/song_editor.h b/include/SongEditor.h
similarity index 94%
rename from include/song_editor.h
rename to include/SongEditor.h
index 955d1481f..3c26e76b1 100644
--- a/include/song_editor.h
+++ b/include/SongEditor.h
@@ -1,5 +1,5 @@
/*
- * song_editor.h - declaration of class songEditor, a window where you can
+ * SongEditor.h - declaration of class SongEditor, a window where you can
* setup your songs
*
* Copyright (c) 2004-2014 Tobias Doerffel
@@ -52,12 +52,12 @@ private:
} ;
-class songEditor : public TrackContainerView
+class SongEditor : public TrackContainerView
{
Q_OBJECT
public:
- songEditor( song * _song );
- virtual ~songEditor();
+ SongEditor( song * _song );
+ virtual ~SongEditor();
void setPauseIcon( bool pause );
diff --git a/include/engine.h b/include/engine.h
index 66a63f929..8310c4d90 100644
--- a/include/engine.h
+++ b/include/engine.h
@@ -44,7 +44,7 @@ class Mixer;
class PianoRoll;
class projectNotes;
class song;
-class songEditor;
+class SongEditor;
class ladspa2LMMS;
class ControllerRackView;
@@ -107,7 +107,7 @@ public:
return s_fxMixerView;
}
- static songEditor * getSongEditor()
+ static SongEditor* songEditor()
{
return s_songEditor;
}
@@ -188,7 +188,7 @@ private:
// GUI
static MainWindow * s_mainWindow;
static FxMixerView * s_fxMixerView;
- static songEditor * s_songEditor;
+ static SongEditor* s_songEditor;
static AutomationEditor * s_automationEditor;
static bbEditor * s_bbEditor;
static PianoRoll* s_pianoRoll;
diff --git a/include/song.h b/include/song.h
index 9ea48b488..7eaceb30c 100644
--- a/include/song.h
+++ b/include/song.h
@@ -354,7 +354,7 @@ private:
friend class engine;
- friend class songEditor;
+ friend class SongEditor;
friend class mainWindow;
friend class ControllerRackView;
diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp
index de974a4c7..852115afb 100644
--- a/plugins/bit_invader/bit_invader.cpp
+++ b/plugins/bit_invader/bit_invader.cpp
@@ -34,7 +34,6 @@
#include "NotePlayHandle.h"
#include "Oscillator.h"
#include "pixmap_button.h"
-#include "song_editor.h"
#include "templates.h"
#include "tooltip.h"
#include "song.h"
diff --git a/plugins/sfxr/sfxr.cpp b/plugins/sfxr/sfxr.cpp
index bdad56cb9..1d5d8354c 100644
--- a/plugins/sfxr/sfxr.cpp
+++ b/plugins/sfxr/sfxr.cpp
@@ -44,7 +44,6 @@ float frnd(float range)
#include "knob.h"
#include "NotePlayHandle.h"
#include "pixmap_button.h"
-#include "song_editor.h"
#include "templates.h"
#include "tooltip.h"
#include "song.h"
diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp
index 0b91fba22..06aa671c6 100644
--- a/plugins/triple_oscillator/TripleOscillator.cpp
+++ b/plugins/triple_oscillator/TripleOscillator.cpp
@@ -36,7 +36,6 @@
#include "NotePlayHandle.h"
#include "pixmap_button.h"
#include "SampleBuffer.h"
-#include "song_editor.h"
#include "tooltip.h"
#include "embed.cpp"
diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp
index 5b7fd738a..28e1697aa 100644
--- a/src/core/DataFile.cpp
+++ b/src/core/DataFile.cpp
@@ -37,7 +37,7 @@
#include "config_mgr.h"
#include "project_version.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "Effect.h"
#include "lmmsversion.h"
@@ -95,8 +95,8 @@ DataFile::DataFile( const QString & _fileName ) :
if( !inFile.open( QIODevice::ReadOnly ) )
{
QMessageBox::critical( NULL,
- songEditor::tr( "Could not open file" ),
- songEditor::tr( "Could not open file %1. You probably "
+ SongEditor::tr( "Could not open file" ),
+ SongEditor::tr( "Could not open file %1. You probably "
"have no permissions to read this "
"file.\n Please make sure to have at "
"least read permissions to the file "
@@ -190,8 +190,8 @@ bool DataFile::writeFile( const QString& filename )
if( !outfile.open( QIODevice::WriteOnly | QIODevice::Truncate ) )
{
QMessageBox::critical( NULL,
- songEditor::tr( "Could not write file" ),
- songEditor::tr( "Could not open %1 for writing. You probably are not permitted to "
+ SongEditor::tr( "Could not write file" ),
+ SongEditor::tr( "Could not open %1 for writing. You probably are not permitted to "
"write to this file. Please make sure you have write-access to "
"the file and try again." ).arg( fullName ) );
return false;
@@ -731,8 +731,8 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
{
qWarning() << "at line" << line << "column" << errorMsg;
QMessageBox::critical( NULL,
- songEditor::tr( "Error in file" ),
- songEditor::tr( "The file %1 seems to contain "
+ SongEditor::tr( "Error in file" ),
+ SongEditor::tr( "The file %1 seems to contain "
"errors and therefore can't be "
"loaded." ).
arg( _sourceFile ) );
diff --git a/src/core/engine.cpp b/src/core/engine.cpp
index fab2f6e77..983cd7160 100644
--- a/src/core/engine.cpp
+++ b/src/core/engine.cpp
@@ -41,7 +41,7 @@
#include "ProjectJournal.h"
#include "project_notes.h"
#include "Plugin.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "song.h"
@@ -54,7 +54,7 @@ FxMixerView * engine::s_fxMixerView = NULL;
MainWindow * engine::s_mainWindow = NULL;
bbTrackContainer * engine::s_bbTrackContainer = NULL;
song * engine::s_song = NULL;
-songEditor * engine::s_songEditor = NULL;
+SongEditor* engine::s_songEditor = NULL;
AutomationEditor * engine::s_automationEditor = NULL;
bbEditor * engine::s_bbEditor = NULL;
PianoRoll* engine::s_pianoRoll = NULL;
@@ -89,7 +89,7 @@ void engine::init( const bool _has_gui )
if( s_hasGUI )
{
s_mainWindow = new MainWindow;
- s_songEditor = new songEditor( s_song );
+ s_songEditor = new SongEditor( s_song );
s_fxMixerView = new FxMixerView;
s_controllerRackView = new ControllerRackView;
s_projectNotes = new projectNotes;
diff --git a/src/core/song.cpp b/src/core/song.cpp
index d54fc7ed6..167c8bd8b 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -57,7 +57,7 @@
#include "project_notes.h"
#include "ProjectRenderer.h"
#include "rename_dialog.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "templates.h"
#include "text_float.h"
#include "timeline.h"
@@ -726,9 +726,9 @@ void song::clearProject()
{
engine::getBBEditor()->clearAllTracks();
}
- if( engine::getSongEditor() )
+ if( engine::songEditor() )
{
- engine::getSongEditor()->clearAllTracks();
+ engine::songEditor()->clearAllTracks();
}
if( engine::fxMixerView() )
{
diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp
index 54e1baff1..3120dacc1 100644
--- a/src/core/timeline.cpp
+++ b/src/core/timeline.cpp
@@ -102,7 +102,7 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt,
timeLine::~timeLine()
{
- if( engine::getSongEditor() )
+ if( engine::songEditor() )
{
m_pos.m_timeLine = NULL;
}
diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp
index 0e80e88b3..cdbbfc734 100644
--- a/src/gui/AutomationEditor.cpp
+++ b/src/gui/AutomationEditor.cpp
@@ -48,7 +48,7 @@
#include
-#include "song_editor.h"
+#include "SongEditor.h"
#include "MainWindow.h"
#include "embed.h"
#include "engine.h"
@@ -2191,7 +2191,7 @@ void AutomationEditor::cutSelectedValues()
}
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
@@ -2213,7 +2213,7 @@ void AutomationEditor::pasteValues()
// least one value...
engine::getSong()->setModified();
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
}
@@ -2243,7 +2243,7 @@ void AutomationEditor::deleteSelectedValues()
{
engine::getSong()->setModified();
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
}
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 588e93bbb..45595546a 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -37,7 +37,7 @@
#include "lmmsversion.h"
#include "MainWindow.h"
#include "bb_editor.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "song.h"
#include "PianoRoll.h"
#include "embed.h"
@@ -867,7 +867,7 @@ void MainWindow::toggleBBEditorWin( bool forceShow )
void MainWindow::toggleSongEditorWin( void )
{
- toggleWindow( engine::getSongEditor() );
+ toggleWindow( engine::songEditor() );
}
diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp
index 66ac82942..570f6f54a 100644
--- a/src/gui/PianoRoll.cpp
+++ b/src/gui/PianoRoll.cpp
@@ -62,7 +62,7 @@
#include "Piano.h"
#include "pixmap_button.h"
#include "song.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "templates.h"
#include "text_float.h"
#include "timeline.h"
@@ -1021,7 +1021,7 @@ void PianoRoll::shiftSemiTone( int amount ) // shift notes by amount semitones
// we modified the song
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
@@ -1057,7 +1057,7 @@ void PianoRoll::shiftPos( int amount ) //shift notes pos by amount
// we modified the song
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
@@ -1745,7 +1745,7 @@ void PianoRoll::mousePressEvent( QMouseEvent * _me )
// added new notes, so must update engine, song, etc
engine::getSong()->setModified();
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
}
@@ -3643,7 +3643,7 @@ void PianoRoll::cutSelectedNotes()
}
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
@@ -3689,7 +3689,7 @@ void PianoRoll::pasteNotes()
m_ctrlMode = ModeDraw;
m_drawButton->setChecked( true );
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
}
@@ -3732,7 +3732,7 @@ void PianoRoll::deleteSelectedNotes()
{
engine::getSong()->setModified();
update();
- engine::getSongEditor()->update();
+ engine::songEditor()->update();
}
}
diff --git a/src/gui/song_editor.cpp b/src/gui/SongEditor.cpp
similarity index 94%
rename from src/gui/song_editor.cpp
rename to src/gui/SongEditor.cpp
index ff9f6c066..1d99a5a16 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/SongEditor.cpp
@@ -1,5 +1,5 @@
/*
- * song_editor.cpp - basic window for song-editing
+ * SongEditor.cpp - basic window for song-editing
*
* Copyright (c) 2004-2014 Tobias Doerffel
*
@@ -35,7 +35,7 @@
#include
-#include "song_editor.h"
+#include "SongEditor.h"
#include "automatable_slider.h"
#include "combobox.h"
#include "config_mgr.h"
@@ -75,7 +75,7 @@ void positionLine::paintEvent( QPaintEvent * _pe )
-songEditor::songEditor( song * _song ) :
+SongEditor::SongEditor( song * _song ) :
TrackContainerView( _song ),
m_s( _song ),
m_scrollBack( false ),
@@ -401,14 +401,14 @@ songEditor::songEditor( song * _song ) :
-songEditor::~songEditor()
+SongEditor::~SongEditor()
{
}
-void songEditor::setHighQuality( bool _hq )
+void SongEditor::setHighQuality( bool _hq )
{
engine::mixer()->changeQuality( Mixer::qualitySettings(
_hq ? Mixer::qualitySettings::Mode_HighQuality :
@@ -418,7 +418,7 @@ void songEditor::setHighQuality( bool _hq )
-void songEditor::scrolled( int _new_pos )
+void SongEditor::scrolled( int _new_pos )
{
update();
emit positionChanged( m_currentPosition = MidiTime( _new_pos, 0 ) );
@@ -427,7 +427,7 @@ void songEditor::scrolled( int _new_pos )
-void songEditor::setPauseIcon( bool pause )
+void SongEditor::setPauseIcon( bool pause )
{
if( pause == true )
{
@@ -442,7 +442,7 @@ void songEditor::setPauseIcon( bool pause )
-void songEditor::play()
+void SongEditor::play()
{
if( engine::getSong()->playMode() != song::Mode_PlaySong )
{
@@ -457,7 +457,7 @@ void songEditor::play()
-void songEditor::record()
+void SongEditor::record()
{
m_s->record();
}
@@ -465,7 +465,7 @@ void songEditor::record()
-void songEditor::recordAccompany()
+void SongEditor::recordAccompany()
{
m_s->playAndRecord();
}
@@ -473,7 +473,7 @@ void songEditor::recordAccompany()
-void songEditor::stop()
+void SongEditor::stop()
{
m_s->stop();
engine::pianoRoll()->stopRecording();
@@ -482,7 +482,7 @@ void songEditor::stop()
-void songEditor::keyPressEvent( QKeyEvent * _ke )
+void SongEditor::keyPressEvent( QKeyEvent * _ke )
{
if( /*_ke->modifiers() & Qt::ShiftModifier*/
engine::mainWindow()->isShiftPressed() == TRUE &&
@@ -536,7 +536,7 @@ void songEditor::keyPressEvent( QKeyEvent * _ke )
-void songEditor::wheelEvent( QWheelEvent * _we )
+void SongEditor::wheelEvent( QWheelEvent * _we )
{
if( engine::mainWindow()->isCtrlPressed() == TRUE )
{
@@ -578,7 +578,7 @@ void songEditor::wheelEvent( QWheelEvent * _we )
-void songEditor::masterVolumeChanged( int _new_val )
+void SongEditor::masterVolumeChanged( int _new_val )
{
masterVolumeMoved( _new_val );
if( m_mvsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
@@ -594,7 +594,7 @@ void songEditor::masterVolumeChanged( int _new_val )
-void songEditor::masterVolumePressed( void )
+void SongEditor::masterVolumePressed( void )
{
m_mvsStatus->moveGlobal( m_masterVolumeSlider,
QPoint( m_masterVolumeSlider->width() + 2, -2 ) );
@@ -605,7 +605,7 @@ void songEditor::masterVolumePressed( void )
-void songEditor::masterVolumeMoved( int _new_val )
+void SongEditor::masterVolumeMoved( int _new_val )
{
m_mvsStatus->setText( tr( "Value: %1%" ).arg( _new_val ) );
}
@@ -613,7 +613,7 @@ void songEditor::masterVolumeMoved( int _new_val )
-void songEditor::masterVolumeReleased( void )
+void SongEditor::masterVolumeReleased( void )
{
m_mvsStatus->hide();
}
@@ -621,7 +621,7 @@ void songEditor::masterVolumeReleased( void )
-void songEditor::masterPitchChanged( int _new_val )
+void SongEditor::masterPitchChanged( int _new_val )
{
masterPitchMoved( _new_val );
if( m_mpsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
@@ -636,7 +636,7 @@ void songEditor::masterPitchChanged( int _new_val )
-void songEditor::masterPitchPressed( void )
+void SongEditor::masterPitchPressed( void )
{
m_mpsStatus->moveGlobal( m_masterPitchSlider,
QPoint( m_masterPitchSlider->width() + 2, -2 ) );
@@ -647,7 +647,7 @@ void songEditor::masterPitchPressed( void )
-void songEditor::masterPitchMoved( int _new_val )
+void SongEditor::masterPitchMoved( int _new_val )
{
m_mpsStatus->setText( tr( "Value: %1 semitones").arg( _new_val ) );
@@ -656,7 +656,7 @@ void songEditor::masterPitchMoved( int _new_val )
-void songEditor::masterPitchReleased( void )
+void SongEditor::masterPitchReleased( void )
{
m_mpsStatus->hide();
}
@@ -664,7 +664,7 @@ void songEditor::masterPitchReleased( void )
-void songEditor::updateScrollBar( int _len )
+void SongEditor::updateScrollBar( int _len )
{
m_leftRightScroll->setMaximum( _len );
}
@@ -703,7 +703,7 @@ static inline void animateScroll( QScrollBar *scrollBar, int newVal, bool smooth
-void songEditor::updatePosition( const MidiTime & _t )
+void SongEditor::updatePosition( const MidiTime & _t )
{
int widgetWidth, trackOpWidth;
if( configManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
@@ -758,7 +758,7 @@ void songEditor::updatePosition( const MidiTime & _t )
-void songEditor::zoomingChanged()
+void SongEditor::zoomingChanged()
{
const QString & zfac = m_zoomingComboBox->model()->currentText();
setPixelsPerTact( zfac.left( zfac.length() - 1 ).toInt() *
@@ -771,7 +771,7 @@ void songEditor::zoomingChanged()
-void songEditor::adjustUiAfterProjectLoad()
+void SongEditor::adjustUiAfterProjectLoad()
{
//if( isMaximized() )
{
@@ -787,7 +787,7 @@ void songEditor::adjustUiAfterProjectLoad()
-bool songEditor::allowRubberband() const
+bool SongEditor::allowRubberband() const
{
return( m_editModeButton->isChecked() );
}
@@ -795,7 +795,7 @@ bool songEditor::allowRubberband() const
-#include "moc_song_editor.cxx"
+#include "moc_SongEditor.cxx"
/* vim: set tw=0 noexpandtab: */
diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp
index c51138e45..8aac63a48 100644
--- a/src/tracks/bb_track.cpp
+++ b/src/tracks/bb_track.cpp
@@ -37,7 +37,7 @@
#include "Mixer.h"
#include "rename_dialog.h"
#include "song.h"
-#include "song_editor.h"
+#include "SongEditor.h"
#include "templates.h"
#include "track_label_button.h"
@@ -264,7 +264,7 @@ void bbTCOView::changeColor()
if( isSelected() )
{
QVector selected =
- engine::getSongEditor()->selectedObjects();
+ engine::songEditor()->selectedObjects();
for( QVector::iterator it =
selected.begin();
it != selected.end(); ++it )