Commit cc022ad6 authored by David Saxton's avatar David Saxton

More Qt4 porting (ui3->ui4, Q3ValueVector->QVector, Q3ValueList->QList).

svn path=/trunk/KDE/kdeedu/kmplot/; revision=522070
parent fb665e13
...@@ -152,7 +152,7 @@ void FktDlg::slotEdit() ...@@ -152,7 +152,7 @@ void FktDlg::slotEdit()
int FktDlg::getId( const QString &f_str ) int FktDlg::getId( const QString &f_str )
{ {
for( Q3ValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it)
{ {
if ( it->fstr == f_str ) if ( it->fstr == f_str )
return it->id; return it->id;
...@@ -163,7 +163,7 @@ int FktDlg::getId( const QString &f_str ) ...@@ -163,7 +163,7 @@ int FktDlg::getId( const QString &f_str )
int FktDlg::getParamId( const QString &f_str) int FktDlg::getParamId( const QString &f_str)
{ {
QString const fname = f_str.section( "(", 0, 0 ); QString const fname = f_str.section( "(", 0, 0 );
for( Q3ValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it)
{ {
if ( it->fname == fname ) if ( it->fname == fname )
return it->id; return it->id;
...@@ -281,7 +281,7 @@ void FktDlg::getPlots() ...@@ -281,7 +281,7 @@ void FktDlg::getPlots()
lb_fktliste->clear(); lb_fktliste->clear();
// adding all yet added functions // adding all yet added functions
for( Q3ValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it)
{ {
if( it->fname.isEmpty() || it->fstr[0] == 'y' ) continue; if( it->fname.isEmpty() || it->fstr[0] == 'y' ) continue;
Q3CheckListItem *item; Q3CheckListItem *item;
......
...@@ -742,7 +742,7 @@ void MainDlg::loadConstants() ...@@ -742,7 +742,7 @@ void MainDlg::loadConstants()
while (!copy_found) while (!copy_found)
{ {
// go through the constant list // go through the constant list
Q3ValueVector<Constant>::iterator it = view->parser()->constant.begin(); QVector<Constant>::iterator it = view->parser()->constant.begin();
while (it!= view->parser()->constant.end() && !copy_found) while (it!= view->parser()->constant.end() && !copy_found)
{ {
if (constant == it->constant ) if (constant == it->constant )
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <QPaintEvent> #include <QPaintEvent>
#include <QKeyEvent> #include <QKeyEvent>
#include <QEvent> #include <QEvent>
#include <Q3ValueList> #include <QList>
#include <QResizeEvent> #include <QResizeEvent>
#include <QMouseEvent> #include <QMouseEvent>
...@@ -217,7 +217,7 @@ void View::draw(QPaintDevice *dev, int form) ...@@ -217,7 +217,7 @@ void View::draw(QPaintDevice *dev, int form)
isDrawing=true; isDrawing=true;
setCursor(Qt::WaitCursor ); setCursor(Qt::WaitCursor );
stop_calculating = false; stop_calculating = false;
for(Q3ValueVector<Ufkt>::iterator ufkt=m_parser->ufkt.begin(); ufkt!=m_parser->ufkt.end() && !stop_calculating; ++ufkt) for(QVector<Ufkt>::iterator ufkt=m_parser->ufkt.begin(); ufkt!=m_parser->ufkt.end() && !stop_calculating; ++ufkt)
if ( !ufkt->fname.isEmpty() ) if ( !ufkt->fname.isEmpty() )
plotfkt(ufkt, &DC); plotfkt(ufkt, &DC);
...@@ -504,7 +504,7 @@ void View::drawHeaderTable(QPainter *pDC) ...@@ -504,7 +504,7 @@ void View::drawHeaderTable(QPainter *pDC)
pDC->Lineh(0, 320, 700); pDC->Lineh(0, 320, 700);
int ypos = 380; int ypos = 380;
//for(uint ix=0; ix<m_parser->countFunctions() && !stop_calculating; ++ix) //for(uint ix=0; ix<m_parser->countFunctions() && !stop_calculating; ++ix)
for(Q3ValueVector<Ufkt>::iterator it=m_parser->ufkt.begin(); it!=m_parser->ufkt.end() && !stop_calculating; ++it) for(QVector<Ufkt>::iterator it=m_parser->ufkt.begin(); it!=m_parser->ufkt.end() && !stop_calculating; ++it)
{ {
pDC->drawText(100, ypos, it->fstr); pDC->drawText(100, ypos, it->fstr);
ypos+=60; ypos+=60;
...@@ -908,7 +908,7 @@ void View::mousePressEvent(QMouseEvent *e) ...@@ -908,7 +908,7 @@ void View::mousePressEvent(QMouseEvent *e)
if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button
{ {
char function_type; char function_type;
for( Q3ValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it)
{ {
function_type = it->fstr[0].latin1(); function_type = it->fstr[0].latin1();
if ( function_type=='y' || function_type=='r' || it->fname.isEmpty()) continue; if ( function_type=='y' || function_type=='r' || it->fname.isEmpty()) continue;
...@@ -932,7 +932,7 @@ void View::mousePressEvent(QMouseEvent *e) ...@@ -932,7 +932,7 @@ void View::mousePressEvent(QMouseEvent *e)
if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot if ( function_type=='x' && fabs(csxpos-m_parser->fkt(it, csxpos))< g && it->fstr.contains('t')==1) //parametric plot
{ {
Q3ValueVector<Ufkt>::iterator ufkt_y = it+1; QVector<Ufkt>::iterator ufkt_y = it+1;
if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g) && ufkt_y->fstr.contains('t')==1) if ( fabs(csypos-m_parser->fkt(ufkt_y, csxpos)<g) && ufkt_y->fstr.contains('t')==1)
{ {
if ( csmode == -1) if ( csmode == -1)
...@@ -1021,7 +1021,7 @@ void View::mousePressEvent(QMouseEvent *e) ...@@ -1021,7 +1021,7 @@ void View::mousePressEvent(QMouseEvent *e)
mouseMoveEvent(e); mouseMoveEvent(e);
return ; return ;
} }
for( Q3ValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it)
{ {
if (it->fname.isEmpty() ) if (it->fname.isEmpty() )
continue; continue;
...@@ -1236,7 +1236,7 @@ void View::getSettings() ...@@ -1236,7 +1236,7 @@ void View::getSettings()
void View::init() void View::init()
{ {
getSettings(); getSettings();
Q3ValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); QVector<Ufkt>::iterator it = m_parser->ufkt.begin();
it->fname=""; it->fname="";
while ( m_parser->ufkt.count() > 1) while ( m_parser->ufkt.count() > 1)
m_parser->Parser::delfkt( &m_parser->ufkt.last() ); m_parser->Parser::delfkt( &m_parser->ufkt.last() );
...@@ -1259,7 +1259,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin, ...@@ -1259,7 +1259,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin,
// TODO: parameter sliders // TODO: parameter sliders
if ( !ufkt->parameters.isEmpty() ) if ( !ufkt->parameters.isEmpty() )
{ {
for ( Q3ValueList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it ) for ( QList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it )
{ {
if ( (*it).expression == str_parameter) if ( (*it).expression == str_parameter)
{ {
...@@ -1408,7 +1408,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const QStrin ...@@ -1408,7 +1408,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const QStrin
// TODO: parameter sliders // TODO: parameter sliders
if ( !ufkt->parameters.isEmpty() ) if ( !ufkt->parameters.isEmpty() )
{ {
for ( Q3ValueList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it ) for ( QList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it )
{ {
if ( (*it).expression == str_parameter) if ( (*it).expression == str_parameter)
{ {
...@@ -1520,7 +1520,7 @@ void View::keyPressEvent( QKeyEvent * e) ...@@ -1520,7 +1520,7 @@ void View::keyPressEvent( QKeyEvent * e)
event = new QMouseEvent(QEvent::MouseMove,QPoint(int(fcx+1),int(fcy+1)),Qt::LeftButton,Qt::LeftButton); event = new QMouseEvent(QEvent::MouseMove,QPoint(int(fcx+1),int(fcy+1)),Qt::LeftButton,Qt::LeftButton);
else if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) //switch graph in trace mode else if (e->key() == Qt::Key_Up || e->key() == Qt::Key_Down) //switch graph in trace mode
{ {
Q3ValueVector<Ufkt>::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)]; QVector<Ufkt>::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)];
int const ke=it->parameters.count(); int const ke=it->parameters.count();
if (ke>0) if (ke>0)
{ {
...@@ -1678,7 +1678,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double ...@@ -1678,7 +1678,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double
// TODO: parameter sliders // TODO: parameter sliders
if ( !ufkt->parameters.isEmpty() ) if ( !ufkt->parameters.isEmpty() )
{ {
for ( Q3ValueList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it ) for ( QList<ParameterValueItem>::Iterator it = ufkt->parameters.begin(); it != ufkt->parameters.end(); ++it )
{ {
if ( (*it).expression == str_parameter) if ( (*it).expression == str_parameter)
{ {
...@@ -1868,7 +1868,7 @@ void View::updateSliders() ...@@ -1868,7 +1868,7 @@ void View::updateSliders()
} }
} }
for(Q3ValueVector<Ufkt>::iterator it=m_parser->ufkt.begin(); it!=m_parser->ufkt.end(); ++it) for(QVector<Ufkt>::iterator it=m_parser->ufkt.begin(); it!=m_parser->ufkt.end(); ++it)
{ {
if (it->fname.isEmpty() ) continue; if (it->fname.isEmpty() ) continue;
if( it->use_slider > -1 && (it->f_mode || it->f1_mode || it->f2_mode || it->integral_mode)) if( it->use_slider > -1 && (it->f_mode || it->f1_mode || it->f2_mode || it->integral_mode))
......
...@@ -230,7 +230,9 @@ void CDiagr::drawAxes( QPainter* pDC ) // draw axes ...@@ -230,7 +230,9 @@ void CDiagr::drawAxes( QPainter* pDC ) // draw axes
if( Settings::showAxes() ) if( Settings::showAxes() )
{ {
pDC->setPen( QPen( QColor(axesColor), axesLineWidth ) ); pDC->setPen( QPen( QColor(axesColor), axesLineWidth ) );
pDC->Lineh(PlotArea.left(), b=TransyToPixel(0.), a=PlotArea.right()); // x-Achse a=PlotArea.right();
b=TransyToPixel(0.);
pDC->Lineh(PlotArea.left(), b, a); // x-Achse
if( Settings::showArrows()) // ARROWS if( Settings::showArrows()) // ARROWS
{ int const dx=40; { int const dx=40;
int const dy=15; int const dy=15;
...@@ -238,7 +240,9 @@ void CDiagr::drawAxes( QPainter* pDC ) // draw axes ...@@ -238,7 +240,9 @@ void CDiagr::drawAxes( QPainter* pDC ) // draw axes
pDC->Line( QPointF( a, b ), QPointF( a-dx, b-dy) ); pDC->Line( QPointF( a, b ), QPointF( a-dx, b-dy) );
} }
pDC->Linev(a=TransxToPixel(0.), PlotArea.bottom(), b=PlotArea.top()); // y-Achse a=TransxToPixel(0.);
b=PlotArea.top();
pDC->Linev(a, PlotArea.bottom(), b); // y-Achse
if( Settings::showArrows() ) // ARROWS if( Settings::showArrows() ) // ARROWS
{ int const dx=15; { int const dx=15;
int const dy=40; int const dy=40;
......
...@@ -71,9 +71,6 @@ EditFunction::EditFunction( XParser* parser, QWidget* parent, const char* name ) ...@@ -71,9 +71,6 @@ EditFunction::EditFunction( XParser* parser, QWidget* parent, const char* name )
editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) ); editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) );
} }
connect( editfunctionpage->cmdParameter, SIGNAL ( clicked() ), this, SLOT( cmdParameter_clicked() ) ); connect( editfunctionpage->cmdParameter, SIGNAL ( clicked() ), this, SLOT( cmdParameter_clicked() ) );
connect( editfunctionpage->useNoParameter, SIGNAL ( toggled(bool) ), this, SLOT( noParameter_toggled(bool) ) );
connect( editfunctionpage->customMinRange, SIGNAL ( toggled(bool) ), this, SLOT( customMinRange_toggled(bool) ) );
connect( editfunctionpage->customMaxRange, SIGNAL ( toggled(bool) ), this, SLOT( customMaxRange_toggled(bool) ) );
m_updatedfunction = 0; m_updatedfunction = 0;
} }
...@@ -178,7 +175,7 @@ void EditFunction::accept() ...@@ -178,7 +175,7 @@ void EditFunction::accept()
m_parser->fixFunctionName(f_str, XParser::Function); m_parser->fixFunctionName(f_str, XParser::Function);
if ( f_str.at(0)== 'x' || f_str.at(0)== 'y' || f_str.at(0)== 'r') if ( f_str.at(0)== 'x' || f_str.at(0)== 'y' || f_str.at(0)== 'r')
{ {
KMessageBox::error( this, i18n("You can only define plot functions in this dialog")); KMessageBox::sorry( this, i18n("You can only define plot functions in this dialog"));
return; return;
} }
...@@ -218,7 +215,7 @@ void EditFunction::accept() ...@@ -218,7 +215,7 @@ void EditFunction::accept()
{ {
if ( tmp_ufkt.dmin >= tmp_ufkt.dmax) if ( tmp_ufkt.dmin >= tmp_ufkt.dmax)
{ {
KMessageBox::error(this,i18n("The minimum range value must be lower than the maximum range value")); KMessageBox::sorry(this,i18n("The minimum range value must be lower than the maximum range value"));
showPage(0); showPage(0);
editfunctionpage->min->setFocus(); editfunctionpage->min->setFocus();
editfunctionpage->min->selectAll(); editfunctionpage->min->selectAll();
...@@ -227,7 +224,7 @@ void EditFunction::accept() ...@@ -227,7 +224,7 @@ void EditFunction::accept()
if ( tmp_ufkt.dmin<View::xmin || tmp_ufkt.dmax>View::xmax ) if ( tmp_ufkt.dmin<View::xmin || tmp_ufkt.dmax>View::xmax )
{ {
KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) ); KMessageBox::sorry(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) );
showPage(0); showPage(0);
editfunctionpage->min->setFocus(); editfunctionpage->min->setFocus();
editfunctionpage->min->selectAll(); editfunctionpage->min->selectAll();
...@@ -245,7 +242,7 @@ void EditFunction::accept() ...@@ -245,7 +242,7 @@ void EditFunction::accept()
tmp_ufkt.str_startx = editintegralpage->txtInitX->text(); tmp_ufkt.str_startx = editintegralpage->txtInitX->text();
if (m_parser->parserError(false) != 0) if (m_parser->parserError(false) != 0)
{ {
KMessageBox::error(this,i18n("Please insert a valid x-value")); KMessageBox::sorry(this,i18n("Please insert a valid x-value"));
showPage(2); showPage(2);
editintegralpage->txtInitX->setFocus(); editintegralpage->txtInitX->setFocus();
editintegralpage->txtInitX->selectAll(); editintegralpage->txtInitX->selectAll();
...@@ -257,7 +254,7 @@ void EditFunction::accept() ...@@ -257,7 +254,7 @@ void EditFunction::accept()
tmp_ufkt.str_starty = editintegralpage->txtInitY->text(); tmp_ufkt.str_starty = editintegralpage->txtInitY->text();
if (m_parser->parserError(false) != 0) if (m_parser->parserError(false) != 0)
{ {
KMessageBox::error(this,i18n("Please insert a valid y-value")); KMessageBox::sorry(this,i18n("Please insert a valid y-value"));
showPage(2); showPage(2);
editintegralpage->txtInitY->setFocus(); editintegralpage->txtInitY->setFocus();
editintegralpage->txtInitY->selectAll(); editintegralpage->txtInitY->selectAll();
...@@ -299,17 +296,17 @@ void EditFunction::accept() ...@@ -299,17 +296,17 @@ void EditFunction::accept()
if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) ) if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
{ {
KMessageBox::error( this, i18n( "Recursive function is only allowed when drawing integral graphs") ); KMessageBox::sorry( this, i18n( "Recursive function is only allowed when drawing integral graphs") );
return; return;
} }
Ufkt *added_ufkt; Ufkt *added_ufkt;
if( m_id != -1 ) //when editing a function: if( m_id != -1 ) //when editing a function:
{ {
int const ix = m_parser->ixValue(m_id); int const ix = m_parser->ixValue(m_id);
if ( ix == -1) //The function could have been deleted if ( ix == -1) //The function could have been deleted
{ {
KMessageBox::error(this,i18n("Function could not be found")); KMessageBox::sorry(this,i18n("Function could not be found"));
return; return;
} }
added_ufkt = &m_parser->ufkt[ix]; added_ufkt = &m_parser->ufkt[ix];
...@@ -402,30 +399,6 @@ void EditFunction::cmdParameter_clicked() ...@@ -402,30 +399,6 @@ void EditFunction::cmdParameter_clicked()
KParameterEditor *dlg = new KParameterEditor(m_parser,&m_parameter); KParameterEditor *dlg = new KParameterEditor(m_parser,&m_parameter);
dlg->show(); dlg->show();
} }
void EditFunction::noParameter_toggled(bool status)
{
if (status)
{
editfunctionpage->cmdParameter->setEnabled(false);
editfunctionpage->listOfSliders->setEnabled(false);
}
}
void EditFunction::customMinRange_toggled(bool status)
{
if (status)
editfunctionpage->min->setEnabled(true);
else
editfunctionpage->min->setEnabled(false);
}
void EditFunction::customMaxRange_toggled(bool status)
{
if (status)
editfunctionpage->max->setEnabled(true);
else
editfunctionpage->max->setEnabled(false);
}
void EditFunction::fixFunctionArguments(QString &f_str) void EditFunction::fixFunctionArguments(QString &f_str)
{ {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "xparser.h" #include "xparser.h"
//Added by qt3to4: //Added by qt3to4:
#include <Q3ValueList> #include <QList>
#include "editderivativespage.h" #include "editderivativespage.h"
#include "editfunctionpage.h" #include "editfunctionpage.h"
...@@ -85,12 +85,6 @@ class EditFunction : public KDialogBase ...@@ -85,12 +85,6 @@ class EditFunction : public KDialogBase
void slotHelp(); void slotHelp();
/// Called when the "Change parameter values" is clicked /// Called when the "Change parameter values" is clicked
void cmdParameter_clicked(); void cmdParameter_clicked();
/// Called when the no_parameter-radiobutton is toggled.
void noParameter_toggled(bool);
/// Called when customMinRange is toggled.
void customMinRange_toggled(bool);
/// Called when customMaxRange is toggled.
void customMaxRange_toggled(bool);
private: private:
/// Clear alls widgets values /// Clear alls widgets values
...@@ -106,7 +100,7 @@ class EditFunction : public KDialogBase ...@@ -106,7 +100,7 @@ class EditFunction : public KDialogBase
XParser* m_parser; XParser* m_parser;
/// Current function index /// Current function index
int m_id; int m_id;
Q3ValueList<ParameterValueItem> m_parameter; QList<ParameterValueItem> m_parameter;
EditFunctionPage* editfunctionpage; EditFunctionPage* editfunctionpage;
EditDerivativesPage* editderivativespage; EditDerivativesPage* editderivativespage;
......
...@@ -365,29 +365,40 @@ Example: f(x)=x^2</string> ...@@ -365,29 +365,40 @@ Example: f(x)=x^2</string>
<pixmap></pixmap> <pixmap></pixmap>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KPushButton</class> <class>KLineEdit</class>
<extends></extends> <extends></extends>
<header>kpushbutton.h</header> <header>klineedit.h</header>
<container>0</container> <container>0</container>
<pixmap></pixmap> <pixmap></pixmap>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KLineEdit</class> <class>KIntNumInput</class>
<extends></extends> <extends></extends>
<header>klineedit.h</header> <header>knuminput.h</header>
<container>0</container> <container>0</container>
<pixmap></pixmap> <pixmap></pixmap>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KIntNumInput</class> <class>KPushButton</class>
<extends></extends> <extends></extends>
<header>knuminput.h</header> <header>kpushbutton.h</header>
<container>0</container> <container>0</container>
<pixmap></pixmap> <pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>equation</tabstop> <tabstop>equation</tabstop>
<tabstop>hideCheck</tabstop>
<tabstop>useNoParameter</tabstop>
<tabstop>useList</tabstop>
<tabstop>cmdParameter</tabstop>
<tabstop>useSlider</tabstop>
<tabstop>listOfSliders</tabstop>
<tabstop>customMinRange</tabstop>
<tabstop>min</tabstop>
<tabstop>customMaxRange</tabstop>
<tabstop>max</tabstop>
<tabstop>color</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections> <connections>
......
...@@ -251,8 +251,6 @@ ...@@ -251,8 +251,6 @@
<tabstop>txtInitX</tabstop> <tabstop>txtInitX</tabstop>
<tabstop>txtInitY</tabstop> <tabstop>txtInitY</tabstop>
<tabstop>customPrecision</tabstop> <tabstop>customPrecision</tabstop>
<tabstop>precision</tabstop>
<tabstop>lineWidth</tabstop>
<tabstop>color</tabstop> <tabstop>color</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <q3valuevector.h> #include <QVector>
#include <qdom.h> #include <qdom.h>
#include "kmplotio.h" #include "kmplotio.h"
...@@ -44,7 +44,7 @@ KConstantEditor::KConstantEditor(View *v, QWidget *parent, const char *name) ...@@ -44,7 +44,7 @@ KConstantEditor::KConstantEditor(View *v, QWidget *parent, const char *name)
: QConstantEditor(parent,name), m_view(v) : QConstantEditor(parent,name), m_view(v)
{ {
QString str_value; QString str_value;
Q3ValueVector<Constant>::iterator it; QVector<Constant>::iterator it;
for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() ;++it) for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() ;++it)
{ {
str_value.setNum(it->value); str_value.setNum(it->value);
...@@ -86,7 +86,7 @@ void KConstantEditor::cmdDelete_clicked() ...@@ -86,7 +86,7 @@ void KConstantEditor::cmdDelete_clicked()
value = varlist->currentItem()->text(1); value = varlist->currentItem()->text(1);
QString str; QString str;
for( Q3ValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it)
{ {
str = it->fstr; str = it->fstr;
for (int i=str.find(')'); i<str.length();i++) for (int i=str.find(')'); i<str.length();i++)
...@@ -96,7 +96,7 @@ void KConstantEditor::cmdDelete_clicked() ...@@ -96,7 +96,7 @@ void KConstantEditor::cmdDelete_clicked()
return; return;
} }
} }
Q3ValueVector<Constant>::iterator it; QVector<Constant>::iterator it;
for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end(); ++it) for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end(); ++it)
{ {
if ( it->constant == constant) if ( it->constant == constant)
...@@ -148,7 +148,7 @@ void KConstantEditor::cmdDuplicate_clicked() ...@@ -148,7 +148,7 @@ void KConstantEditor::cmdDuplicate_clicked()
continue; continue;
found = false; found = false;
Q3ValueVector<Constant>::iterator it; QVector<Constant>::iterator it;
for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() && !found;++it) for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() && !found;++it)
{ {
if ( it->constant == i || i == constant) if ( it->constant == i || i == constant)
...@@ -180,7 +180,7 @@ void KConstantEditor::editConstantSlot() ...@@ -180,7 +180,7 @@ void KConstantEditor::editConstantSlot()
{ {
double dvalue = m_view->parser()->eval(value); double dvalue = m_view->parser()->eval(value);
bool found = false; bool found = false;
Q3ValueVector<Constant>::iterator it; QVector<Constant>::iterator it;
for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() && !found;++it) for(it = m_view->parser()->constant.begin(); it!= m_view->parser()->constant.end() && !found;++it)
{ {
if ( it->constant == constant) if ( it->constant == constant)
...@@ -201,7 +201,7 @@ void KConstantEditor::editConstantSlot() ...@@ -201,7 +201,7 @@ void KConstantEditor::editConstantSlot()
int index = 0; int index = 0;
for( Q3ValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it) for( QVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it != m_view->parser()->ufkt.end(); ++it)
{ {
if( it->fstr.contains(constant)!=0 ) if( it->fstr.contains(constant)!=0 )
m_view->parser()->reparse(index); //reparsing the function m_view->parser()->reparse(index); //reparsing the function
......
...@@ -67,7 +67,7 @@ void KEditConstant::cmdOK_clicked() ...@@ -67,7 +67,7 @@ void KEditConstant::cmdOK_clicked()
if ( txtConstant->isEnabled() ) //creating, not edit a constant if ( txtConstant->isEnabled() ) //creating, not edit a constant
{ {
bool found= false; bool found= false;
Q3ValueVector<Constant>::iterator it;