Skip to content
Snippets Groups Projects
Commit d48cda9d authored by SeeLook's avatar SeeLook
Browse files

Change method param type, add missing library macro (Win complains)

parent 8f12f124
Branches
Tags
No related merge requests found
......@@ -20,6 +20,7 @@
#define TACTION_H
#include <nootkacoreglobal.h>
#include <QtCore/qobject.h>
......@@ -30,7 +31,7 @@
* Also it keeps QML @p Shortcut through @p QObject,
* so if @p shortcut() is set, @p key() returns its text representation
*/
class Taction : public QObject
class NOOTKACORE_EXPORT Taction : public QObject
{
Q_OBJECT
......
/***************************************************************************
* Copyright (C) 2017 by Tomasz Bojczuk *
* Copyright (C) 2017-2018 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -202,17 +202,17 @@ QString TnameItem::octavesLink() const {
* Text on name buttons depends on style
*/
QString TnameItem::noteButtonText(int noteNr, int nStyle) {
return Tnote(noteNr, 0, 0).toText(static_cast<Tnote::EnameStyle>(nStyle), false);
return Tnote(static_cast<char>(noteNr), 0, 0).toText(static_cast<Tnote::EnameStyle>(nStyle), false);
}
void TnameItem::askQuestion(const Tnote& note, Tnote::EnameStyle questStyle, char strNr) {
void TnameItem::askQuestion(const Tnote& note, Tnote::EnameStyle questStyle, quint8 strNr) {
changeNameBgColor(Tcolor::merge(Tcolor::alpha(GLOB->EquestionColor, 40), qApp->palette().base().color()));
setNameStyle(questStyle);
setNote(note);
m_appendix.clear();
if (strNr > 0)
m_appendix = QString::number(static_cast<int>(strNr));
m_appendix = QString::number(strNr);
m_appendix += QLatin1String("?");
emit appendixChanged();
}
......
/***************************************************************************
* Copyright (C) 2017 by Tomasz Bojczuk *
* Copyright (C) 2017-2018 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
......@@ -88,7 +88,7 @@ public:
Q_INVOKABLE QString octavesLink() const;
Q_INVOKABLE QString noteButtonText(int noteNr, int nStyle = -1);
void askQuestion(const Tnote& note, Tnote::EnameStyle questStyle, char strNr = 0);
void askQuestion(const Tnote& note, Tnote::EnameStyle questStyle, quint8 strNr = 0);
void prepareAnswer(Tnote::EnameStyle answStyle);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment