Merge pull request #2321 from Wallacoloo/reserved-names

Remove double-underscore variable prefixes & prefer static member variables over globals

include/InstrumentSoundShaping.h

@@ -75,6 +75,8 @@ private:
 	FloatModel m_filterCutModel;
 	FloatModel m_filterResModel;
 
+	static const QString targetNames[InstrumentSoundShaping::NumTargets][3];
+
 
 	friend class InstrumentSoundShapingView;
 	friend class FlpImport;
@@ -82,7 +84,4 @@ private:
 } ;
 
 
-extern const QString __targetNames[InstrumentSoundShaping::NumTargets][3];
-
-
 #endif

include/ProjectRenderer.h

@@ -64,6 +64,14 @@ public:
 		}
 	} ;
 
+	struct FileEncodeDevice
+	{
+		ExportFileFormats m_fileFormat;
+		const char * m_description;
+		const char * m_extension;
+		AudioFileDeviceInstantiaton m_getDevInst;
+	} ;
+
 
 	ProjectRenderer( const Mixer::qualitySettings & _qs,
 				const OutputSettings & _os,
@@ -79,6 +87,8 @@ public:
 	static ExportFileFormats getFileFormatFromExtension(
 							const QString & _ext );
 
+	static const FileEncodeDevice fileEncodeDevices[];
+
 
 public slots:
 	void startProcessing();
@@ -103,16 +113,4 @@ private:
 
 } ;
 
-
-struct FileEncodeDevice
-{
-	ProjectRenderer::ExportFileFormats m_fileFormat;
-	const char * m_description;
-	const char * m_extension;
-	AudioFileDeviceInstantiaton m_getDevInst;
-} ;
-
-
-extern FileEncodeDevice __fileEncodeDevices[];
-
 #endif