Converted all latin1() instances. Ported Qt3 methods to Qt4.

4 files changed, 9 insertions, 7 deletions

diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 3c2895d6..a8c133e4 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -341,7 +341,7 @@ bool DrumCanvas::moveItem(CItem* item, const QPoint& pos, DragType dtype)
       
       // Added by T356. 
       if(((int)newEvent.endTick() - (int)part->lenTick()) > 0)  
-        printf("DrumCanvas::moveItem Error! New event end:%d exceeds length:%d of part:%s\n", newEvent.endTick(), part->lenTick(), part->name().latin1());
+        printf("DrumCanvas::moveItem Error! New event end:%d exceeds length:%d of part:%s\n", newEvent.endTick(), part->lenTick(), part->name().toLatin1().constData());
       
       if (dtype == MOVE_COPY || dtype == MOVE_CLONE) {
             // Indicate no undo, and do not do port controller values and clone parts. 
@@ -896,7 +896,8 @@ void DrumCanvas::copy()
 
 int DrumCanvas::pasteAt(const QString& pt, int pos)
       {
-      const char* p = pt.latin1();
+      QByteArray ba = pt.toLatin1();
+      const char* p = ba.constData();
       Xml xml(p);
 
       // Added by T356. 
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 43227810..3c9e4ecd 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -1199,7 +1199,7 @@ void DrumEdit::execDeliveredScript(int id)
 {
       //QString scriptfile = QString(INSTPREFIX) + SCRIPTSSUFFIX + deliveredScriptNames[id];
       QString scriptfile = song->getScriptPath(id, true);
-      song->executeScript(scriptfile.toLatin1().data(), parts(), quant(), true); 
+      song->executeScript(scriptfile.toLatin1().constData(), parts(), quant(), true); 
 }
 
 //---------------------------------------------------------
@@ -1208,6 +1208,6 @@ void DrumEdit::execDeliveredScript(int id)
 void DrumEdit::execUserScript(int id)
 {
       QString scriptfile = song->getScriptPath(id, false);
-      song->executeScript(scriptfile.toLatin1().data(), parts(), quant(), true);
+      song->executeScript(scriptfile.toLatin1().constData(), parts(), quant(), true);
 }
 
diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 85801336..94a7d0c8 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -454,7 +454,7 @@ QMimeData* EventCanvas::getTextDrag()
 
 void EventCanvas::pasteAt(const QString& pt, int pos)
       {
-      const char* p = pt.latin1();
+      const char* p = pt.toLatin1();
       Xml xml(p);
       for (;;) {
             Xml::Token token = xml.parse();
diff --git a/muse2/muse/midiedit/prcanvas.cpp b/muse2/muse/midiedit/prcanvas.cpp
index d5d9786c..279ed6bb 100644
--- a/muse2/muse/midiedit/prcanvas.cpp
+++ b/muse2/muse/midiedit/prcanvas.cpp
@@ -507,7 +507,7 @@ bool PianoCanvas::moveItem(CItem* item, const QPoint& pos, DragType dtype)
       
       // Added by T356. 
       if(((int)newEvent.endTick() - (int)part->lenTick()) > 0)  
-        printf("PianoCanvas::moveItem Error! New event end:%d exceeds length:%d of part:%s\n", newEvent.endTick(), part->lenTick(), part->name().latin1());
+        printf("PianoCanvas::moveItem Error! New event end:%d exceeds length:%d of part:%s\n", newEvent.endTick(), part->lenTick(), part->name().toLatin1().constData());
       
       if (dtype == MOVE_COPY || dtype == MOVE_CLONE)
             // Indicate no undo, and do not do port controller values and clone parts. 
@@ -1411,7 +1411,8 @@ void PianoCanvas::copy()
 
 void PianoCanvas::pasteAt(const QString& pt, int pos)
       {
-      const char* p = pt.latin1();
+      QByteArray ba = pt.toLatin1();
+      const char* p = ba.constData();
       Xml xml(p);
       for (;;) {
             Xml::Token token = xml.parse();