freebsd-ports/math/xgfe/files/patch-legendOp.cpp
Alexander Leidinger 7ad012e1d9 Unfortunately, the recent changes to math/xgfe (PR 59024) broke its
compilation on FreeBSD 4 with GCC 2.95.4:
        http://bento.freebsd.org/errorlogs/i386-4-latest/xgfe-2.1.log

The patch below fixes this.

During testing it on FreeBSD 4 and 5 with QT 3.3.1 I noticed that the
Advanced -> Multiple Files and Advanced -> Multiple Functions dialogs
were broken. I'm not sure if this is a new breakage with QT 3.3.1 or
if I didn't notice these when testing the previous patch on FreeBSD 5
with QT 3.2.1. Anyway, these are also fixed and as a precaution
PORTREVISION is bumped.

The patch also adds SIZE info.

PR:		64390
Submitted by:	Marius Strobl <marius@alchemy.franken.de>
Approved by:	maintainer
2004-03-30 17:02:58 +00:00

51 lines
1.8 KiB
C++

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 = positionXEdit->text().ascii();
+ string legendPositionYVal = positionYEdit->text().ascii();
+ string legendPositionZVal = positionZEdit->text().ascii();
gnuInt->setLegendPositionXVal(legendPositionXVal);
gnuInt->setLegendPositionYVal(legendPositionYVal);
gnuInt->setLegendPositionZVal(legendPositionZVal);
- string justify = textJustifyList->currentText();
+ string justify = textJustifyList->currentText().ascii();
gnuInt->setLegendTextJustify(justify);
- string reverse = reverseList->currentText();
+ string reverse = reverseList->currentText().ascii();
gnuInt->setLegendReverse(reverse);
- string box = boxList->currentText();
+ string box = boxList->currentText().ascii();
gnuInt->setLegendBox(box);
- string linetype = lineTypeEdit->text();
+ string linetype = lineTypeEdit->text().ascii();
gnuInt->setLegendLinetype(linetype);
- string sample = sampleLengthEdit->text();
+ string sample = sampleLengthEdit->text().ascii();
gnuInt->setLegendSampleLength(sample);
- string spacing = spacingEdit->text();
+ string spacing = spacingEdit->text().ascii();
gnuInt->setLegendSpacing(spacing);
- string width = widthIncrementEdit->text();
+ string width = widthIncrementEdit->text().ascii();
gnuInt->setLegendWidthIncrement(width);
- string title = legendTitleEdit->text();
+ string title = legendTitleEdit->text().ascii();
gnuInt->setLegendTitle(title);
QDialog::accept();