7ad012e1d9
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
40 lines
1.7 KiB
C++
40 lines
1.7 KiB
C++
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 = dataSetStartEdit->text().ascii();
|
|
+ string dataSetEnd = dataSetEndEdit->text().ascii();
|
|
+ string dataSetInc = dataSetIncEdit->text().ascii();
|
|
+ string sampPointInc = pointIncEdit->text().ascii();
|
|
+ string sampLineInc = lineIncEdit->text().ascii();
|
|
+ string sampStartPoint = startPointEdit->text().ascii();
|
|
+ string sampStartLine = startLineEdit->text().ascii();
|
|
+ string sampEndPoint = endPointEdit->text().ascii();
|
|
+ string sampEndLine = endLineEdit->text().ascii();
|
|
+ string xCol = xColumnEdit->text().ascii();
|
|
+ string yCol = yColumnEdit->text().ascii();
|
|
+ string zCol = zColumnEdit->text().ascii();
|
|
+ string format = formatEdit->text().ascii();
|
|
+ string rawFormat = rawFormatEdit->text().ascii();
|
|
+ string smoothType = interpList->currentText().ascii();
|
|
|
|
gnuInt->setFileDataSetStart(dataSetStart);
|
|
gnuInt->setFileDataSetEnd(dataSetEnd);
|