mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-17 11:18:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Namespace lmms (#6174)

Browse Source 
This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921306 .

Co-authored-by: allejok96 <allejok96@gmail.com>
This commit is contained in:
Levin Oehlmann
2022-06-19 20:08:46 +02:00
committed by GitHub
parent 371f7f506d
commit 7227c89847
804 changed files with 6609 additions and 1478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/DataFile.cpp
View File

@@ -50,6 +50,10 @@
#include "lmmsversion.h"
namespace lmms
{
static void findIds(const QDomElement& elem, QList<jo_id_t>& idList);
@@ -139,11 +143,11 @@ DataFile::DataFile( const QString & _fileName ) :
QFile inFile( _fileName );
if( !inFile.open( QIODevice::ReadOnly ) )
{
if( getGUI() != nullptr )
if (gui::getGUI() != nullptr)
{
QMessageBox::critical( nullptr,
SongEditor::tr( "Could not open file" ),
SongEditor::tr( "Could not open file %1. You probably "
gui::SongEditor::tr( "Could not open file" ),
gui::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 "
@@ -295,7 +299,7 @@ bool DataFile::writeFile(const QString& filename, bool withResources)
{
// Small lambda function for displaying errors
auto showError = [this](QString title, QString body){
if (getGUI() != nullptr)
if (gui::getGUI() != nullptr)
{
QMessageBox mb;
mb.setWindowTitle(title);
@@ -325,6 +329,8 @@ bool DataFile::writeFile(const QString& filename, bool withResources)
const QString fullNameTemp = fullName + ".new";
const QString fullNameBak = fullName + ".bak";
using gui::SongEditor;
// If we are saving with resources, setup the bundle folder first
if (withResources)
{
@@ -1884,8 +1890,10 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
}
if( line >= 0 && col >= 0 )
{
using gui::SongEditor;
qWarning() << "at line" << line << "column" << errorMsg;
if( getGUI() != nullptr )
if (gui::getGUI() != nullptr)
{
QMessageBox::critical( nullptr,
SongEditor::tr( "Error in file" ),
@@ -1918,18 +1926,20 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile )
if (root.hasAttribute("creatorversion"))
{
using gui::SongEditor;
// compareType defaults to All, so it doesn't have to be set here
ProjectVersion createdWith = root.attribute("creatorversion");
ProjectVersion openedWith = LMMS_VERSION;
if (createdWith.setCompareType(ProjectVersion::Minor)
!= openedWith.setCompareType(ProjectVersion::Minor)
&& getGUI() != nullptr && root.attribute("type") == "song"
&& gui::getGUI() != nullptr && root.attribute("type") == "song"
){
auto projectType = _sourceFile.endsWith(".mpt") ?
SongEditor::tr("template") : SongEditor::tr("project");
TextFloat::displayMessage(
gui::TextFloat::displayMessage(
SongEditor::tr("Version difference"),
SongEditor::tr("This %1 was created with LMMS %2")
.arg(projectType).arg(createdWith.getVersion()),
@@ -1973,3 +1983,6 @@ unsigned int DataFile::legacyFileVersion()
// Convert the iterator to an index, which is our file version (starting at 0)
return std::distance( UPGRADE_VERSIONS.begin(), firstRequiredUpgrade );
}
} // namespace lmms