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
59 lines
1.8 KiB
C++
59 lines
1.8 KiB
C++
--- multiFunc.cpp.orig Sat Mar 21 04:26:33 1998
|
|
+++ multiFunc.cpp Thu Oct 30 21:42:04 2003
|
|
@@ -76,7 +76,7 @@
|
|
if (multiFuncList->count() > 0)
|
|
{
|
|
// get current function
|
|
- function = multiFuncList->currentText();
|
|
+ function = multiFuncList->currentText().ascii();
|
|
|
|
// get style option
|
|
string style = gnuInt->getMultiFuncStyleOption(function);
|
|
@@ -135,7 +135,7 @@
|
|
void multiFunc::insertNewFunction()
|
|
{
|
|
// get function in edit box
|
|
- string function = functionEdit->text();
|
|
+ string function = functionEdit->text().ascii();
|
|
|
|
// 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 = multiFuncList->currentText().ascii();
|
|
|
|
// get options
|
|
- string style = funcStyleList->currentText();
|
|
+ string style = funcStyleList->currentText().ascii();
|
|
|
|
// set options
|
|
gnuInt->setMultiFuncStyleOption(function,style);
|
|
|
|
|
|
// set title
|
|
- string title = legendTitleEdit->text();
|
|
+ string title = legendTitleEdit->text().ascii();
|
|
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 = multiFuncList->currentText().ascii();
|
|
|
|
int currentItem = multiFuncList->currentItem();
|
|
|
|
@@ -211,7 +211,7 @@
|
|
multiFuncList->setCurrentItem(0);
|
|
|
|
// get function that is now current in combo box
|
|
- function = multiFuncList->currentText();
|
|
+ function = multiFuncList->currentText().ascii();
|
|
|
|
// set edit box to current function
|
|
functionEdit->setText(function.c_str());
|