Add predeclarations, #includes and gui::prefixes in some places that …

…were missing them.
LMMS · Oct 2, 2021 · c59e575 · c59e575
1 parent 5970af1
commit c59e575
Show file tree

Hide file tree

Showing 19 changed files with 61 additions and 24 deletions.
diff --git a/include/AutomationPattern.h b/include/AutomationPattern.h
@@ -40,6 +40,11 @@ namespace lmms
 class AutomationTrack;
 class TimePos;
 
+namespace gui
+{
+class AutomationPatternView;
+} // namespace gui
+
 
 
 class LMMS_EXPORT AutomationPattern : public TrackContentObject
@@ -207,7 +212,7 @@ public slots:
 	static const float DEFAULT_MIN_VALUE;
 	static const float DEFAULT_MAX_VALUE;
 
-	friend class AutomationPatternView;
+	friend class gui::AutomationPatternView;
 	friend class AutomationNode;
 
 } ;

diff --git a/include/LinkedModelGroups.h b/include/LinkedModelGroups.h
@@ -30,6 +30,9 @@
 #include <memory>
 #include <vector>
 
+#include <QDomDocument>
+#include <QDomElement>
+
 #include "Model.h"
 
 

diff --git a/include/Lv2Ports.h b/include/Lv2Ports.h
@@ -205,7 +205,7 @@ struct Audio : public VisitablePort<Audio, PortBase>
 	bool m_sidechain;
 
 	// the only case when data of m_buffer may be referenced:
-	friend struct ::ConnectPortVisitor;
+	friend struct lmms::ConnectPortVisitor;
 };
 
 struct AtomSeq : public VisitablePort<AtomSeq, PortBase>

diff --git a/include/MidiController.h b/include/MidiController.h
@@ -38,6 +38,11 @@ namespace lmms
 
 class MidiPort;
 
+namespace gui
+{
+class ControllerConnectionDialog;
+}
+
 
 class MidiController : public Controller, public MidiEventProcessor
 {
@@ -79,7 +84,7 @@ public slots:
 	float m_lastValue;
 	float m_previousValue;
 
-	friend class ControllerConnectionDialog;
+	friend class gui::ControllerConnectionDialog;
 	friend class AutoDetectMidiController;
 
 } ;

diff --git a/include/MidiPort.h b/include/MidiPort.h
@@ -45,6 +45,8 @@ namespace gui
 {
 
 class MidiPortMenu;
+class ControllerConnectionDialog;
+class InstrumentMidiIOView;
 
 }
 
@@ -173,8 +175,8 @@ private slots:
 	Map m_writablePorts;
 
 
-	friend class ControllerConnectionDialog;
-	friend class InstrumentMidiIOView;
+	friend class gui::ControllerConnectionDialog;
+	friend class gui::InstrumentMidiIOView;
 
 
 signals:

diff --git a/include/Pattern.h b/include/Pattern.h
@@ -39,6 +39,12 @@ namespace lmms
 
 class InstrumentTrack;
 
+namespace gui
+{
+class PatternView;
+class BBTrackContainerView;
+}
+
 
 class LMMS_EXPORT Pattern : public TrackContentObject
 {
@@ -106,7 +112,7 @@ class LMMS_EXPORT Pattern : public TrackContentObject
 	bool empty();
 
 
-	TrackContentObjectView * createView( TrackView * _tv ) override;
+	gui::TrackContentObjectView * createView( gui::TrackView * _tv ) override;
 
 
 	using Model::dataChanged;

diff --git a/include/SampleTCO.h b/include/SampleTCO.h
@@ -62,7 +62,7 @@ class SampleTCO : public TrackContentObject
 	TimePos sampleLength() const;
 	void setSampleStartFrame( f_cnt_t startFrame );
 	void setSamplePlayLength( f_cnt_t length );
-	TrackContentObjectView * createView( TrackView * _tv ) override;
+	gui::TrackContentObjectView* createView( gui::TrackView* _tv ) override;
 
 
 	bool isPlaying() const;

diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp
@@ -34,6 +34,8 @@
 #include "LedCheckbox.h"
 #include "embed.h"
 
+namespace lmms::gui
+{
 
 PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 				PeakControllerEffectControls * _controls ) :
@@ -103,3 +105,5 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 	setLayout( mainLayout );
 }
 
+
+} // namespace lmms::gui
diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h
@@ -28,7 +28,13 @@
 
 #include "EffectControlDialog.h"
 
+namespace lmms
+{
+
 class PeakControllerEffectControls;
+
+namespace gui
+{
 class Knob;
 class LedCheckBox;
 
@@ -57,5 +63,8 @@ class PeakControllerEffectControlDialog : public EffectControlDialog
 
 } ;
 
+} // namespace gui
+
+} // namespace lmms
 
 #endif
diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.h b/plugins/peak_controller_effect/peak_controller_effect_controls.h
@@ -36,6 +36,7 @@ namespace lmms
 
 class PeakControllerEffect;
 
+
 class PeakControllerEffectControls : public EffectControls
 {
 	Q_OBJECT
@@ -56,9 +57,9 @@ class PeakControllerEffectControls : public EffectControls
 	{
 		return 1;
 	}
-	EffectControlDialog * createView() override
+	gui::EffectControlDialog * createView() override
 	{
-		return new PeakControllerEffectControlDialog( this );
+		return new gui::PeakControllerEffectControlDialog( this );
 	}
 
 
@@ -74,7 +75,7 @@ class PeakControllerEffectControls : public EffectControls
 	BoolModel m_absModel;
 	FloatModel m_amountMultModel;
 
-	friend class PeakControllerEffectControlDialog;
+	friend class gui::PeakControllerEffectControlDialog;
 	friend class PeakControllerEffect;
 
 } ;

diff --git a/src/core/LinkedModelGroups.cpp b/src/core/LinkedModelGroups.cpp
@@ -24,8 +24,6 @@
 
 #include "LinkedModelGroups.h"
 
-#include <QDomDocument>
-#include <QDomElement>
 
 #include "AutomatableModel.h"
 

diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp
@@ -1124,7 +1124,7 @@ void SampleBuffer::visualize(
 
 QString SampleBuffer::openAudioFile() const
 {
-	FileDialog ofd(nullptr, tr("Open audio file"));
+	gui::FileDialog ofd(nullptr, tr("Open audio file"));
 
 	QString dir;
 	if (!m_audioFile.isEmpty())
@@ -1147,7 +1147,7 @@ QString SampleBuffer::openAudioFile() const
 	}
 	// change dir to position of previously opened file
 	ofd.setDirectory(dir);
-	ofd.setFileMode(FileDialog::ExistingFiles);
+	ofd.setFileMode(gui::FileDialog::ExistingFiles);
 
 	// set filters
 	QStringList types;

diff --git a/src/core/SampleTCO.cpp b/src/core/SampleTCO.cpp
@@ -51,7 +51,7 @@ SampleTCO::SampleTCO( Track * _track ) :
 					this, SLOT( updateLength() ) );
 
 	//care about positionmarker
-	TimeLineWidget * timeLine = Engine::getSong()->getPlayPos( Engine::getSong()->Mode_PlaySong ).m_timeLine;
+	gui::TimeLineWidget* timeLine = Engine::getSong()->getPlayPos( Engine::getSong()->Mode_PlaySong ).m_timeLine;
 	if( timeLine )
 	{
 		connect( timeLine, SIGNAL( positionMarkerMoved() ), this, SLOT( playbackPositionChanged() ) );
@@ -319,9 +319,9 @@ void SampleTCO::loadSettings( const QDomElement & _this )
 
 
 
-TrackContentObjectView * SampleTCO::createView( TrackView * _tv )
+gui::TrackContentObjectView* SampleTCO::createView( gui::TrackView* _tv )
 {
-	return new SampleTCOView( this, _tv );
+	return new gui::SampleTCOView( this, _tv );
 }
 
 

diff --git a/src/core/TrackContainer.cpp b/src/core/TrackContainer.cpp
@@ -118,7 +118,7 @@ void TrackContainer::loadSettings( const QDomElement & _this )
 			{
 				if ( getGUI() != nullptr )
 				{
-					TextFloat::displayMessage( tr( "Loading cancelled" ),
+					gui::TextFloat::displayMessage( tr( "Loading cancelled" ),
 					tr( "Project loading was cancelled." ),
 					embed::getIconPixmap( "project_file", 24, 24 ),
 					2000 );

diff --git a/src/core/TrackContentObject.cpp b/src/core/TrackContentObject.cpp
@@ -148,7 +148,7 @@ void TrackContentObject::copyStateTo( TrackContentObject *src, TrackContentObjec
 		dst->movePosition( pos );
 
 		AutomationPattern::resolveAllIDs();
-		GuiApplication::instance()->automationEditor()->m_editor->updateAfterPatternChange();
+		getGUI()->automationEditor()->m_editor->updateAfterPatternChange();
 	}
 }
 

diff --git a/src/core/audio/AudioFileDevice.cpp b/src/core/audio/AudioFileDevice.cpp
@@ -40,6 +40,8 @@ AudioFileDevice::AudioFileDevice( OutputSettings const & outputSettings,
 	m_outputFile( _file ),
 	m_outputSettings(outputSettings)
 {
+	using gui::ExportProjectDialog;
+
 	setSampleRate( outputSettings.getSampleRate() );
 
 	if( m_outputFile.open( QFile::WriteOnly | QFile::Truncate ) == false )

diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp
@@ -411,6 +411,8 @@ void AudioPortAudioSetupUtil::updateChannels()
 AudioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 	AudioDeviceSetupWidget( AudioPortAudio::name(), _parent )
 {
+	using gui::ComboBox;
+
 	m_backend = new ComboBox( this, "BACKEND" );
 	m_backend->setGeometry( 64, 15, 260, ComboBox::DEFAULT_HEIGHT );
 

diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp
@@ -44,7 +44,7 @@ namespace lmms
 
 static float floatFromClipboard(bool* ok=nullptr);
 
-AutomatableModelView::AutomatableModelView( ::Model* model, QWidget* _this ) :
+AutomatableModelView::AutomatableModelView( Model* model, QWidget* _this ) :
 	ModelView( model, _this ),
 	m_conversionFactor( 1.0 )
 {
@@ -174,7 +174,7 @@ void AutomatableModelView::mousePressEvent( QMouseEvent* event )
 {
 	if( event->button() == Qt::LeftButton && event->modifiers() & Qt::ControlModifier )
 	{
-		new StringPairDrag( "automatable_model", QString::number( modelUntyped()->id() ), QPixmap(), widget() );
+		new gui::StringPairDrag( "automatable_model", QString::number( modelUntyped()->id() ), QPixmap(), widget() );
 		event->accept();
 	}
 	else if( event->button() == Qt::MidButton )
@@ -216,7 +216,7 @@ void AutomatableModelViewSlots::execConnectionDialog()
 	AutomatableModel* m = m_amv->modelUntyped();
 
 	m->displayName();
-	ControllerConnectionDialog d( getGUI()->mainWindow(), m );
+	gui::ControllerConnectionDialog d( getGUI()->mainWindow(), m );
 
 	if( d.exec() == 1 )
 	{

diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp
@@ -554,9 +554,9 @@ void Pattern::removeSteps()
 
 
 
-TrackContentObjectView * Pattern::createView( TrackView * _tv )
+gui::TrackContentObjectView * Pattern::createView( gui::TrackView * _tv )
 {
-	return new PatternView( this, _tv );
+	return new gui::PatternView( this, _tv );
 }