$NetBSD: patch-at,v 1.1.1.1 2005/02/25 21:00:02 daprice Exp $

--- multiFile.cpp.orig	1998-05-17 20:13:18.000000000 -0600
+++ multiFile.cpp
@@ -86,24 +86,24 @@ void multiFile::apply()
   // make sure we actually have files in the combo box
   if (multiFileList->count() > 0)
   {
-    string filename = multiFileList->currentText();
-    string dataSetStart = dataSetStartEdit->text();
-    string dataSetEnd = dataSetEndEdit->text();
-    string dataSetInc = dataSetIncEdit->text();
-    string sampPointInc = pointIncEdit->text();
-    string sampLineInc = lineIncEdit->text();
-    string sampStartPoint = startPointEdit->text();
-    string sampStartLine = startLineEdit->text();
-    string sampEndPoint = endPointEdit->text();
-    string sampEndLine = endLineEdit->text();
-    string xcol = xColumnEdit->text();
-    string ycol = yColumnEdit->text();
-    string zcol = zColumnEdit->text();
-    string format = formatEdit->text();
-    string rawformat = rawFormatEdit->text();
-    string smoothType = interpList->currentText();
-    string style = fileStyleList->currentText();
-    string filter = filterEdit->text();
+    string filename = multiFileList->currentText().ascii();
+    string dataSetStart = dataSetStartEdit->text().ascii();
+    string dataSetEnd = dataSetEndEdit->text().ascii();
+    string dataSetInc = dataSetIncEdit->text().ascii();
+    string sampPointInc = pointIncEdit->text().ascii();
+    string sampLineInc = lineIncEdit->text().ascii();
+    string sampStartPoint = startPointEdit->text().ascii();
+    string sampStartLine = startLineEdit->text().ascii();
+    string sampEndPoint = endPointEdit->text().ascii();
+    string sampEndLine = endLineEdit->text().ascii();
+    string xcol = xColumnEdit->text().ascii();
+    string ycol = yColumnEdit->text().ascii();
+    string zcol = zColumnEdit->text().ascii();
+    string format = formatEdit->text().ascii();
+    string rawformat = rawFormatEdit->text().ascii();
+    string smoothType = interpList->currentText().ascii();
+    string style = fileStyleList->currentText().ascii();
+    string filter = filterEdit->text().ascii();
 
     gnuInt->setMultiFileStyleOption(filename, style);
     gnuInt->setMultiFileDataSetStart(filename,dataSetStart);
@@ -122,7 +122,7 @@ void multiFile::apply()
     gnuInt->insertMultiFileRawFormatOption(filename, rawformat);
     gnuInt->setMultiFileSmoothType(filename,smoothType);
 
-    string title = legendTitleEdit->text();
+    string title = legendTitleEdit->text().ascii();
     gnuInt->setMultiFileLegendTitle(filename, title);
 
     if (legendTitleDefaultButton->isChecked() == TRUE)
@@ -165,7 +165,7 @@ void multiFile::deleteFile()
   if (multiFileList->count() > 0)
   { 
     // get current file in combo box
-    string filename = multiFileList->currentText();
+    string filename = multiFileList->currentText().ascii();
     
     int currentItem = multiFileList->currentItem();
     
@@ -204,9 +204,9 @@ void multiFile::fileChanged(const char* 
 
 void multiFile::insertCurrentFilename()
 {
-  QString currentText = filterEdit->text();
+  QString currentText = filterEdit->text().ascii();
 
-  QString filename = multiFileList->currentText();
+  QString filename = multiFileList->currentText().ascii();
 
   QString newString;
 
@@ -218,7 +218,7 @@ void multiFile::insertCurrentFilename()
 
 void multiFile::insertNewFilename()
 {
-  QString currentText = filterEdit->text();
+  QString currentText = filterEdit->text().ascii();
   
   QString filename = QFileDialog::getOpenFileName();
 
@@ -235,7 +235,7 @@ void multiFile::insertNewFilename()
 void multiFile::getCurrentOptions()
 {
   // get options for this file
-  string filename = multiFileList->currentText();
+  string filename = multiFileList->currentText().ascii();
   string dataSetStart = gnuInt->getMultiFileDataSetStart(filename);
   string dataSetEnd = gnuInt->getMultiFileDataSetEnd(filename);
   string dataSetInc = gnuInt->getMultiFileDataSetIncrement(filename);
