From 1b100163692dd0f46b1824302e9dadd70f3fedb6 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Sat, 6 Apr 2019 18:59:49 -1000 Subject: [PATCH] Fix some compilation warnings --- Editor/Common.hpp | 2 -- Editor/SongGroupEditor.cpp | 2 +- Editor/SoundGroupEditor.cpp | 2 +- Editor/SoundMacroEditor.cpp | 2 +- Editor/resources/lang_de.ts | 2 +- driver/amuseplay.cpp | 15 --------------- 6 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Editor/Common.hpp b/Editor/Common.hpp index bdfeaa8..4e97596 100644 --- a/Editor/Common.hpp +++ b/Editor/Common.hpp @@ -40,8 +40,6 @@ bool MkPath(const QDir& dir, const QString& file, UIMessenger& messenger); void ShowInGraphicalShell(QWidget* parent, const QString& pathIn); QString ShowInGraphicalShellString(); -static QLatin1String StringViewToQString(std::string_view sv) { return QLatin1String(sv.data(), int(sv.size())); } - /* Used for generating transform matrices to map SVG coordinate space */ QTransform RectToRect(const QRectF& from, const QRectF& to); diff --git a/Editor/SongGroupEditor.cpp b/Editor/SongGroupEditor.cpp index 6c4f30f..21e5df2 100644 --- a/Editor/SongGroupEditor.cpp +++ b/Editor/SongGroupEditor.cpp @@ -1352,8 +1352,8 @@ MIDIPlayerWidget::~MIDIPlayerWidget() { MIDIPlayerWidget::MIDIPlayerWidget(QModelIndex index, amuse::GroupId gid, amuse::SongId id, const QString& path, QWidget* parent) : QWidget(parent) -, m_button(this) , m_playAction(tr("Play")) +, m_button(this) , m_index(index) , m_groupId(gid) , m_songId(id) diff --git a/Editor/SoundGroupEditor.cpp b/Editor/SoundGroupEditor.cpp index 466f715..e26c916 100644 --- a/Editor/SoundGroupEditor.cpp +++ b/Editor/SoundGroupEditor.cpp @@ -551,7 +551,7 @@ SFXPlayerWidget::~SFXPlayerWidget() { } SFXPlayerWidget::SFXPlayerWidget(QModelIndex index, amuse::GroupId gid, amuse::SFXId id, QWidget* parent) -: QWidget(parent), m_button(this), m_playAction(tr("Play")), m_index(index), m_groupId(gid), m_sfxId(id) { +: QWidget(parent), m_playAction(tr("Play")), m_button(this), m_index(index), m_groupId(gid), m_sfxId(id) { m_playAction.setIcon(QIcon(QStringLiteral(":/icons/IconSoundMacro.svg"))); m_button.setDefaultAction(&m_playAction); connect(&m_playAction, SIGNAL(triggered()), this, SLOT(clicked())); diff --git a/Editor/SoundMacroEditor.cpp b/Editor/SoundMacroEditor.cpp index 273222b..62ccc83 100644 --- a/Editor/SoundMacroEditor.cpp +++ b/Editor/SoundMacroEditor.cpp @@ -199,7 +199,7 @@ CommandWidget::CommandWidget(QWidget* parent, amuse::SoundMacro::ICmd* cmd, amus case amuse::SoundMacro::CmdIntrospection::Field::Type::SoundMacroId: case amuse::SoundMacro::CmdIntrospection::Field::Type::TableId: case amuse::SoundMacro::CmdIntrospection::Field::Type::SampleId: { - ProjectModel::INode::Type collectionType; + ProjectModel::INode::Type collectionType = ProjectModel::INode::Type::Null; if (field.m_tp == amuse::SoundMacro::CmdIntrospection::Field::Type::SoundMacroId) { collectionType = ProjectModel::INode::Type::SoundMacro; } else if (field.m_tp == amuse::SoundMacro::CmdIntrospection::Field::Type::TableId) { diff --git a/Editor/resources/lang_de.ts b/Editor/resources/lang_de.ts index ef6519d..2c6f814 100644 --- a/Editor/resources/lang_de.ts +++ b/Editor/resources/lang_de.ts @@ -443,7 +443,7 @@ - + Play diff --git a/driver/amuseplay.cpp b/driver/amuseplay.cpp index 9d85bbf..0291732 100644 --- a/driver/amuseplay.cpp +++ b/driver/amuseplay.cpp @@ -8,21 +8,6 @@ static logvisor::Module Log("amuseplay"); -#if __GNUC__ -__attribute__((__format__(__printf__, 3, 4))) -#endif -static inline void -SNPrintf(boo::SystemChar* str, size_t maxlen, const boo::SystemChar* format, ...) { - va_list va; - va_start(va, format); -#if _WIN32 - _vsnwprintf(str, maxlen, format, va); -#else - vsnprintf(str, maxlen, format, va); -#endif - va_end(va); -} - struct AppCallback; struct EventCallback : boo::IWindowCallback {