View | Details | Raw Unified | Return to bug 64390
Collapse All | Expand All

(-)Makefile (+1 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	xgfe
8
PORTNAME=	xgfe
9
PORTVERSION=	2.1
9
PORTVERSION=	2.1
10
PORTREVISION=	1
10
CATEGORIES=	math
11
CATEGORIES=	math
11
MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
12
MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
12
MASTER_SITE_SUBDIR=	graphics/gnuplot/contrib
13
MASTER_SITE_SUBDIR=	graphics/gnuplot/contrib
(-)distinfo (+1 lines)
Line 1 Link Here
1
MD5 (xgfe-2.1.tar.gz) = a9bb67a76be198142f587155b37c1864
1
MD5 (xgfe-2.1.tar.gz) = a9bb67a76be198142f587155b37c1864
2
SIZE (xgfe-2.1.tar.gz) = 438146
(-)files/patch-barOp.cpp (-2 / +10 lines)
Lines 1-4 Link Here
1
diff -u barOp.cpp.orig barOp.cpp
2
--- barOp.cpp.orig	Thu May  7 07:46:39 1998
1
--- barOp.cpp.orig	Thu May  7 07:46:39 1998
3
+++ barOp.cpp	Thu Oct 30 21:42:04 2003
2
+++ barOp.cpp	Thu Oct 30 21:42:04 2003
4
@@ -59,7 +59,7 @@
3
@@ -59,7 +59,7 @@
Lines 6-12 Link Here
6
 void barOp::setBarOption()
5
 void barOp::setBarOption()
7
 {
6
 {
8
-  string barSize = barSizeEdit->text();
7
-  string barSize = barSizeEdit->text();
9
+  string barSize = string(barSizeEdit->text());
8
+  string barSize = barSizeEdit->text().ascii();
10
   
9
   
11
   if (barSize != "")
10
   if (barSize != "")
12
   {
11
   {
12
@@ -67,7 +67,7 @@
13
   }
14
   else
15
   {
16
-    barSize = synList->currentText();
17
+    barSize = synList->currentText().ascii();
18
     gnuInt->setBarSizeOption(barSize);
19
   }
20
   
(-)files/patch-boxWidthOp.cpp (-1 / +1 lines)
Lines 6-12 Link Here
6
 void boxWidthOp::setBoxWidth()
6
 void boxWidthOp::setBoxWidth()
7
 {
7
 {
8
-  string width = boxWidthEdit->text();
8
-  string width = boxWidthEdit->text();
9
+  string width = string(boxWidthEdit->text());
9
+  string width = boxWidthEdit->text().ascii();
10
   
10
   
11
   gnuInt->setBoxWidth(width);
11
   gnuInt->setBoxWidth(width);
12
 
12
 
(-)files/patch-curveFit.cpp (-27 / +27 lines)
Lines 15-30 Link Here
15
-  string varYRangeMin = varYRangeMinEdit->text();
15
-  string varYRangeMin = varYRangeMinEdit->text();
16
-  string varYRangeMax = varYRangeMaxEdit->text();
16
-  string varYRangeMax = varYRangeMaxEdit->text();
17
-  string paramFile = paramFileEdit->text();
17
-  string paramFile = paramFileEdit->text();
18
+  string functionName = string(functionNameEdit->text());
18
+  string functionName = functionNameEdit->text().ascii();
19
+  string functionValue = string(functionValueEdit->text());
19
+  string functionValue = functionValueEdit->text().ascii();
20
+  string dataFile = string(dataFileEdit->text());
20
+  string dataFile = dataFileEdit->text().ascii();
21
+  string varXRangeName = string(varXRangeNameEdit->text());
21
+  string varXRangeName = varXRangeNameEdit->text().ascii();
22
+  string varXRangeMin = string(varXRangeMinEdit->text());
22
+  string varXRangeMin = varXRangeMinEdit->text().ascii();
23
+  string varXRangeMax = string(varXRangeMaxEdit->text());
23
+  string varXRangeMax = varXRangeMaxEdit->text().ascii();
24
+  string varYRangeName = string(varYRangeNameEdit->text());
24
+  string varYRangeName = varYRangeNameEdit->text().ascii();
25
+  string varYRangeMin = string(varYRangeMinEdit->text());
25
+  string varYRangeMin = varYRangeMinEdit->text().ascii();
26
+  string varYRangeMax = string(varYRangeMaxEdit->text());
26
+  string varYRangeMax = varYRangeMaxEdit->text().ascii();
27
+  string paramFile = string(paramFileEdit->text());
27
+  string paramFile = paramFileEdit->text().ascii();
28
 
28
 
29
   int paramFileFlag;
29
   int paramFileFlag;
30
   int paramCSLFlag;
30
   int paramCSLFlag;
Lines 49-71 Link Here
49
-  string zColumn = zColumnEdit->text();
49
-  string zColumn = zColumnEdit->text();
50
-  string format = formatEdit->text();
50
-  string format = formatEdit->text();
51
-  string rawFormat = rawFormatEdit->text();
51
-  string rawFormat = rawFormatEdit->text();
52
+  string paramCSL = string(paramCSLEdit->text());
52
+  string paramCSL = paramCSLEdit->text().ascii();
53
+  string fitLimit = string(fitLimitEdit->text());
53
+  string fitLimit = fitLimitEdit->text().ascii();
54
+  string fitMaxIter = string(fitMaxIterEdit->text());
54
+  string fitMaxIter = fitMaxIterEdit->text().ascii();
55
+  string dataSetStart = string(dataSetStartEdit->text());
55
+  string dataSetStart = dataSetStartEdit->text().ascii();
56
+  string dataSetEnd = string(dataSetEndEdit->text());
56
+  string dataSetEnd = dataSetEndEdit->text().ascii();
57
+  string dataSetInc = string(dataSetIncEdit->text());
57
+  string dataSetInc = dataSetIncEdit->text().ascii();
58
+  string pointInc = string(pointIncEdit->text());
58
+  string pointInc = pointIncEdit->text().ascii();
59
+  string lineInc = string(lineIncEdit->text());
59
+  string lineInc = lineIncEdit->text().ascii();
60
+  string startPoint = string(startPointEdit->text());
60
+  string startPoint = startPointEdit->text().ascii();
61
+  string startLine = string(startLineEdit->text());
61
+  string startLine = startLineEdit->text().ascii();
62
+  string endPoint = string(endPointEdit->text());
62
+  string endPoint = endPointEdit->text().ascii();
63
+  string endLine = string(endLineEdit->text());
63
+  string endLine = endLineEdit->text().ascii();
64
+  string xColumn = string(xColumnEdit->text());
64
+  string xColumn = xColumnEdit->text().ascii();
65
+  string yColumn = string(yColumnEdit->text());
65
+  string yColumn = yColumnEdit->text().ascii();
66
+  string zColumn = string(zColumnEdit->text());
66
+  string zColumn = zColumnEdit->text().ascii();
67
+  string format = string(formatEdit->text());
67
+  string format = formatEdit->text().ascii();
68
+  string rawFormat = string(rawFormatEdit->text());
68
+  string rawFormat = rawFormatEdit->text().ascii();
69
 
69
 
70
   // set options
70
   // set options
71
 
71
 
(-)files/patch-fileFilter.cpp (+11 lines)
Added Link Here
1
--- fileFilter.cpp.orig	Mon May 18 04:06:51 1998
2
+++ fileFilter.cpp	Wed Mar 17 15:29:57 2004
3
@@ -93,7 +93,7 @@
4
   else if (doubleQuoteRB->isChecked() == TRUE)
5
     gnuInt->setFileFilterQuoteChar("double");
6
   
7
-  filterCmd += filterEdit->text();
8
+  filterCmd += filterEdit->text().ascii();
9
   
10
   gnuInt->setFileFilter(filterCmd);
11
 
(-)files/patch-fileLegendTitle.cpp (-1 / +1 lines)
Lines 6-12 Link Here
6
 void fileLegendTitle::setFileLegendTitleOK()
6
 void fileLegendTitle::setFileLegendTitleOK()
7
 {
7
 {
8
-  string title = fileLegendTitleEdit->text();
8
-  string title = fileLegendTitleEdit->text();
9
+  string title = string(fileLegendTitleEdit->text());
9
+  string title = fileLegendTitleEdit->text().ascii();
10
   gnuInt->setFileLegendTitle(title);
10
   gnuInt->setFileLegendTitle(title);
11
 
11
 
12
   if (defaultCButton->isChecked() == TRUE)
12
   if (defaultCButton->isChecked() == TRUE)
(-)files/patch-fileOptions.cpp (-15 / +15 lines)
Lines 20-40 Link Here
20
-  string format = formatEdit->text();
20
-  string format = formatEdit->text();
21
-  string rawFormat = rawFormatEdit->text();
21
-  string rawFormat = rawFormatEdit->text();
22
-  string smoothType = interpList->currentText();
22
-  string smoothType = interpList->currentText();
23
+  string dataSetStart = string(dataSetStartEdit->text());
23
+  string dataSetStart = dataSetStartEdit->text().ascii();
24
+  string dataSetEnd = string(dataSetEndEdit->text());
24
+  string dataSetEnd = dataSetEndEdit->text().ascii();
25
+  string dataSetInc = string(dataSetIncEdit->text());
25
+  string dataSetInc = dataSetIncEdit->text().ascii();
26
+  string sampPointInc = string(pointIncEdit->text());
26
+  string sampPointInc = pointIncEdit->text().ascii();
27
+  string sampLineInc = string(lineIncEdit->text());
27
+  string sampLineInc = lineIncEdit->text().ascii();
28
+  string sampStartPoint = string(startPointEdit->text());
28
+  string sampStartPoint = startPointEdit->text().ascii();
29
+  string sampStartLine = string(startLineEdit->text());
29
+  string sampStartLine = startLineEdit->text().ascii();
30
+  string sampEndPoint = string(endPointEdit->text());
30
+  string sampEndPoint = endPointEdit->text().ascii();
31
+  string sampEndLine = string(endLineEdit->text());
31
+  string sampEndLine = endLineEdit->text().ascii();
32
+  string xCol = string(xColumnEdit->text());
32
+  string xCol = xColumnEdit->text().ascii();
33
+  string yCol = string(yColumnEdit->text());
33
+  string yCol = yColumnEdit->text().ascii();
34
+  string zCol = string(zColumnEdit->text());
34
+  string zCol = zColumnEdit->text().ascii();
35
+  string format = string(formatEdit->text());
35
+  string format = formatEdit->text().ascii();
36
+  string rawFormat = string(rawFormatEdit->text());
36
+  string rawFormat = rawFormatEdit->text().ascii();
37
+  string smoothType = string(interpList->currentText());
37
+  string smoothType = interpList->currentText().ascii();
38
 
38
 
39
   gnuInt->setFileDataSetStart(dataSetStart);
39
   gnuInt->setFileDataSetStart(dataSetStart);
40
   gnuInt->setFileDataSetEnd(dataSetEnd);
40
   gnuInt->setFileDataSetEnd(dataSetEnd);
(-)files/patch-funcLegendTitle.cpp (-1 / +1 lines)
Lines 6-12 Link Here
6
 void funcLegendTitle::setFuncLegendTitleOK()
6
 void funcLegendTitle::setFuncLegendTitleOK()
7
 {
7
 {
8
-  string title = funcLegendTitleEdit->text();
8
-  string title = funcLegendTitleEdit->text();
9
+  string title = string(funcLegendTitleEdit->text());
9
+  string title = funcLegendTitleEdit->text().ascii();
10
   gnuInt->setFuncLegendTitle(title);
10
   gnuInt->setFuncLegendTitle(title);
11
 
11
 
12
   if (defaultCButton->isChecked() == TRUE)
12
   if (defaultCButton->isChecked() == TRUE)
(-)files/patch-isoLinesOp.cpp (-2 / +2 lines)
Lines 7-14 Link Here
7
 {
7
 {
8
-  string isoU = isoUEdit->text();
8
-  string isoU = isoUEdit->text();
9
-  string isoV = isoVEdit->text();
9
-  string isoV = isoVEdit->text();
10
+  string isoU = string(isoUEdit->text());
10
+  string isoU = isoUEdit->text().ascii();
11
+  string isoV = string(isoVEdit->text());
11
+  string isoV = isoVEdit->text().ascii();
12
   
12
   
13
   gnuInt->setIsolineU(isoU);
13
   gnuInt->setIsolineU(isoU);
14
   gnuInt->setIsolineV(isoV);
14
   gnuInt->setIsolineV(isoV);
(-)files/patch-latexEmtexOp.cpp (-3 / +3 lines)
Lines 8-16 Link Here
8
-  string font = FontList->currentText();
8
-  string font = FontList->currentText();
9
-  string size = FontSizeList->currentText();
9
-  string size = FontSizeList->currentText();
10
-  string otherSize = FontSizeOther->text();
10
-  string otherSize = FontSizeOther->text();
11
+  string font = string(FontList->currentText());
11
+  string font = FontList->currentText().ascii();
12
+  string size = string(FontSizeList->currentText());
12
+  string size = FontSizeList->currentText().ascii();
13
+  string otherSize = string(FontSizeOther->text());
13
+  string otherSize = FontSizeOther->text().ascii();
14
 
14
 
15
   gnuInt->setTermLateXEmtexFont(font);
15
   gnuInt->setTermLateXEmtexFont(font);
16
     
16
     
(-)files/patch-legendOp.cpp (-11 / +11 lines)
Lines 8-51 Link Here
8
-  string legendPositionXVal = positionXEdit->text();
8
-  string legendPositionXVal = positionXEdit->text();
9
-  string legendPositionYVal = positionYEdit->text();
9
-  string legendPositionYVal = positionYEdit->text();
10
-  string legendPositionZVal = positionZEdit->text();
10
-  string legendPositionZVal = positionZEdit->text();
11
+  string legendPositionXVal = string(positionXEdit->text());
11
+  string legendPositionXVal = positionXEdit->text().ascii();
12
+  string legendPositionYVal = string(positionYEdit->text());
12
+  string legendPositionYVal = positionYEdit->text().ascii();
13
+  string legendPositionZVal = string(positionZEdit->text());
13
+  string legendPositionZVal = positionZEdit->text().ascii();
14
 
14
 
15
   gnuInt->setLegendPositionXVal(legendPositionXVal);
15
   gnuInt->setLegendPositionXVal(legendPositionXVal);
16
   gnuInt->setLegendPositionYVal(legendPositionYVal);
16
   gnuInt->setLegendPositionYVal(legendPositionYVal);
17
   gnuInt->setLegendPositionZVal(legendPositionZVal);
17
   gnuInt->setLegendPositionZVal(legendPositionZVal);
18
 
18
 
19
-  string justify = textJustifyList->currentText();
19
-  string justify = textJustifyList->currentText();
20
+  string justify = string(textJustifyList->currentText());
20
+  string justify = textJustifyList->currentText().ascii();
21
   gnuInt->setLegendTextJustify(justify);
21
   gnuInt->setLegendTextJustify(justify);
22
 
22
 
23
-  string reverse = reverseList->currentText();
23
-  string reverse = reverseList->currentText();
24
+  string reverse = string(reverseList->currentText());
24
+  string reverse = reverseList->currentText().ascii();
25
   gnuInt->setLegendReverse(reverse);
25
   gnuInt->setLegendReverse(reverse);
26
   
26
   
27
-  string box = boxList->currentText();
27
-  string box = boxList->currentText();
28
+  string box = string(boxList->currentText());
28
+  string box = boxList->currentText().ascii();
29
   gnuInt->setLegendBox(box);
29
   gnuInt->setLegendBox(box);
30
 
30
 
31
-  string linetype = lineTypeEdit->text();
31
-  string linetype = lineTypeEdit->text();
32
+  string linetype = string(lineTypeEdit->text());
32
+  string linetype = lineTypeEdit->text().ascii();
33
   gnuInt->setLegendLinetype(linetype);
33
   gnuInt->setLegendLinetype(linetype);
34
   
34
   
35
-  string sample = sampleLengthEdit->text();
35
-  string sample = sampleLengthEdit->text();
36
+  string sample = string(sampleLengthEdit->text());
36
+  string sample = sampleLengthEdit->text().ascii();
37
   gnuInt->setLegendSampleLength(sample);
37
   gnuInt->setLegendSampleLength(sample);
38
   
38
   
39
-  string spacing = spacingEdit->text();
39
-  string spacing = spacingEdit->text();
40
+  string spacing = string(spacingEdit->text());
40
+  string spacing = spacingEdit->text().ascii();
41
   gnuInt->setLegendSpacing(spacing);
41
   gnuInt->setLegendSpacing(spacing);
42
   
42
   
43
-  string width = widthIncrementEdit->text();
43
-  string width = widthIncrementEdit->text();
44
+  string width = string(widthIncrementEdit->text());
44
+  string width = widthIncrementEdit->text().ascii();
45
   gnuInt->setLegendWidthIncrement(width);
45
   gnuInt->setLegendWidthIncrement(width);
46
   
46
   
47
-  string title = legendTitleEdit->text();
47
-  string title = legendTitleEdit->text();
48
+  string title = string(legendTitleEdit->text());
48
+  string title = legendTitleEdit->text().ascii();
49
   gnuInt->setLegendTitle(title);
49
   gnuInt->setLegendTitle(title);
50
   
50
   
51
   QDialog::accept();
51
   QDialog::accept();
(-)files/patch-multiFile.cpp (-22 / +30 lines)
Lines 1-4 Link Here
1
diff -u multiFile.cpp.orig multiFile.cpp
2
--- multiFile.cpp.orig	Mon May 18 04:13:18 1998
1
--- multiFile.cpp.orig	Mon May 18 04:13:18 1998
3
+++ multiFile.cpp	Thu Oct 30 21:42:04 2003
2
+++ multiFile.cpp	Thu Oct 30 21:42:04 2003
4
@@ -23,7 +23,7 @@
3
@@ -23,7 +23,7 @@
Lines 32-55 Link Here
32
-    string smoothType = interpList->currentText();
31
-    string smoothType = interpList->currentText();
33
-    string style = fileStyleList->currentText();
32
-    string style = fileStyleList->currentText();
34
-    string filter = filterEdit->text();
33
-    string filter = filterEdit->text();
35
+    string filename = string(multiFileList->currentText());
34
+    string filename = multiFileList->currentText().ascii();
36
+    string dataSetStart = string(dataSetStartEdit->text());
35
+    string dataSetStart = dataSetStartEdit->text().ascii();
37
+    string dataSetEnd = string(dataSetEndEdit->text());
36
+    string dataSetEnd = dataSetEndEdit->text().ascii();
38
+    string dataSetInc = string(dataSetIncEdit->text());
37
+    string dataSetInc = dataSetIncEdit->text().ascii();
39
+    string sampPointInc = string(pointIncEdit->text());
38
+    string sampPointInc = pointIncEdit->text().ascii();
40
+    string sampLineInc = string(lineIncEdit->text());
39
+    string sampLineInc = lineIncEdit->text().ascii();
41
+    string sampStartPoint = string(startPointEdit->text());
40
+    string sampStartPoint = startPointEdit->text().ascii();
42
+    string sampStartLine = string(startLineEdit->text());
41
+    string sampStartLine = startLineEdit->text().ascii();
43
+    string sampEndPoint = string(endPointEdit->text());
42
+    string sampEndPoint = endPointEdit->text().ascii();
44
+    string sampEndLine = string(endLineEdit->text());
43
+    string sampEndLine = endLineEdit->text().ascii();
45
+    string xcol = string(xColumnEdit->text());
44
+    string xcol = xColumnEdit->text().ascii();
46
+    string ycol = string(yColumnEdit->text());
45
+    string ycol = yColumnEdit->text().ascii();
47
+    string zcol = string(zColumnEdit->text());
46
+    string zcol = zColumnEdit->text().ascii();
48
+    string format = string(formatEdit->text());
47
+    string format = formatEdit->text().ascii();
49
+    string rawformat = string(rawFormatEdit->text());
48
+    string rawformat = rawFormatEdit->text().ascii();
50
+    string smoothType = string(interpList->currentText());
49
+    string smoothType = interpList->currentText().ascii();
51
+    string style = string(fileStyleList->currentText());
50
+    string style = fileStyleList->currentText().ascii();
52
+    string filter = string(filterEdit->text());
51
+    string filter = filterEdit->text().ascii();
53
 
52
 
54
     gnuInt->setMultiFileStyleOption(filename, style);
53
     gnuInt->setMultiFileStyleOption(filename, style);
55
     gnuInt->setMultiFileDataSetStart(filename,dataSetStart);
54
     gnuInt->setMultiFileDataSetStart(filename,dataSetStart);
Lines 58-73 Link Here
58
     gnuInt->setMultiFileSmoothType(filename,smoothType);
57
     gnuInt->setMultiFileSmoothType(filename,smoothType);
59
 
58
 
60
-    string title = legendTitleEdit->text();
59
-    string title = legendTitleEdit->text();
61
+    string title = string(legendTitleEdit->text());
60
+    string title = legendTitleEdit->text().ascii();
62
     gnuInt->setMultiFileLegendTitle(filename, title);
61
     gnuInt->setMultiFileLegendTitle(filename, title);
63
 
62
 
64
     if (legendTitleDefaultButton->isChecked() == TRUE)
63
     if (legendTitleDefaultButton->isChecked() == TRUE)
64
@@ -150,7 +150,7 @@
65
   
66
   if ( !filename.isNull() )
67
   {
68
-    temp = filename;
69
+    temp = filename.ascii();
70
 
71
     multiFileList->insertItem(filename,0);
72
     gnuInt->insertMultiFileNew(temp);
65
@@ -165,7 +165,7 @@
73
@@ -165,7 +165,7 @@
66
   if (multiFileList->count() > 0)
74
   if (multiFileList->count() > 0)
67
   { 
75
   { 
68
     // get current file in combo box
76
     // get current file in combo box
69
-    string filename = multiFileList->currentText();
77
-    string filename = multiFileList->currentText();
70
+    string filename = string(multiFileList->currentText());
78
+    string filename = multiFileList->currentText().ascii();
71
     
79
     
72
     int currentItem = multiFileList->currentItem();
80
     int currentItem = multiFileList->currentItem();
73
     
81
     
Lines 76-82 Link Here
76
 {
84
 {
77
   // get options for this file
85
   // get options for this file
78
-  string filename = multiFileList->currentText();
86
-  string filename = multiFileList->currentText();
79
+  string filename = string(multiFileList->currentText());
87
+  string filename = multiFileList->currentText().ascii();
80
   string dataSetStart = gnuInt->getMultiFileDataSetStart(filename);
88
   string dataSetStart = gnuInt->getMultiFileDataSetStart(filename);
81
   string dataSetEnd = gnuInt->getMultiFileDataSetEnd(filename);
89
   string dataSetEnd = gnuInt->getMultiFileDataSetEnd(filename);
82
   string dataSetInc = gnuInt->getMultiFileDataSetIncrement(filename);
90
   string dataSetInc = gnuInt->getMultiFileDataSetIncrement(filename);
(-)files/patch-multiFileData.cpp (+22 lines)
Added Link Here
1
--- multiFileData.cpp.orig	Thu May 21 00:09:57 1998
2
+++ multiFileData.cpp	Wed Mar 17 17:30:37 2004
3
@@ -59,8 +59,8 @@
4
   multiFileList = new QComboBox( FALSE, mainMultiFileOptions, "ComboBox_2" );
5
   multiFileList->setMinimumSize( 340, 30 );
6
   multiFileList->setMaximumSize( 32767, 30 );
7
-  connect( multiFileList, SIGNAL(activated(const char*)), this,
8
-           SLOT(fileChanged(const char*)) );
9
+  connect( multiFileList, SIGNAL(activated(const QString&)), this,
10
+           SLOT(fileChanged(const QString&)) );
11
   multiFileList->setSizeLimit( 100 );
12
   multiFileList->setAutoResize( FALSE );
13
 
14
@@ -689,7 +689,7 @@
15
 {
16
 }
17
 
18
-void multiFileData::fileChanged(const char*)
19
+void multiFileData::fileChanged(const QString&)
20
 {
21
 }
22
 
(-)files/patch-multiFileData.h (+11 lines)
Added Link Here
1
--- multiFileData.h.orig	Sat May  9 02:47:03 1998
2
+++ multiFileData.h	Wed Mar 17 17:29:03 2004
3
@@ -53,7 +53,7 @@
4
 
5
   virtual void getNewFile();
6
   virtual void deleteFile();
7
-  virtual void fileChanged(const char*);
8
+  virtual void fileChanged(const QString&);
9
   virtual void insertCurrentFilename();
10
   virtual void insertNewFilename();
11
   virtual void apply();
(-)files/patch-multiFunc.cpp (-6 / +23 lines)
Lines 1-12 Link Here
1
diff -u multiFunc.cpp.orig multiFunc.cpp
2
--- multiFunc.cpp.orig	Sat Mar 21 04:26:33 1998
1
--- multiFunc.cpp.orig	Sat Mar 21 04:26:33 1998
3
+++ multiFunc.cpp	Thu Oct 30 21:42:04 2003
2
+++ multiFunc.cpp	Thu Oct 30 21:42:04 2003
3
@@ -76,7 +76,7 @@
4
   if (multiFuncList->count() > 0)
5
   {
6
     // get current function
7
-    function = multiFuncList->currentText();
8
+    function = multiFuncList->currentText().ascii();
9
     
10
     // get style option
11
     string style = gnuInt->getMultiFuncStyleOption(function);
4
@@ -135,7 +135,7 @@
12
@@ -135,7 +135,7 @@
5
 void multiFunc::insertNewFunction()
13
 void multiFunc::insertNewFunction()
6
 {
14
 {
7
   // get function in edit box
15
   // get function in edit box
8
-  string function = functionEdit->text();
16
-  string function = functionEdit->text();
9
+  string function = string(functionEdit->text());
17
+  string function = functionEdit->text().ascii();
10
 
18
 
11
   // insert function in list
19
   // insert function in list
12
   multiFuncList->insertItem(function.c_str(),0);
20
   multiFuncList->insertItem(function.c_str(),0);
Lines 15-25 Link Here
15
   {
23
   {
16
     // get function
24
     // get function
17
-    string function = multiFuncList->currentText();
25
-    string function = multiFuncList->currentText();
18
+    string function = string(multiFuncList->currentText());
26
+    string function = multiFuncList->currentText().ascii();
19
 
27
 
20
     // get options
28
     // get options
21
-    string style = funcStyleList->currentText();
29
-    string style = funcStyleList->currentText();
22
+    string style = string(funcStyleList->currentText());
30
+    string style = funcStyleList->currentText().ascii();
23
     
31
     
24
     // set options
32
     // set options
25
     gnuInt->setMultiFuncStyleOption(function,style);
33
     gnuInt->setMultiFuncStyleOption(function,style);
Lines 27-33 Link Here
27
 
35
 
28
     // set title
36
     // set title
29
-    string title = legendTitleEdit->text();
37
-    string title = legendTitleEdit->text();
30
+    string title = string(legendTitleEdit->text());
38
+    string title = legendTitleEdit->text().ascii();
31
     gnuInt->setMultiFuncLegendTitle(function, title);
39
     gnuInt->setMultiFuncLegendTitle(function, title);
32
 
40
 
33
     if (legendTitleDefaultButton->isChecked() == TRUE)
41
     if (legendTitleDefaultButton->isChecked() == TRUE)
Lines 36-42 Link Here
36
     
44
     
37
     // get current function in combo box
45
     // get current function in combo box
38
-    string function = multiFuncList->currentText();
46
-    string function = multiFuncList->currentText();
39
+    string function = string(multiFuncList->currentText());
47
+    string function = multiFuncList->currentText().ascii();
40
     
48
     
41
     int currentItem = multiFuncList->currentItem();
49
     int currentItem = multiFuncList->currentItem();
42
     
50
     
51
@@ -211,7 +211,7 @@
52
       multiFuncList->setCurrentItem(0);
53
       
54
       // get function that is now current in combo box
55
-      function = multiFuncList->currentText();
56
+      function = multiFuncList->currentText().ascii();
57
 
58
       // set edit box to current function
59
       functionEdit->setText(function.c_str());
(-)files/patch-multiFuncData.cpp (+20 lines)
Added Link Here
1
--- multiFuncData.cpp.orig	Mon May 18 04:04:37 1998
2
+++ multiFuncData.cpp	Wed Mar 17 17:35:27 2004
3
@@ -52,7 +52,7 @@
4
 	multiFuncList = new QComboBox( FALSE, this, "ComboBox_3" );
5
 	multiFuncList->setMinimumSize( 340, 30 );
6
 	multiFuncList->setMaximumSize( 32767, 30 );
7
-	connect( multiFuncList, SIGNAL(activated(const char*)), SLOT(funcChanged(const char*)) );
8
+	connect( multiFuncList, SIGNAL(activated(const QString&)), SLOT(funcChanged(const QString&)) );
9
 	multiFuncList->setSizeLimit( 100 );
10
 	multiFuncList->setAutoResize( FALSE );
11
 
12
@@ -243,7 +243,7 @@
13
 multiFuncData::~multiFuncData()
14
 {
15
 }
16
-void multiFuncData::funcChanged(const char*)
17
+void multiFuncData::funcChanged(const QString&)
18
 {
19
 }
20
 void multiFuncData::insertNewFunction()
(-)files/patch-multiFuncData.h (+11 lines)
Added Link Here
1
--- multiFuncData.h.orig	Sat Mar 21 04:26:34 1998
2
+++ multiFuncData.h	Wed Mar 17 17:36:27 2004
3
@@ -53,7 +53,7 @@
4
     virtual void setFuncOptions();
5
     virtual void closeMultiFunc();
6
     virtual void deleteFunction();
7
-    virtual void funcChanged(const char*);
8
+    virtual void funcChanged(const QString&);
9
 
10
 protected:
11
     QComboBox* multiFuncList;
(-)files/patch-pbmOp.cpp (-4 / +4 lines)
Lines 9-18 Link Here
9
-  string colormode = colorMode->currentText();
9
-  string colormode = colorMode->currentText();
10
-  string hSize = horizSize->text();
10
-  string hSize = horizSize->text();
11
-  string vSize = vertSize->text();
11
-  string vSize = vertSize->text();
12
+  string size = string(fontSize->currentText());
12
+  string size = fontSize->currentText().ascii();
13
+  string colormode = string(colorMode->currentText());
13
+  string colormode = colorMode->currentText().ascii();
14
+  string hSize = string(horizSize->text());
14
+  string hSize = horizSize->text().ascii();
15
+  string vSize = string(vertSize->text());
15
+  string vSize = vertSize->text().ascii();
16
 
16
 
17
   gnuInt->setTermPBMFontSize(size);
17
   gnuInt->setTermPBMFontSize(size);
18
   gnuInt->setTermPBMColormode(colormode);
18
   gnuInt->setTermPBMColormode(colormode);
(-)files/patch-psOpt.cpp (-8 / +8 lines)
Lines 13-26 Link Here
13
-  string fontSize = fontSizeEdit->text();
13
-  string fontSize = fontSizeEdit->text();
14
-  string hSize = horizSize->text();
14
-  string hSize = horizSize->text();
15
-  string vSize = vertSize->text();
15
-  string vSize = vertSize->text();
16
+  string mode = string(modeList->currentText());
16
+  string mode = modeList->currentText().ascii();
17
+  string color = string(colorList->currentText());
17
+  string color = colorList->currentText().ascii();
18
+  string dashed = string(dashedList->currentText());
18
+  string dashed = dashedList->currentText().ascii();
19
+  string enhanced = string(enhancedList->currentText());
19
+  string enhanced = enhancedList->currentText().ascii();
20
+  string fontName = string(fontNameEdit->text());
20
+  string fontName = fontNameEdit->text().ascii();
21
+  string fontSize = string(fontSizeEdit->text());
21
+  string fontSize = fontSizeEdit->text().ascii();
22
+  string hSize = string(horizSize->text());
22
+  string hSize = horizSize->text().ascii();
23
+  string vSize = string(vertSize->text());
23
+  string vSize = vertSize->text().ascii();
24
 
24
 
25
   gnuInt->setTermPSmode(mode);
25
   gnuInt->setTermPSmode(mode);
26
   gnuInt->setTermPScolor(color);
26
   gnuInt->setTermPScolor(color);
(-)files/patch-rawGnu.cpp (+11 lines)
Added Link Here
1
--- rawGnu.cpp.orig	Wed Jan  7 22:24:01 1998
2
+++ rawGnu.cpp	Wed Mar 17 15:43:43 2004
3
@@ -54,7 +54,7 @@
4
   QString command = rawCommand->text();
5
 
6
   string temp;
7
-  temp = command;
8
+  temp = command.ascii();
9
 
10
   // issue command
11
   gnuInt->doRawCommand(temp);
(-)files/patch-rotation.cpp (-2 / +2 lines)
Lines 7-14 Link Here
7
 {  
7
 {  
8
-  string scale = plotScalingEdit->text();
8
-  string scale = plotScalingEdit->text();
9
-  string zscale = zAxisScalingEdit->text();
9
-  string zscale = zAxisScalingEdit->text();
10
+  string scale = string(plotScalingEdit->text());
10
+  string scale = plotScalingEdit->text().ascii();
11
+  string zscale = string(zAxisScalingEdit->text());
11
+  string zscale = zAxisScalingEdit->text().ascii();
12
 
12
 
13
   gnuInt->setRotationXAxis(xAxisRotation);
13
   gnuInt->setRotationXAxis(xAxisRotation);
14
   gnuInt->setRotationZAxis(zAxisRotation);
14
   gnuInt->setRotationZAxis(zAxisRotation);
(-)files/patch-sizeOp.cpp (-2 / +2 lines)
Lines 7-14 Link Here
7
 {
7
 {
8
-  string hSize = hSizeEdit->text();
8
-  string hSize = hSizeEdit->text();
9
-  string vSize = vSizeEdit->text();
9
-  string vSize = vSizeEdit->text();
10
+  string hSize = string(hSizeEdit->text());
10
+  string hSize = hSizeEdit->text().ascii();
11
+  string vSize = string(vSizeEdit->text());
11
+  string vSize = vSizeEdit->text().ascii();
12
 
12
 
13
   gnuInt->setHorizSize(hSize);
13
   gnuInt->setHorizSize(hSize);
14
   gnuInt->setVertSize(vSize);
14
   gnuInt->setVertSize(vSize);
(-)files/patch-ticsLevel.cpp (-1 / +1 lines)
Lines 6-12 Link Here
6
 void ticsLevel::setTicsLevel()
6
 void ticsLevel::setTicsLevel()
7
 {
7
 {
8
-  string level = ticsLevelEdit->text();
8
-  string level = ticsLevelEdit->text();
9
+  string level = string(ticsLevelEdit->text());
9
+  string level = ticsLevelEdit->text().ascii();
10
 
10
 
11
   gnuInt->setTicsLevel(level);
11
   gnuInt->setTicsLevel(level);
12
   
12
   
(-)files/patch-ticsOp.cpp (-34 / +34 lines)
Lines 8-16 Link Here
8
-  string xticsLocation = xticsLocationCBox->currentText();
8
-  string xticsLocation = xticsLocationCBox->currentText();
9
-  string xticsMirror = xticsMirrorCBox->currentText();
9
-  string xticsMirror = xticsMirrorCBox->currentText();
10
-  string xticsRotation = xticsRotationCBox->currentText();
10
-  string xticsRotation = xticsRotationCBox->currentText();
11
+  string xticsLocation = string(xticsLocationCBox->currentText());
11
+  string xticsLocation = xticsLocationCBox->currentText().ascii();
12
+  string xticsMirror = string(xticsMirrorCBox->currentText());
12
+  string xticsMirror = xticsMirrorCBox->currentText().ascii();
13
+  string xticsRotation = string(xticsRotationCBox->currentText());
13
+  string xticsRotation = xticsRotationCBox->currentText().ascii();
14
 
14
 
15
   string xticsPositionType;
15
   string xticsPositionType;
16
 
16
 
Lines 22-31 Link Here
22
-  string xticsIncPos = xticsIncPosEdit->text();
22
-  string xticsIncPos = xticsIncPosEdit->text();
23
-  string xticsEndPos = xticsEndPosEdit->text();
23
-  string xticsEndPos = xticsEndPosEdit->text();
24
-  string xticsLabelsPos = xticsLabelsPosEdit->text();
24
-  string xticsLabelsPos = xticsLabelsPosEdit->text();
25
+  string xticsStartPos = string(xticsStartPosEdit->text());
25
+  string xticsStartPos = xticsStartPosEdit->text().ascii();
26
+  string xticsIncPos = string(xticsIncPosEdit->text());
26
+  string xticsIncPos = xticsIncPosEdit->text().ascii();
27
+  string xticsEndPos = string(xticsEndPosEdit->text());
27
+  string xticsEndPos = xticsEndPosEdit->text().ascii();
28
+  string xticsLabelsPos = string(xticsLabelsPosEdit->text());
28
+  string xticsLabelsPos = xticsLabelsPosEdit->text().ascii();
29
 
29
 
30
   gnuInt->setXticsLocation(xticsLocation);
30
   gnuInt->setXticsLocation(xticsLocation);
31
   gnuInt->setXticsMirror(xticsMirror);
31
   gnuInt->setXticsMirror(xticsMirror);
Lines 36-44 Link Here
36
-  string yticsLocation = yticsLocationCBox->currentText();
36
-  string yticsLocation = yticsLocationCBox->currentText();
37
-  string yticsMirror = yticsMirrorCBox->currentText();
37
-  string yticsMirror = yticsMirrorCBox->currentText();
38
-  string yticsRotation = yticsRotationCBox->currentText();
38
-  string yticsRotation = yticsRotationCBox->currentText();
39
+  string yticsLocation = string(yticsLocationCBox->currentText());
39
+  string yticsLocation = yticsLocationCBox->currentText().ascii();
40
+  string yticsMirror = string(yticsMirrorCBox->currentText());
40
+  string yticsMirror = yticsMirrorCBox->currentText().ascii();
41
+  string yticsRotation = string(yticsRotationCBox->currentText());
41
+  string yticsRotation = yticsRotationCBox->currentText().ascii();
42
 
42
 
43
   string yticsPositionType;
43
   string yticsPositionType;
44
 
44
 
Lines 50-59 Link Here
50
-  string yticsIncPos = yticsIncPosEdit->text();
50
-  string yticsIncPos = yticsIncPosEdit->text();
51
-  string yticsEndPos = yticsEndPosEdit->text();
51
-  string yticsEndPos = yticsEndPosEdit->text();
52
-  string yticsLabelsPos = yticsLabelsPosEdit->text();
52
-  string yticsLabelsPos = yticsLabelsPosEdit->text();
53
+  string yticsStartPos = string(yticsStartPosEdit->text());
53
+  string yticsStartPos = yticsStartPosEdit->text().ascii();
54
+  string yticsIncPos = string(yticsIncPosEdit->text());
54
+  string yticsIncPos = yticsIncPosEdit->text().ascii();
55
+  string yticsEndPos = string(yticsEndPosEdit->text());
55
+  string yticsEndPos = yticsEndPosEdit->text().ascii();
56
+  string yticsLabelsPos = string(yticsLabelsPosEdit->text());
56
+  string yticsLabelsPos = yticsLabelsPosEdit->text().ascii();
57
 
57
 
58
   gnuInt->setYticsLocation(yticsLocation);
58
   gnuInt->setYticsLocation(yticsLocation);
59
   gnuInt->setYticsMirror(yticsMirror);
59
   gnuInt->setYticsMirror(yticsMirror);
Lines 63-70 Link Here
63
 
63
 
64
-  string zticsMirror = zticsMirrorCBox->currentText();
64
-  string zticsMirror = zticsMirrorCBox->currentText();
65
-  string zticsRotation = zticsRotationCBox->currentText();
65
-  string zticsRotation = zticsRotationCBox->currentText();
66
+  string zticsMirror = string(zticsMirrorCBox->currentText());
66
+  string zticsMirror = zticsMirrorCBox->currentText().ascii();
67
+  string zticsRotation = string(zticsRotationCBox->currentText());
67
+  string zticsRotation = zticsRotationCBox->currentText().ascii();
68
 
68
 
69
   string zticsPositionType;
69
   string zticsPositionType;
70
 
70
 
Lines 76-85 Link Here
76
-  string zticsIncPos = zticsIncPosEdit->text();
76
-  string zticsIncPos = zticsIncPosEdit->text();
77
-  string zticsEndPos = zticsEndPosEdit->text();
77
-  string zticsEndPos = zticsEndPosEdit->text();
78
-  string zticsLabelsPos = zticsLabelsPosEdit->text();
78
-  string zticsLabelsPos = zticsLabelsPosEdit->text();
79
+  string zticsStartPos = string(zticsStartPosEdit->text());
79
+  string zticsStartPos = zticsStartPosEdit->text().ascii();
80
+  string zticsIncPos = string(zticsIncPosEdit->text());
80
+  string zticsIncPos = zticsIncPosEdit->text().ascii();
81
+  string zticsEndPos = string(zticsEndPosEdit->text());
81
+  string zticsEndPos = zticsEndPosEdit->text().ascii();
82
+  string zticsLabelsPos = string(zticsLabelsPosEdit->text());
82
+  string zticsLabelsPos = zticsLabelsPosEdit->text().ascii();
83
 
83
 
84
   gnuInt->setZticsMirror(zticsMirror);
84
   gnuInt->setZticsMirror(zticsMirror);
85
   gnuInt->setZticsRotation(zticsRotation);
85
   gnuInt->setZticsRotation(zticsRotation);
Lines 90-98 Link Here
90
-  string x2ticsLocation = x2ticsLocationCBox->currentText();
90
-  string x2ticsLocation = x2ticsLocationCBox->currentText();
91
-  string x2ticsMirror = x2ticsMirrorCBox->currentText();
91
-  string x2ticsMirror = x2ticsMirrorCBox->currentText();
92
-  string x2ticsRotation = x2ticsRotationCBox->currentText();
92
-  string x2ticsRotation = x2ticsRotationCBox->currentText();
93
+  string x2ticsLocation = string(x2ticsLocationCBox->currentText());
93
+  string x2ticsLocation = x2ticsLocationCBox->currentText().ascii();
94
+  string x2ticsMirror = string(x2ticsMirrorCBox->currentText());
94
+  string x2ticsMirror = x2ticsMirrorCBox->currentText().ascii();
95
+  string x2ticsRotation = string(x2ticsRotationCBox->currentText());
95
+  string x2ticsRotation = x2ticsRotationCBox->currentText().ascii();
96
 
96
 
97
   string x2ticsPositionType;
97
   string x2ticsPositionType;
98
 
98
 
Lines 104-113 Link Here
104
-  string x2ticsIncPos = x2ticsIncPosEdit->text();
104
-  string x2ticsIncPos = x2ticsIncPosEdit->text();
105
-  string x2ticsEndPos = x2ticsEndPosEdit->text();
105
-  string x2ticsEndPos = x2ticsEndPosEdit->text();
106
-  string x2ticsLabelsPos = x2ticsLabelsPosEdit->text();
106
-  string x2ticsLabelsPos = x2ticsLabelsPosEdit->text();
107
+  string x2ticsStartPos = string(x2ticsStartPosEdit->text());
107
+  string x2ticsStartPos = x2ticsStartPosEdit->text().ascii();
108
+  string x2ticsIncPos = string(x2ticsIncPosEdit->text());
108
+  string x2ticsIncPos = x2ticsIncPosEdit->text().ascii();
109
+  string x2ticsEndPos = string(x2ticsEndPosEdit->text());
109
+  string x2ticsEndPos = x2ticsEndPosEdit->text().ascii();
110
+  string x2ticsLabelsPos = string(x2ticsLabelsPosEdit->text());
110
+  string x2ticsLabelsPos = x2ticsLabelsPosEdit->text().ascii();
111
 
111
 
112
   gnuInt->setX2ticsLocation(x2ticsLocation);
112
   gnuInt->setX2ticsLocation(x2ticsLocation);
113
   gnuInt->setX2ticsMirror(x2ticsMirror);
113
   gnuInt->setX2ticsMirror(x2ticsMirror);
Lines 118-126 Link Here
118
-  string y2ticsLocation = y2ticsLocationCBox->currentText();
118
-  string y2ticsLocation = y2ticsLocationCBox->currentText();
119
-  string y2ticsMirror = y2ticsMirrorCBox->currentText();
119
-  string y2ticsMirror = y2ticsMirrorCBox->currentText();
120
-  string y2ticsRotation = y2ticsRotationCBox->currentText();
120
-  string y2ticsRotation = y2ticsRotationCBox->currentText();
121
+  string y2ticsLocation = string(y2ticsLocationCBox->currentText());
121
+  string y2ticsLocation = y2ticsLocationCBox->currentText().ascii();
122
+  string y2ticsMirror = string(y2ticsMirrorCBox->currentText());
122
+  string y2ticsMirror = y2ticsMirrorCBox->currentText().ascii();
123
+  string y2ticsRotation = string(y2ticsRotationCBox->currentText());
123
+  string y2ticsRotation = y2ticsRotationCBox->currentText().ascii();
124
 
124
 
125
   string y2ticsPositionType;
125
   string y2ticsPositionType;
126
 
126
 
Lines 132-141 Link Here
132
-  string y2ticsIncPos = y2ticsIncPosEdit->text();
132
-  string y2ticsIncPos = y2ticsIncPosEdit->text();
133
-  string y2ticsEndPos = y2ticsEndPosEdit->text();
133
-  string y2ticsEndPos = y2ticsEndPosEdit->text();
134
-  string y2ticsLabelsPos = y2ticsLabelsPosEdit->text();
134
-  string y2ticsLabelsPos = y2ticsLabelsPosEdit->text();
135
+  string y2ticsStartPos = string(y2ticsStartPosEdit->text());
135
+  string y2ticsStartPos = y2ticsStartPosEdit->text().ascii();
136
+  string y2ticsIncPos = string(y2ticsIncPosEdit->text());
136
+  string y2ticsIncPos = y2ticsIncPosEdit->text().ascii();
137
+  string y2ticsEndPos = string(y2ticsEndPosEdit->text());
137
+  string y2ticsEndPos = y2ticsEndPosEdit->text().ascii();
138
+  string y2ticsLabelsPos = string(y2ticsLabelsPosEdit->text());
138
+  string y2ticsLabelsPos = y2ticsLabelsPosEdit->text().ascii();
139
 
139
 
140
   gnuInt->setY2ticsLocation(y2ticsLocation);
140
   gnuInt->setY2ticsLocation(y2ticsLocation);
141
   gnuInt->setY2ticsMirror(y2ticsMirror);
141
   gnuInt->setY2ticsMirror(y2ticsMirror);
(-)files/patch-xgfeMain.cpp (-37 / +81 lines)
Lines 1-4 Link Here
1
diff -u xgfeMain.cpp.orig xgfeMain.cpp
2
--- xgfeMain.cpp.orig	Wed Sep 30 04:26:25 1998
1
--- xgfeMain.cpp.orig	Wed Sep 30 04:26:25 1998
3
+++ xgfeMain.cpp	Thu Oct 30 21:42:04 2003
2
+++ xgfeMain.cpp	Thu Oct 30 21:42:04 2003
4
@@ -62,40 +62,40 @@
3
@@ -62,40 +62,40 @@
Lines 6-22 Link Here
6
 
5
 
7
   // save filename
6
   // save filename
8
-  gnuInt->setPlotFilename(filenameEdit->text());
7
-  gnuInt->setPlotFilename(filenameEdit->text());
9
+  gnuInt->setPlotFilename(string(filenameEdit->text()));
8
+  gnuInt->setPlotFilename(string(filenameEdit->text().ascii()));
10
 
9
 
11
   // save function
10
   // save function
12
-  gnuInt->setPlotFunction(functionEdit->text());
11
-  gnuInt->setPlotFunction(functionEdit->text());
13
+  gnuInt->setPlotFunction(string(functionEdit->text()));
12
+  gnuInt->setPlotFunction(string(functionEdit->text().ascii()));
14
   
13
   
15
   // save x and y variable names
14
   // save x and y variable names
16
-  gnuInt->setXVariableName(varX->text());
15
-  gnuInt->setXVariableName(varX->text());
17
-  gnuInt->setYVariableName(varY->text());
16
-  gnuInt->setYVariableName(varY->text());
18
+  gnuInt->setXVariableName(string(varX->text()));
17
+  gnuInt->setXVariableName(string(varX->text().ascii()));
19
+  gnuInt->setYVariableName(string(varY->text()));
18
+  gnuInt->setYVariableName(string(varY->text().ascii()));
20
 
19
 
21
   // save x,y,z ranges
20
   // save x,y,z ranges
22
-  gnuInt->setXRangeStart(xStart->text());
21
-  gnuInt->setXRangeStart(xStart->text());
Lines 25-36 Link Here
25
-  gnuInt->setYRangeEnd(yEnd->text());
24
-  gnuInt->setYRangeEnd(yEnd->text());
26
-  gnuInt->setZRangeStart(zStart->text());
25
-  gnuInt->setZRangeStart(zStart->text());
27
-  gnuInt->setZRangeEnd(zEnd->text());
26
-  gnuInt->setZRangeEnd(zEnd->text());
28
+  gnuInt->setXRangeStart(string(xStart->text()));
27
+  gnuInt->setXRangeStart(string(xStart->text().ascii()));
29
+  gnuInt->setXRangeEnd(string(xEnd->text()));
28
+  gnuInt->setXRangeEnd(string(xEnd->text().ascii()));
30
+  gnuInt->setYRangeStart(string(yStart->text()));
29
+  gnuInt->setYRangeStart(string(yStart->text().ascii()));
31
+  gnuInt->setYRangeEnd(string(yEnd->text()));
30
+  gnuInt->setYRangeEnd(string(yEnd->text().ascii()));
32
+  gnuInt->setZRangeStart(string(zStart->text()));
31
+  gnuInt->setZRangeStart(string(zStart->text().ascii()));
33
+  gnuInt->setZRangeEnd(string(zEnd->text()));
32
+  gnuInt->setZRangeEnd(string(zEnd->text().ascii()));
34
   
33
   
35
   // set x,y,z axis labels
34
   // set x,y,z axis labels
36
-  gnuInt->setXlabel(xLabel->text());
35
-  gnuInt->setXlabel(xLabel->text());
Lines 44-68 Link Here
44
-  gnuInt->setZlabel(zLabel->text());
43
-  gnuInt->setZlabel(zLabel->text());
45
-  gnuInt->setZOffset_X(ZLabelOffset_X->text());
44
-  gnuInt->setZOffset_X(ZLabelOffset_X->text());
46
-  gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
45
-  gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
47
+  gnuInt->setXlabel(string(xLabel->text()));
46
+  gnuInt->setXlabel(string(xLabel->text().ascii()));
48
+  gnuInt->setXOffset_X(string(XLabelOffset_X->text()));
47
+  gnuInt->setXOffset_X(string(XLabelOffset_X->text().ascii()));
49
+  gnuInt->setXOffset_Y(string(XLabelOffset_Y->text()));
48
+  gnuInt->setXOffset_Y(string(XLabelOffset_Y->text().ascii()));
50
+  
49
+  
51
+  gnuInt->setYlabel(string(yLabel->text()));
50
+  gnuInt->setYlabel(string(yLabel->text().ascii()));
52
+  gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
51
+  gnuInt->setYOffset_X(string(YLabelOffset_X->text().ascii()));
53
+  gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
52
+  gnuInt->setYOffset_Y(string(YLabelOffset_Y->text().ascii()));
54
+
53
+
55
+  gnuInt->setZlabel(string(zLabel->text()));
54
+  gnuInt->setZlabel(string(zLabel->text().ascii()));
56
+  gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
55
+  gnuInt->setZOffset_X(string(ZLabelOffset_X->text().ascii()));
57
+  gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
56
+  gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text().ascii()));
58
   
57
   
59
   // save title
58
   // save title
60
-  gnuInt->setTitle(titleLabel->text());
59
-  gnuInt->setTitle(titleLabel->text());
61
-  gnuInt->setTitleOffset_X(titleOffset_X->text());
60
-  gnuInt->setTitleOffset_X(titleOffset_X->text());
62
-  gnuInt->setTitleOffset_Y(titleOffset_Y->text());
61
-  gnuInt->setTitleOffset_Y(titleOffset_Y->text());
63
+  gnuInt->setTitle(string(titleLabel->text()));
62
+  gnuInt->setTitle(string(titleLabel->text().ascii()));
64
+  gnuInt->setTitleOffset_X(string(titleOffset_X->text()));
63
+  gnuInt->setTitleOffset_X(string(titleOffset_X->text().ascii()));
65
+  gnuInt->setTitleOffset_Y(string(titleOffset_Y->text()));
64
+  gnuInt->setTitleOffset_Y(string(titleOffset_Y->text().ascii()));
66
 
65
 
67
   // filename option is checked
66
   // filename option is checked
68
   if (filenameCB->isChecked() == TRUE)
67
   if (filenameCB->isChecked() == TRUE)
Lines 71-81 Link Here
71
 
70
 
72
   // save filename
71
   // save filename
73
-  gnuInt->setPlotFilename(filenameEdit->text());
72
-  gnuInt->setPlotFilename(filenameEdit->text());
74
+  gnuInt->setPlotFilename(string(filenameEdit->text()));
73
+  gnuInt->setPlotFilename(string(filenameEdit->text().ascii()));
75
 
74
 
76
   // save function
75
   // save function
77
-  gnuInt->setPlotFunction(functionEdit->text());
76
-  gnuInt->setPlotFunction(functionEdit->text());
78
+  gnuInt->setPlotFunction(string(functionEdit->text()));
77
+  gnuInt->setPlotFunction(string(functionEdit->text().ascii()));
79
   
78
   
80
   // don't set ranges because they can't be reset in a replot
79
   // don't set ranges because they can't be reset in a replot
81
   
80
   
Lines 91-115 Link Here
91
-  gnuInt->setZlabel(zLabel->text());
90
-  gnuInt->setZlabel(zLabel->text());
92
-  gnuInt->setZOffset_X(ZLabelOffset_X->text());
91
-  gnuInt->setZOffset_X(ZLabelOffset_X->text());
93
-  gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
92
-  gnuInt->setZOffset_Y(ZLabelOffset_Y->text());
94
+  gnuInt->setXlabel(string(xLabel->text()));
93
+  gnuInt->setXlabel(string(xLabel->text().ascii()));
95
+  gnuInt->setXOffset_X(string(XLabelOffset_X->text()));
94
+  gnuInt->setXOffset_X(string(XLabelOffset_X->text().ascii()));
96
+  gnuInt->setXOffset_Y(string(XLabelOffset_Y->text()));
95
+  gnuInt->setXOffset_Y(string(XLabelOffset_Y->text().ascii()));
97
+  
96
+  
98
+  gnuInt->setYlabel(string(yLabel->text()));
97
+  gnuInt->setYlabel(string(yLabel->text().ascii()));
99
+  gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
98
+  gnuInt->setYOffset_X(string(YLabelOffset_X->text().ascii()));
100
+  gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
99
+  gnuInt->setYOffset_Y(string(YLabelOffset_Y->text().ascii()));
101
+
100
+
102
+  gnuInt->setZlabel(string(zLabel->text()));
101
+  gnuInt->setZlabel(string(zLabel->text().ascii()));
103
+  gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
102
+  gnuInt->setZOffset_X(string(ZLabelOffset_X->text().ascii()));
104
+  gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
103
+  gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text().ascii()));
105
   
104
   
106
   // save title
105
   // save title
107
-  gnuInt->setTitle(titleLabel->text());
106
-  gnuInt->setTitle(titleLabel->text());
108
-  gnuInt->setTitleOffset_X(titleOffset_X->text());
107
-  gnuInt->setTitleOffset_X(titleOffset_X->text());
109
-  gnuInt->setTitleOffset_Y(titleOffset_Y->text());
108
-  gnuInt->setTitleOffset_Y(titleOffset_Y->text());
110
+  gnuInt->setTitle(string(titleLabel->text()));
109
+  gnuInt->setTitle(string(titleLabel->text().ascii()));
111
+  gnuInt->setTitleOffset_X(string(titleOffset_X->text()));
110
+  gnuInt->setTitleOffset_X(string(titleOffset_X->text().ascii()));
112
+  gnuInt->setTitleOffset_Y(string(titleOffset_Y->text()));
111
+  gnuInt->setTitleOffset_Y(string(titleOffset_Y->text().ascii()));
113
 
112
 
114
   if (filenameCB->isChecked() == TRUE) // filename option is checked
113
   if (filenameCB->isChecked() == TRUE) // filename option is checked
115
   {
114
   {
115
@@ -227,7 +227,7 @@
116
   {
117
     filenameEdit->setText(filename); // set label to filename
118
     filenameCB->setChecked(TRUE);     // set filename checkbox
119
-    temp = filename;
120
+    temp = filename.ascii();
121
     gnuInt->setPlotFilename(temp);
122
   }
123
   
124
@@ -242,7 +242,7 @@
125
   
126
   if (!saveFile.isEmpty())
127
   {
128
-    temp = saveFile;
129
+    temp = saveFile.ascii();
130
     gnuInt->setGnuFileSave(temp);
131
     gnuInt->doSave();
132
   }
133
@@ -257,7 +257,7 @@
134
 
135
   if (!loadFile.isEmpty())
136
   {
137
-    temp = loadFile;
138
+    temp = loadFile.ascii();
139
     gnuInt->setGnuFileLoad(temp);
140
     gnuInt->doLoad();
141
   }
142
@@ -272,7 +272,7 @@
143
   
144
   if (!saveFile.isEmpty())
145
   {
146
-    temp = saveFile;
147
+    temp = saveFile.ascii();
148
     gnuInt->savePlotData(temp);
149
   }
150
 }
151
@@ -286,7 +286,7 @@
152
 
153
   if (!loadFile.isEmpty())
154
   {
155
-    temp = loadFile;
156
+    temp = loadFile.ascii();
157
     gnuInt->loadPlotData(temp);
158
 
159
     // get options and set GUI
(-)files/patch-xgfeMainData.cpp (-1 / +9 lines)
Lines 1-4 Link Here
1
diff -u xgfeMainData.cpp.orig xgfeMainData.cpp
2
--- xgfeMainData.cpp.orig	Thu Oct 30 21:54:58 2003
1
--- xgfeMainData.cpp.orig	Thu Oct 30 21:54:58 2003
3
+++ xgfeMainData.cpp	Thu Oct 30 21:42:04 2003
2
+++ xgfeMainData.cpp	Thu Oct 30 21:42:04 2003
4
@@ -34,10 +34,13 @@
3
@@ -34,10 +34,13 @@
Lines 17-19 Link Here
17
 )
16
 )
18
 	:
17
 	:
19
   Inherited( parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder 
18
   Inherited( parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder 
19
@@ -973,7 +976,7 @@
20
 
21
   if (!f.isEmpty())
22
   {
23
-    temp = f;
24
+    temp = f.ascii();
25
     gnuInt->setOutput(temp);
26
     outputLabel->setText(f);
27
   }

Return to bug 64390