Bunch of minor ports and cleanups. See ChangeLog.

4 files changed, 7 insertions, 7 deletions

diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index c15492ae..4a79b1c2 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -249,7 +249,7 @@ Arranger::Arranger(QMainWindow* parent, const char* name)
       ib->setOn(showTrackinfoFlag);
       connect(ib, SIGNAL(toggled(bool)), SLOT(showTrackInfo(bool)));
 
-      header = new HeaderNew(tracklist);
+      header = new Header(tracklist);
       
       header->setFixedHeight(30);
 
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index 439f55fc..a642c7a8 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -23,7 +23,7 @@ class QScrollBar;
 class QToolButton;
 class QWheelEvent;
 
-class HeaderNew;
+class Header;
 class TList;
 class ScrollScale;
 class MTScale;
@@ -80,7 +80,7 @@ class Arranger : public QWidget {
       ScrollScale* hscroll;
       QScrollBar* vscroll;
       TList* list;
-      HeaderNew* header;
+      Header* header;
       MTScale* time;
       SpinBox* lenEntry;
       bool showTrackinfoFlag;
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index f2a3677e..e9ed1a88 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -55,7 +55,7 @@ static const int WHEEL_DELTA = 120;
 //   TList
 //---------------------------------------------------------
 
-TList::TList(HeaderNew* hdr, QWidget* parent, const char* name)
+TList::TList(Header* hdr, QWidget* parent, const char* name)
    : QWidget(parent, name, Qt::WNoAutoErase | Qt::WResizeNoErase)
       {
       ypos = 0;
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index 4e911711..de631e47 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -21,7 +21,7 @@ class QWheelEvent;
 class ScrollScale;
 class Track;
 class Xml;
-class HeaderNew;
+class Header;
 
 enum TrackColumn {
       COL_RECORD = 0,
@@ -52,7 +52,7 @@ class TList : public QWidget {
 
       bool resizeFlag;        // true if resize cursor is shown
 
-      HeaderNew* header;
+      Header* header;
       QScrollBar* scroll;
       QLineEdit* editor;
       Track* editTrack;
@@ -103,7 +103,7 @@ class TList : public QWidget {
       void selectTrackBelow();
 
    public:
-      TList(HeaderNew*, QWidget* parent, const char* name);
+      TList(Header*, QWidget* parent, const char* name);
       void setScroll(QScrollBar* s) { scroll = s; }
       Track* track() const { return editTrack; }
       void writeStatus(int level, Xml&, const char* name) const;