Fix wrong usage of QObject
leading to warnings
Classes inheriting from `QObject` must use the `Q_OBJECT` macro. This was not the case and thus causing warnings. Since the `QObject` base class was not utilized here anyways except for `tr()` I simply removed the that inheritance.
This commit is contained in:
parent
c787b1bc7c
commit
eb0111dd7b
|
@ -315,7 +315,7 @@ void CConductor::reconnectMidi()
|
||||||
{
|
{
|
||||||
if (!validMidiOutput()) {
|
if (!validMidiOutput()) {
|
||||||
QString midiInputName = m_settings->value("Midi/Input").toString();
|
QString midiInputName = m_settings->value("Midi/Input").toString();
|
||||||
if (midiInputName.startsWith(tr("None"))) {
|
if (midiInputName.startsWith(QCoreApplication::translate("CConductor", "None"))) {
|
||||||
CChord::setPianoRange(PC_KEY_LOWEST_NOTE, PC_KEY_HIGHEST_NOTE);
|
CChord::setPianoRange(PC_KEY_LOWEST_NOTE, PC_KEY_HIGHEST_NOTE);
|
||||||
} else {
|
} else {
|
||||||
CChord::setPianoRange(m_settings->value("Keyboard/LowestNote", 0).toInt(),
|
CChord::setPianoRange(m_settings->value("Keyboard/LowestNote", 0).toInt(),
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
#include "MidiEvent.h"
|
#include "MidiEvent.h"
|
||||||
|
|
||||||
class CMidiDeviceBase : public QObject
|
class CMidiDeviceBase
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual void init() = 0;
|
virtual void init() = 0;
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
|
|
||||||
static QString getFluidInternalName()
|
static QString getFluidInternalName()
|
||||||
{
|
{
|
||||||
return QString(tr("Internal Sound") + " " + FLUID_NAME );
|
return QCoreApplication::translate("CMidiDeviceFluidSynth", "Internal Sound %1").arg(QString::fromUtf8(FLUID_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user