aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/xgfe/Makefile1
-rw-r--r--math/xgfe/distinfo1
-rw-r--r--math/xgfe/files/patch-barOp.cpp12
-rw-r--r--math/xgfe/files/patch-boxWidthOp.cpp2
-rw-r--r--math/xgfe/files/patch-curveFit.cpp54
-rw-r--r--math/xgfe/files/patch-fileFilter.cpp11
-rw-r--r--math/xgfe/files/patch-fileLegendTitle.cpp2
-rw-r--r--math/xgfe/files/patch-fileOptions.cpp30
-rw-r--r--math/xgfe/files/patch-funcLegendTitle.cpp2
-rw-r--r--math/xgfe/files/patch-isoLinesOp.cpp4
-rw-r--r--math/xgfe/files/patch-latexEmtexOp.cpp6
-rw-r--r--math/xgfe/files/patch-legendOp.cpp22
-rw-r--r--math/xgfe/files/patch-multiFile.cpp52
-rw-r--r--math/xgfe/files/patch-multiFileData.cpp22
-rw-r--r--math/xgfe/files/patch-multiFileData.h11
-rw-r--r--math/xgfe/files/patch-multiFunc.cpp29
-rw-r--r--math/xgfe/files/patch-multiFuncData.cpp20
-rw-r--r--math/xgfe/files/patch-multiFuncData.h11
-rw-r--r--math/xgfe/files/patch-pbmOp.cpp8
-rw-r--r--math/xgfe/files/patch-psOpt.cpp16
-rw-r--r--math/xgfe/files/patch-rawGnu.cpp11
-rw-r--r--math/xgfe/files/patch-rotation.cpp4
-rw-r--r--math/xgfe/files/patch-sizeOp.cpp4
-rw-r--r--math/xgfe/files/patch-ticsLevel.cpp2
-rw-r--r--math/xgfe/files/patch-ticsOp.cpp68
-rw-r--r--math/xgfe/files/patch-xgfeMain.cpp118
-rw-r--r--math/xgfe/files/patch-xgfeMainData.cpp10
27 files changed, 353 insertions, 180 deletions
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 96476a57216..e92b2019c9b 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xgfe
PORTVERSION= 2.1
+PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= graphics/gnuplot/contrib
diff --git a/math/xgfe/distinfo b/math/xgfe/distinfo
index 19b4021a3ee..12f3960eb51 100644
--- a/math/xgfe/distinfo
+++ b/math/xgfe/distinfo
@@ -1 +1,2 @@
MD5 (xgfe-2.1.tar.gz) = a9bb67a76be198142f587155b37c1864
+SIZE (xgfe-2.1.tar.gz) = 438146
diff --git a/math/xgfe/files/patch-barOp.cpp b/math/xgfe/files/patch-barOp.cpp
index b0d15f30124..3898f4ecd17 100644
--- a/math/xgfe/files/patch-barOp.cpp
+++ b/math/xgfe/files/patch-barOp.cpp
@@ -1,4 +1,3 @@
-diff -u barOp.cpp.orig barOp.cpp
--- barOp.cpp.orig Thu May 7 07:46:39 1998
+++ barOp.cpp Thu Oct 30 21:42:04 2003
@@ -59,7 +59,7 @@
@@ -6,7 +5,16 @@ diff -u barOp.cpp.orig barOp.cpp
void barOp::setBarOption()
{
- string barSize = barSizeEdit->text();
-+ string barSize = string(barSizeEdit->text());
++ string barSize = barSizeEdit->text().ascii();
if (barSize != "")
{
+@@ -67,7 +67,7 @@
+ }
+ else
+ {
+- barSize = synList->currentText();
++ barSize = synList->currentText().ascii();
+ gnuInt->setBarSizeOption(barSize);
+ }
+
diff --git a/math/xgfe/files/patch-boxWidthOp.cpp b/math/xgfe/files/patch-boxWidthOp.cpp
index 8d8327cc88f..dbcbabc7bbe 100644
--- a/math/xgfe/files/patch-boxWidthOp.cpp
+++ b/math/xgfe/files/patch-boxWidthOp.cpp
@@ -6,7 +6,7 @@ diff -u boxWidthOp.cpp.orig boxWidthOp.cpp
void boxWidthOp::setBoxWidth()
{
- string width = boxWidthEdit->text();
-+ string width = string(boxWidthEdit->text());
++ string width = boxWidthEdit->text().ascii();
gnuInt->setBoxWidth(width);
diff --git a/math/xgfe/files/patch-curveFit.cpp b/math/xgfe/files/patch-curveFit.cpp
index 117c16e7553..be877056b42 100644
--- a/math/xgfe/files/patch-curveFit.cpp
+++ b/math/xgfe/files/patch-curveFit.cpp
@@ -15,16 +15,16 @@ diff -u curveFit.cpp.orig curveFit.cpp
- string varYRangeMin = varYRangeMinEdit->text();
- string varYRangeMax = varYRangeMaxEdit->text();
- string paramFile = paramFileEdit->text();
-+ string functionName = string(functionNameEdit->text());
-+ string functionValue = string(functionValueEdit->text());
-+ string dataFile = string(dataFileEdit->text());
-+ string varXRangeName = string(varXRangeNameEdit->text());
-+ string varXRangeMin = string(varXRangeMinEdit->text());
-+ string varXRangeMax = string(varXRangeMaxEdit->text());
-+ string varYRangeName = string(varYRangeNameEdit->text());
-+ string varYRangeMin = string(varYRangeMinEdit->text());
-+ string varYRangeMax = string(varYRangeMaxEdit->text());
-+ string paramFile = string(paramFileEdit->text());
++ string functionName = functionNameEdit->text().ascii();
++ string functionValue = functionValueEdit->text().ascii();
++ string dataFile = dataFileEdit->text().ascii();
++ string varXRangeName = varXRangeNameEdit->text().ascii();
++ string varXRangeMin = varXRangeMinEdit->text().ascii();
++ string varXRangeMax = varXRangeMaxEdit->text().ascii();
++ string varYRangeName = varYRangeNameEdit->text().ascii();
++ string varYRangeMin = varYRangeMinEdit->text().ascii();
++ string varYRangeMax = varYRangeMaxEdit->text().ascii();
++ string paramFile = paramFileEdit->text().ascii();
int paramFileFlag;
int paramCSLFlag;
@@ -49,23 +49,23 @@ diff -u curveFit.cpp.orig curveFit.cpp
- string zColumn = zColumnEdit->text();
- string format = formatEdit->text();
- string rawFormat = rawFormatEdit->text();
-+ string paramCSL = string(paramCSLEdit->text());
-+ string fitLimit = string(fitLimitEdit->text());
-+ string fitMaxIter = string(fitMaxIterEdit->text());
-+ string dataSetStart = string(dataSetStartEdit->text());
-+ string dataSetEnd = string(dataSetEndEdit->text());
-+ string dataSetInc = string(dataSetIncEdit->text());
-+ string pointInc = string(pointIncEdit->text());
-+ string lineInc = string(lineIncEdit->text());
-+ string startPoint = string(startPointEdit->text());
-+ string startLine = string(startLineEdit->text());
-+ string endPoint = string(endPointEdit->text());
-+ string endLine = string(endLineEdit->text());
-+ string xColumn = string(xColumnEdit->text());
-+ string yColumn = string(yColumnEdit->text());
-+ string zColumn = string(zColumnEdit->text());
-+ string format = string(formatEdit->text());
-+ string rawFormat = string(rawFormatEdit->text());
++ string paramCSL = paramCSLEdit->text().ascii();
++ string fitLimit = fitLimitEdit->text().ascii();
++ string fitMaxIter = fitMaxIterEdit->text().ascii();
++ string dataSetStart = dataSetStartEdit->text().ascii();
++ string dataSetEnd = dataSetEndEdit->text().ascii();
++ string dataSetInc = dataSetIncEdit->text().ascii();
++ string pointInc = pointIncEdit->text().ascii();
++ string lineInc = lineIncEdit->text().ascii();
++ string startPoint = startPointEdit->text().ascii();
++ string startLine = startLineEdit->text().ascii();
++ string endPoint = endPointEdit->text().ascii();
++ string endLine = endLineEdit->text().ascii();
++ string xColumn = xColumnEdit->text().ascii();
++ string yColumn = yColumnEdit->text().ascii();
++ string zColumn = zColumnEdit->text().ascii();
++ string format = formatEdit->text().ascii();
++ string rawFormat = rawFormatEdit->text().ascii();
// set options
diff --git a/math/xgfe/files/patch-fileFilter.cpp b/math/xgfe/files/patch-fileFilter.cpp
new file mode 100644
index 00000000000..9e9754cab3e
--- /dev/null
+++ b/math/xgfe/files/patch-fileFilter.cpp
@@ -0,0 +1,11 @@
+--- fileFilter.cpp.orig Mon May 18 04:06:51 1998
++++ fileFilter.cpp Wed Mar 17 15:29:57 2004
+@@ -93,7 +93,7 @@
+ else if (doubleQuoteRB->isChecked() == TRUE)
+ gnuInt->setFileFilterQuoteChar("double");
+
+- filterCmd += filterEdit->text();
++ filterCmd += filterEdit->text().ascii();
+
+ gnuInt->setFileFilter(filterCmd);
+
diff --git a/math/xgfe/files/patch-fileLegendTitle.cpp b/math/xgfe/files/patch-fileLegendTitle.cpp
index 706ec15c3de..d7f8e8ada93 100644
--- a/math/xgfe/files/patch-fileLegendTitle.cpp
+++ b/math/xgfe/files/patch-fileLegendTitle.cpp
@@ -6,7 +6,7 @@ diff -u fileLegendTitle.cpp.orig fileLegendTitle.cpp
void fileLegendTitle::setFileLegendTitleOK()
{
- string title = fileLegendTitleEdit->text();
-+ string title = string(fileLegendTitleEdit->text());
++ string title = fileLegendTitleEdit->text().ascii();
gnuInt->setFileLegendTitle(title);
if (defaultCButton->isChecked() == TRUE)
diff --git a/math/xgfe/files/patch-fileOptions.cpp b/math/xgfe/files/patch-fileOptions.cpp
index 1c5e322ec5d..d7d32d15128 100644
--- a/math/xgfe/files/patch-fileOptions.cpp
+++ b/math/xgfe/files/patch-fileOptions.cpp
@@ -20,21 +20,21 @@ diff -u fileOptions.cpp.orig fileOptions.cpp
- string format = formatEdit->text();
- string rawFormat = rawFormatEdit->text();
- string smoothType = interpList->currentText();
-+ string dataSetStart = string(dataSetStartEdit->text());
-+ string dataSetEnd = string(dataSetEndEdit->text());
-+ string dataSetInc = string(dataSetIncEdit->text());
-+ string sampPointInc = string(pointIncEdit->text());
-+ string sampLineInc = string(lineIncEdit->text());
-+ string sampStartPoint = string(startPointEdit->text());
-+ string sampStartLine = string(startLineEdit->text());
-+ string sampEndPoint = string(endPointEdit->text());
-+ string sampEndLine = string(endLineEdit->text());
-+ string xCol = string(xColumnEdit->text());
-+ string yCol = string(yColumnEdit->text());
-+ string zCol = string(zColumnEdit->text());
-+ string format = string(formatEdit->text());
-+ string rawFormat = string(rawFormatEdit->text());
-+ string smoothType = string(interpList->currentText());
++ 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();
gnuInt->setFileDataSetStart(dataSetStart);
gnuInt->setFileDataSetEnd(dataSetEnd);
diff --git a/math/xgfe/files/patch-funcLegendTitle.cpp b/math/xgfe/files/patch-funcLegendTitle.cpp
index b3fa226aa83..18a4130a4f7 100644
--- a/math/xgfe/files/patch-funcLegendTitle.cpp
+++ b/math/xgfe/files/patch-funcLegendTitle.cpp
@@ -6,7 +6,7 @@ diff -u funcLegendTitle.cpp.orig funcLegendTitle.cpp
void funcLegendTitle::setFuncLegendTitleOK()
{
- string title = funcLegendTitleEdit->text();
-+ string title = string(funcLegendTitleEdit->text());
++ string title = funcLegendTitleEdit->text().ascii();
gnuInt->setFuncLegendTitle(title);
if (defaultCButton->isChecked() == TRUE)
diff --git a/math/xgfe/files/patch-isoLinesOp.cpp b/math/xgfe/files/patch-isoLinesOp.cpp
index 7517fea7e1f..d65b8f2c257 100644
--- a/math/xgfe/files/patch-isoLinesOp.cpp
+++ b/math/xgfe/files/patch-isoLinesOp.cpp
@@ -7,8 +7,8 @@ diff -u isoLinesOp.cpp.orig isoLinesOp.cpp
{
- string isoU = isoUEdit->text();
- string isoV = isoVEdit->text();
-+ string isoU = string(isoUEdit->text());
-+ string isoV = string(isoVEdit->text());
++ string isoU = isoUEdit->text().ascii();
++ string isoV = isoVEdit->text().ascii();
gnuInt->setIsolineU(isoU);
gnuInt->setIsolineV(isoV);
diff --git a/math/xgfe/files/patch-latexEmtexOp.cpp b/math/xgfe/files/patch-latexEmtexOp.cpp
index aae40c8c485..06979ac3277 100644
--- a/math/xgfe/files/patch-latexEmtexOp.cpp
+++ b/math/xgfe/files/patch-latexEmtexOp.cpp
@@ -8,9 +8,9 @@ diff -u latexEmtexOp.cpp.orig latexEmtexOp.cpp
- string font = FontList->currentText();
- string size = FontSizeList->currentText();
- string otherSize = FontSizeOther->text();
-+ string font = string(FontList->currentText());
-+ string size = string(FontSizeList->currentText());
-+ string otherSize = string(FontSizeOther->text());
++ string font = FontList->currentText().ascii();
++ string size = FontSizeList->currentText().ascii();
++ string otherSize = FontSizeOther->text().ascii();
gnuInt->setTermLateXEmtexFont(font);
diff --git a/math/xgfe/files/patch-legendOp.cpp b/math/xgfe/files/patch-legendOp.cpp
index 4ed5ba4d177..aaaa6682e6f 100644
--- a/math/xgfe/files/patch-legendOp.cpp
+++ b/math/xgfe/files/patch-legendOp.cpp
@@ -8,44 +8,44 @@ diff -u legendOp.cpp.orig legendOp.cpp
- string legendPositionXVal = positionXEdit->text();
- string legendPositionYVal = positionYEdit->text();
- string legendPositionZVal = positionZEdit->text();
-+ string legendPositionXVal = string(positionXEdit->text());
-+ string legendPositionYVal = string(positionYEdit->text());
-+ string legendPositionZVal = string(positionZEdit->text());
++ string legendPositionXVal = positionXEdit->text().ascii();
++ string legendPositionYVal = positionYEdit->text().ascii();
++ string legendPositionZVal = positionZEdit->text().ascii();
gnuInt->setLegendPositionXVal(legendPositionXVal);
gnuInt->setLegendPositionYVal(legendPositionYVal);
gnuInt->setLegendPositionZVal(legendPositionZVal);
- string justify = textJustifyList->currentText();
-+ string justify = string(textJustifyList->currentText());
++ string justify = textJustifyList->currentText().ascii();
gnuInt->setLegendTextJustify(justify);
- string reverse = reverseList->currentText();
-+ string reverse = string(reverseList->currentText());
++ string reverse = reverseList->currentText().ascii();
gnuInt->setLegendReverse(reverse);
- string box = boxList->currentText();
-+ string box = string(boxList->currentText());
++ string box = boxList->currentText().ascii();
gnuInt->setLegendBox(box);
- string linetype = lineTypeEdit->text();
-+ string linetype = string(lineTypeEdit->text());
++ string linetype = lineTypeEdit->text().ascii();
gnuInt->setLegendLinetype(linetype);
- string sample = sampleLengthEdit->text();
-+ string sample = string(sampleLengthEdit->text());
++ string sample = sampleLengthEdit->text().ascii();
gnuInt->setLegendSampleLength(sample);
- string spacing = spacingEdit->text();
-+ string spacing = string(spacingEdit->text());
++ string spacing = spacingEdit->text().ascii();
gnuInt->setLegendSpacing(spacing);
- string width = widthIncrementEdit->text();
-+ string width = string(widthIncrementEdit->text());
++ string width = widthIncrementEdit->text().ascii();
gnuInt->setLegendWidthIncrement(width);
- string title = legendTitleEdit->text();
-+ string title = string(legendTitleEdit->text());
++ string title = legendTitleEdit->text().ascii();
gnuInt->setLegendTitle(title);
QDialog::accept();
diff --git a/math/xgfe/files/patch-multiFile.cpp b/math/xgfe/files/patch-multiFile.cpp
index 9938a1fbc6f..b8ae133b2dc 100644
--- a/math/xgfe/files/patch-multiFile.cpp
+++ b/math/xgfe/files/patch-multiFile.cpp
@@ -1,4 +1,3 @@
-diff -u multiFile.cpp.orig multiFile.cpp
--- multiFile.cpp.orig Mon May 18 04:13:18 1998
+++ multiFile.cpp Thu Oct 30 21:42:04 2003
@@ -23,7 +23,7 @@
@@ -32,24 +31,24 @@ diff -u multiFile.cpp.orig multiFile.cpp
- string smoothType = interpList->currentText();
- string style = fileStyleList->currentText();
- string filter = filterEdit->text();
-+ string filename = string(multiFileList->currentText());
-+ string dataSetStart = string(dataSetStartEdit->text());
-+ string dataSetEnd = string(dataSetEndEdit->text());
-+ string dataSetInc = string(dataSetIncEdit->text());
-+ string sampPointInc = string(pointIncEdit->text());
-+ string sampLineInc = string(lineIncEdit->text());
-+ string sampStartPoint = string(startPointEdit->text());
-+ string sampStartLine = string(startLineEdit->text());
-+ string sampEndPoint = string(endPointEdit->text());
-+ string sampEndLine = string(endLineEdit->text());
-+ string xcol = string(xColumnEdit->text());
-+ string ycol = string(yColumnEdit->text());
-+ string zcol = string(zColumnEdit->text());
-+ string format = string(formatEdit->text());
-+ string rawformat = string(rawFormatEdit->text());
-+ string smoothType = string(interpList->currentText());
-+ string style = string(fileStyleList->currentText());
-+ string filter = string(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);
@@ -58,16 +57,25 @@ diff -u multiFile.cpp.orig multiFile.cpp
gnuInt->setMultiFileSmoothType(filename,smoothType);
- string title = legendTitleEdit->text();
-+ string title = string(legendTitleEdit->text());
++ string title = legendTitleEdit->text().ascii();
gnuInt->setMultiFileLegendTitle(filename, title);
if (legendTitleDefaultButton->isChecked() == TRUE)
+@@ -150,7 +150,7 @@
+
+ if ( !filename.isNull() )
+ {
+- temp = filename;
++ temp = filename.ascii();
+
+ multiFileList->insertItem(filename,0);
+ gnuInt->insertMultiFileNew(temp);
@@ -165,7 +165,7 @@
if (multiFileList->count() > 0)
{
// get current file in combo box
- string filename = multiFileList->currentText();
-+ string filename = string(multiFileList->currentText());
++ string filename = multiFileList->currentText().ascii();
int currentItem = multiFileList->currentItem();
@@ -76,7 +84,7 @@ diff -u multiFile.cpp.orig multiFile.cpp
{
// get options for this file
- string filename = multiFileList->currentText();
-+ string filename = string(multiFileList->currentText());
++ string filename = multiFileList->currentText().ascii();
string dataSetStart = gnuInt->getMultiFileDataSetStart(filename);
string dataSetEnd = gnuInt->getMultiFileDataSetEnd(filename);
string dataSetInc = gnuInt->getMultiFileDataSetIncrement(filename);
diff --git a/math/xgfe/files/patch-multiFileData.cpp b/math/xgfe/files/patch-multiFileData.cpp
new file mode 100644
index 00000000000..9d9da6f5105
--- /dev/null
+++ b/math/xgfe/files/patch-multiFileData.cpp
@@ -0,0 +1,22 @@
+--- multiFileData.cpp.orig Thu May 21 00:09:57 1998
++++ multiFileData.cpp Wed Mar 17 17:30:37 2004
+@@ -59,8 +59,8 @@
+ multiFileList = new QComboBox( FALSE, mainMultiFileOptions, "ComboBox_2" );
+ multiFileList->setMinimumSize( 340, 30 );
+ multiFileList->setMaximumSize( 32767, 30 );
+- connect( multiFileList, SIGNAL(activated(const char*)), this,
+- SLOT(fileChanged(const char*)) );
++ connect( multiFileList, SIGNAL(activated(const QString&)), this,
++ SLOT(fileChanged(const QString&)) );
+ multiFileList->setSizeLimit( 100 );
+ multiFileList->setAutoResize( FALSE );
+
+@@ -689,7 +689,7 @@
+ {
+ }
+
+-void multiFileData::fileChanged(const char*)
++void multiFileData::fileChanged(const QString&)
+ {
+ }
+
diff --git a/math/xgfe/files/patch-multiFileData.h b/math/xgfe/files/patch-multiFileData.h
new file mode 100644
index 00000000000..530ed0215a3
--- /dev/null
+++ b/math/xgfe/files/patch-multiFileData.h
@@ -0,0 +1,11 @@
+--- multiFileData.h.orig Sat May 9 02:47:03 1998
++++ multiFileData.h Wed Mar 17 17:29:03 2004
+@@ -53,7 +53,7 @@
+
+ virtual void getNewFile();
+ virtual void deleteFile();
+- virtual void fileChanged(const char*);
++ virtual void fileChanged(const QString&);
+ virtual void insertCurrentFilename();
+ virtual void insertNewFilename();
+ virtual void apply();
diff --git a/math/xgfe/files/patch-multiFunc.cpp b/math/xgfe/files/patch-multiFunc.cpp
index 2286c6f0e1d..d1ded076a48 100644
--- a/math/xgfe/files/patch-multiFunc.cpp
+++ b/math/xgfe/files/patch-multiFunc.cpp
@@ -1,12 +1,20 @@
-diff -u multiFunc.cpp.orig multiFunc.cpp
--- multiFunc.cpp.orig Sat Mar 21 04:26:33 1998
+++ multiFunc.cpp Thu Oct 30 21:42:04 2003
+@@ -76,7 +76,7 @@
+ if (multiFuncList->count() > 0)
+ {
+ // get current function
+- function = multiFuncList->currentText();
++ function = multiFuncList->currentText().ascii();
+
+ // get style option
+ string style = gnuInt->getMultiFuncStyleOption(function);
@@ -135,7 +135,7 @@
void multiFunc::insertNewFunction()
{
// get function in edit box
- string function = functionEdit->text();
-+ string function = string(functionEdit->text());
++ string function = functionEdit->text().ascii();
// insert function in list
multiFuncList->insertItem(function.c_str(),0);
@@ -15,11 +23,11 @@ diff -u multiFunc.cpp.orig multiFunc.cpp
{
// get function
- string function = multiFuncList->currentText();
-+ string function = string(multiFuncList->currentText());
++ string function = multiFuncList->currentText().ascii();
// get options
- string style = funcStyleList->currentText();
-+ string style = string(funcStyleList->currentText());
++ string style = funcStyleList->currentText().ascii();
// set options
gnuInt->setMultiFuncStyleOption(function,style);
@@ -27,7 +35,7 @@ diff -u multiFunc.cpp.orig multiFunc.cpp
// set title
- string title = legendTitleEdit->text();
-+ string title = string(legendTitleEdit->text());
++ string title = legendTitleEdit->text().ascii();
gnuInt->setMultiFuncLegendTitle(function, title);
if (legendTitleDefaultButton->isChecked() == TRUE)
@@ -36,7 +44,16 @@ diff -u multiFunc.cpp.orig multiFunc.cpp
// get current function in combo box
- string function = multiFuncList->currentText();
-+ string function = string(multiFuncList->currentText());
++ string function = multiFuncList->currentText().ascii();
int currentItem = multiFuncList->currentItem();
+@@ -211,7 +211,7 @@
+ multiFuncList->setCurrentItem(0);
+
+ // get function that is now current in combo box
+- function = multiFuncList->currentText();
++ function = multiFuncList->currentText().ascii();
+
+ // set edit box to current function
+ functionEdit->setText(function.c_str());
diff --git a/math/xgfe/files/patch-multiFuncData.cpp b/math/xgfe/files/patch-multiFuncData.cpp
new file mode 100644
index 00000000000..b4ffd7ee1b4
--- /dev/null
+++ b/math/xgfe/files/patch-multiFuncData.cpp
@@ -0,0 +1,20 @@
+--- multiFuncData.cpp.orig Mon May 18 04:04:37 1998
++++ multiFuncData.cpp Wed Mar 17 17:35:27 2004
+@@ -52,7 +52,7 @@
+ multiFuncList = new QComboBox( FALSE, this, "ComboBox_3" );
+ multiFuncList->setMinimumSize( 340, 30 );
+ multiFuncList->setMaximumSize( 32767, 30 );
+- connect( multiFuncList, SIGNAL(activated(const char*)), SLOT(funcChanged(const char*)) );
++ connect( multiFuncList, SIGNAL(activated(const QString&)), SLOT(funcChanged(const QString&)) );
+ multiFuncList->setSizeLimit( 100 );
+ multiFuncList->setAutoResize( FALSE );
+
+@@ -243,7 +243,7 @@
+ multiFuncData::~multiFuncData()
+ {
+ }
+-void multiFuncData::funcChanged(const char*)
++void multiFuncData::funcChanged(const QString&)
+ {
+ }
+ void multiFuncData::insertNewFunction()
diff --git a/math/xgfe/files/patch-multiFuncData.h b/math/xgfe/files/patch-multiFuncData.h
new file mode 100644
index 00000000000..de1f324ca09
--- /dev/null
+++ b/math/xgfe/files/patch-multiFuncData.h
@@ -0,0 +1,11 @@
+--- multiFuncData.h.orig Sat Mar 21 04:26:34 1998
++++ multiFuncData.h Wed Mar 17 17:36:27 2004
+@@ -53,7 +53,7 @@
+ virtual void setFuncOptions();
+ virtual void closeMultiFunc();
+ virtual void deleteFunction();
+- virtual void funcChanged(const char*);
++ virtual void funcChanged(const QString&);
+
+ protected:
+ QComboBox* multiFuncList;
diff --git a/math/xgfe/files/patch-pbmOp.cpp b/math/xgfe/files/patch-pbmOp.cpp
index 4d426ffc00d..c5745c50673 100644
--- a/math/xgfe/files/patch-pbmOp.cpp
+++ b/math/xgfe/files/patch-pbmOp.cpp
@@ -9,10 +9,10 @@ diff -u pbmOp.cpp.orig pbmOp.cpp
- string colormode = colorMode->currentText();
- string hSize = horizSize->text();
- string vSize = vertSize->text();
-+ string size = string(fontSize->currentText());
-+ string colormode = string(colorMode->currentText());
-+ string hSize = string(horizSize->text());
-+ string vSize = string(vertSize->text());
++ string size = fontSize->currentText().ascii();
++ string colormode = colorMode->currentText().ascii();
++ string hSize = horizSize->text().ascii();
++ string vSize = vertSize->text().ascii();
gnuInt->setTermPBMFontSize(size);
gnuInt->setTermPBMColormode(colormode);
diff --git a/math/xgfe/files/patch-psOpt.cpp b/math/xgfe/files/patch-psOpt.cpp
index 1f18c95a4b1..b03c2fc30f4 100644
--- a/math/xgfe/files/patch-psOpt.cpp
+++ b/math/xgfe/files/patch-psOpt.cpp
@@ -13,14 +13,14 @@ diff -u psOpt.cpp.orig psOpt.cpp
- string fontSize = fontSizeEdit->text();
- string hSize = horizSize->text();
- string vSize = vertSize->text();
-+ string mode = string(modeList->currentText());
-+ string color = string(colorList->currentText());
-+ string dashed = string(dashedList->currentText());
-+ string enhanced = string(enhancedList->currentText());
-+ string fontName = string(fontNameEdit->text());
-+ string fontSize = string(fontSizeEdit->text());
-+ string hSize = string(horizSize->text());
-+ string vSize = string(vertSize->text());
++ string mode = modeList->currentText().ascii();
++ string color = colorList->currentText().ascii();
++ string dashed = dashedList->currentText().ascii();
++ string enhanced = enhancedList->currentText().ascii();
++ string fontName = fontNameEdit->text().ascii();
++ string fontSize = fontSizeEdit->text().ascii();
++ string hSize = horizSize->text().ascii();
++ string vSize = vertSize->text().ascii();
gnuInt->setTermPSmode(mode);
gnuInt->setTermPScolor(color);
diff --git a/math/xgfe/files/patch-rawGnu.cpp b/math/xgfe/files/patch-rawGnu.cpp
new file mode 100644
index 00000000000..081b48569bb
--- /dev/null
+++ b/math/xgfe/files/patch-rawGnu.cpp
@@ -0,0 +1,11 @@
+--- rawGnu.cpp.orig Wed Jan 7 22:24:01 1998
++++ rawGnu.cpp Wed Mar 17 15:43:43 2004
+@@ -54,7 +54,7 @@
+ QString command = rawCommand->text();
+
+ string temp;
+- temp = command;
++ temp = command.ascii();
+
+ // issue command
+ gnuInt->doRawCommand(temp);
diff --git a/math/xgfe/files/patch-rotation.cpp b/math/xgfe/files/patch-rotation.cpp
index 648b697b1bf..7831f893951 100644
--- a/math/xgfe/files/patch-rotation.cpp
+++ b/math/xgfe/files/patch-rotation.cpp
@@ -7,8 +7,8 @@ diff -u rotation.cpp.orig rotation.cpp
{
- string scale = plotScalingEdit->text();
- string zscale = zAxisScalingEdit->text();
-+ string scale = string(plotScalingEdit->text());
-+ string zscale = string(zAxisScalingEdit->text());
++ string scale = plotScalingEdit->text().ascii();
++ string zscale = zAxisScalingEdit->text().ascii();
gnuInt->setRotationXAxis(xAxisRotation);
gnuInt->setRotationZAxis(zAxisRotation);
diff --git a/math/xgfe/files/patch-sizeOp.cpp b/math/xgfe/files/patch-sizeOp.cpp
index 80a641be695..bfc8e268ae5 100644
--- a/math/xgfe/files/patch-sizeOp.cpp
+++ b/math/xgfe/files/patch-sizeOp.cpp
@@ -7,8 +7,8 @@ diff -u sizeOp.cpp.orig sizeOp.cpp
{
- string hSize = hSizeEdit->text();
- string vSize = vSizeEdit->text();
-+ string hSize = string(hSizeEdit->text());
-+ string vSize = string(vSizeEdit->text());
++ string hSize = hSizeEdit->text().ascii();
++ string vSize = vSizeEdit->text().ascii();
gnuInt->setHorizSize(hSize);
gnuInt->setVertSize(vSize);
diff --git a/math/xgfe/files/patch-ticsLevel.cpp b/math/xgfe/files/patch-ticsLevel.cpp
index 4e0ef58ebf0..67d12d55860 100644
--- a/math/xgfe/files/patch-ticsLevel.cpp
+++ b/math/xgfe/files/patch-ticsLevel.cpp
@@ -6,7 +6,7 @@ diff -u ticsLevel.cpp.orig ticsLevel.cpp
void ticsLevel::setTicsLevel()
{
- string level = ticsLevelEdit->text();
-+ string level = string(ticsLevelEdit->text());
++ string level = ticsLevelEdit->text().ascii();
gnuInt->setTicsLevel(level);
diff --git a/math/xgfe/files/patch-ticsOp.cpp b/math/xgfe/files/patch-ticsOp.cpp
index 340744b4bf9..53fa5a74f2d 100644
--- a/math/xgfe/files/patch-ticsOp.cpp
+++ b/math/xgfe/files/patch-ticsOp.cpp
@@ -8,9 +8,9 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string xticsLocation = xticsLocationCBox->currentText();
- string xticsMirror = xticsMirrorCBox->currentText();
- string xticsRotation = xticsRotationCBox->currentText();
-+ string xticsLocation = string(xticsLocationCBox->currentText());
-+ string xticsMirror = string(xticsMirrorCBox->currentText());
-+ string xticsRotation = string(xticsRotationCBox->currentText());
++ string xticsLocation = xticsLocationCBox->currentText().ascii();
++ string xticsMirror = xticsMirrorCBox->currentText().ascii();
++ string xticsRotation = xticsRotationCBox->currentText().ascii();
string xticsPositionType;
@@ -22,10 +22,10 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string xticsIncPos = xticsIncPosEdit->text();
- string xticsEndPos = xticsEndPosEdit->text();
- string xticsLabelsPos = xticsLabelsPosEdit->text();
-+ string xticsStartPos = string(xticsStartPosEdit->text());
-+ string xticsIncPos = string(xticsIncPosEdit->text());
-+ string xticsEndPos = string(xticsEndPosEdit->text());
-+ string xticsLabelsPos = string(xticsLabelsPosEdit->text());
++ string xticsStartPos = xticsStartPosEdit->text().ascii();
++ string xticsIncPos = xticsIncPosEdit->text().ascii();
++ string xticsEndPos = xticsEndPosEdit->text().ascii();
++ string xticsLabelsPos = xticsLabelsPosEdit->text().ascii();
gnuInt->setXticsLocation(xticsLocation);
gnuInt->setXticsMirror(xticsMirror);
@@ -36,9 +36,9 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string yticsLocation = yticsLocationCBox->currentText();
- string yticsMirror = yticsMirrorCBox->currentText();
- string yticsRotation = yticsRotationCBox->currentText();
-+ string yticsLocation = string(yticsLocationCBox->currentText());
-+ string yticsMirror = string(yticsMirrorCBox->currentText());
-+ string yticsRotation = string(yticsRotationCBox->currentText());
++ string yticsLocation = yticsLocationCBox->currentText().ascii();
++ string yticsMirror = yticsMirrorCBox->currentText().ascii();
++ string yticsRotation = yticsRotationCBox->currentText().ascii();
string yticsPositionType;
@@ -50,10 +50,10 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string yticsIncPos = yticsIncPosEdit->text();
- string yticsEndPos = yticsEndPosEdit->text();
- string yticsLabelsPos = yticsLabelsPosEdit->text();
-+ string yticsStartPos = string(yticsStartPosEdit->text());
-+ string yticsIncPos = string(yticsIncPosEdit->text());
-+ string yticsEndPos = string(yticsEndPosEdit->text());
-+ string yticsLabelsPos = string(yticsLabelsPosEdit->text());
++ string yticsStartPos = yticsStartPosEdit->text().ascii();
++ string yticsIncPos = yticsIncPosEdit->text().ascii();
++ string yticsEndPos = yticsEndPosEdit->text().ascii();
++ string yticsLabelsPos = yticsLabelsPosEdit->text().ascii();
gnuInt->setYticsLocation(yticsLocation);
gnuInt->setYticsMirror(yticsMirror);
@@ -63,8 +63,8 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string zticsMirror = zticsMirrorCBox->currentText();
- string zticsRotation = zticsRotationCBox->currentText();
-+ string zticsMirror = string(zticsMirrorCBox->currentText());
-+ string zticsRotation = string(zticsRotationCBox->currentText());
++ string zticsMirror = zticsMirrorCBox->currentText().ascii();
++ string zticsRotation = zticsRotationCBox->currentText().ascii();
string zticsPositionType;
@@ -76,10 +76,10 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string zticsIncPos = zticsIncPosEdit->text();
- string zticsEndPos = zticsEndPosEdit->text();
- string zticsLabelsPos = zticsLabelsPosEdit->text();
-+ string zticsStartPos = string(zticsStartPosEdit->text());
-+ string zticsIncPos = string(zticsIncPosEdit->text());
-+ string zticsEndPos = string(zticsEndPosEdit->text());
-+ string zticsLabelsPos = string(zticsLabelsPosEdit->text());
++ string zticsStartPos = zticsStartPosEdit->text().ascii();
++ string zticsIncPos = zticsIncPosEdit->text().ascii();
++ string zticsEndPos = zticsEndPosEdit->text().ascii();
++ string zticsLabelsPos = zticsLabelsPosEdit->text().ascii();
gnuInt->setZticsMirror(zticsMirror);
gnuInt->setZticsRotation(zticsRotation);
@@ -90,9 +90,9 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string x2ticsLocation = x2ticsLocationCBox->currentText();
- string x2ticsMirror = x2ticsMirrorCBox->currentText();
- string x2ticsRotation = x2ticsRotationCBox->currentText();
-+ string x2ticsLocation = string(x2ticsLocationCBox->currentText());
-+ string x2ticsMirror = string(x2ticsMirrorCBox->currentText());
-+ string x2ticsRotation = string(x2ticsRotationCBox->currentText());
++ string x2ticsLocation = x2ticsLocationCBox->currentText().ascii();
++ string x2ticsMirror = x2ticsMirrorCBox->currentText().ascii();
++ string x2ticsRotation = x2ticsRotationCBox->currentText().ascii();
string x2ticsPositionType;
@@ -104,10 +104,10 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string x2ticsIncPos = x2ticsIncPosEdit->text();
- string x2ticsEndPos = x2ticsEndPosEdit->text();
- string x2ticsLabelsPos = x2ticsLabelsPosEdit->text();
-+ string x2ticsStartPos = string(x2ticsStartPosEdit->text());
-+ string x2ticsIncPos = string(x2ticsIncPosEdit->text());
-+ string x2ticsEndPos = string(x2ticsEndPosEdit->text());
-+ string x2ticsLabelsPos = string(x2ticsLabelsPosEdit->text());
++ string x2ticsStartPos = x2ticsStartPosEdit->text().ascii();
++ string x2ticsIncPos = x2ticsIncPosEdit->text().ascii();
++ string x2ticsEndPos = x2ticsEndPosEdit->text().ascii();
++ string x2ticsLabelsPos = x2ticsLabelsPosEdit->text().ascii();
gnuInt->setX2ticsLocation(x2ticsLocation);
gnuInt->setX2ticsMirror(x2ticsMirror);
@@ -118,9 +118,9 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string y2ticsLocation = y2ticsLocationCBox->currentText();
- string y2ticsMirror = y2ticsMirrorCBox->currentText();
- string y2ticsRotation = y2ticsRotationCBox->currentText();
-+ string y2ticsLocation = string(y2ticsLocationCBox->currentText());
-+ string y2ticsMirror = string(y2ticsMirrorCBox->currentText());
-+ string y2ticsRotation = string(y2ticsRotationCBox->currentText());
++ string y2ticsLocation = y2ticsLocationCBox->currentText().ascii();
++ string y2ticsMirror = y2ticsMirrorCBox->currentText().ascii();
++ string y2ticsRotation = y2ticsRotationCBox->currentText().ascii();
string y2ticsPositionType;
@@ -132,10 +132,10 @@ diff -u ticsOp.cpp.orig ticsOp.cpp
- string y2ticsIncPos = y2ticsIncPosEdit->text();
- string y2ticsEndPos = y2ticsEndPosEdit->text();
- string y2ticsLabelsPos = y2ticsLabelsPosEdit->text();
-+ string y2ticsStartPos = string(y2ticsStartPosEdit->text());
-+ string y2ticsIncPos = string(y2ticsIncPosEdit->text());
-+ string y2ticsEndPos = string(y2ticsEndPosEdit->text());
-+ string y2ticsLabelsPos = string(y2ticsLabelsPosEdit->text());
++ string y2ticsStartPos = y2ticsStartPosEdit->text().ascii();
++ string y2ticsIncPos = y2ticsIncPosEdit->text().ascii();
++ string y2ticsEndPos = y2ticsEndPosEdit->text().ascii();
++ string y2ticsLabelsPos = y2ticsLabelsPosEdit->text().ascii();
gnuInt->setY2ticsLocation(y2ticsLocation);
gnuInt->setY2ticsMirror(y2ticsMirror);
diff --git a/math/xgfe/files/patch-xgfeMain.cpp b/math/xgfe/files/patch-xgfeMain.cpp
index 5b3378dbc41..88abf614cf2 100644
--- a/math/xgfe/files/patch-xgfeMain.cpp
+++ b/math/xgfe/files/patch-xgfeMain.cpp
@@ -1,4 +1,3 @@
-diff -u xgfeMain.cpp.orig xgfeMain.cpp
--- xgfeMain.cpp.orig Wed Sep 30 04:26:25 1998
+++ xgfeMain.cpp Thu Oct 30 21:42:04 2003
@@ -62,40 +62,40 @@
@@ -6,17 +5,17 @@ diff -u xgfeMain.cpp.orig xgfeMain.cpp
// save filename
- gnuInt->setPlotFilename(filenameEdit->text());
-+ gnuInt->setPlotFilename(string(filenameEdit->text()));
++ gnuInt->setPlotFilename(string(filenameEdit->text().ascii()));
// save function
- gnuInt->setPlotFunction(functionEdit->text());
-+ gnuInt->setPlotFunction(string(functionEdit->text()));
++ gnuInt->setPlotFunction(string(functionEdit->text().ascii()));
// save x and y variable names
- gnuInt->setXVariableName(varX->text());
- gnuInt->setYVariableName(varY->text());
-+ gnuInt->setXVariableName(string(varX->text()));
-+ gnuInt->setYVariableName(string(varY->text()));
++ gnuInt->setXVariableName(string(varX->text().ascii()));
++ gnuInt->setYVariableName(string(varY->text().ascii()));
// save x,y,z ranges
- gnuInt->setXRangeStart(xStart->text());
@@ -25,12 +24,12 @@ diff -u xgfeMain.cpp.orig xgfeMain.cpp
- gnuInt->setYRangeEnd(yEnd->text());
- gnuInt->setZRangeStart(zStart->text());
- gnuInt->setZRangeEnd(zEnd->text());
-+ gnuInt->setXRangeStart(string(xStart->text()));
-+ gnuInt->setXRangeEnd(string(xEnd->text()));
-+ gnuInt->setYRangeStart(string(yStart->text()));
-+ gnuInt->setYRangeEnd(string(yEnd->text()));
-+ gnuInt->setZRangeStart(string(zStart->text()));
-+ gnuInt->setZRangeEnd(string(zEnd->text()));
++ gnuInt->setXRangeStart(string(xStart->text().ascii()));
++ gnuInt->setXRangeEnd(string(xEnd->text().ascii()));
++ gnuInt->setYRangeStart(string(yStart->text().ascii()));
++ gnuInt->setYRangeEnd(string(yEnd->text().ascii()));
++ gnuInt->setZRangeStart(string(zStart->text().ascii()));
++ gnuInt->setZRangeEnd(string(zEnd->text().ascii()));
// set x,y,z axis labels
- gnuInt->setXlabel(xLabel->text());
@@ -44,25 +43,25 @@ diff -u xgfeMain.cpp.orig xgfeMain.cpp
- gnuInt->setZlabel(zLabel->text());
- gnuInt->setZOffset_X(ZLabelOffset_X->text());
- gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
-+ gnuInt->setXlabel(string(xLabel->text()));
-+ gnuInt->setXOffset_X(string(XLabelOffset_X->text()));
-+ gnuInt->setXOffset_Y(string(XLabelOffset_Y->text()));
++ gnuInt->setXlabel(string(xLabel->text().ascii()));
++ gnuInt->setXOffset_X(string(XLabelOffset_X->text().ascii()));
++ gnuInt->setXOffset_Y(string(XLabelOffset_Y->text().ascii()));
+
-+ gnuInt->setYlabel(string(yLabel->text()));
-+ gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
-+ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
++ gnuInt->setYlabel(string(yLabel->text().ascii()));
++ gnuInt->setYOffset_X(string(YLabelOffset_X->text().ascii()));
++ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text().ascii()));
+
-+ gnuInt->setZlabel(string(zLabel->text()));
-+ gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
-+ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
++ gnuInt->setZlabel(string(zLabel->text().ascii()));
++ gnuInt->setZOffset_X(string(ZLabelOffset_X->text().ascii()));
++ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text().ascii()));
// save title
- gnuInt->setTitle(titleLabel->text());
- gnuInt->setTitleOffset_X(titleOffset_X->text());
- gnuInt->setTitleOffset_Y(titleOffset_Y->text());
-+ gnuInt->setTitle(string(titleLabel->text()));
-+ gnuInt->setTitleOffset_X(string(titleOffset_X->text()));
-+ gnuInt->setTitleOffset_Y(string(titleOffset_Y->text()));
++ gnuInt->setTitle(string(titleLabel->text().ascii()));
++ gnuInt->setTitleOffset_X(string(titleOffset_X->text().ascii()));
++ gnuInt->setTitleOffset_Y(string(titleOffset_Y->text().ascii()));
// filename option is checked
if (filenameCB->isChecked() == TRUE)
@@ -71,11 +70,11 @@ diff -u xgfeMain.cpp.orig xgfeMain.cpp
// save filename
- gnuInt->setPlotFilename(filenameEdit->text());
-+ gnuInt->setPlotFilename(string(filenameEdit->text()));
++ gnuInt->setPlotFilename(string(filenameEdit->text().ascii()));
// save function
- gnuInt->setPlotFunction(functionEdit->text());
-+ gnuInt->setPlotFunction(string(functionEdit->text()));
++ gnuInt->setPlotFunction(string(functionEdit->text().ascii()));
// don't set ranges because they can't be reset in a replot
@@ -91,25 +90,70 @@ diff -u xgfeMain.cpp.orig xgfeMain.cpp
- gnuInt->setZlabel(zLabel->text());
- gnuInt->setZOffset_X(ZLabelOffset_X->text());
- gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
-+ gnuInt->setXlabel(string(xLabel->text()));
-+ gnuInt->setXOffset_X(string(XLabelOffset_X->text()));
-+ gnuInt->setXOffset_Y(string(XLabelOffset_Y->text()));
++ gnuInt->setXlabel(string(xLabel->text().ascii()));
++ gnuInt->setXOffset_X(string(XLabelOffset_X->text().ascii()));
++ gnuInt->setXOffset_Y(string(XLabelOffset_Y->text().ascii()));
+
-+ gnuInt->setYlabel(string(yLabel->text()));
-+ gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
-+ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
++ gnuInt->setYlabel(string(yLabel->text().ascii()));
++ gnuInt->setYOffset_X(string(YLabelOffset_X->text().ascii()));
++ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text().ascii()));
+
-+ gnuInt->setZlabel(string(zLabel->text()));
-+ gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
-+ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
++ gnuInt->setZlabel(string(zLabel->text().ascii()));
++ gnuInt->setZOffset_X(string(ZLabelOffset_X->text().ascii()));
++ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text().ascii()));
// save title
- gnuInt->setTitle(titleLabel->text());
- gnuInt->setTitleOffset_X(titleOffset_X->text());
- gnuInt->setTitleOffset_Y(titleOffset_Y->text());
-+ gnuInt->setTitle(string(titleLabel->text()));
-+ gnuInt->setTitleOffset_X(string(titleOffset_X->text()));
-+ gnuInt->setTitleOffset_Y(string(titleOffset_Y->text()));
++ gnuInt->setTitle(string(titleLabel->text().ascii()));
++ gnuInt->setTitleOffset_X(string(titleOffset_X->text().ascii()));
++ gnuInt->setTitleOffset_Y(string(titleOffset_Y->text().ascii()));
if (filenameCB->isChecked() == TRUE) // filename option is checked
{
+@@ -227,7 +227,7 @@
+ {
+ filenameEdit->setText(filename); // set label to filename
+ filenameCB->setChecked(TRUE); // set filename checkbox
+- temp = filename;
++ temp = filename.ascii();
+ gnuInt->setPlotFilename(temp);
+ }
+
+@@ -242,7 +242,7 @@
+
+ if (!saveFile.isEmpty())
+ {
+- temp = saveFile;
++ temp = saveFile.ascii();
+ gnuInt->setGnuFileSave(temp);
+ gnuInt->doSave();
+ }
+@@ -257,7 +257,7 @@
+
+ if (!loadFile.isEmpty())
+ {
+- temp = loadFile;
++ temp = loadFile.ascii();
+ gnuInt->setGnuFileLoad(temp);
+ gnuInt->doLoad();
+ }
+@@ -272,7 +272,7 @@
+
+ if (!saveFile.isEmpty())
+ {
+- temp = saveFile;
++ temp = saveFile.ascii();
+ gnuInt->savePlotData(temp);
+ }
+ }
+@@ -286,7 +286,7 @@
+
+ if (!loadFile.isEmpty())
+ {
+- temp = loadFile;
++ temp = loadFile.ascii();
+ gnuInt->loadPlotData(temp);
+
+ // get options and set GUI
diff --git a/math/xgfe/files/patch-xgfeMainData.cpp b/math/xgfe/files/patch-xgfeMainData.cpp
index 852e4c6b84d..2ee032e3caf 100644
--- a/math/xgfe/files/patch-xgfeMainData.cpp
+++ b/math/xgfe/files/patch-xgfeMainData.cpp
@@ -1,4 +1,3 @@
-diff -u xgfeMainData.cpp.orig xgfeMainData.cpp
--- xgfeMainData.cpp.orig Thu Oct 30 21:54:58 2003
+++ xgfeMainData.cpp Thu Oct 30 21:42:04 2003
@@ -34,10 +34,13 @@
@@ -17,3 +16,12 @@ diff -u xgfeMainData.cpp.orig xgfeMainData.cpp
)
:
Inherited( parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder
+@@ -973,7 +976,7 @@
+
+ if (!f.isEmpty())
+ {
+- temp = f;
++ temp = f.ascii();
+ gnuInt->setOutput(temp);
+ outputLabel->setText(f);
+ }
generated by cgit (git 2.34.1) at 2024-12-18 04:31:01 +0800