diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:43 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:58:43 -0600 |
commit | 2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (patch) | |
tree | 628c1676b27475e583cfd0c2105bb41b646654bf /kmplot | |
parent | 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (diff) | |
download | tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.tar.gz tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
Diffstat (limited to 'kmplot')
30 files changed, 142 insertions, 142 deletions
diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index eae23ab5..cd30abfa 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.at(0).latin1(); + char const prefix = m_view->parser()->ufkt[ m_view->parser()->ixValue(id) ].fstr.tqat(0).latin1(); if ( prefix == 'r') slotEditPolar( id ); diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 705e2c09..c2d8b98a 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -12,7 +12,7 @@ <height>355</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>250</height> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -329,7 +329,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 5a736097..9c0fac37 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?" ).arg( 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?" ).tqarg( 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?" ).arg(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?" ).tqarg(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.at(0).upper().latin1(); + constant = tmp_constant.tqat(0).upper().latin1(); if ( constant<'A' || constant>'Z') constant = 'A'; diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index d9d88613..a88d364e 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -140,7 +140,7 @@ void View::draw(TQPaintDevice *dev, int form) DC.resetXForm(); DC.scale((float)w/(float)(lx+2*ref.x()), (float)w/(float)(lx+2*ref.x())); } - wm=DC.worldMatrix(); + wm=DC.tqworldMatrix(); s=DC.xForm(TQPoint(1000, 0)).x()/1000.; dgr.Create( ref, lx, ly, xmin, xmax, ymin, ymax ); } diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui index 235721f2..f8693ecc 100644 --- a/kmplot/kmplot/editderivativespage.ui +++ b/kmplot/kmplot/editderivativespage.ui @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 7e0277f0..a503884f 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -29,7 +29,7 @@ #include <tqdialog.h> #include <tqframe.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqradiobutton.h> #include <tqstringlist.h> #include <tqvbox.h> @@ -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" ).arg( number +1) ); + editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).tqarg( 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").arg(View::xmin).arg(View::xmax) ); + KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(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.at(openBracket+1).latin1(); + char const function_name = f_str.tqat(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 439c3970..e7ecf01d 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -366,7 +366,7 @@ Example: f(x)=x^2</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -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&)</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&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</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&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -466,7 +466,7 @@ Example: f(x)=x^2</string> <slot access="public" specifier="">setPalette(const QPalette&)</slot> <slot access="public" specifier="">setSelection(int,int)</slot> <slot access="public" specifier="">setCursorPosition(int)</slot> - <slot access="public" specifier="">setAlignment(int)</slot> + <slot access="public" specifier="">tqsetAlignment(int)</slot> <slot access="public" specifier="">cut()</slot> <slot access="public" specifier="">copy()</slot> <slot access="public" specifier="">paste()</slot> @@ -490,10 +490,10 @@ Example: f(x)=x^2</string> <slot access="private" specifier="">setTextWorkaround(const QString&)</slot> <property type="CString">name</property> <property type="Bool">enabled</property> - <property type="Rect">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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">alignment</property> + <property type="Alignment">tqalignment</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&)</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&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</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&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -606,10 +606,10 @@ 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">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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&)</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&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</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&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -713,10 +713,10 @@ 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">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</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&)</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&)</slot> - <slot access="public" specifier="">repaint(const QRect&,bool)</slot> - <slot access="public" specifier="">repaint(const QRegion&)</slot> - <slot access="public" specifier="">repaint(const QRegion&,bool)</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&)</slot> + <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> + <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -818,10 +818,10 @@ 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">geometry</property> + <property type="Rect">tqgeometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">minimumSize</property> - <property type="Size">maximumSize</property> + <property type="Size">tqminimumSize</property> + <property type="Size">tqmaximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui index 70c63f6a..694edf46 100644 --- a/kmplot/kmplot/editintegralpage.ui +++ b/kmplot/kmplot/editintegralpage.ui @@ -229,7 +229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>62</height> diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index c2017c8a..6318e124 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).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(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).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(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).at(0).latin1(); + constant = varlist->currentItem()->text(0).tqat(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()).at(0).latin1(); + constant = (*result.begin()).tqat(0).latin1(); emit newConstantSlot(); } diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index e32bfcd5..6fa8a0b1 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -54,7 +54,7 @@ KEditConstant::~KEditConstant() void KEditConstant::cmdOK_clicked() { - constant = txtConstant->text().at(0).latin1(); + constant = txtConstant->text().tqat(0).latin1(); value = txtValue->text(); if ( constant<'A' || constant>'Z') { diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 2a6b3df1..ce013373 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").arg(View::xmin).arg(View::xmax) ); + KMessageBox::error(this,i18n("Please insert a minimum and maximum range between %1 and %2").tqarg(View::xmin).tqarg(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.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(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").arg(dmin).arg(dmax) ); + KMessageBox::information(this,i18n("Minimum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(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").arg(dmin).arg(dmax)); + KMessageBox::information(this,i18n("Maximum value:\nx: %1\ny: %2").tqarg(dmin).tqarg(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").arg(dmin_tmp).arg(dmax).arg(dmin)); + KMessageBox::information(this,i18n("The integral in the interval [%1, %2] is:\n%3").tqarg(dmin_tmp).tqarg(dmax).tqarg(dmin)); } } @@ -367,7 +367,7 @@ void KMinMax::list_highlighted(TQListBoxItem* item) else if ( function.at(0).category() == TQChar::Letter_Uppercase) { p_mode = 3; - function.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(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.at(0) = function.at(0).lower(); + function.tqat(0) = function.tqat(0).lower(); } TQString const sec_function = function.section('(',0,0); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 5eb17971..f9d84256 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -82,7 +82,7 @@ KmPlot::KmPlot( KCmdLineArgs* args) } if (!initialGeometrySet()) - resize( TQSize(450, 520).expandedTo(minimumSizeHint())); + resize( TQSize(450, 520).expandedTo(tqminimumSizeHint())); // apply the saved mainwindow settings, if any, and ask the mainwindow // to automatically save settings if changed: window size, toolbar diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index 0beb551a..1b195a42 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").arg(ufkt.fstr)); + KMessageBox::error(0,i18n("The function %1 could not be loaded").tqarg(ufkt.fstr)); return; } } diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 32ca2573..17586610 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -35,7 +35,7 @@ #include <ktempfile.h> #include <kurl.h> #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <tqvaluelist.h> #include "kparametereditor.h" @@ -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.").arg(result)); + KMessageBox::error(0,i18n("The value %1 already exists and will therefore not be added.").tqarg(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.").arg(result)); + KMessageBox::error(0,i18n("The value %1 already exists.").tqarg(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?").arg(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?").tqarg(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?" ).arg( 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?" ).tqarg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) { TQString tmpfile; TQFile file; diff --git a/kmplot/kmplot/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp index 504aaa64..4ddc63f4 100644 --- a/kmplot/kmplot/kprinterdlg.cpp +++ b/kmplot/kmplot/kprinterdlg.cpp @@ -24,7 +24,7 @@ */ // TQt includes -#include <layout.h> +#include <tqlayout.h> // KDE includes #include <kdialog.h> @@ -37,16 +37,16 @@ KPrinterDlg::KPrinterDlg( TQWidget *parent, const char *name ) : KPrintDialogPage( parent, name ) { setTitle( i18n( "KmPlot Options" ) ); - TQVBoxLayout *layout = new TQVBoxLayout( this ); - layout->setMargin( KDialog::marginHint() ); - layout->setSpacing( KDialog::spacingHint() ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + tqlayout->setMargin( KDialog::marginHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); printHeaderTable = new TQCheckBox( i18n( "Print header table" ), this ); transparent_background = new TQCheckBox( i18n( "Transparent background" ), this ); - layout->addWidget( printHeaderTable ); - layout->addWidget( transparent_background ); - layout->addStretch( 1 ); + tqlayout->addWidget( printHeaderTable ); + tqlayout->addWidget( transparent_background ); + tqlayout->addStretch( 1 ); } void KPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool include_def ) diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 0b3e4193..491e3889 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" ).arg( num+1 ) ); - TQToolTip::add( slider, i18n( "Slider no. %1" ).arg( num+1 )); + setCaption(i18n( "Slider %1" ).tqarg( num+1 ) ); + TQToolTip::add( slider, i18n( "Slider no. %1" ).tqarg( 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 ed064b85..e47feaa8 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").arg(TQString::number(errpos)), "KmPlot"); + "Syntax error").tqarg(TQString::number(errpos)), "KmPlot"); break; case 2: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Missing parenthesis").arg(TQString::number(errpos)), "KmPlot"); + "Missing parenthesis").tqarg(TQString::number(errpos)), "KmPlot"); break; case 3: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Function name unknown").arg(TQString::number(errpos)), "KmPlot"); + "Function name unknown").tqarg(TQString::number(errpos)), "KmPlot"); break; case 4: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Void function variable").arg(TQString::number(errpos)), "KmPlot"); + "Void function variable").tqarg(TQString::number(errpos)), "KmPlot"); break; case 5: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Too many functions").arg(TQString::number(errpos)), "KmPlot"); + "Too many functions").tqarg(TQString::number(errpos)), "KmPlot"); break; case 6: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Token-memory overflow").arg(TQString::number(errpos)), "KmPlot"); + "Token-memory overflow").tqarg(TQString::number(errpos)), "KmPlot"); break; case 7: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Stack overflow").arg(TQString::number(errpos)), "KmPlot"); + "Stack overflow").tqarg(TQString::number(errpos)), "KmPlot"); break; case 8: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "Name of function not free.").arg(TQString::number(errpos)), "KmPlot"); + "Name of function not free.").tqarg(TQString::number(errpos)), "KmPlot"); break; case 9: KMessageBox::error(0, i18n("Parser error at position %1:\n" - "recursive function not allowed.").arg(TQString::number(errpos)), "KmPlot"); + "recursive function not allowed.").tqarg(TQString::number(errpos)), "KmPlot"); break; - case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).arg(TQString::number(errpos)), + case 10: KMessageBox::error(0, i18n("Could not find a defined constant at position %1." ).tqarg(TQString::number(errpos)), "KmPlot"); break; case 11: KMessageBox::error(0, i18n("Empty function"), "KmPlot"); diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index 215b4d65..a367d809 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>147</height> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index 02d3273f..85e9236d 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -40,7 +40,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>71</width> <height>20</height> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 46a36465..41fa84c4 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -48,7 +48,7 @@ <property name="text"> <string>Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -93,7 +93,7 @@ The name of a function must be unique. If you leave this line empty KmPlot will </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -156,7 +156,7 @@ Example: sin(t)</string> </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -340,7 +340,7 @@ Example: sin(t)</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index 61624136..e582734b 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -218,7 +218,7 @@ Example: loop(angle)=ln(angle)</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui index 6309a390..98996444 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="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -62,7 +62,7 @@ <property name="text"> <string>and:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui index d87d1784..18d7dce4 100644 --- a/kmplot/kmplot/qparametereditor.ui +++ b/kmplot/kmplot/qparametereditor.ui @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>80</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui index 5b938c04..ba35f0c5 100644 --- a/kmplot/kmplot/settingspagecolor.ui +++ b/kmplot/kmplot/settingspagecolor.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -123,7 +123,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <grid> <property name="name"> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -283,7 +283,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui index 6293d0cd..65d78d92 100644 --- a/kmplot/kmplot/settingspagecoords.ui +++ b/kmplot/kmplot/settingspagecoords.ui @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <hbox> <property name="name"> @@ -131,7 +131,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <grid> <property name="name"> @@ -277,7 +277,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20_2</cstring> + <cstring>tqlayout20_2</cstring> </property> <grid> <property name="name"> @@ -335,7 +335,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -375,7 +375,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout25</cstring> + <cstring>tqlayout25</cstring> </property> <hbox> <property name="name"> @@ -415,7 +415,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout26</cstring> + <cstring>tqlayout26</cstring> </property> <hbox> <property name="name"> @@ -458,7 +458,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout22</cstring> + <cstring>tqlayout22</cstring> </property> <grid> <property name="name"> @@ -544,7 +544,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -626,7 +626,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <hbox> <property name="name"> @@ -677,7 +677,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui index 3ed93a8f..7564d04a 100644 --- a/kmplot/kmplot/settingspagefonts.ui +++ b/kmplot/kmplot/settingspagefonts.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui index cafc3365..3ad5d990 100644 --- a/kmplot/kmplot/settingspageprecision.ui +++ b/kmplot/kmplot/settingspageprecision.ui @@ -26,7 +26,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>29</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>81</width> <height>20</height> @@ -212,7 +212,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui index eaaf0690..3b0cd872 100644 --- a/kmplot/kmplot/settingspagescaling.ui +++ b/kmplot/kmplot/settingspagescaling.ui @@ -18,7 +18,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout35</cstring> + <cstring>tqlayout35</cstring> </property> <hbox> <property name="name"> @@ -396,7 +396,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>91</height> diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui index 8c87cb40..c54384a2 100644 --- a/kmplot/kmplot/sliderwindow.ui +++ b/kmplot/kmplot/sliderwindow.ui @@ -23,7 +23,7 @@ <property name="name"> <cstring>slider</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -60,7 +60,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>45</width> <height>0</height> @@ -69,7 +69,7 @@ <property name="text"> <string>0</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index e7b84fb8..b5d03918 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.at(pos)=last_character; + function_name.tqat(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.at(pos)='f'; + function_name.tqat(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.at(0).latin1() ) + switch ( fstr.tqat(0).latin1() ) { case 'r': { |