sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to xgfe 2.1, switch to QT 3, respect NOPORTDOCS, fix build

Browse source 
with gcc 3.

Submitted by:	Marius Strobl <marius@alchemy.franken.de>
PR:		ports/59024
This commit is contained in:
Kris Kennaway 2004-03-06 22:57:48 +00:00
parent 4d8534d2a2
commit d3c24d35b2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=103143
37 changed files with 1144 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
math/xgfe/Makefile
View file

@ -6,21 +6,21 @@
# #
PORTNAME= xgfe PORTNAME= xgfe
PORTVERSION= 2.0 PORTVERSION= 2.1
CATEGORIES= math CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= mph MASTER_SITE_SUBDIR= graphics/gnuplot/contrib
MAINTAINER= mph@freebsd.org MAINTAINER= mph@freebsd.org
COMMENT= An X11 front-end for Gnuplot COMMENT= An X11 front-end for Gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
USE_GCC= 2.95 USE_QT_VER= 3
USE_QT_VER= 1
USE_X_PREFIX= yes USE_X_PREFIX= yes
MAKE_ENV= X11BASE=$(X11BASE) PREFIX=$(PREFIX) MAKE_ENV+= DOCSDIR=$(DOCSDIR) PTHREAD_CFLAGS="$(PTHREAD_CFLAGS)" \
PTHREAD_LIBS="$(PTHREAD_LIBS)"
.if defined(NOPORTDOCS) .if defined(NOPORTDOCS)
MAKE_ENV+= NOPORTDOCS=$(NOPORTDOCS) MAKE_ENV+= NOPORTDOCS=$(NOPORTDOCS)
.endif .endif
@ -28,6 +28,6 @@ MAKE_ENV+= NOPORTDOCS=$(NOPORTDOCS)
WRKSRC= $(WRKDIR)/$(DISTNAME)/source WRKSRC= $(WRKDIR)/$(DISTNAME)/source
post-extract: post-extract:
cd $(WRKSRC) && ${RM} Makefile && ${LN} -s Makefile.freebsd-gcc Makefile @cd $(WRKSRC) && ${LN} -sf Makefile.freebsd-gcc Makefile
.include <bsd.port.mk> .include <bsd.port.mk>

2
math/xgfe/distinfo
View file

@ -1 +1 @@
MD5 (xgfe-2.0.tar.gz) = 2994ae3e9475b1fcb4eb7791ca3c33ae MD5 (xgfe-2.1.tar.gz) = a9bb67a76be198142f587155b37c1864

20
math/xgfe/files/patch-aa
View file

@ -5,40 +5,40 @@
####### Compiler, tools and options ####### Compiler, tools and options
-CC = gcc -CC = gcc
-CFLAGS = -Wall -W -O2 -fno-strength-reduce -CFLAGS = -Wall -W
-INCPATH = -I$(QTDIR)/include -INCPATH = -I$(QTDIR)/include
-LINK = gcc -LINK = gcc
+#CC = gcc +#CC = gcc
+#CFLAGS = -Wall -W -O2 -fno-strength-reduce +CXXFLAGS += ${PTHREAD_CFLAGS}
+QTDIR = $(X11BASE) +QTDIR = $(X11BASE)
+INCPATH = -I$(X11BASE)/include/X11/qt1 +INCPATH = -I$(X11BASE)/include
+LINK = $(CXX) +LINK = $(CXX)
LFLAGS = LFLAGS =
-LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11 -LIBS = -L$(QTDIR)/lib -lqt -L/usr/X11R6/lib -lX11
-MOC = moc -MOC = moc
+LIBS = -L$(QTDIR)/lib -lqt1 -L$(X11BASE)/lib -lX11 +LIBS = -L$(X11BASE)/lib -lqt-mt -lX11 ${PTHREAD_LIBS}
+MOC = ${X11BASE}/bin/moc1 +MOC = ${X11BASE}/bin/moc
####### Files ####### Files
@@ -224,16 +225,16 @@ @@ -254,16 +255,16 @@
.SUFFIXES: .cpp .cxx .cc .C .c .SUFFIXES: .cpp .cxx .cc .C .c
.cpp.o: .cpp.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cxx.o: .cxx.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.cc.o: .cc.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.C.o: .C.o:
- $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< - $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
+ $(CXX) -c $(CFLAGS) $(INCPATH) -o $@ $< + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
.c.o: .c.o:
$(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<

2
math/xgfe/files/patch-ab
View file

@ -7,7 +7,7 @@
-INSTALL_BIN = /usr/local/bin -INSTALL_BIN = /usr/local/bin
-INSTALL_DOC = /usr/local/doc/xgfe-$(VERSION) -INSTALL_DOC = /usr/local/doc/xgfe-$(VERSION)
+INSTALL_BIN = $(PREFIX)/bin +INSTALL_BIN = $(PREFIX)/bin
+INSTALL_DOC = $(PREFIX)/share/doc/xgfe +INSTALL_DOC = $(DOCSDIR)
STATIC_TARGET = xgfe-static STATIC_TARGET = xgfe-static
# end modifications # end modifications

12
math/xgfe/files/patch-ac
View file

@ -1,12 +0,0 @@
--- xgfeMainData.cpp.orig Sun Jun 7 14:39:29 1998
+++ xgfeMainData.cpp Sat Feb 12 05:00:10 2000
@@ -34,6 +34,9 @@
#include <qpushbt.h>
#include <qlayout.h>
+#define QColor(i) (QColor)(i)
+#define QRgb(i) (QRgb)(i)
+
xgfeMainData::xgfeMainData
(
QWidget* parent = 0,

12
math/xgfe/files/patch-barOp.cpp Normal file
View file

@ -0,0 +1,12 @@
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 @@
void barOp::setBarOption()
{
- string barSize = barSizeEdit->text();
+ string barSize = string(barSizeEdit->text());
if (barSize != "")
{

12
math/xgfe/files/patch-boxWidthOp.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u boxWidthOp.cpp.orig boxWidthOp.cpp
--- boxWidthOp.cpp.orig Sat May 30 23:51:13 1998
+++ boxWidthOp.cpp Thu Oct 30 21:42:04 2003
@@ -57,7 +57,7 @@
void boxWidthOp::setBoxWidth()
{
- string width = boxWidthEdit->text();
+ string width = string(boxWidthEdit->text());
gnuInt->setBoxWidth(width);

71
math/xgfe/files/patch-curveFit.cpp Normal file
View file

@ -0,0 +1,71 @@
diff -u curveFit.cpp.orig curveFit.cpp
--- curveFit.cpp.orig Mon May 18 04:06:03 1998
+++ curveFit.cpp Thu Oct 30 21:42:04 2003
@@ -145,16 +145,16 @@
{
// get current options
- string functionName = functionNameEdit->text();
- string functionValue = functionValueEdit->text();
- string dataFile = dataFileEdit->text();
- string varXRangeName = varXRangeNameEdit->text();
- string varXRangeMin = varXRangeMinEdit->text();
- string varXRangeMax = varXRangeMaxEdit->text();
- string varYRangeName = varYRangeNameEdit->text();
- 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());
int paramFileFlag;
int paramCSLFlag;
@@ -171,23 +171,23 @@
paramCSLFlag = 1;
}
- string paramCSL = paramCSLEdit->text();
- string fitLimit = fitLimitEdit->text();
- string fitMaxIter = fitMaxIterEdit->text();
- string dataSetStart = dataSetStartEdit->text();
- string dataSetEnd = dataSetEndEdit->text();
- string dataSetInc = dataSetIncEdit->text();
- string pointInc = pointIncEdit->text();
- string lineInc = lineIncEdit->text();
- string startPoint = startPointEdit->text();
- string startLine = startLineEdit->text();
- string endPoint = endPointEdit->text();
- string endLine = endLineEdit->text();
- string xColumn = xColumnEdit->text();
- string yColumn = yColumnEdit->text();
- 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());
// set options

12
math/xgfe/files/patch-curveFitData.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u curveFitData.cpp.orig curveFitData.cpp
--- curveFitData.cpp.orig Wed May 20 05:10:03 1998
+++ curveFitData.cpp Thu Oct 30 21:42:04 2003
@@ -103,7 +103,7 @@
{
QFont font( "helvetica", 24, 50, 0 );
font.setStyleHint( (QFont::StyleHint)0 );
- font.setCharSet( (QFont::CharSet)0 );
+ //font.setCharSet( (QFont::CharSet)0 );
equalLabel->setFont( font );
}
equalLabel->setText( "=" );

12
math/xgfe/files/patch-fileLegendTitle.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u fileLegendTitle.cpp.orig fileLegendTitle.cpp
--- fileLegendTitle.cpp.orig Sat Mar 21 04:24:41 1998
+++ fileLegendTitle.cpp Thu Oct 30 21:42:04 2003
@@ -45,7 +45,7 @@
void fileLegendTitle::setFileLegendTitleOK()
{
- string title = fileLegendTitleEdit->text();
+ string title = string(fileLegendTitleEdit->text());
gnuInt->setFileLegendTitle(title);
if (defaultCButton->isChecked() == TRUE)

40
math/xgfe/files/patch-fileOptions.cpp Normal file
View file

@ -0,0 +1,40 @@
diff -u fileOptions.cpp.orig fileOptions.cpp
--- fileOptions.cpp.orig Sat May 9 02:48:15 1998
+++ fileOptions.cpp Thu Oct 30 21:42:04 2003
@@ -96,21 +96,21 @@
void fileOptions::setFormat()
{
- string dataSetStart = dataSetStartEdit->text();
- string dataSetEnd = dataSetEndEdit->text();
- string dataSetInc = dataSetIncEdit->text();
- string sampPointInc = pointIncEdit->text();
- string sampLineInc = lineIncEdit->text();
- string sampStartPoint = startPointEdit->text();
- string sampStartLine = startLineEdit->text();
- string sampEndPoint = endPointEdit->text();
- string sampEndLine = endLineEdit->text();
- string xCol = xColumnEdit->text();
- string yCol = yColumnEdit->text();
- string zCol = zColumnEdit->text();
- string format = formatEdit->text();
- string rawFormat = rawFormatEdit->text();
- string smoothType = interpList->currentText();
+ string 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());
gnuInt->setFileDataSetStart(dataSetStart);
gnuInt->setFileDataSetEnd(dataSetEnd);

12
math/xgfe/files/patch-funcLegendTitle.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u funcLegendTitle.cpp.orig funcLegendTitle.cpp
--- funcLegendTitle.cpp.orig Sat Mar 21 04:24:42 1998
+++ funcLegendTitle.cpp Thu Oct 30 21:42:04 2003
@@ -44,7 +44,7 @@
void funcLegendTitle::setFuncLegendTitleOK()
{
- string title = funcLegendTitleEdit->text();
+ string title = string(funcLegendTitleEdit->text());
gnuInt->setFuncLegendTitle(title);
if (defaultCButton->isChecked() == TRUE)

12
math/xgfe/files/patch-gnuCurveFit.h Normal file
View file

@ -0,0 +1,12 @@
diff -u gnuCurveFit.h.orig gnuCurveFit.h
--- gnuCurveFit.h.orig Mon May 18 04:08:30 1998
+++ gnuCurveFit.h Thu Oct 30 21:42:04 2003
@@ -23,6 +23,8 @@
#include <string>
+using namespace std;
+
#ifndef gnuCurveFit_included
#define gnuCurveFit_included

219
math/xgfe/files/patch-gnuInterface.cpp Normal file
View file

@ -0,0 +1,219 @@
diff -u gnuInterface.cpp.orig gnuInterface.cpp
--- gnuInterface.cpp.orig Wed Sep 30 04:25:51 1998
+++ gnuInterface.cpp Thu Oct 30 21:42:04 2003
@@ -3626,7 +3626,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setPlotFileFlag(tempint);
@@ -3636,7 +3636,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setPlotFuncFlag(tempint);
@@ -3646,7 +3646,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setPlotMultipleFileFlag(tempint);
@@ -3656,7 +3656,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setPlotMultipleFuncFlag(tempint);
@@ -4114,7 +4114,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionLeft(tempint);
@@ -4124,7 +4124,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionRight(tempint);
@@ -4134,7 +4134,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionTop(tempint);
@@ -4144,7 +4144,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionBottom(tempint);
@@ -4154,7 +4154,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionOutside(tempint);
@@ -4164,7 +4164,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLegendPositionBelow(tempint);
@@ -4251,7 +4251,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleBase(tempint);
@@ -4261,7 +4261,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleYAxis(tempint);
@@ -4271,7 +4271,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleYAxis(tempint);
@@ -4281,7 +4281,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleZAxis(tempint);
@@ -4291,7 +4291,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleX2Axis(tempint);
@@ -4301,7 +4301,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setLogScaleY2Axis(tempint);
@@ -4325,7 +4325,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setXticsOnFlag(tempint);
@@ -4391,7 +4391,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setYticsOnFlag(tempint);
@@ -4457,7 +4457,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setZticsOnFlag(tempint);
@@ -4516,7 +4516,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setX2ticsOnFlag(tempint);
@@ -4582,7 +4582,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setY2ticsOnFlag(tempint);
@@ -4648,7 +4648,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setRotationXAxis(tempint);
@@ -4658,7 +4658,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setRotationZAxis(tempint);
@@ -4689,7 +4689,7 @@
tempint = 0;
infile.getline(buffer,buffsize,';');
- istrstream temp(buffer);
+ istringstream temp(buffer);
if (temp >> tempint)
setd3HiddenLineFlag(tempint);

24
math/xgfe/files/patch-gnuInterface.h Normal file
View file

@ -0,0 +1,24 @@
diff -u gnuInterface.h.orig gnuInterface.h
--- gnuInterface.h.orig Wed Sep 30 04:26:59 1998
+++ gnuInterface.h Thu Oct 30 21:42:04 2003
@@ -35,15 +35,17 @@
#define gnuInterface_included
#include <string>
-#include <iostream.h>
-#include <fstream.h>
-#include <strstream.h>
+#include <iostream>
+#include <fstream>
+#include <sstream>
#include <stdio.h>
#include "gnuPlotFile.h"
#include "gnuPlotFunction.h"
#include "gnuMultiFile.h"
#include "gnuMultiFunc.h"
#include "gnuCurveFit.h"
+
+using namespace std;
class gnuInterface
{

12
math/xgfe/files/patch-gnuMultiFile.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u gnuMultiFile.cpp.orig gnuMultiFile.cpp
--- gnuMultiFile.cpp.orig Mon May 18 04:11:55 1998
+++ gnuMultiFile.cpp Thu Oct 30 21:42:04 2003
@@ -31,7 +31,7 @@
gnuMultiFile::gnuMultiFile()
{
// create new filelist
- fileList = new QDict<gnuPlotFile>(101,TRUE,TRUE); // max 100 elements
+ fileList = new QDict<gnuPlotFile>(101,TRUE); // max 100 elements
fileList->setAutoDelete(TRUE); // autodelete members when removed
// create new iterator

12
math/xgfe/files/patch-gnuMultiFunc.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u gnuMultiFunc.cpp.orig gnuMultiFunc.cpp
--- gnuMultiFunc.cpp.orig Sat Mar 21 04:24:44 1998
+++ gnuMultiFunc.cpp Thu Oct 30 21:42:04 2003
@@ -31,7 +31,7 @@
gnuMultiFunc::gnuMultiFunc()
{
// create new function list
- funcList = new QDict<gnuPlotFunction>(101,TRUE,TRUE); // max 100 elements
+ funcList = new QDict<gnuPlotFunction>(101,TRUE); // max 100 elements
funcList->setAutoDelete(TRUE); // autodelete members when removed
// create new iterator

12
math/xgfe/files/patch-gnuPlotFile.h Normal file
View file

@ -0,0 +1,12 @@
diff -u gnuPlotFile.h.orig gnuPlotFile.h
--- gnuPlotFile.h.orig Mon May 18 04:12:01 1998
+++ gnuPlotFile.h Thu Oct 30 21:42:04 2003
@@ -28,6 +28,8 @@
#include <string>
+using namespace std;
+
class gnuPlotFile
{
public:

14
math/xgfe/files/patch-gnuPlotFunction.h Normal file
View file

@ -0,0 +1,14 @@
diff -u gnuPlotFunction.h.orig gnuPlotFunction.h
--- gnuPlotFunction.h.orig Sat Mar 21 04:30:33 1998
+++ gnuPlotFunction.h Thu Oct 30 21:42:04 2003
@@ -27,7 +27,9 @@
#define gnuPlotFunction_included
#include <string>
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
class gnuPlotFunction
{

14
math/xgfe/files/patch-isoLinesOp.cpp Normal file
View file

@ -0,0 +1,14 @@
diff -u isoLinesOp.cpp.orig isoLinesOp.cpp
--- isoLinesOp.cpp.orig Wed Sep 30 04:29:34 1998
+++ isoLinesOp.cpp Thu Oct 30 21:42:04 2003
@@ -63,8 +63,8 @@
void isoLinesOp::setIsolinesOp()
{
- string isoU = isoUEdit->text();
- string isoV = isoVEdit->text();
+ string isoU = string(isoUEdit->text());
+ string isoV = string(isoVEdit->text());
gnuInt->setIsolineU(isoU);
gnuInt->setIsolineV(isoV);

16
math/xgfe/files/patch-latexEmtexOp.cpp Normal file
View file

@ -0,0 +1,16 @@
diff -u latexEmtexOp.cpp.orig latexEmtexOp.cpp
--- latexEmtexOp.cpp.orig Tue May 19 03:20:25 1998
+++ latexEmtexOp.cpp Thu Oct 30 21:42:04 2003
@@ -71,9 +71,9 @@
void latexEmtexOp::setTerm()
{
// set options
- 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());
gnuInt->setTermLateXEmtexFont(font);

51
math/xgfe/files/patch-legendOp.cpp Normal file
View file

@ -0,0 +1,51 @@
diff -u legendOp.cpp.orig legendOp.cpp
--- legendOp.cpp.orig Mon Feb 23 23:36:08 1998
+++ legendOp.cpp Thu Oct 30 21:42:04 2003
@@ -203,36 +203,36 @@
gnuInt->setLegendPositionBelow(0);
- 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());
gnuInt->setLegendPositionXVal(legendPositionXVal);
gnuInt->setLegendPositionYVal(legendPositionYVal);
gnuInt->setLegendPositionZVal(legendPositionZVal);
- string justify = textJustifyList->currentText();
+ string justify = string(textJustifyList->currentText());
gnuInt->setLegendTextJustify(justify);
- string reverse = reverseList->currentText();
+ string reverse = string(reverseList->currentText());
gnuInt->setLegendReverse(reverse);
- string box = boxList->currentText();
+ string box = string(boxList->currentText());
gnuInt->setLegendBox(box);
- string linetype = lineTypeEdit->text();
+ string linetype = string(lineTypeEdit->text());
gnuInt->setLegendLinetype(linetype);
- string sample = sampleLengthEdit->text();
+ string sample = string(sampleLengthEdit->text());
gnuInt->setLegendSampleLength(sample);
- string spacing = spacingEdit->text();
+ string spacing = string(spacingEdit->text());
gnuInt->setLegendSpacing(spacing);
- string width = widthIncrementEdit->text();
+ string width = string(widthIncrementEdit->text());
gnuInt->setLegendWidthIncrement(width);
- string title = legendTitleEdit->text();
+ string title = string(legendTitleEdit->text());
gnuInt->setLegendTitle(title);
QDialog::accept();

21
math/xgfe/files/patch-logScaleOp.cpp Normal file
View file

@ -0,0 +1,21 @@
diff -u logScaleOp.cpp.orig logScaleOp.cpp
--- logScaleOp.cpp.orig Tue Jul 21 04:18:45 1998
+++ logScaleOp.cpp Thu Oct 30 21:42:04 2003
@@ -26,7 +26,7 @@
#include "logScaleOp.h"
#include <string>
#include <qstring.h>
-#include <strstream.h>
+#include <sstream>
#define Inherited logScaleOpData
@@ -65,7 +65,7 @@
x2Axis = gnuInt->getLogScaleX2Axis();
y2Axis = gnuInt->getLogScaleY2Axis();
- ostrstream temp;
+ ostringstream temp;
temp << base << ends; // make sure to add terminator with ends, to avoid garbage
// from unterminated string

82
math/xgfe/files/patch-multiFile.cpp Normal file
View file

@ -0,0 +1,82 @@
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 @@
------------------------------------------------------------------------*/
#include "multiFile.h"
-#include <iostream.h>
+#include <iostream>
#define Inherited multiFileData
@@ -86,24 +86,24 @@
// make sure we actually have files in the combo box
if (multiFileList->count() > 0)
{
- string filename = multiFileList->currentText();
- string dataSetStart = dataSetStartEdit->text();
- string dataSetEnd = dataSetEndEdit->text();
- string dataSetInc = dataSetIncEdit->text();
- string sampPointInc = pointIncEdit->text();
- string sampLineInc = lineIncEdit->text();
- string sampStartPoint = startPointEdit->text();
- string sampStartLine = startLineEdit->text();
- string sampEndPoint = endPointEdit->text();
- string sampEndLine = endLineEdit->text();
- string xcol = xColumnEdit->text();
- string ycol = yColumnEdit->text();
- string zcol = zColumnEdit->text();
- string format = formatEdit->text();
- string rawformat = rawFormatEdit->text();
- string smoothType = interpList->currentText();
- string style = fileStyleList->currentText();
- string filter = filterEdit->text();
+ string filename = 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());
gnuInt->setMultiFileStyleOption(filename, style);
gnuInt->setMultiFileDataSetStart(filename,dataSetStart);
@@ -122,7 +122,7 @@
gnuInt->insertMultiFileRawFormatOption(filename, rawformat);
gnuInt->setMultiFileSmoothType(filename,smoothType);
- string title = legendTitleEdit->text();
+ string title = string(legendTitleEdit->text());
gnuInt->setMultiFileLegendTitle(filename, title);
if (legendTitleDefaultButton->isChecked() == TRUE)
@@ -165,7 +165,7 @@
if (multiFileList->count() > 0)
{
// get current file in combo box
- string filename = multiFileList->currentText();
+ string filename = string(multiFileList->currentText());
int currentItem = multiFileList->currentItem();
@@ -235,7 +235,7 @@
void multiFile::getCurrentOptions()
{
// get options for this file
- string filename = multiFileList->currentText();
+ string filename = string(multiFileList->currentText());
string dataSetStart = gnuInt->getMultiFileDataSetStart(filename);
string dataSetEnd = gnuInt->getMultiFileDataSetEnd(filename);
string dataSetInc = gnuInt->getMultiFileDataSetIncrement(filename);

42
math/xgfe/files/patch-multiFunc.cpp Normal file
View file

@ -0,0 +1,42 @@
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
@@ -135,7 +135,7 @@
void multiFunc::insertNewFunction()
{
// get function in edit box
- string function = functionEdit->text();
+ string function = string(functionEdit->text());
// insert function in list
multiFuncList->insertItem(function.c_str(),0);
@@ -158,17 +158,17 @@
if (multiFuncList->count() > 0)
{
// get function
- string function = multiFuncList->currentText();
+ string function = string(multiFuncList->currentText());
// get options
- string style = funcStyleList->currentText();
+ string style = string(funcStyleList->currentText());
// set options
gnuInt->setMultiFuncStyleOption(function,style);
// set title
- string title = legendTitleEdit->text();
+ string title = string(legendTitleEdit->text());
gnuInt->setMultiFuncLegendTitle(function, title);
if (legendTitleDefaultButton->isChecked() == TRUE)
@@ -194,7 +194,7 @@
multiFuncList->setCurrentItem(0);
// get current function in combo box
- string function = multiFuncList->currentText();
+ string function = string(multiFuncList->currentText());
int currentItem = multiFuncList->currentItem();

18
math/xgfe/files/patch-pbmOp.cpp Normal file
View file

@ -0,0 +1,18 @@
diff -u pbmOp.cpp.orig pbmOp.cpp
--- pbmOp.cpp.orig Tue May 19 05:13:52 1998
+++ pbmOp.cpp Thu Oct 30 21:42:04 2003
@@ -74,10 +74,10 @@
void pbmOp::setTerm()
{
// get options
- string size = fontSize->currentText();
- 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());
gnuInt->setTermPBMFontSize(size);
gnuInt->setTermPBMColormode(colormode);

26
math/xgfe/files/patch-psOpt.cpp Normal file
View file

@ -0,0 +1,26 @@
diff -u psOpt.cpp.orig psOpt.cpp
--- psOpt.cpp.orig Tue May 19 05:39:02 1998
+++ psOpt.cpp Thu Oct 30 21:42:04 2003
@@ -88,14 +88,14 @@
void psOpt::setTerm()
{
- string mode = modeList->currentText();
- string color = colorList->currentText();
- string dashed = dashedList->currentText();
- string enhanced = enhancedList->currentText();
- string fontName = fontNameEdit->text();
- 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());
gnuInt->setTermPSmode(mode);
gnuInt->setTermPScolor(color);

11
math/xgfe/files/patch-rawGnuData.h Normal file
View file

@ -0,0 +1,11 @@
diff -u rawGnuData.h.orig rawGnuData.h
--- rawGnuData.h.orig Thu Jan 15 05:13:02 1998
+++ rawGnuData.h Thu Oct 30 21:42:04 2003
@@ -28,6 +28,7 @@
#include <qdialog.h>
#include <qmlined.h>
+#include <qmultilineedit.h>
class rawGnuData : public QDialog
{

14
math/xgfe/files/patch-rotation.cpp Normal file
View file

@ -0,0 +1,14 @@
diff -u rotation.cpp.orig rotation.cpp
--- rotation.cpp.orig Thu Jul 23 04:31:04 1998
+++ rotation.cpp Thu Oct 30 21:42:04 2003
@@ -62,8 +62,8 @@
void rotation::doOK()
{
- string scale = plotScalingEdit->text();
- string zscale = zAxisScalingEdit->text();
+ string scale = string(plotScalingEdit->text());
+ string zscale = string(zAxisScalingEdit->text());
gnuInt->setRotationXAxis(xAxisRotation);
gnuInt->setRotationZAxis(zAxisRotation);

14
math/xgfe/files/patch-sizeOp.cpp Normal file
View file

@ -0,0 +1,14 @@
diff -u sizeOp.cpp.orig sizeOp.cpp
--- sizeOp.cpp.orig Wed May 27 02:37:46 1998
+++ sizeOp.cpp Thu Oct 30 21:42:04 2003
@@ -57,8 +57,8 @@
void sizeOp::setSize()
{
- string hSize = hSizeEdit->text();
- string vSize = vSizeEdit->text();
+ string hSize = string(hSizeEdit->text());
+ string vSize = string(vSizeEdit->text());
gnuInt->setHorizSize(hSize);
gnuInt->setVertSize(vSize);

12
math/xgfe/files/patch-ticsLevel.cpp Normal file
View file

@ -0,0 +1,12 @@
diff -u ticsLevel.cpp.orig ticsLevel.cpp
--- ticsLevel.cpp.orig Thu Jul 23 04:31:07 1998
+++ ticsLevel.cpp Thu Oct 30 21:42:04 2003
@@ -55,7 +55,7 @@
void ticsLevel::setTicsLevel()
{
- string level = ticsLevelEdit->text();
+ string level = string(ticsLevelEdit->text());
gnuInt->setTicsLevel(level);

141
math/xgfe/files/patch-ticsOp.cpp Normal file
View file

@ -0,0 +1,141 @@
diff -u ticsOp.cpp.orig ticsOp.cpp
--- ticsOp.cpp.orig Sun Jun 7 07:37:48 1998
+++ ticsOp.cpp Thu Oct 30 21:42:04 2003
@@ -339,9 +339,9 @@
if (xticsOnRButton->isChecked() == FALSE)
gnuInt->setXticsOnFlag(0);
- 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 xticsPositionType;
@@ -351,10 +351,10 @@
if (xticsLabelPosRButton->isChecked() == TRUE)
xticsPositionType = "LABELS";
- string xticsStartPos = xticsStartPosEdit->text();
- 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());
gnuInt->setXticsLocation(xticsLocation);
gnuInt->setXticsMirror(xticsMirror);
@@ -372,9 +372,9 @@
if (yticsOnRButton->isChecked() == FALSE)
gnuInt->setYticsOnFlag(0);
- 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 yticsPositionType;
@@ -384,10 +384,10 @@
if (yticsLabelPosRButton->isChecked() == TRUE)
yticsPositionType = "LABELS";
- string yticsStartPos = yticsStartPosEdit->text();
- 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());
gnuInt->setYticsLocation(yticsLocation);
gnuInt->setYticsMirror(yticsMirror);
@@ -405,8 +405,8 @@
if (zticsOnRButton->isChecked() == FALSE)
gnuInt->setZticsOnFlag(0);
- string zticsMirror = zticsMirrorCBox->currentText();
- string zticsRotation = zticsRotationCBox->currentText();
+ string zticsMirror = string(zticsMirrorCBox->currentText());
+ string zticsRotation = string(zticsRotationCBox->currentText());
string zticsPositionType;
@@ -416,10 +416,10 @@
if (zticsLabelPosRButton->isChecked() == TRUE)
zticsPositionType = "LABELS";
- string zticsStartPos = zticsStartPosEdit->text();
- 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());
gnuInt->setZticsMirror(zticsMirror);
gnuInt->setZticsRotation(zticsRotation);
@@ -436,9 +436,9 @@
if (x2ticsOnRButton->isChecked() == FALSE)
gnuInt->setX2ticsOnFlag(0);
- 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 x2ticsPositionType;
@@ -448,10 +448,10 @@
if (x2ticsLabelPosRButton->isChecked() == TRUE)
x2ticsPositionType = "LABELS";
- string x2ticsStartPos = x2ticsStartPosEdit->text();
- 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());
gnuInt->setX2ticsLocation(x2ticsLocation);
gnuInt->setX2ticsMirror(x2ticsMirror);
@@ -469,9 +469,9 @@
if (y2ticsOnRButton->isChecked() == FALSE)
gnuInt->setY2ticsOnFlag(0);
- 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 y2ticsPositionType;
@@ -481,10 +481,10 @@
if (y2ticsLabelPosRButton->isChecked() == TRUE)
y2ticsPositionType = "LABELS";
- string y2ticsStartPos = y2ticsStartPosEdit->text();
- 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());
gnuInt->setY2ticsLocation(y2ticsLocation);
gnuInt->setY2ticsMirror(y2ticsMirror);

12
math/xgfe/files/patch-ticsOp.h Normal file
View file

@ -0,0 +1,12 @@
diff -u ticsOp.h.orig ticsOp.h
--- ticsOp.h.orig Sun Jun 7 07:37:49 1998
+++ ticsOp.h Thu Oct 30 21:42:04 2003
@@ -28,7 +28,7 @@
#include "ticsOpData.h"
#include "gnuInterface.h"
-#include <iostream.h>
+#include <iostream>
#include <string>
class ticsOp : public ticsOpData

115
math/xgfe/files/patch-xgfeMain.cpp Normal file
View file

@ -0,0 +1,115 @@
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 @@
gnuInt->setFuncPlotType("splot");
// save filename
- gnuInt->setPlotFilename(filenameEdit->text());
+ gnuInt->setPlotFilename(string(filenameEdit->text()));
// save function
- gnuInt->setPlotFunction(functionEdit->text());
+ gnuInt->setPlotFunction(string(functionEdit->text()));
// save x and y variable names
- gnuInt->setXVariableName(varX->text());
- gnuInt->setYVariableName(varY->text());
+ gnuInt->setXVariableName(string(varX->text()));
+ gnuInt->setYVariableName(string(varY->text()));
// save x,y,z ranges
- gnuInt->setXRangeStart(xStart->text());
- gnuInt->setXRangeEnd(xEnd->text());
- gnuInt->setYRangeStart(yStart->text());
- 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()));
// set x,y,z axis labels
- gnuInt->setXlabel(xLabel->text());
- gnuInt->setXOffset_X(XLabelOffset_X->text());
- gnuInt->setXOffset_Y(XLabelOffset_Y->text());
-
- gnuInt->setYlabel(yLabel->text());
- gnuInt->setYOffset_X(YLabelOffset_X->text());
- gnuInt->setYOffset_Y(YLabelOffset_Y->text());
-
- 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->setYlabel(string(yLabel->text()));
+ gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
+ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
+
+ gnuInt->setZlabel(string(zLabel->text()));
+ gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
+ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
// 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()));
// filename option is checked
if (filenameCB->isChecked() == TRUE)
@@ -130,30 +130,30 @@
gnuInt->setReplotFlag(1); // set replot flag to true
// save filename
- gnuInt->setPlotFilename(filenameEdit->text());
+ gnuInt->setPlotFilename(string(filenameEdit->text()));
// save function
- gnuInt->setPlotFunction(functionEdit->text());
+ gnuInt->setPlotFunction(string(functionEdit->text()));
// don't set ranges because they can't be reset in a replot
// set x,y,z axis labels
- gnuInt->setXlabel(xLabel->text());
- gnuInt->setXOffset_X(XLabelOffset_X->text());
- gnuInt->setXOffset_Y(XLabelOffset_Y->text());
-
- gnuInt->setYlabel(yLabel->text());
- gnuInt->setYOffset_X(YLabelOffset_X->text());
- gnuInt->setYOffset_Y(YLabelOffset_Y->text());
-
- 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->setYlabel(string(yLabel->text()));
+ gnuInt->setYOffset_X(string(YLabelOffset_X->text()));
+ gnuInt->setYOffset_Y(string(YLabelOffset_Y->text()));
+
+ gnuInt->setZlabel(string(zLabel->text()));
+ gnuInt->setZOffset_X(string(ZLabelOffset_X->text()));
+ gnuInt->setZOffset_Y(string(ZLabelOffset_Y->text()));
// 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()));
if (filenameCB->isChecked() == TRUE) // filename option is checked
{

12
math/xgfe/files/patch-xgfeMain.h Normal file
View file

@ -0,0 +1,12 @@
diff -u xgfeMain.h.orig xgfeMain.h
--- xgfeMain.h.orig Wed Sep 30 04:27:19 1998
+++ xgfeMain.h Thu Oct 30 21:42:04 2003
@@ -51,7 +51,7 @@
#include <qfiledlg.h>
#include <qstring.h>
#include <qmsgbox.h>
-#include <iostream.h>
+#include <iostream>
#include <string>
#include <stdio.h>

19
math/xgfe/files/patch-xgfeMainData.cpp Normal file
View file

@ -0,0 +1,19 @@
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 @@
#include <qpushbt.h>
#include <qlayout.h>
+#define QColor(i) (QColor)(i)
+#define QRgb(i) (QRgb)(i)
+
xgfeMainData::xgfeMainData
(
- QWidget* parent = 0,
- const char* name = 0
+ QWidget* parent,
+ const char* name
)
:
Inherited( parent, name, TRUE, WStyle_Customize | WStyle_NormalBorder

56
math/xgfe/pkg-plist
View file

@ -1,28 +1,30 @@
bin/xgfe bin/xgfe
share/doc/xgfe/CHANGES %%PORTDOCS%%%%DOCSDIR%%/CHANGES
share/doc/xgfe/curve-fitting.gif %%PORTDOCS%%%%DOCSDIR%%/curve-fitting.gif
share/doc/xgfe/features.html %%PORTDOCS%%%%DOCSDIR%%/d3options.gif
share/doc/xgfe/file-options.gif %%PORTDOCS%%%%DOCSDIR%%/d3rotation.gif
share/doc/xgfe/filelegendtitle.gif %%PORTDOCS%%%%DOCSDIR%%/features.html
share/doc/xgfe/filemenu.gif %%PORTDOCS%%%%DOCSDIR%%/file-options.gif
share/doc/xgfe/fileplottypes.gif %%PORTDOCS%%%%DOCSDIR%%/filelegendtitle.gif
share/doc/xgfe/filestyles.gif %%PORTDOCS%%%%DOCSDIR%%/filemenu.gif
share/doc/xgfe/latexterm.gif %%PORTDOCS%%%%DOCSDIR%%/fileplottypes.gif
share/doc/xgfe/legend-options.gif %%PORTDOCS%%%%DOCSDIR%%/filestyles.gif
share/doc/xgfe/mainwindow.gif %%PORTDOCS%%%%DOCSDIR%%/latexterm.gif
share/doc/xgfe/multi-files.gif %%PORTDOCS%%%%DOCSDIR%%/legend-options.gif
share/doc/xgfe/multi-funcs.gif %%PORTDOCS%%%%DOCSDIR%%/mainwindow.gif
share/doc/xgfe/open.gif %%PORTDOCS%%%%DOCSDIR%%/multi-files.gif
share/doc/xgfe/optionsmenu.gif %%PORTDOCS%%%%DOCSDIR%%/multi-funcs.gif
share/doc/xgfe/pbmterm.gif %%PORTDOCS%%%%DOCSDIR%%/open.gif
share/doc/xgfe/plot-size.gif %%PORTDOCS%%%%DOCSDIR%%/optionsmenu.gif
share/doc/xgfe/psterm.gif %%PORTDOCS%%%%DOCSDIR%%/pbmterm.gif
share/doc/xgfe/rawgnu.gif %%PORTDOCS%%%%DOCSDIR%%/plot-size.gif
share/doc/xgfe/screenshots.html %%PORTDOCS%%%%DOCSDIR%%/psterm.gif
share/doc/xgfe/terminals.gif %%PORTDOCS%%%%DOCSDIR%%/rawgnu.gif
share/doc/xgfe/ticsoptions.gif %%PORTDOCS%%%%DOCSDIR%%/screenshots.html
share/doc/xgfe/xgfe-abb.jpg %%PORTDOCS%%%%DOCSDIR%%/terminals.gif
share/doc/xgfe/xgfe-docs.html %%PORTDOCS%%%%DOCSDIR%%/ticsoptions.gif
share/doc/xgfe/xgfe-main.jpg %%PORTDOCS%%%%DOCSDIR%%/xgfe-abb.jpg
share/doc/xgfe/xgfe.html %%PORTDOCS%%%%DOCSDIR%%/xgfe-docs.html
@dirrm share/doc/xgfe %%PORTDOCS%%%%DOCSDIR%%/xgfe-main.jpg
%%PORTDOCS%%%%DOCSDIR%%/xgfe.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%