Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

31 files changed, 171 insertions, 171 deletions

diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui
index 9678e889..7624f2de 100644
--- a/kmplot/kmplot/FktDlgData.ui
+++ b/kmplot/kmplot/FktDlgData.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FktDlgData</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="QLayoutWidget" 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>
@@ -417,7 +417,7 @@
     <slot access="protected">slotHelp()</slot>
     <slot>slotNewPrime()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp
index e8916f93..83a09080 100644
--- a/kmplot/kmplot/MainDlg.cpp
+++ b/kmplot/kmplot/MainDlg.cpp
@@ -63,13 +63,13 @@ class KmPlotIO;
 
 bool MainDlg::oldfileversion;
 
-MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name) :  DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(parentWidget)
+MainDlg::MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name) :  DCOPObject( "MainDlg" ), KParts::ReadOnlyPart( parent, name ), m_recentFiles( 0 ), m_modified(false), m_parent(tqparentWidget)
 {
 	// we need an instance
 	setInstance( KmPlotPartFactory::instance() );
 
-	kdDebug() << "parentWidget->name():" << parentWidget->name() << endl;
-	if ( TQString(parentWidget->name()).startsWith("KmPlot") )
+	kdDebug() << "tqparentWidget->name():" << tqparentWidget->name() << endl;
+	if ( TQString(tqparentWidget->name()).startsWith("KmPlot") )
 	{
 		setXMLFile("kmplot_part.rc");
 		m_readonly = false;
@@ -82,14 +82,14 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
 	}
 	fdlg = 0;
 	coordsDialog = 0;
-	m_popupmenu = new KPopupMenu(parentWidget);
-	view = new View( m_readonly, m_modified, m_popupmenu, parentWidget );
+	m_popupmenu = new KPopupMenu(tqparentWidget);
+	view = new View( m_readonly, m_modified, m_popupmenu, tqparentWidget );
 	connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) );
 	setWidget( view );
 	view->setFocusPolicy(TQWidget::ClickFocus);
 	minmaxdlg = new KMinMax(view, m_parent);
 	view->setMinMaxDlg(minmaxdlg);
-	m_quickEdit = new KLineEdit( parentWidget );
+	m_quickEdit = new KLineEdit( tqparentWidget );
 	m_quickEdit->setFocus();
 	TQToolTip::add( m_quickEdit, i18n( "Enter a function equation, for example: f(x)=x^2" ) );
 	setupActions();
@@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c
 	m_recentFiles->loadEntries( m_config );
 
 	// Let's create a Configure Diloag
-	m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() );
+	m_settingsDialog = new KConfigDialog( tqparentWidget, "settings", Settings::self() );
 	m_settingsDialog->setHelp("general-config");
 
 	// create and add the page(s)
@@ -538,7 +538,7 @@ void MainDlg::slotQuickEdit(const TQString& f_str_const )
 		KMessageBox::error( m_parent, i18n("Parametric functions must be definied in the \"New Parametric Plot\"-dialog which you can find in the menubar"));
 		return;
 	}
-	if  ( f_str.contains('y') != 0)
+	if  ( f_str.tqcontains('y') != 0)
 	{
 		KMessageBox::error( m_parent, i18n( "Recursive function is not allowed"));
 		m_quickEdit->setFocus();
@@ -785,12 +785,12 @@ KmPlotPartFactory::~KmPlotPartFactory()
 	s_instance = 0L;
 }
 
-KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
+KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
         TQObject *parent, const char *name,
         const char *, const TQStringList & )
 {
 	// Create an instance of our Part
-	MainDlg* obj = new MainDlg( parentWidget, widgetName, parent, name );
+	MainDlg* obj = new MainDlg( tqparentWidget, widgetName, parent, name );
 	emit objectCreated( obj );
 	return obj;
 }
diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h
index 7b4d83bf..69520f2a 100644
--- a/kmplot/kmplot/MainDlg.h
+++ b/kmplot/kmplot/MainDlg.h
@@ -64,7 +64,7 @@ class BrowserExtension;
 
 /** @short This is the main window of KmPlot.
  *
- * Its central widget view contains the parser, accessable via its parser() function.
+ * Its central widget view tqcontains the parser, accessable via its parser() function.
  * @see View, View::m_parser, View::parser
  */
 class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface
@@ -73,11 +73,11 @@ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface
 
 public:
 	/** Constuctor.
-	 * @param parentWidget parent widget for this part
+	 * @param tqparentWidget parent widget for this part
 	 * @param parent parent object
 	 * @param name name of this dialog
 	 */
-	MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const char *name);
+	MainDlg(TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name);
 	/// Cleaning up a bit.
 	virtual ~MainDlg();
 	/// This class needs access to private members, too.
@@ -219,7 +219,7 @@ class KmPlotPartFactory : public KParts::Factory
 public:
 	KmPlotPartFactory();
 	virtual ~KmPlotPartFactory();
-	virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
+	virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
 	                                        TQObject *parent, const char *name,
 	                                        const char *classname, const TQStringList &args );
 	static KInstance* instance();
diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
index f5158dc9..27b903a4 100644
--- a/kmplot/kmplot/Makefile.am
+++ b/kmplot/kmplot/Makefile.am
@@ -45,7 +45,7 @@ kde_module_LTLIBRARIES = libkmplotpart.la
 # the Part's source, library search path, and link libraries
 libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp  diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp
 libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkmplotpart_la_LIBADD  = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT)
+libkmplotpart_la_LIBADD  = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_KDEPRINT) -lDCOP $(LIB_KPARTS)
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)
diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp
index 0d45fd2c..e0b3ac5e 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 );
 	}
@@ -531,7 +531,7 @@ void View::setpi(TQString *s)
 	int i;
 	TQChar c(960);
 
-	while((i=s->find('p')) != -1) s->replace(i, 2, &c, 1);
+	while((i=s->find('p')) != -1) s->tqreplace(i, 2, &c, 1);
 }
 
 
@@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e)
 		csflg=0;
 	}
 	
-	if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
+	if(area.tqcontains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax))
 	{
 		TQPoint ptd, ptl;
 		TQPainter DC;
@@ -887,10 +887,10 @@ void View::mousePressEvent(TQMouseEvent *e)
 						it->setParameter( sw->slider->value() );
 				}
 
-				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.tqcontains('t')==1) //parametric plot
 				{
 					TQValueVector<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.tqcontains('t')==1)
 					{
 						if ( csmode == -1)
 						{
@@ -1681,7 +1681,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode,  double &dmin, double
 	else
 		forward_direction = true;
 	
-	int intervals = qRound((dmax-dmin)/dx);
+	int intervals = tqRound((dmax-dmin)/dx);
 	int at = 0;
 	
 	while ((at<=intervals) ||  (p_mode == 3 && x>=dmin && !forward_direction) || (p_mode == 3 && x<=dmax && forward_direction))
diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h
index a28aadbc..63785656 100644
--- a/kmplot/kmplot/View.h
+++ b/kmplot/kmplot/View.h
@@ -59,7 +59,7 @@ enum ZoomMode
 };
 
 /**
- * @short This class contains the plots. 
+ * @short This class tqcontains the plots. 
  *
  * It is the central widget of MainDlg.
  * @see MainDlg, MainDlg::view
diff --git a/kmplot/kmplot/diagr.cpp b/kmplot/kmplot/diagr.cpp
index ba65fce8..8f03961a 100644
--- a/kmplot/kmplot/diagr.cpp
+++ b/kmplot/kmplot/diagr.cpp
@@ -45,9 +45,9 @@ int isinf(double x)
 
 CDiagr::CDiagr()
 {
-	frameColor=qRgb(0, 0, 0);
-	axesColor=qRgb(0, 0, 0);
-	gridColor=qRgb(192, 192, 192);
+	frameColor=tqRgb(0, 0, 0);
+	axesColor=tqRgb(0, 0, 0);
+	gridColor=tqRgb(192, 192, 192);
 	borderThickness=2;
 	axesLineWidth = Settings::axesLineWidth();
 	gridLineWidth = Settings::gridLineWidth();
diff --git a/kmplot/kmplot/editderivativespage.ui b/kmplot/kmplot/editderivativespage.ui
index a6a88b78..7e257f93 100644
--- a/kmplot/kmplot/editderivativespage.ui
+++ b/kmplot/kmplot/editderivativespage.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EditDerivativesPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -217,7 +217,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>110</height>
@@ -268,7 +268,7 @@
     <tabstop>lineWidthDerivative2</tabstop>
     <tabstop>colorDerivative2</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp
index 2d75cc49..8100d742 100644
--- a/kmplot/kmplot/editfunction.cpp
+++ b/kmplot/kmplot/editfunction.cpp
@@ -296,7 +296,7 @@ void EditFunction::accept()
 	tmp_ufkt.f2_linewidth = editderivativespage->lineWidthDerivative2->value();
 	tmp_ufkt.f2_color = editderivativespage->colorDerivative2->color().rgb();
 	
-	if ( f_str.contains('y') != 0 && ( tmp_ufkt.f_mode || tmp_ufkt.f1_mode || tmp_ufkt.f2_mode) )
+	if ( f_str.tqcontains('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") );
 		return;
diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui
index 31d9bd28..6b8ff03f 100644
--- a/kmplot/kmplot/editfunctionpage.ui
+++ b/kmplot/kmplot/editfunctionpage.ui
@@ -7,7 +7,7 @@
     <property name="enabled">
         <bool>true</bool>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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&amp;)</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="">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="">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&amp;)</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&amp;)</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&amp;)</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="">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="">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&amp;)</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="">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="">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&amp;)</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="">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="">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>
@@ -897,7 +897,7 @@ Example: f(x)=x^2</string>
     <slot>slotHelp()</slot>
     <slot>customRange_toggled( bool )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kmplot/kmplot/editintegralpage.ui b/kmplot/kmplot/editintegralpage.ui
index 5180a8d2..3a8be1cf 100644
--- a/kmplot/kmplot/editintegralpage.ui
+++ b/kmplot/kmplot/editintegralpage.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EditIntegralPage</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -229,7 +229,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>62</height>
@@ -281,7 +281,7 @@
     <tabstop>lineWidth</tabstop>
     <tabstop>color</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp
index c2017c8a..dbcd3c18 100644
--- a/kmplot/kmplot/kconstanteditor.cpp
+++ b/kmplot/kmplot/kconstanteditor.cpp
@@ -199,7 +199,7 @@ void KConstantEditor::editConstantSlot()
         int index = 0;
         for( TQValueVector<Ufkt>::iterator it =  m_view->parser()->ufkt.begin(); it !=  m_view->parser()->ufkt.end(); ++it)
 	{
-		if( it->fstr.contains(constant)!=0 )
+		if( it->fstr.tqcontains(constant)!=0 )
 			m_view->parser()->reparse(index); //reparsing the function
                 ++index;
 	}
diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp
index 67ee0421..4136a8f8 100644
--- a/kmplot/kmplot/keditparametric.cpp
+++ b/kmplot/kmplot/keditparametric.cpp
@@ -103,7 +103,7 @@ void KEditParametric::setWidgets()
 
 void KEditParametric::accept()
 {
-	if  ( kLineEditXFunction->text().contains('y') != 0 ||  kLineEditYFunction->text().contains('y') != 0)
+	if  ( kLineEditXFunction->text().tqcontains('y') != 0 ||  kLineEditYFunction->text().tqcontains('y') != 0)
 	{
 		KMessageBox::error( this, i18n( "Recursive function not allowed"));
 		kLineEditXFunction->setFocus();
diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp
index 3f8db2c8..659710d9 100644
--- a/kmplot/kmplot/kminmax.cpp
+++ b/kmplot/kmplot/kminmax.cpp
@@ -258,13 +258,13 @@ void KMinMax::cmdFind_clicked()
 
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.contains('\'') == 1)
+	if ( function.tqcontains('\'') == 1)
 	{
 		p_mode = 1;
 		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.contains('\'') == 2)
+	else if ( function.tqcontains('\'') == 2)
 	{
 		p_mode = 2;
 		int pos = function.find('\'');
@@ -352,13 +352,13 @@ void KMinMax::list_highlighted(TQListBoxItem* item)
 	}
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.contains('\'') == 1)
+	if ( function.tqcontains('\'') == 1)
 	{
 		p_mode = 1;
 		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.contains('\'') == 2)
+	else if ( function.tqcontains('\'') == 2)
 	{
 		p_mode = 2;
 		int pos = function.find('\'');
@@ -390,13 +390,13 @@ void KMinMax::cmdParameter_clicked()
 {
 	TQString function( list->currentText() );
 	char p_mode = 0;
-	if ( function.contains('\'') == 1)
+	if ( function.tqcontains('\'') == 1)
 	{
 		p_mode = 1;
 		int pos = function.find('\'');
 		function.remove(pos,1);
 	}
-	else if ( function.contains('\'') == 2)
+	else if ( function.tqcontains('\'') == 2)
 	{
 		p_mode = 2;
 		int pos = function.find('\'');
diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp
index e6f71013..8cc03beb 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/kprinterdlg.cpp b/kmplot/kmplot/kprinterdlg.cpp
index aa74a7b5..91036668 100644
--- a/kmplot/kmplot/kprinterdlg.cpp
+++ b/kmplot/kmplot/kprinterdlg.cpp
@@ -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/parser.cpp b/kmplot/kmplot/parser.cpp
index ed064b85..efa391ac 100644
--- a/kmplot/kmplot/parser.cpp
+++ b/kmplot/kmplot/parser.cpp
@@ -190,7 +190,7 @@ double Parser::eval(TQString str)
 	
 	fix_expression(str,0);
         
-	if ( str.contains('y')!=0)
+	if ( str.tqcontains('y')!=0)
 	{
 		err=9;
                 delete []stack;
@@ -520,7 +520,7 @@ void Parser::fix_expression(TQString &str, int const pos)
                 }
         }
         TQString str_end = str.mid(pos);
-        str_end = str_end.replace(m_decimalsymbol, "."); //replace the locale decimal symbol with a '.'
+        str_end = str_end.tqreplace(m_decimalsymbol, "."); //tqreplace the locale decimal symbol with a '.'
         str.truncate(pos);
         str.append(str_end);
         //kdDebug() << "str:" << str << endl;
@@ -1006,7 +1006,7 @@ int Parser::parserError(bool showMessageBox)
 TQString Parser::number( double value )
 {
        TQString str = TQString::number( value, 'g', 6 );
-       str.replace( 'e', "*10^" );
+       str.tqreplace( 'e', "*10^" );
 //     kDebug() << "returning str="<<str<<endl;
        return str;
 }
diff --git a/kmplot/kmplot/parser.h b/kmplot/kmplot/parser.h
index 13098039..a07810bb 100644
--- a/kmplot/kmplot/parser.h
+++ b/kmplot/kmplot/parser.h
@@ -246,7 +246,7 @@ private:
 	 * \li  9 => recursive function call
 	 * \li  10 => didn't found the wanted constant
 	 * \li   11 => emtpy function
-	 * \li   12 => function name contains a capital letter
+	 * \li   12 => function name tqcontains a capital letter
 	 * \li   13 => function could not be found
 	 * \li   14 => evalation expression may not use user definded constants
 	 */
@@ -254,7 +254,7 @@ private:
 	///  Position where the error occurred.
         int errpos;
 
-        void fix_expression(TQString &, int const); ///adding extra *-characters, remove spaces and replace the locale .-character with '.'
+        void fix_expression(TQString &, int const); ///adding extra *-characters, remove spaces and tqreplace the locale .-character with '.'
         
 	void ps_init(),
 	heir1(),
diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui
index 92baf7e5..a0139aa0 100644
--- a/kmplot/kmplot/qconstanteditor.ui
+++ b/kmplot/kmplot/qconstanteditor.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QConstantEditor</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -133,7 +133,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>147</height>
@@ -193,7 +193,7 @@
     <slot>newNewConstantSlot()</slot>
     <slot>varlist_doubleClicked( QListViewItem * )</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui
index 1d9bdb0a..301a1c46 100644
--- a/kmplot/kmplot/qeditconstant.ui
+++ b/kmplot/kmplot/qeditconstant.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QEditConstant</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
         </widget>
         <widget class="QLayoutWidget" 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>
@@ -131,7 +131,7 @@
 <slots>
     <slot>txtVariable_lostFocus()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui
index b41573ab..d66f7c75 100644
--- a/kmplot/kmplot/qeditparametric.ui
+++ b/kmplot/kmplot/qeditparametric.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QEditParametric</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="QLayoutWidget" 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="QLayoutWidget" 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>
@@ -531,7 +531,7 @@ Example: sin(t)</string>
 <slots>
     <slot>slotHelp()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui
index e61c5c6d..9d3d5522 100644
--- a/kmplot/kmplot/qeditpolar.ui
+++ b/kmplot/kmplot/qeditpolar.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QEditPolar</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -395,7 +395,7 @@ Example: loop(angle)=ln(angle)</string>
 <slots>
     <slot>slotHelp()</slot>
 </slots>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kmplot/kmplot/qminmax.ui b/kmplot/kmplot/qminmax.ui
index d828cbd6..338d641a 100644
--- a/kmplot/kmplot/qminmax.ui
+++ b/kmplot/kmplot/qminmax.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QMinMax</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -138,5 +138,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmplot/kmplot/qparametereditor.ui b/kmplot/kmplot/qparametereditor.ui
index 619f4fd7..779d1393 100644
--- a/kmplot/kmplot/qparametereditor.ui
+++ b/kmplot/kmplot/qparametereditor.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>QParameterEditor</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -181,5 +181,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmplot/kmplot/settingspagecolor.ui b/kmplot/kmplot/settingspagecolor.ui
index e8e85323..a883f1ae 100644
--- a/kmplot/kmplot/settingspagecolor.ui
+++ b/kmplot/kmplot/settingspagecolor.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsPageColor</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <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="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout19</cstring>
+                            <cstring>tqlayout19</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -131,7 +131,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <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="QLayoutWidget">
                                 <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>
@@ -455,5 +455,5 @@
     <tabstop>kcfg_Color8</tabstop>
     <tabstop>kcfg_Color9</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmplot/kmplot/settingspagecoords.ui b/kmplot/kmplot/settingspagecoords.ui
index cf2826b3..7e2a8274 100644
--- a/kmplot/kmplot/settingspagecoords.ui
+++ b/kmplot/kmplot/settingspagecoords.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsPageCoords</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout23</cstring>
+                            <cstring>tqlayout23</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -131,7 +131,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout20</cstring>
+                                            <cstring>tqlayout20</cstring>
                                         </property>
                                         <grid>
                                             <property name="name">
@@ -277,7 +277,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout20_2</cstring>
+                                            <cstring>tqlayout20_2</cstring>
                                         </property>
                                         <grid>
                                             <property name="name">
@@ -335,7 +335,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout24</cstring>
+                            <cstring>tqlayout24</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -375,7 +375,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout25</cstring>
+                            <cstring>tqlayout25</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -415,7 +415,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout26</cstring>
+                            <cstring>tqlayout26</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -458,7 +458,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <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="QLayoutWidget">
                         <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>
@@ -751,7 +751,7 @@
     <tabstop>radioButton14</tabstop>
     <tabstop>kcfg_GridLineWidth</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kmplot/kmplot/settingspagefonts.ui b/kmplot/kmplot/settingspagefonts.ui
index e5f80ccd..10c6b80a 100644
--- a/kmplot/kmplot/settingspagefonts.ui
+++ b/kmplot/kmplot/settingspagefonts.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsPageFonts</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>110</height>
@@ -119,7 +119,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kfontcombo.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kmplot/kmplot/settingspageprecision.ui b/kmplot/kmplot/settingspageprecision.ui
index 25f732ce..a3711c76 100644
--- a/kmplot/kmplot/settingspageprecision.ui
+++ b/kmplot/kmplot/settingspageprecision.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsPagePrecision</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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="QLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -268,7 +268,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kmplot/kmplot/settingspagescaling.ui b/kmplot/kmplot/settingspagescaling.ui
index 222359ba..f004b5ac 100644
--- a/kmplot/kmplot/settingspagescaling.ui
+++ b/kmplot/kmplot/settingspagescaling.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsPageScaling</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -18,7 +18,7 @@
         </property>
         <widget class="QLayoutWidget">
             <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>
@@ -411,5 +411,5 @@
     <tabstop>kcfg_YScaling</tabstop>
     <tabstop>kcfg_YPrinting</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmplot/kmplot/sliderwindow.ui b/kmplot/kmplot/sliderwindow.ui
index deff716a..daf21345 100644
--- a/kmplot/kmplot/sliderwindow.ui
+++ b/kmplot/kmplot/sliderwindow.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SliderWindow</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -83,5 +83,5 @@
         <slot>setNum(int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp
index 18d9a3b3..7d34e58f 100644
--- a/kmplot/kmplot/xparser.cpp
+++ b/kmplot/kmplot/xparser.cpp
@@ -648,7 +648,7 @@ int XParser::addFunction(const TQString &f_str)
 	fixFunctionName(added_function);
 	if ( added_function.at(0)== 'x' || added_function.at(0)== 'y') //TODO: Make it possible to define parametric functions
 		return -1;
-	if  ( added_function.contains('y') != 0)
+	if  ( added_function.tqcontains('y') != 0)
 		return -1;
 	int const id = addfkt( added_function );
 	if (id==-1)