1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index e971521..4d891a6 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -1230,15 +1230,15 @@ NotationHLayout::finishLayout(timeT startTime, timeT endTime)
 
         m_timePerProgressIncrement = timeCovered / (100 / m_barData.size());
 
-        tqlayout(i, startTime, endTime);
+        layout(i, startTime, endTime);
         ++staffNo;
     }
 }
 
 void
-NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime)
+NotationHLayout::layout(BarDataMap::iterator i, timeT startTime, timeT endTime)
 {
-    Profiler profiler("NotationHLayout::tqlayout");
+    Profiler profiler("NotationHLayout::layout");
 
     Staff &staff = *(i->first);
     NotationElementList *notes = staff.getViewElementList();
@@ -1251,7 +1251,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
     //    bool haveSimpleOffset = false;
     //    double simpleOffset = 0;
 
-    NOTATION_DEBUG << "NotationHLayout::tqlayout: full tqlayout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
+    NOTATION_DEBUG << "NotationHLayout::layout: full layout " << isFullLayout << ", times " << startTime << "->" << endTime << endl;
 
     double x = 0, barX = 0;
     TieMap tieMap;
@@ -1287,7 +1287,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
         NotationElementList::iterator from = bdi->second.basicData.start;
         NotationElementList::iterator to;
 
-        NOTATION_DEBUG << "NotationHLayout::tqlayout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
+        NOTATION_DEBUG << "NotationHLayout::layout(): starting bar " << barNo << ", x = " << barX << ", width = " << bdi->second.sizeData.idealWidth << ", time = " << (from == notes->end() ? -1 : (*from)->getViewAbsoluteTime()) << endl;
 
         BarDataList::iterator nbdi(bdi);
         if (++nbdi == barList.end()) {
@@ -1307,10 +1307,10 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
 
             double offset = barX - bdi->second.layoutData.x;
 
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): bar " << barNo << " has needsLayout false and offset of " << offset << endl;
 
             if (offset > -0.1 && offset < 0.1) {
-                NOTATION_DEBUG << "NotationHLayout::tqlayout(): no offset, ignoring" << endl;
+                NOTATION_DEBUG << "NotationHLayout::layout(): no offset, ignoring" << endl;
                 continue;
             }
 
@@ -1323,7 +1323,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                     it != to && it != notes->end(); ++it) {
 
                 NotationElement* nel = static_cast<NotationElement*>(*it);
-                NOTATION_DEBUG << "NotationHLayout::tqlayout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
+                NOTATION_DEBUG << "NotationHLayout::layout(): shifting element's x to " << ((*it)->getLayoutX() + offset) << " (was " << (*it)->getLayoutX() << ")" << endl;
                 nel->setLayoutX((*it)->getLayoutX() + offset);
                 double airX, airWidth;
                 nel->getLayoutAirspace(airX, airWidth);
@@ -1342,7 +1342,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             timeSigToPlace = !bdi->second.basicData.timeSignature.isHidden();
         }
         if (timeSigToPlace) {
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): there's a time sig in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): there's a time sig in this bar" << endl;
         }
 
         bool repeatClefAndKey = false;
@@ -1350,7 +1350,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
             repeatClefAndKey = true;
         }
         if (repeatClefAndKey) {
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): need to repeat clef & key in this bar" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): need to repeat clef & key in this bar" << endl;
         }
 
         double barInset = notationStaff.getBarInset(barNo, repeatClefAndKey);
@@ -1467,7 +1467,7 @@ NotationHLayout::tqlayout(BarDataMap::iterator i, timeT startTime, timeT endTime
                 }
             }
 
-            NOTATION_DEBUG << "NotationHLayout::tqlayout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
+            NOTATION_DEBUG << "NotationHLayout::layout(): setting element's x to " << x << " (was " << el->getLayoutX() << ")" << endl;
 
             double displacedX = 0.0;
             long dxRaw = 0;
@@ -1692,7 +1692,7 @@ NotationHLayout::positionChord(Staff &staff,
             barEndsInChord = true;
 
         // #704958 (multiple tuplet spanners created when entering
-        // triplet chord) -- tqlayout() updates the beamed group data
+        // triplet chord) -- layout() updates the beamed group data
         // for non-notes, but we have to do it for notes so as to
         // ensure every note in the chord is accounted for
         sampleGroupElement(staff, clef, key, citr);