summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NoteFontMap.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:40:46 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:40:46 -0600
commit97f1c43c867725d49f3943a68ef08d7e71767e99 (patch)
treeece35be847c1fcc581a6db7b3d9fc6aa497590af /src/gui/editors/notation/NoteFontMap.cpp
parentef13416bfc43e51ef4e20919e0fab81ae05e0fe2 (diff)
downloadrosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.tar.gz
rosegarden-97f1c43c867725d49f3943a68ef08d7e71767e99.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'src/gui/editors/notation/NoteFontMap.cpp')
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 47fc9f5..f82a263 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -57,8 +57,8 @@ NoteFontMap::NoteFontMap(std::string name) :
TQString mapFileName;
TQString mapFileMixedName = TQString("%1/mappings/%2.xml")
- .tqarg(m_fontDirectory)
- .tqarg(strtoqstr(name));
+ .arg(m_fontDirectory)
+ .arg(strtoqstr(name));
TQFileInfo mapFileMixedInfo(mapFileMixedName);
@@ -67,8 +67,8 @@ NoteFontMap::NoteFontMap(std::string name) :
TQString lowerName = strtoqstr(name).lower();
lowerName.replace(TQRegExp(" "), "_");
TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
- .tqarg(m_fontDirectory)
- .tqarg(lowerName);
+ .arg(m_fontDirectory)
+ .arg(lowerName);
TQFileInfo mapFileLowerInfo(mapFileLowerName);
@@ -76,11 +76,11 @@ NoteFontMap::NoteFontMap(std::string name) :
if (mapFileLowerName != mapFileMixedName) {
throw MappingFileReadFailed
(qstrtostr(i18n("Can't open font mapping file %1 or %2").
- tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
+ arg(mapFileMixedName).arg(mapFileLowerName)));
} else {
throw MappingFileReadFailed
(qstrtostr(i18n("Can't open font mapping file %1").
- tqarg(mapFileMixedName)));
+ arg(mapFileMixedName)));
}
} else {
mapFileName = mapFileLowerName;
@@ -595,7 +595,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
m_systemFontNames[n] = name;
delete font;
} else {
- std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(name).ascii() << std::endl;
+ std::cerr << TQString("Warning: Unable to load font \"%1\"").arg(name).ascii() << std::endl;
m_ok = false;
}
@@ -615,7 +615,7 @@ NoteFontMap::startElement(const TQString &, const TQString &,
}
if (!have) {
std::cerr << TQString("Warning: Unable to load any of the fonts in \"%1\"").
- tqarg(names).ascii() << std::endl;
+ arg(names).ascii() << std::endl;
m_ok = false;
}
@@ -657,10 +657,10 @@ bool
NoteFontMap::error(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3: %4")
- .tqarg(exception.message())
- .tqarg(exception.lineNumber())
- .tqarg(exception.columnNumber())
- .tqarg(m_errorString);
+ .arg(exception.message())
+ .arg(exception.lineNumber())
+ .arg(exception.columnNumber())
+ .arg(m_errorString);
return TQXmlDefaultHandler::error(exception);
}
@@ -668,10 +668,10 @@ bool
NoteFontMap::fatalError(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3: %4")
- .tqarg(exception.message())
- .tqarg(exception.lineNumber())
- .tqarg(exception.columnNumber())
- .tqarg(m_errorString);
+ .arg(exception.message())
+ .arg(exception.lineNumber())
+ .arg(exception.columnNumber())
+ .arg(m_errorString);
return TQXmlDefaultHandler::fatalError(exception);
}
@@ -705,20 +705,20 @@ bool
NoteFontMap::checkFile(int size, std::string &src) const
{
TQString pixmapFileMixedName = TQString("%1/%2/%3/%4.xpm")
- .tqarg(m_fontDirectory)
- .tqarg(strtoqstr(m_srcDirectory))
- .tqarg(size)
- .tqarg(strtoqstr(src));
+ .arg(m_fontDirectory)
+ .arg(strtoqstr(m_srcDirectory))
+ .arg(size)
+ .arg(strtoqstr(src));
TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
if (!pixmapFileMixedInfo.isReadable()) {
TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
- .tqarg(m_fontDirectory)
- .tqarg(strtoqstr(m_srcDirectory).lower())
- .tqarg(size)
- .tqarg(strtoqstr(src));
+ .arg(m_fontDirectory)
+ .arg(strtoqstr(m_srcDirectory).lower())
+ .arg(size)
+ .arg(strtoqstr(src));
TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);