1 files changed, 24 insertions, 24 deletions

diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 461d299..ac8f58c 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -274,13 +274,13 @@ public:
     /// Sound the given note
     void playNote(Segment &segment, int pitch, int velocity = -1);
 
-    /// Switches between page- and linear- tqlayout modes
+    /// Switches between page- and linear- layout modes
     void setPageMode(LinedStaff::PageMode mode);
 
-    /// Returns the page width according to the tqlayout mode (page/linear)
+    /// Returns the page width according to the layout mode (page/linear)
     int getPageWidth();
 
-    /// Returns the page height according to the tqlayout mode (page/linear)
+    /// Returns the page height according to the layout mode (page/linear)
     int getPageHeight();
 
     /// Returns the margins within the page (zero if not in MultiPageMode)
@@ -310,7 +310,7 @@ public:
 
     /**
      * Render segments on printing painter.  This uses the current
-     * font size and tqlayout, rather than the optimal ones for the
+     * font size and layout, rather than the optimal ones for the
      * printer configuration (notation editing is not quite WYSIWYG,
      * and we may be in a non-page mode).
      * 
@@ -446,7 +446,7 @@ public slots:
     void slotToggleGroupToolBar();
 
     /**
-     * toggles the tqlayout toolbar
+     * toggles the layout toolbar
      */
     void slotToggleLayoutToolBar();
 
@@ -494,9 +494,9 @@ public slots:
     void slotToggleStepByStep();
 
     /// status stuff
-    void slotUpdateInsertModetqStatus();
-    void slotUpdateAnnotationstqStatus();
-    void slotUpdateLilyPondDirectivestqStatus();
+    void slotUpdateInsertModeStatus();
+    void slotUpdateAnnotationsStatus();
+    void slotUpdateLilyPondDirectivesStatus();
 
     /// edit menu
     void slotPreviewSelection();
@@ -773,22 +773,22 @@ public slots:
     /// Changes to the next font size down
     void slotZoomOut();
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacing(int newSpacing);
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacingFromStringValue(const TQString&);
 
-    /// Changes the htqlayout spacing of the staffs on the view
+    /// Changes the hlayout spacing of the staffs on the view
     void slotChangeSpacingFromAction();
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportion(int newProportion);
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportionFromIndex(int newProportionIndex);
 
-    /// Changes the htqlayout proportion of the staffs on the view
+    /// Changes the hlayout proportion of the staffs on the view
     void slotChangeProportionFromAction();
 
     /// Note-on received asynchronously -- consider step-by-step editing
@@ -812,7 +812,7 @@ public slots:
     /// Do some background rendering work.
     void slotRenderSomething();
 
-    void slotSetOperationNameAndtqStatus(TQString);
+    void slotSetOperationNameAndStatus(TQString);
 
     // Update notation view based on track/staff name change
     void slotUpdateStaffName();
@@ -876,7 +876,7 @@ protected:
 protected slots:
     /**
      * save general Options like all bar positions and status as well
-     * as the tqgeometry and the recent file list to the configuration
+     * as the geometry and the recent file list to the configuration
      * file
      */
     virtual void slotSaveOptions();
@@ -912,13 +912,13 @@ protected:
     virtual void initStatusBar();
 
     /**
-     * Place the staffs at the correct x & y coordinates (before tqlayout)
+     * Place the staffs at the correct x & y coordinates (before layout)
      */
     void positionStaffs();
 
     /**
      * Place the page pixmaps (if any) at the correct x & y
-     * coordinates (after tqlayout)
+     * coordinates (after layout)
      */
     void positionPages();
 
@@ -929,7 +929,7 @@ protected:
     void updateThumbnails(bool complete);
 
     /**
-     * setup the tqlayout/font toolbar
+     * setup the layout/font toolbar
      */
     void initLayoutToolbar();
 
@@ -940,15 +940,15 @@ protected:
      */
     void toggleNamedToolBar(const TQString& toolBarName, bool* force = 0);
 
-    /// Calls all the relevant preparse and tqlayout methods
+    /// Calls all the relevant preparse and layout methods
     virtual bool applyLayout(int staffNo = -1,
                              timeT startTime = 0,
                              timeT endTime = 0);
 
     /**
-     * Readjust the size of the canvas after a tqlayout
+     * Readjust the size of the canvas after a layout
      *
-     * Checks the total width computed by the horizontal tqlayout
+     * Checks the total width computed by the horizontal layout
      *
      * @see NotationHLayout#getTotalWidth()
      */
@@ -1074,8 +1074,8 @@ protected:
 
     NotePixmapFactory *m_notePixmapFactory;
     
-    NotationHLayout* m_htqlayout;
-    NotationVLayout* m_vtqlayout;
+    NotationHLayout* m_hlayout;
+    NotationVLayout* m_vlayout;
 
     ChordNameRuler *m_chordNameRuler;
     TQWidget *m_tempoRuler;