diff options
Diffstat (limited to 'src/gui/editors/notation/NoteFont.cpp')
| -rw-r--r-- | src/gui/editors/notation/NoteFont.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp index 3a0ea18..e494169 100644 --- a/src/gui/editors/notation/NoteFont.cpp +++ b/src/gui/editors/notation/NoteFont.cpp @@ -66,7 +66,7 @@ NoteFont::NoteFont(std::string fontName, int size) : if (size > 0) { if (sizes.find(size) == sizes.end()) { - throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").arg(strtoqstr(fontName)).arg(size))); + throw BadNoteFont(qstrtostr(TQString("Font \"%1\" not available in size %2").tqarg(strtoqstr(fontName)).tqarg(size))); } else { m_size = size; } @@ -86,8 +86,8 @@ NoteFont::NoteFont(std::string fontName, int size) : // Locate our font's pixmap map in the font map, create if necessary std::string fontKey = qstrtostr(TQString("__%1__%2__") - .arg(strtoqstr(m_fontMap.getName())) - .arg(m_size)); + .tqarg(strtoqstr(m_fontMap.getName())) + .tqarg(m_size)); FontPixmapMap::iterator i = m_fontPixmapMap->find(fontKey); if (i == m_fontPixmapMap->end()) { @@ -231,7 +231,8 @@ NoteFont::lookupDrawRep(TQPixmap *pixmap) const if (!pixel) { if (startx < xi) { - a->resize(a->size() + 2, TQGArray::SpeedOptim); + //a->resize(a->size() + 2, TQGArray::SpeedOptim); + a->resize(a->size() + 2); a->setPoint(a->size() - 2, startx, yi); a->setPoint(a->size() - 1, xi - 1, yi); } @@ -286,7 +287,7 @@ NoteFont::getPixmap(CharName charName, TQPixmap &pixmap, bool inverted) const if (!found->isNull()) { if (found->tqmask() == 0) { - std::cerr << "NoteFont::getPixmap: Warning: No automatic mask " + std::cerr << "NoteFont::getPixmap: Warning: No automatic tqmask " << "for character \"" << charName << "\"" << (inverted ? " (inverted)" : "") << " in font \"" << m_fontMap.getName() << "-" << m_size @@ -400,7 +401,7 @@ NoteFont::getColouredPixmap(CharName baseCharName, TQPixmap &pixmap, return false; } - found = new QPixmap + found = new TQPixmap (PixmapFunctions::colourPixmap(basePixmap, hue, minValue)); add(charName, inverted, found); pixmap = *found; @@ -443,13 +444,13 @@ NoteFont::getShadedPixmap(CharName baseCharName, TQPixmap &pixmap, CharName NoteFont::getNameWithColour(CharName base, int hue) const { - return qstrtostr(TQString("%1__%2").arg(hue).arg(strtoqstr(base))); + return qstrtostr(TQString("%1__%2").tqarg(hue).tqarg(strtoqstr(base))); } CharName NoteFont::getNameShaded(CharName base) const { - return qstrtostr(TQString("shaded__%1").arg(strtoqstr(base))); + return qstrtostr(TQString("shaded__%1").tqarg(strtoqstr(base))); } bool @@ -497,7 +498,7 @@ NoteFont::getHotspot(CharName charName, int &x, int &y, bool inverted) const return ok; } -QPoint +TQPoint NoteFont::getHotspot(CharName charName, bool inverted) const { int x, y; |