summaryrefslogtreecommitdiffstats
path: root/kmplot
diff options
context:
space:
mode:
Diffstat (limited to 'kmplot')
-rw-r--r--kmplot/kmplot/FktDlg.cpp2
-rw-r--r--kmplot/kmplot/MainDlg.cpp6
-rw-r--r--kmplot/kmplot/editfunction.cpp6
-rw-r--r--kmplot/kmplot/editfunctionpage.ui74
-rw-r--r--kmplot/kmplot/kconstanteditor.cpp8
-rw-r--r--kmplot/kmplot/keditconstant.cpp2
-rw-r--r--kmplot/kmplot/kminmax.cpp14
-rw-r--r--kmplot/kmplot/kmplotio.cpp2
-rw-r--r--kmplot/kmplot/kparametereditor.cpp8
-rw-r--r--kmplot/kmplot/ksliderwindow.cpp4
-rw-r--r--kmplot/kmplot/parser.cpp20
-rw-r--r--kmplot/kmplot/qeditparametric.ui2
-rw-r--r--kmplot/kmplot/qminmax.ui4
-rw-r--r--kmplot/kmplot/sliderwindow.ui2
-rw-r--r--kmplot/kmplot/xparser.cpp6
15 files changed, 80 insertions, 80 deletions
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp
index cd30abfa..eae23ab5 100644
--- a/kmplot/kmplot/FktDlg.cpp
+++ b/kmplot/kmplot/FktDlg.cpp
@@ -137,7 +137,7 @@ void FktDlg::slotEdit()
int const id = getId( currentItem->text().section( ";", 0, 0) ) ;
// find out the function type
- char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.tqat(0).latin1();
+ char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.at(0).latin1();
if ( prefix == 'r')
slotEditPolar( id );
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index 9c0fac37..5a736097 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -268,7 +268,7 @@ void MainDlg::slotSaveas()
if ( !url.isEmpty() )
{
// check if file exists and overwriting is ok.
- if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
+ if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
{
if ( !kmplotio->save( url ) )
KMessageBox::error(m_parent, i18n("The file could not be saved") );
@@ -293,7 +293,7 @@ void MainDlg::slotExport()
if(!url.isEmpty())
{
// check if file exists and overwriting is ok.
- if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
+ if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return;
if( url.fileName().right(4).lower()==".svg")
{
@@ -630,7 +630,7 @@ void MainDlg::loadConstants()
if ( tmp_constant == " " || tmp_constant == " ")
return;
- constant = tmp_constant.tqat(0).upper().latin1();
+ constant = tmp_constant.at(0).upper().latin1();
if ( constant<'A' || constant>'Z')
constant = 'A';
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index a503884f..0f86d52f 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -67,7 +67,7 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name
editintegralpage = new EditIntegralPage( page2 );
for( int number = 0; number < SLIDER_COUNT; number++ )
{
- editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).tqarg( number +1) );
+ editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) );
}
connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) );
connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) );
@@ -226,7 +226,7 @@ void EditFunction::accept()
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").tqarg(View::xmin).tqarg(View::xmax) );
+ KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) );
showPage(0);
editfunctionpage->min->setFocus();
editfunctionpage->min->selectAll();
@@ -433,7 +433,7 @@ void EditFunction::fixFunctionArguments(TQString &f_str)
char parameter_name;
if ( closeBracket-openBracket == 2) //the function atribute is only one character
{
- char const function_name = f_str.tqat(openBracket+1).latin1();
+ char const function_name = f_str.at(openBracket+1).latin1();
parameter_name = 'a';
while ( parameter_name == function_name)
parameter_name++;
diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui
index 47973b30..439c3970 100644
--- a/kmplot/kmplot/editfunctionpage.ui
+++ b/kmplot/kmplot/editfunctionpage.ui
@@ -418,14 +418,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint()</slot>
- <slot access="public" specifier="">tqrepaint(bool)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint()</slot>
+ <slot access="public" specifier="">repaint(bool)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@@ -490,7 +490,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">setTextWorkaround(const QString&amp;)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
- <property type="Rect">tqgeometry</property>
+ <property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@@ -519,7 +519,7 @@ Example: f(x)=x^2</string>
<property type="Bool">frame</property>
<property type="EchoMode">echoMode</property>
<property type="Int">cursorPosition</property>
- <property type="Alignment">tqalignment</property>
+ <property type="Alignment">alignment</property>
<property type="Bool">dragEnabled</property>
<property type="Bool">readOnly</property>
<property type="String">inputMask</property>
@@ -565,14 +565,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint()</slot>
- <slot access="public" specifier="">tqrepaint(bool)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint()</slot>
+ <slot access="public" specifier="">repaint(bool)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@@ -606,7 +606,7 @@ Example: f(x)=x^2</string>
<slot access="protected" specifier="">chooseColor()</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
- <property type="Rect">tqgeometry</property>
+ <property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@@ -671,14 +671,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint()</slot>
- <slot access="public" specifier="">tqrepaint(bool)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint()</slot>
+ <slot access="public" specifier="">repaint(bool)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@@ -713,7 +713,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">slotEmitRelativeValueChanged(int)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
- <property type="Rect">tqgeometry</property>
+ <property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
@@ -777,14 +777,14 @@ Example: f(x)=x^2</string>
<slot access="public" specifier="">update()</slot>
<slot access="public" specifier="">update(int,int,int,int)</slot>
<slot access="public" specifier="">update(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint()</slot>
- <slot access="public" specifier="">tqrepaint(bool)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
- <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
- <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint()</slot>
+ <slot access="public" specifier="">repaint(bool)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int)</slot>
+ <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
+ <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
<slot access="public" specifier="">show()</slot>
<slot access="public" specifier="">hide()</slot>
<slot access="public" specifier="">setShown(bool)</slot>
@@ -818,7 +818,7 @@ Example: f(x)=x^2</string>
<slot access="private" specifier="">slotSettingsChanged(int)</slot>
<property type="CString">name</property>
<property type="Bool">enabled</property>
- <property type="Rect">tqgeometry</property>
+ <property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property>
<property type="Size">minimumSize</property>
<property type="Size">maximumSize</property>
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index 6318e124..c2017c8a 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -69,7 +69,7 @@ void KConstantEditor::cmdEdit_clicked()
{
if ( !varlist->currentItem() )
return;
- constant = varlist->currentItem()->text(0).tqat(0).latin1();
+ constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value);
@@ -82,7 +82,7 @@ void KConstantEditor::cmdDelete_clicked()
if ( !varlist->currentItem() )
return;
- constant = varlist->currentItem()->text(0).tqat(0).latin1();
+ constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
TQString str;
@@ -136,7 +136,7 @@ void KConstantEditor::cmdDuplicate_clicked()
{
if (!varlist->currentItem())
return;
- constant = varlist->currentItem()->text(0).tqat(0).latin1();
+ constant = varlist->currentItem()->text(0).at(0).latin1();
value = varlist->currentItem()->text(1);
TQStringList list;
@@ -158,7 +158,7 @@ void KConstantEditor::cmdDuplicate_clicked()
TQStringList result = KInputDialog::getItemList(i18n("Choose Name"),i18n("Choose a name for the constant:"),list, TQStringList(), false, &found);
if (found)
{
- constant = (*result.begin()).tqat(0).latin1();
+ constant = (*result.begin()).at(0).latin1();
emit newConstantSlot();
}
diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp
index 6fa8a0b1..e32bfcd5 100644
--- a/kmplot/kmplot/keditconstant.cpp
+++ b/kmplot/kmplot/keditconstant.cpp
@@ -54,7 +54,7 @@ KEditConstant::~KEditConstant()
void KEditConstant::cmdOK_clicked()
{
- constant = txtConstant->text().tqat(0).latin1();
+ constant = txtConstant->text().at(0).latin1();
value = txtValue->text();
if ( constant<'A' || constant>'Z')
{
diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp
index ce013373..2a6b3df1 100644
--- a/kmplot/kmplot/kminmax.cpp
+++ b/kmplot/kmplot/kminmax.cpp
@@ -248,7 +248,7 @@ void KMinMax::cmdFind_clicked()
if ( dmin<View::xmin || dmax>View::xmax )
{
- KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(View::xmax) );
+ KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").arg(View::xmin).arg(View::xmax) );
min->setFocus();
min->selectAll();
return;
@@ -273,7 +273,7 @@ void KMinMax::cmdFind_clicked()
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
- function.tqat(0) = function.tqat(0).lower();
+ function.at(0) = function.at(0).lower();
}
TQString fname, fstr;
@@ -308,13 +308,13 @@ void KMinMax::cmdFind_clicked()
{
m_view->findMinMaxValue(ufkt,p_mode,true,dmin,dmax,parameter);
if ( !m_view->isCalculationStopped() )
- KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax) );
+ KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").arg(dmin).arg(dmax) );
}
else if ( m_mode == 1)
{
m_view->findMinMaxValue(ufkt,p_mode,false,dmin,dmax,parameter);
if ( !m_view->isCalculationStopped() )
- KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(dmax));
+ KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").arg(dmin).arg(dmax));
}
else if ( m_mode == 2)
{
@@ -336,7 +336,7 @@ void KMinMax::cmdFind_clicked()
{
m_view->setFocus();
m_view->update();
- KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").tqarg(dmin_tmp).tqarg(dmax).tqarg(dmin));
+ KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").arg(dmin_tmp).arg(dmax).arg(dmin));
}
}
@@ -367,7 +367,7 @@ void KMinMax::list_highlighted(TQListBoxItem* item)
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
- function.tqat(0) = function.tqat(0).lower();
+ function.at(0) = function.at(0).lower();
}
TQString const sec_function = function.section('(',0,0);
for(TQValueVector<Ufkt>::iterator it = m_view->parser()->ufkt.begin(); it!=m_view->parser()->ufkt.end(); ++it)
@@ -405,7 +405,7 @@ void KMinMax::cmdParameter_clicked()
else if ( function.at(0).category() == TQChar::Letter_Uppercase)
{
p_mode = 3;
- function.tqat(0) = function.tqat(0).lower();
+ function.at(0) = function.at(0).lower();
}
TQString const sec_function = function.section('(',0,0);
diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp
index 1b195a42..0beb551a 100644
--- a/kmplot/kmplot/kmplotio.cpp
+++ b/kmplot/kmplot/kmplotio.cpp
@@ -538,7 +538,7 @@ void KmPlotIO::oldParseFunction( XParser *m_parser, const TQDomElement & n )
ufkt.fstr = tmp_fstr.left(pos);
if ( !m_parser->getext( &ufkt, tmp_fstr) )
{
- KMessageBox::error(0,i18n("The function %1 could not be loaded").tqarg(ufkt.fstr));
+ KMessageBox::error(0,i18n("The function %1 could not be loaded").arg(ufkt.fstr));
return;
}
}
diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp
index 17586610..dd320ac7 100644
--- a/kmplot/kmplot/kparametereditor.cpp
+++ b/kmplot/kmplot/kparametereditor.cpp
@@ -89,7 +89,7 @@ void KParameterEditor::cmdNew_clicked()
}
if ( checkTwoOfIt(result) )
{
- KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").tqarg(result));
+ KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").arg(result));
continue;
}
list->insertItem(result);
@@ -116,7 +116,7 @@ void KParameterEditor::cmdEdit_clicked()
if ( checkTwoOfIt(result) )
{
if( result != list->currentText() )
- KMessageBox::error(0,i18n("The value %1 already exists.").tqarg(result));
+ KMessageBox::error(0,i18n("The value %1 already exists.").arg(result));
continue;
}
list->removeItem( list->currentItem());
@@ -179,7 +179,7 @@ void KParameterEditor::cmdImport_clicked()
}
else if ( !verbose)
{
- if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").tqarg(i) ) == KMessageBox::Cancel)
+ if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").arg(i) ) == KMessageBox::Cancel)
{
file.close();
KIO::NetAccess::removeTempFile( tmpfile );
@@ -206,7 +206,7 @@ void KParameterEditor::cmdExport_clicked()
if ( url.isEmpty() )
return;
- if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
+ if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue )
{
TQString tmpfile;
TQFile file;
diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp
index 491e3889..0b3e4193 100644
--- a/kmplot/kmplot/ksliderwindow.cpp
+++ b/kmplot/kmplot/ksliderwindow.cpp
@@ -45,8 +45,8 @@
KSliderWindow::KSliderWindow(TQWidget* parent, int num ) :
SliderWindow( parent, "", false, TQt::WStyle_Tool-TQt::WStyle_Maximize ), m_num(num)
{
- setCaption(i18n( "Slider %1" ).tqarg( num+1 ) );
- TQToolTip::add( slider, i18n( "Slider no. %1" ).tqarg( num+1 ));
+ setCaption(i18n( "Slider %1" ).arg( num+1 ) );
+ TQToolTip::add( slider, i18n( "Slider no. %1" ).arg( num+1 ));
TQWhatsThis::add( this, i18n( "Move slider to change the parameter of the function plot connected to this slider." ) );
// load the min and max value + the current value
diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp
index e47feaa8..ed064b85 100644
--- a/kmplot/kmplot/parser.cpp
+++ b/kmplot/kmplot/parser.cpp
@@ -959,33 +959,33 @@ int Parser::parserError(bool showMessageBox)
switch(err)
{
case 1: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Syntax error").tqarg(TQString::number(errpos)), "KmPlot");
+ "Syntax error").arg(TQString::number(errpos)), "KmPlot");
break;
case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Missing parenthesis").tqarg(TQString::number(errpos)), "KmPlot");
+ "Missing parenthesis").arg(TQString::number(errpos)), "KmPlot");
break;
case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Function name unknown").tqarg(TQString::number(errpos)), "KmPlot");
+ "Function name unknown").arg(TQString::number(errpos)), "KmPlot");
break;
case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Void function variable").tqarg(TQString::number(errpos)), "KmPlot");
+ "Void function variable").arg(TQString::number(errpos)), "KmPlot");
break;
case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Too many functions").tqarg(TQString::number(errpos)), "KmPlot");
+ "Too many functions").arg(TQString::number(errpos)), "KmPlot");
break;
case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Token-memory overflow").tqarg(TQString::number(errpos)), "KmPlot");
+ "Token-memory overflow").arg(TQString::number(errpos)), "KmPlot");
break;
case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Stack overflow").tqarg(TQString::number(errpos)), "KmPlot");
+ "Stack overflow").arg(TQString::number(errpos)), "KmPlot");
break;
case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "Name of function not free.").tqarg(TQString::number(errpos)), "KmPlot");
+ "Name of function not free.").arg(TQString::number(errpos)), "KmPlot");
break;
case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n"
- "recursive function not allowed.").tqarg(TQString::number(errpos)), "KmPlot");
+ "recursive function not allowed.").arg(TQString::number(errpos)), "KmPlot");
break;
- case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).tqarg(TQString::number(errpos)),
+ case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).arg(TQString::number(errpos)),
"KmPlot");
break;
case 11: KMessageBox::error(0, i18n("Empty function"), "KmPlot");
diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui
index 5ac56e19..50c01d75 100644
--- a/kmplot/kmplot/qeditparametric.ui
+++ b/kmplot/kmplot/qeditparametric.ui
@@ -48,7 +48,7 @@
<property name="text">
<string>Name:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui
index 98996444..6309a390 100644
--- a/kmplot/kmplot/qminmax.ui
+++ b/kmplot/kmplot/qminmax.ui
@@ -51,7 +51,7 @@
<property name="text">
<string>Search between the x-value:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -62,7 +62,7 @@
<property name="text">
<string>and:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui
index 18a27f17..8c87cb40 100644
--- a/kmplot/kmplot/sliderwindow.ui
+++ b/kmplot/kmplot/sliderwindow.ui
@@ -69,7 +69,7 @@
<property name="text">
<string>0</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index b5d03918..e7b84fb8 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -148,7 +148,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const
for (bool ok=true; last_character<'x'; ++last_character)
{
if ( pos==0 && last_character == 'r') continue;
- function_name.tqat(pos)=last_character;
+ function_name.at(pos)=last_character;
for( TQValueVector<Ufkt>::iterator it = ufkt.begin(); it != ufkt.end(); ++it)
{
if (it == ufkt.begin() && it->fname.isEmpty() ) continue;
@@ -162,7 +162,7 @@ void XParser::findFunctionName(TQString &function_name, int const id, int const
}
ok = true;
}
- function_name.tqat(pos)='f';
+ function_name.at(pos)='f';
function_name.append('f');
}
function_name = "e"; //this should never happen
@@ -667,7 +667,7 @@ int XParser::addFunction(const TQString &f_str)
bool XParser::addFunction(const TQString &fstr_const, bool f_mode, bool f1_mode, bool f2_mode, bool integral_mode, bool integral_use_precision, int linewidth, int f1_linewidth, int f2_linewidth, int integral_linewidth, const TQString &str_dmin, const TQString &str_dmax, const TQString &str_startx, const TQString &str_starty, double integral_precision, TQRgb color, TQRgb f1_color, TQRgb f2_color, TQRgb integral_color, TQStringList str_parameter, int use_slider)
{
TQString fstr(fstr_const);
- switch ( fstr.tqat(0).latin1() )
+ switch ( fstr.at(0).latin1() )
{
case 'r':
{