summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/guitar/Chord.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/guitar/Chord.cpp')
-rw-r--r--src/gui/editors/guitar/Chord.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/editors/guitar/Chord.cpp b/src/gui/editors/guitar/Chord.cpp
index c697e96..33c137c 100644
--- a/src/gui/editors/guitar/Chord.cpp
+++ b/src/gui/editors/guitar/Chord.cpp
@@ -50,7 +50,7 @@ Chord::Chord(const TQString& root, const TQString& ext)
m_isUserChord(false)
{
if (m_ext.isEmpty())
- m_ext = TQString::null;
+ m_ext = TQString();
}
Chord::Chord(const Event& e)
@@ -61,19 +61,19 @@ Chord::Chord(const Event& e)
ok = e.get<String>(RootPropertyName, f);
if (ok)
- m_root = f;
+ m_root = f.c_str();
ok = e.get<String>(ExtPropertyName, f);
if (ok) {
if (f.length() == 0)
- m_ext = TQString::null;
+ m_ext = TQString();
else
- m_ext = f;
+ m_ext = f.c_str();
}
ok = e.get<String>(FingeringPropertyName, f);
if (ok) {
- TQString qf(f);
+ TQString qf(f.c_str());
TQString errString;
Fingering fingering = Fingering::parseFingering(qf, errString);
@@ -84,8 +84,8 @@ Chord::Chord(const Event& e)
Event* Chord::getAsEvent(timeT absoluteTime) const
{
Event *e = new Event(EventType, absoluteTime, 0, EventSubOrdering);
- e->set<String>(RootPropertyName, m_root);
- e->set<String>(ExtPropertyName, m_ext);
+ e->set<String>(RootPropertyName, m_root.ascii());
+ e->set<String>(ExtPropertyName, m_ext.ascii());
e->set<String>(FingeringPropertyName, getFingering().toString());
return e;
}