Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.

1 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index f82a263..47fc9f5 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")
-                               .arg(m_fontDirectory)
-                               .arg(strtoqstr(name));
+                               .tqarg(m_fontDirectory)
+                               .tqarg(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")
-                                   .arg(m_fontDirectory)
-                                   .arg(lowerName);
+                                   .tqarg(m_fontDirectory)
+                                   .tqarg(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").
-                           arg(mapFileMixedName).arg(mapFileLowerName)));
+                           tqarg(mapFileMixedName).tqarg(mapFileLowerName)));
             } else {
                 throw MappingFileReadFailed
                 (qstrtostr(i18n("Can't open font mapping file %1").
-                           arg(mapFileMixedName)));
+                           tqarg(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\"").arg(name).ascii() << std::endl;
+                std::cerr << TQString("Warning: Unable to load font \"%1\"").tqarg(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\"").
-                arg(names).ascii() << std::endl;
+                tqarg(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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber())
-                    .arg(m_errorString);
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(exception.columnNumber())
+                    .tqarg(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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber())
-                    .arg(m_errorString);
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(exception.columnNumber())
+                    .tqarg(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")
-                                  .arg(m_fontDirectory)
-                                  .arg(strtoqstr(m_srcDirectory))
-                                  .arg(size)
-                                  .arg(strtoqstr(src));
+                                  .tqarg(m_fontDirectory)
+                                  .tqarg(strtoqstr(m_srcDirectory))
+                                  .tqarg(size)
+                                  .tqarg(strtoqstr(src));
 
     TQFileInfo pixmapFileMixedInfo(pixmapFileMixedName);
 
     if (!pixmapFileMixedInfo.isReadable()) {
 
         TQString pixmapFileLowerName = TQString("%1/%2/%3/%4.xpm")
-                                      .arg(m_fontDirectory)
-                                      .arg(strtoqstr(m_srcDirectory).lower())
-                                      .arg(size)
-                                      .arg(strtoqstr(src));
+                                      .tqarg(m_fontDirectory)
+                                      .tqarg(strtoqstr(m_srcDirectory).lower())
+                                      .tqarg(size)
+                                      .tqarg(strtoqstr(src));
 
         TQFileInfo pixmapFileLowerInfo(pixmapFileLowerName);