Rename a lot of classes

* aboutDialog -> AboutDialog * bbEditor -> BBEditor * exportProjectDialog -> ExportProjectDialog * setupDialog -> SetupDialog * stringPairDrag -> StringPairDrag
LMMS · diizy · Nov 26, 2014 · Nov 25, 2014 · Nov 25, 2014 · Nov 25, 2014
commit 95798da9d002f7b029594a5a28431aab5ecf4378
diff --git a/include/AboutDialog.h b/include/AboutDialog.h
@@ -1,5 +1,5 @@
 /*
- * AboutDialog.h - declaration of class aboutDialog
+ * AboutDialog.h - declaration of class AboutDialog
  *
  * Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
@@ -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 );
 
 } ;
 

diff --git a/include/BBEditor.h b/include/BBEditor.h
@@ -34,12 +34,12 @@ 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
 	{

diff --git a/include/BBTrackContainer.h b/include/BBTrackContainer.h
@@ -74,7 +74,7 @@ public slots:
 	ComboBoxModel m_bbComboBoxModel;
 
 
-	friend class bbEditor;
+	friend class BBEditor;
 
 } ;
 

diff --git a/include/Engine.h b/include/Engine.h
@@ -34,7 +34,7 @@
 #include "export.h"
 
 class AutomationEditor;
-class bbEditor;
+class BBEditor;
 class BBTrackContainer;
 class DummyTrackContainer;
 class FxMixer;
@@ -113,7 +113,7 @@ class EXPORT Engine
 		return s_songEditor;
 	}
 
-	static bbEditor * getBBEditor()
+	static BBEditor * getBBEditor()
 	{
 		return s_bbEditor;
 	}
@@ -189,7 +189,7 @@ class EXPORT Engine
 	static FxMixerView * s_fxMixerView;
 	static SongEditor* s_songEditor;
 	static AutomationEditor * s_automationEditor;
-	static bbEditor * s_bbEditor;
+	static BBEditor * s_bbEditor;
 	static PianoRoll* s_pianoRoll;
 	static ProjectNotes * s_projectNotes;
 	static Ladspa2LMMS * s_ladspaManager;

diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h
@@ -1,5 +1,5 @@
 /*
- * ExportProjectDialog.h - declaration of class exportProjectDialog which is
+ * ExportProjectDialog.h - declaration of class ExportProjectDialog which is
  *                           responsible for exporting project
  *
  * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -34,12 +34,12 @@
 #include "ProjectRenderer.h"
 
 
-class exportProjectDialog : public QDialog, public Ui::ExportProjectDialog
+class ExportProjectDialog : public QDialog, public Ui::ExportProjectDialog
 {
 	Q_OBJECT
 public:
-	exportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
-	virtual ~exportProjectDialog();
+	ExportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export );
+	virtual ~ExportProjectDialog();
 
 
 protected:

diff --git a/include/Pattern.h b/include/Pattern.h
@@ -138,7 +138,7 @@ protected slots:
 	int m_steps;
 
 	friend class PatternView;
-	friend class bbEditor;
+	friend class BBEditor;
 
 
 signals:

diff --git a/include/SetupDialog.h b/include/SetupDialog.h
@@ -41,7 +41,7 @@ class QSlider;
 class TabBar;
 
 
-class setupDialog : public QDialog
+class SetupDialog : public QDialog
 {
 	Q_OBJECT
 public:
@@ -54,8 +54,8 @@ class setupDialog : public QDialog
 		MidiSettings
 	} ;
 
-	setupDialog( ConfigTabs _tab_to_open = GeneralSettings );
-	virtual ~setupDialog();
+	SetupDialog( ConfigTabs _tab_to_open = GeneralSettings );
+	virtual ~SetupDialog();
 
 
 protected slots:

diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h
@@ -1,5 +1,5 @@
 /*
- * StringPairDrag.h - class stringPairDrag which provides general support
+ * StringPairDrag.h - class StringPairDrag which provides general support
  *                      for drag'n'drop of string-pairs
  *
  * Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -36,12 +36,12 @@
 class QPixmap;
 
 
-class EXPORT stringPairDrag : public QDrag
+class EXPORT StringPairDrag : public QDrag
 {
 public:
-	stringPairDrag( const QString & _key, const QString & _value,
+	StringPairDrag( const QString & _key, const QString & _value,
 					const QPixmap & _icon, QWidget * _w );
-	~stringPairDrag();
+	~StringPairDrag();
 
 	static bool processDragEnterEvent( QDragEnterEvent * _dee,
 						const QString & _allowed_keys );

diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -605,10 +605,10 @@ AudioFileProcessorView::~AudioFileProcessorView()
 
 void AudioFileProcessorView::dragEnterEvent( QDragEnterEvent * _dee )
 {
-	if( _dee->mimeData()->hasFormat( stringPairDrag::mimeType() ) )
+	if( _dee->mimeData()->hasFormat( StringPairDrag::mimeType() ) )
 	{
 		QString txt = _dee->mimeData()->data(
-						stringPairDrag::mimeType() );
+						StringPairDrag::mimeType() );
 		if( txt.section( ':', 0, 0 ) == QString( "tco_%1" ).arg(
 							Track::SampleTrack ) )
 		{
@@ -634,8 +634,8 @@ void AudioFileProcessorView::dragEnterEvent( QDragEnterEvent * _dee )
 
 void AudioFileProcessorView::dropEvent( QDropEvent * _de )
 {
-	QString type = stringPairDrag::decodeKey( _de );
-	QString value = stringPairDrag::decodeValue( _de );
+	QString type = StringPairDrag::decodeKey( _de );
+	QString value = StringPairDrag::decodeValue( _de );
 	if( type == "samplefile" )
 	{
 		castModel<audioFileProcessor>()->setAudioFile( value );

diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp
@@ -588,10 +588,10 @@ void PatmanView::updateFilename( void )
 
 void PatmanView::dragEnterEvent( QDragEnterEvent * _dee )
 {
-	if( _dee->mimeData()->hasFormat( stringPairDrag::mimeType() ) )
+	if( _dee->mimeData()->hasFormat( StringPairDrag::mimeType() ) )
 	{
 		QString txt = _dee->mimeData()->data(
-						stringPairDrag::mimeType() );
+						StringPairDrag::mimeType() );
 		if( txt.section( ':', 0, 0 ) == "samplefile" )
 		{
 			_dee->acceptProposedAction();
@@ -612,8 +612,8 @@ void PatmanView::dragEnterEvent( QDragEnterEvent * _dee )
 
 void PatmanView::dropEvent( QDropEvent * _de )
 {
-	QString type = stringPairDrag::decodeKey( _de );
-	QString value = stringPairDrag::decodeValue( _de );
+	QString type = StringPairDrag::decodeKey( _de );
+	QString value = StringPairDrag::decodeValue( _de );
 	if( type == "samplefile" )
 	{
 		m_pi->setFile( value );

diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp
@@ -791,10 +791,10 @@ void VestigeInstrumentView::noteOffAll( void )
 
 void VestigeInstrumentView::dragEnterEvent( QDragEnterEvent * _dee )
 {
-	if( _dee->mimeData()->hasFormat( stringPairDrag::mimeType() ) )
+	if( _dee->mimeData()->hasFormat( StringPairDrag::mimeType() ) )
 	{
 		QString txt = _dee->mimeData()->data(
-						stringPairDrag::mimeType() );
+						StringPairDrag::mimeType() );
 		if( txt.section( ':', 0, 0 ) == "vstplugin" )
 		{
 			_dee->acceptProposedAction();
@@ -815,8 +815,8 @@ void VestigeInstrumentView::dragEnterEvent( QDragEnterEvent * _dee )
 
 void VestigeInstrumentView::dropEvent( QDropEvent * _de )
 {
-	QString type = stringPairDrag::decodeKey( _de );
-	QString value = stringPairDrag::decodeValue( _de );
+	QString type = StringPairDrag::decodeKey( _de );
+	QString value = StringPairDrag::decodeValue( _de );
 	if( type == "vstplugin" )
 	{
 		m_vi->loadFile( value );
@@ -1105,10 +1105,10 @@ void manageVestigeInstrumentView::setParameter( void )
 
 void manageVestigeInstrumentView::dragEnterEvent( QDragEnterEvent * _dee )
 {
-	if( _dee->mimeData()->hasFormat( stringPairDrag::mimeType() ) )
+	if( _dee->mimeData()->hasFormat( StringPairDrag::mimeType() ) )
 	{
 		QString txt = _dee->mimeData()->data(
-						stringPairDrag::mimeType() );
+						StringPairDrag::mimeType() );
 		if( txt.section( ':', 0, 0 ) == "vstplugin" )
 		{
 			_dee->acceptProposedAction();
@@ -1129,8 +1129,8 @@ void manageVestigeInstrumentView::dragEnterEvent( QDragEnterEvent * _dee )
 
 void manageVestigeInstrumentView::dropEvent( QDropEvent * _de )
 {
-	QString type = stringPairDrag::decodeKey( _de );
-	QString value = stringPairDrag::decodeValue( _de );
+	QString type = StringPairDrag::decodeKey( _de );
+	QString value = StringPairDrag::decodeValue( _de );
 	if( type == "vstplugin" )
 	{
 		m_vi->loadFile( value );

diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp
@@ -571,10 +571,10 @@ ZynAddSubFxView::~ZynAddSubFxView()
 
 void ZynAddSubFxView::dragEnterEvent( QDragEnterEvent * _dee )
 {
-	if( _dee->mimeData()->hasFormat( stringPairDrag::mimeType() ) )
+	if( _dee->mimeData()->hasFormat( StringPairDrag::mimeType() ) )
 	{
 		QString txt = _dee->mimeData()->data(
-						stringPairDrag::mimeType() );
+						StringPairDrag::mimeType() );
 		if( txt.section( ':', 0, 0 ) == "pluginpresetfile" )
 		{
 			_dee->acceptProposedAction();
@@ -595,8 +595,8 @@ void ZynAddSubFxView::dragEnterEvent( QDragEnterEvent * _dee )
 
 void ZynAddSubFxView::dropEvent( QDropEvent * _de )
 {
-	const QString type = stringPairDrag::decodeKey( _de );
-	const QString value = stringPairDrag::decodeValue( _de );
+	const QString type = StringPairDrag::decodeKey( _de );
+	const QString value = StringPairDrag::decodeValue( _de );
 	if( type == "pluginpresetfile" )
 	{
 		castModel<ZynAddSubFxInstrument>()->loadFile( value );

diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp
@@ -57,7 +57,7 @@ BBTrackContainer * Engine::s_bbTrackContainer = NULL;
 Song * Engine::s_song = NULL;
 SongEditor* Engine::s_songEditor = NULL;
 AutomationEditor * Engine::s_automationEditor = NULL;
-bbEditor * Engine::s_bbEditor = NULL;
+BBEditor * Engine::s_bbEditor = NULL;
 PianoRoll* Engine::s_pianoRoll = NULL;
 ProjectNotes * Engine::s_projectNotes = NULL;
 ProjectJournal * Engine::s_projectJournal = NULL;
@@ -97,7 +97,7 @@ void Engine::init( const bool _has_gui )
 		s_fxMixerView = new FxMixerView;
 		s_controllerRackView = new ControllerRackView;
 		s_projectNotes = new ProjectNotes;
-		s_bbEditor = new bbEditor( s_bbTrackContainer );
+		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
@@ -1221,7 +1221,7 @@ void Song::exportProject(bool multiExport)
 		}
 
 		const QString export_file_name = efd.selectedFiles()[0] + suffix;
-		exportProjectDialog epd( export_file_name, Engine::mainWindow(), multiExport );
+		ExportProjectDialog epd( export_file_name, Engine::mainWindow(), multiExport );
 		epd.exec();
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,7 +74,7 @@ public slots: @@
     	ComboBoxModel m_bbComboBoxModel;
-    	friend class bbEditor;
+    	friend class BBEditor;
     } ;
@@ Expand Down @@