Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit bab171b2a7d7f36e2d5dd510df80fc8cb4a6b06f.

31 files changed, 126 insertions, 126 deletions

diff --git a/src/gui/asmformattingwidget.ui b/src/gui/asmformattingwidget.ui
index db4ee05..1245538 100644
--- a/src/gui/asmformattingwidget.ui
+++ b/src/gui/asmformattingwidget.ui
@@ -185,7 +185,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>484</height>
diff --git a/src/gui/contexthelp.cpp b/src/gui/contexthelp.cpp
index 050eecb..f7a2432 100644
--- a/src/gui/contexthelp.cpp
+++ b/src/gui/contexthelp.cpp
@@ -16,10 +16,10 @@
 
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqwhatsthis.h>
 
 #include <assert.h>
@@ -42,18 +42,18 @@ ContextHelp::ContextHelp( KateMDI::ToolView * parent )
 {
 	TQWhatsThis::add( this, i18n("Provides context-sensitive help relevant to the current editing being performed.") );
 	
-	TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
 
 	m_nameLbl = new TQLabel( this, "" );
-	vlayout->addWidget(m_nameLbl);
-	vlayout->addSpacing(8);
+	vtqlayout->addWidget(m_nameLbl);
+	vtqlayout->addSpacing(8);
 	
 	m_info = new TQTextBrowser( this, "" );
-	vlayout->addWidget(m_info);
-	m_info->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
+	vtqlayout->addWidget(m_info);
+	m_info->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding );
 	
 	TQSpacerItem *spacer3 = new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Preferred );
-	vlayout->addItem(spacer3);
+	vtqlayout->addItem(spacer3);
 	
 	slotClear();
 } 
diff --git a/src/gui/createsubprojectwidget.ui b/src/gui/createsubprojectwidget.ui
index 5354bcd..2d18c06 100644
--- a/src/gui/createsubprojectwidget.ui
+++ b/src/gui/createsubprojectwidget.ui
@@ -81,7 +81,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/src/gui/doublespinbox.cpp b/src/gui/doublespinbox.cpp
index 4418538..b994c23 100644
--- a/src/gui/doublespinbox.cpp
+++ b/src/gui/doublespinbox.cpp
@@ -40,7 +40,7 @@ DoubleSpinBox::DoubleSpinBox( double lower, double upper, double minAbs, double
 	m_minAbsValue = minAbs;
 	m_queuedSuffix = TQString();
 	
-	editor()->setAlignment( TQt::AlignRight );
+	editor()->tqsetAlignment( TQt::AlignRight );
 	
 	connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(checkIfChanged()) );
 	TQSpinBox::setMinValue( -(1<<30) );
@@ -129,7 +129,7 @@ double DoubleSpinBox::getMult()
 	if ( text.length() == 0 )
 		return 1.0;
 	
-	if ( text.endsWith( m_unit, false ) )
+	if ( text.tqendsWith( m_unit, false ) )
 		text = text.remove( text.length() - m_unit.length(), m_unit.length() );
 	
 	text.stripWhiteSpace();
diff --git a/src/gui/generaloptionswidget.ui b/src/gui/generaloptionswidget.ui
index 729861b..6c9cd19 100644
--- a/src/gui/generaloptionswidget.ui
+++ b/src/gui/generaloptionswidget.ui
@@ -152,7 +152,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8_2</cstring>
+                        <cstring>tqlayout8_2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -217,7 +217,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -233,7 +233,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
diff --git a/src/gui/gpasmsettingswidget.ui b/src/gui/gpasmsettingswidget.ui
index e8d5c32..2e94ebc 100644
--- a/src/gui/gpasmsettingswidget.ui
+++ b/src/gui/gpasmsettingswidget.ui
@@ -87,7 +87,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -207,7 +207,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -224,7 +224,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -241,7 +241,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
diff --git a/src/gui/itemeditor.cpp b/src/gui/itemeditor.cpp
index 4e800e5..58b0661 100644
--- a/src/gui/itemeditor.cpp
+++ b/src/gui/itemeditor.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
@@ -42,17 +42,17 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
 {
 	TQWhatsThis::add( this, i18n("This allows editing of advanced properties of the selected item(s). Right click on the picture of the item to set the orientation.") );
 	
-	TQVBoxLayout *vlayout = new TQVBoxLayout( this, 0, 6 );
+	TQVBoxLayout *vtqlayout = new TQVBoxLayout( this, 0, 6 );
 
 	m_nameLbl = new TQLabel( this, "" );
-	vlayout->addWidget(m_nameLbl);
-	vlayout->addSpacing(8);
+	vtqlayout->addWidget(m_nameLbl);
+	vtqlayout->addSpacing(8);
 
 	propList = new PropertiesListView(this);
-	vlayout->addWidget(propList);
+	vtqlayout->addWidget(propList);
 	TQWhatsThis::add(propList,i18n("<qt>Shows properties associated with the currently selected item(s).<p>Select a property to change its value. If multiple items are selected with different values then the property will appear greyed out, use ""Merge Properties"" to make them the same.<p>Select ""Defaults to set all properties to their default values""")); 
 	
-	TQHBoxLayout *h1Layout = new TQHBoxLayout( vlayout, 4 );
+	TQHBoxLayout *h1Layout = new TQHBoxLayout( vtqlayout, 4 );
 	TQSpacerItem *spacer1 = new TQSpacerItem( 1, 1 );
 	h1Layout->addItem(spacer1);
 	
@@ -67,7 +67,7 @@ ItemEditor::ItemEditor( KateMDI::ToolView * parent )
 	h1Layout->addWidget(m_mergeBtn);
 	
 	// Qt::Orientation widget stuff
-	TQHBoxLayout *h2Layout = new TQHBoxLayout( vlayout, 6 );
+	TQHBoxLayout *h2Layout = new TQHBoxLayout( vtqlayout, 6 );
 	TQSpacerItem *spacer2 = new TQSpacerItem( 1, 1 );
 	h2Layout->addItem(spacer2);
 	m_orientationWidget = new OrientationWidget(this);
diff --git a/src/gui/itemselector.cpp b/src/gui/itemselector.cpp
index 5b4ae41..539bc40 100644
--- a/src/gui/itemselector.cpp
+++ b/src/gui/itemselector.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 
 #include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tqwhatsthis.h>
 
@@ -163,7 +163,7 @@ void ItemSelector::slotContextMenuRequested( TQListViewItem* item, const TQPoint
 	}
 	
 	TQPopupMenu *menu = new TQPopupMenu(this);
-	menu->insertItem( i18n("Remove %1").arg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
+	menu->insertItem( i18n("Remove %1").tqarg(item->text(0)), this, TQT_SLOT(slotRemoveSelectedItem()), TQt::Key_Delete );
 	menu->popup(pos);
 }
 
@@ -177,7 +177,7 @@ void ItemSelector::slotRemoveSelectedItem()
 	emit itemRemoved( item->key( 0, 0 ) );
 	ILVItem *parent = dynamic_cast<ILVItem*>(item->TQListViewItem::parent());
 	delete item;
-	// Get rid of the category as well if it has no children
+	// Get rid of the category as well if it has no tqchildren
 	if ( parent && !parent->firstChild() )
 	{
 		m_categories.remove(parent->text(0));
diff --git a/src/gui/logicwidget.ui b/src/gui/logicwidget.ui
index e57feab..2280eb4 100644
--- a/src/gui/logicwidget.ui
+++ b/src/gui/logicwidget.ui
@@ -239,7 +239,7 @@
 
 These values will apply to all components, apart from the PIC, whose pins' impedances depend on the pin in use.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -253,7 +253,7 @@ These values will apply to all components, apart from the PIC, whose pins' imped
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/gui/logview.cpp b/src/gui/logview.cpp
index 2da75a2..574d967 100644
--- a/src/gui/logview.cpp
+++ b/src/gui/logview.cpp
@@ -49,23 +49,23 @@ void LogView::addOutput( TQString text, OutputType outputType, MessageInfo messa
 	switch(outputType)
 	{
 		case LogView::ot_important:
-			append( TQString("<font color=\"#000000\"><b>%1</b></font>").arg(text) );
+			append( TQString("<font color=\"#000000\"><b>%1</b></font>").tqarg(text) );
 			break;
 			
 		case LogView::ot_info:
-			append( TQString("<font color=\"#000000\"><i>%1</i></font>").arg(text) );
+			append( TQString("<font color=\"#000000\"><i>%1</i></font>").tqarg(text) );
 			break;
 			
 		case LogView::ot_message:
-			append( TQString("<font color=\"#000000\">%1</font>").arg(text) );
+			append( TQString("<font color=\"#000000\">%1</font>").tqarg(text) );
 			break;
 			
 		case LogView::ot_warning:
-			append( TQString("<font color=\"#666666\">%1</font>").arg(text) );
+			append( TQString("<font color=\"#666666\">%1</font>").tqarg(text) );
 			break;
 			
 		case LogView::ot_error:
-			append( TQString("<font color=\"#800000\">%1</font>").arg(text) );
+			append( TQString("<font color=\"#800000\">%1</font>").tqarg(text) );
 			break;
 	}
 	
diff --git a/src/gui/microselectwidget.cpp b/src/gui/microselectwidget.cpp
index f988a8d..59dfa33 100644
--- a/src/gui/microselectwidget.cpp
+++ b/src/gui/microselectwidget.cpp
@@ -17,7 +17,7 @@
 #include <klocale.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqvariant.h>
 #include <tqwhatsthis.h>
@@ -35,13 +35,13 @@ MicroSelectWidget::MicroSelectWidget( TQWidget* parent, const char* name, WFlags
 	m_pMicroFamilyLabel->setText( i18n("Family") );
 
 	m_pMicroFamily = new KComboBox( FALSE, this, "m_pMicroFamily" );
-	m_pMicroFamily->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+	m_pMicroFamily->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
 
 	m_pMicroLabel = new TQLabel( this, "m_pMicroLabel" );
 	m_pMicroLabel->setText( i18n("Micro") );
 
 	m_pMicro = new KComboBox( FALSE, this, "m_pMicro" );
-	m_pMicro->setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+	m_pMicro->tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
 	m_pMicro->setEditable( TRUE );
 	m_pMicro->setAutoCompletion(true);
 	updateFromAllowed();
diff --git a/src/gui/microsettingsdlg.cpp b/src/gui/microsettingsdlg.cpp
index 4a14626..d8d3a05 100644
--- a/src/gui/microsettingsdlg.cpp
+++ b/src/gui/microsettingsdlg.cpp
@@ -26,7 +26,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <tqtable.h>
 #include <tqwhatsthis.h>
@@ -69,10 +69,10 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
 		TQGroupBox * groupBox = new TQGroupBox( *it, m_pWidget->portsGroupBox );
 		
 		groupBox->setColumnLayout(0, Qt::Vertical );
-		groupBox->layout()->setSpacing( 6 );
-		groupBox->layout()->setMargin( 11 );
-		TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->layout() );
-		groupBoxLayout->setAlignment( TQt::AlignTop );
+		groupBox->tqlayout()->setSpacing( 6 );
+		groupBox->tqlayout()->setMargin( 11 );
+		TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() );
+		groupBoxLayout->tqsetAlignment( TQt::AlignTop );
 		
 		// TODO: replace this with i18n( "the type", "Type (TRIS register):" );
 		groupBoxLayout->addWidget( new TQLabel( i18n("Type (TRIS register):"), groupBox ), 0, 0 ); 
@@ -84,8 +84,8 @@ MicroSettingsDlg::MicroSettingsDlg( MicroSettings * microSettings, TQWidget *par
 		m_portStateEdit[row] = new KLineEdit( portState, groupBox );
 		groupBoxLayout->addWidget( m_portStateEdit[row], 1, 1 );
 
-// 		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->insertWidget( row, groupBox );
-		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->layout()))->addWidget( groupBox );
+// 		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->insertWidget( row, groupBox );
+		(dynamic_cast<TQVBoxLayout*>(m_pWidget->portsGroupBox->tqlayout()))->addWidget( groupBox );
 	}
 	//END Initialize initial port settings
 	
@@ -370,26 +370,26 @@ void MicroSettingsDlg::savePort( int row )
 	
 	TQString typeText = m_portTypeEdit[row]->text();
 	bool typeOk = true;
-	if 		( typeText.startsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 );
+	if 		( typeText.tqstartsWith( "0x", false ) ) type = typeText.remove(0,2).toInt( &typeOk, 16 );
 	else if ( typeText.contains( TQRegExp("[^01]") ) ) type = typeText.toInt( &typeOk, 10 );
 	else type = typeText.toInt( &typeOk, 2 );
 	
 	if ( !typeOk )
 	{
-// 		KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").arg(typeText) );
+// 		KMessageBox::sorry( this, i18n("Unregnised Port Type: %1").tqarg(typeText) );
 		return;
 	}
 	
 	
 	TQString stateText = m_portStateEdit[row]->text();
 	bool stateOk = true;
-	if 		( stateText.startsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 );
+	if 		( stateText.tqstartsWith( "0x", false ) ) state = stateText.remove(0,2).toInt( &stateOk, 16 );
 	else if ( stateText.contains( TQRegExp("[^01]") ) ) state = stateText.toInt( &stateOk, 10 );
 	else state = stateText.toInt( &stateOk, 2 );
 	
 	if ( !stateOk )
 	{
-// 		KMessageBox::sorry( this, i18n("Unregnised Port State: %1").arg(stateText) );
+// 		KMessageBox::sorry( this, i18n("Unregnised Port State: %1").tqarg(stateText) );
 		return;
 	}
 	
@@ -406,12 +406,12 @@ void MicroSettingsDlg::saveVariable( int row )
 	TQString valueText = m_pWidget->variables->text( row, 1 );
 	int value;
 	bool ok = true;
-	if ( valueText.startsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 );
+	if ( valueText.tqstartsWith( "0x", false ) ) value = valueText.remove(0,2).toInt( &ok, 16 );
 	else value = valueText.toInt( &ok, 10 );
 
 	if (!ok)
 	{
-		KMessageBox::sorry( this, i18n("Invalid variable value: %1").arg(valueText) );
+		KMessageBox::sorry( this, i18n("Invalid variable value: %1").tqarg(valueText) );
 		return;
 	}
 	
diff --git a/src/gui/microsettingswidget.ui b/src/gui/microsettingswidget.ui
index 9030238..3d5ff66 100644
--- a/src/gui/microsettingswidget.ui
+++ b/src/gui/microsettingswidget.ui
@@ -96,7 +96,7 @@ Drag it to set the type (input/output).</string>
                     <property name="name">
                         <cstring>variables</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>64</height>
@@ -145,7 +145,7 @@ Drag it to set the type (input/output).</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>60</width>
                             <height>20</height>
diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui
index 4f0b4dc..cf33850 100644
--- a/src/gui/newfilewidget.ui
+++ b/src/gui/newfilewidget.ui
@@ -59,7 +59,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
             <property name="text">
                 <string>File Type:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
@@ -75,7 +75,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>500</width>
                     <height>150</height>
@@ -128,13 +128,13 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -151,7 +151,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/src/gui/newpinmappingwidget.ui b/src/gui/newpinmappingwidget.ui
index 36a7117..4972642 100644
--- a/src/gui/newpinmappingwidget.ui
+++ b/src/gui/newpinmappingwidget.ui
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
@@ -83,7 +83,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>300</width>
                     <height>0</height>
@@ -112,7 +112,7 @@
             <property name="name">
                 <cstring>typeCombo</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
diff --git a/src/gui/newprojectwidget.ui b/src/gui/newprojectwidget.ui
index b7c73b8..dc36007 100644
--- a/src/gui/newprojectwidget.ui
+++ b/src/gui/newprojectwidget.ui
@@ -48,7 +48,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/gui/orientationwidget.cpp b/src/gui/orientationwidget.cpp
index e46e191..19f88c3 100644
--- a/src/gui/orientationwidget.cpp
+++ b/src/gui/orientationwidget.cpp
@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <tqbitmap.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqimage.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
@@ -30,7 +30,7 @@ const int _size = 44;
 OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
 	: TQWidget(parent, name)
 {
-	TQGridLayout *layout = new TQGridLayout( this, 2, 4, 0, 4 );
+	TQGridLayout *tqlayout = new TQGridLayout( this, 2, 4, 0, 4 );
 	p_activeFlowPart = 0l;
 	
 	for ( int row=0; row<2; ++row )
@@ -39,7 +39,7 @@ OrientationWidget::OrientationWidget(TQWidget *parent, const char *name)
 		{
 			TQPushButton *btn = new TQPushButton(this);
 			m_toolBtn[row][col] = btn;
-			layout->addWidget( btn, row, col );
+			tqlayout->addWidget( btn, row, col );
 			btn->setFixedSize( _size+6, _size+6 );
 // 			btn->setFlat(true);
 			btn->setEnabled(false);
diff --git a/src/gui/oscilloscopeview.cpp b/src/gui/oscilloscopeview.cpp
index e42af21..f74a822 100644
--- a/src/gui/oscilloscopeview.cpp
+++ b/src/gui/oscilloscopeview.cpp
@@ -77,7 +77,7 @@ void OscilloscopeView::updateView()
 void OscilloscopeView::updateViewTimeout()
 {
 	b_needRedraw = true;
-	repaint(false);
+	tqrepaint(false);
 	updateTimeLabel();
 }
 
@@ -130,7 +130,7 @@ void OscilloscopeView::mousePressEvent( TQMouseEvent *event )
 			for ( uint i=0; i<5; ++i )
 			{
 				const int num = fps[i];
-				fpsMenu.insertItem( i18n("%1 fps").arg(num), num );
+				fpsMenu.insertItem( i18n("%1 fps").tqarg(num), num );
 				fpsMenu.setItemChecked( num, num == m_fps );
 			}
 	
diff --git a/src/gui/oscilloscopeview.h b/src/gui/oscilloscopeview.h
index 533c92e..b4e6a10 100644
--- a/src/gui/oscilloscopeview.h
+++ b/src/gui/oscilloscopeview.h
@@ -33,7 +33,7 @@ class OscilloscopeView : public TQFrame
 		
 	public slots:
 		/**
-		 * Sets the needRedraw flag to true, and then class repaint
+		 * Sets the needRedraw flag to true, and then class tqrepaint
 		 */
 		void updateView();
 		void slotSetFrameRate( int fps );
diff --git a/src/gui/oscilloscopewidget.ui b/src/gui/oscilloscopewidget.ui
index 79a98d0..0a6acb9 100644
--- a/src/gui/oscilloscopewidget.ui
+++ b/src/gui/oscilloscopewidget.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="3" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -67,13 +67,13 @@
                     <property name="name">
                         <cstring>probePositioner</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>16</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>16</width>
                             <height>32767</height>
@@ -92,7 +92,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -111,7 +111,7 @@
                     <property name="text">
                         <string>Zoom</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -150,7 +150,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -164,7 +164,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -178,7 +178,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>6</height>
@@ -216,7 +216,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>6</width>
                     <height>6</height>
@@ -233,7 +233,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>6</width>
                     <height>6</height>
diff --git a/src/gui/outputmethodwidget.ui b/src/gui/outputmethodwidget.ui
index 3eee06d..0814591 100644
--- a/src/gui/outputmethodwidget.ui
+++ b/src/gui/outputmethodwidget.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>450</width>
             <height>0</height>
@@ -115,7 +115,7 @@
             <property name="name">
                 <cstring>m_pMicroSelect</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -132,7 +132,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/src/gui/picprogrammerconfigwidget.ui b/src/gui/picprogrammerconfigwidget.ui
index 60654f9..43929f9 100644
--- a/src/gui/picprogrammerconfigwidget.ui
+++ b/src/gui/picprogrammerconfigwidget.ui
@@ -43,7 +43,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>295</width>
                             <height>20</height>
@@ -215,7 +215,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -249,7 +249,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/gui/pieditor.cpp b/src/gui/pieditor.cpp
index f0daf3f..5adce57 100644
--- a/src/gui/pieditor.cpp
+++ b/src/gui/pieditor.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 //BEGIN class PIEditor
 PIEditor::PIEditor(TQString id, Variant *data, TQWidget *parent, const char *name)
@@ -46,8 +46,8 @@ void PIEditor::valueChanged( TQVariant /*variant*/ )
 PIBool::PIBool(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor( id, data, parent, name )
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	m_comboBox = new KComboBox(this);
 	m_comboBox->insertItem( i18n("True"), 0 );
@@ -82,8 +82,8 @@ void PIBool::valueChanged( TQVariant /*variant*/ )
 PIColor::PIColor(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	m_combo = new ColorCombo( (ColorCombo::ColorScheme)m_data->colorScheme(), this );
 	m_combo->setColor(m_data->value().toColor());
@@ -117,8 +117,8 @@ void PIColor::valueChanged( TQVariant /*variant*/ )
 PIDouble::PIDouble(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	spin = new DoubleSpinBox(m_data->minValue(),m_data->maxValue(),m_data->minAbsValue(),m_data->value().toDouble(),m_data->unit(),this);
 	
@@ -145,8 +145,8 @@ void PIDouble::valueChanged( TQVariant /*variant*/ )
 PIFilename::PIFilename(TQString id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor(id,data,parent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	m_combo = 0L;
 	if( m_data->allowed().count() == 0 )
@@ -196,8 +196,8 @@ void PIFilename::valueChanged( TQVariant /*variant*/ )
 PIInt::PIInt( const TQString &id, Variant *data, TQWidget *parent, const char *name )
 	: PIEditor( id, data, parent, name )
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	spin = new KIntSpinBox( (int)m_data->minValue(), (int)m_data->maxValue(), 1, m_data->value().toInt(), 10, this );
 	
@@ -224,8 +224,8 @@ void PIInt::valueChanged( TQVariant /*variant*/ )
 PILineEdit::PILineEdit(TQString id, Variant *data, TQWidget *parent, const char *name)
 	: PIEditor( id, data, parent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	m_edit = new KLineEdit( m_data->value().toString() , this );
 	connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotEditTextChanged()));
 }
@@ -251,8 +251,8 @@ void PILineEdit::valueChanged( TQVariant /*variant*/ )
 PIStringCombo::PIStringCombo(TQString id, Variant *data, TQWidget *parent, const char *name)
 	: PIEditor( id, data, parent, name)
 {
-	TQHBoxLayout *layout = new TQHBoxLayout(this);
-	layout->setAutoAdd(true);
+	TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
+	tqlayout->setAutoAdd(true);
 	
 	m_combo = new KComboBox( this );
 	m_combo->insertStringList(m_data->allowed());
diff --git a/src/gui/probepositioner.cpp b/src/gui/probepositioner.cpp
index 25f7119..481612c 100644
--- a/src/gui/probepositioner.cpp
+++ b/src/gui/probepositioner.cpp
@@ -41,7 +41,7 @@ ProbePositioner::~ProbePositioner()
 void ProbePositioner::forceRepaint()
 {
 	b_needRedraw = true;
-	repaint(false);
+	tqrepaint(false);
 }
 
 
diff --git a/src/gui/processingoptionswidget.ui b/src/gui/processingoptionswidget.ui
index 658e394..501fd3b 100644
--- a/src/gui/processingoptionswidget.ui
+++ b/src/gui/processingoptionswidget.ui
@@ -26,7 +26,7 @@
             <property name="name">
                 <cstring>m_pMicroSelect</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -43,7 +43,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/gui/programmerwidget.ui b/src/gui/programmerwidget.ui
index e9e603e..b41a05a 100644
--- a/src/gui/programmerwidget.ui
+++ b/src/gui/programmerwidget.ui
@@ -50,7 +50,7 @@
             <property name="name">
                 <cstring>m_pMicroSelect</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -83,7 +83,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/src/gui/projectdlgs.cpp b/src/gui/projectdlgs.cpp
index 4524bea..0f3ed9d 100644
--- a/src/gui/projectdlgs.cpp
+++ b/src/gui/projectdlgs.cpp
@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 //BEGIN class NewProjectDlg
 NewProjectDlg::NewProjectDlg( TQWidget * parent )
@@ -165,8 +165,8 @@ LinkerOptionsDlg::LinkerOptionsDlg( LinkerOptions * linkingOptions, TQWidget *pa
 	
 	delete m_pWidget->m_pExternalLibraries;
 	m_pWidget->m_pExternalLibraries = new KEditListBox( i18n("Link libraries outside project"), m_pExternalLibraryRequester->customEditor(), m_pWidget );
-	m_pWidget->m_pExternalLibraries->layout()->setMargin(11);
-	(dynamic_cast<TQGridLayout*>(m_pWidget->layout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
+	m_pWidget->m_pExternalLibraries->tqlayout()->setMargin(11);
+	(dynamic_cast<TQGridLayout*>(m_pWidget->tqlayout()))->addMultiCellWidget( m_pWidget->m_pExternalLibraries, 7, 7, 0, 1 );
 	
 #if defined(KDE_MAKE_VERSION)
 # if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
diff --git a/src/gui/propertieslistview.cpp b/src/gui/propertieslistview.cpp
index e647997..75d21ba 100644
--- a/src/gui/propertieslistview.cpp
+++ b/src/gui/propertieslistview.cpp
@@ -191,18 +191,18 @@ void PropertiesListView::slotSelectionChanged(TQListViewItem *item)
 	connect(m_editor,TQT_SIGNAL(editorDataChanged(const TQString&,TQVariant)),this,TQT_SLOT(slotDataChanged(const TQString&,TQVariant)));
 	
 	int x = columnWidth(0);
-	int y = viewportToContents(TQPoint(0,itemRect(p_lastItem).y())).y();
+	int y = viewportToContents(TQPoint(0,tqitemRect(p_lastItem).y())).y();
 	addChild(m_editor,x,y);
 	m_editor->setFocus();
 	m_editor->show();
-	m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height()));
+	m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height()));
 	
 	if(p_lastItem->data()->type() == Variant::Type::FileName)
 	{
 		// The folder button in the KURLComboBox has a minimum size taller than
 		// the height of the ListViewItems so this is a temporary kludge to
 		// make it look slightly acceptable.
-		m_editor->setGeometry(TQRect(x,y,columnWidth(1),itemRect(p_lastItem).height()+7));
+		m_editor->setGeometry(TQRect(x,y,columnWidth(1),tqitemRect(p_lastItem).height()+7));
 	}
 	
 	// Active the editor as appropriate
@@ -271,7 +271,7 @@ void PropertiesListView::headerSizeChanged(int section, int /*oldSize*/, int new
 	
 	// Resize the editor to the new column width
 	// and move it to the right place.
-	TQRect rect = m_editor->geometry();
+	TQRect rect = m_editor->tqgeometry();
 	rect.setWidth(newSize);
 	rect.setX( columnWidth(0) );
 	m_editor->setGeometry(rect);
diff --git a/src/gui/sdccoptionswidget.ui b/src/gui/sdccoptionswidget.ui
index 475a53b..a8412b8 100644
--- a/src/gui/sdccoptionswidget.ui
+++ b/src/gui/sdccoptionswidget.ui
@@ -111,7 +111,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -225,7 +225,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -397,7 +397,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -537,7 +537,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -570,7 +570,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/src/gui/settingsdlg.cpp b/src/gui/settingsdlg.cpp
index 3fd5a28..72a7a07 100644
--- a/src/gui/settingsdlg.cpp
+++ b/src/gui/settingsdlg.cpp
@@ -104,19 +104,19 @@ void SettingsDlg::slotUpdateRefreshRateLabel( int sliderValue )
 	switch(sliderValue)
 	{
 		case 0:
-			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").arg(number) );
+			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Lowest (%1 FPS)").tqarg(number) );
 			break;
 		case 1:
-			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").arg(number) );
+			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Low (%1 FPS)").tqarg(number) );
 			break;
 		case 2:
-			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").arg(number) );
+			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Medium (%1 FPS)").tqarg(number) );
 			break;
 		case 3:
-			m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").arg(number) );
+			m_generalOptionsWidget->refreshRateLabel->setText( i18n("High (%1 FPS)").tqarg(number) );
 			break;
 		case 4:
-			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").arg(number) );
+			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Highest (%1 FPS)").tqarg(number) );
 			break;
 		default:
 			m_generalOptionsWidget->refreshRateLabel->setText( i18n("Unknown value") );
@@ -141,9 +141,9 @@ void SettingsDlg::slotUpdatePicProgrammerDescription()
 	
 	TQString programLocation = KStandardDirs::findExe( executable );
 	if ( programLocation.isNull() )
-		description.prepend( i18n("<b>%1</b> cannot be found.<br>").arg( executable ) );
+		description.prepend( i18n("<b>%1</b> cannot be found.<br>").tqarg( executable ) );
 	else
-		description.prepend( i18n("<b>%1</b> found: %2<br>").arg( executable ).arg(programLocation) );
+		description.prepend( i18n("<b>%1</b> found: %2<br>").tqarg( executable ).tqarg(programLocation) );
 	
 	m_picProgrammerConfigWidget->m_pProgrammerDescription->setText( description );
 	m_picProgrammerConfigWidget->removeButton->setEnabled( customProgrammer );
@@ -193,7 +193,7 @@ void SettingsDlg::slotRemoveProgrammerConfig()
 	
 	TQString program = combo->currentText();
 	
-	KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").arg(program), i18n("Remove \"%1\"").arg(program), i18n("Remove") );
+	KMessageBox::ButtonCode confirm = (KMessageBox::ButtonCode)KMessageBox::warningContinueCancel( this, i18n("Remove programmer configuration \"%1\"?").tqarg(program), i18n("Remove \"%1\"").tqarg(program), i18n("Remove") );
 	if ( confirm == KMessageBox::Cancel )
 		return;
 	
diff --git a/src/gui/symbolviewer.cpp b/src/gui/symbolviewer.cpp
index f264cd7..170880b 100644
--- a/src/gui/symbolviewer.cpp
+++ b/src/gui/symbolviewer.cpp
@@ -19,7 +19,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <assert.h>