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

33 files changed, 225 insertions, 225 deletions

diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index 5aef8a26f..26483e2ad 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 
 #include <kaccelmanager.h>
@@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name )
   topLayout->addWidget( mInterval, 2, 1 );
   label->setBuddy( mInterval );
 
-  resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) );
 
   KAcceleratorManager::manage( page );
 }
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
index 1980c3762..8d2b5e302 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
@@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name )
 
   // Anything smaller than this does not make sense.
   setMinimumSize( 16, 16 );
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
                  TQSizePolicy::Expanding, false ) );
 }
 
@@ -78,7 +78,7 @@ bool BarGraph::removeBar( uint idx )
   }
 
   samples.resize( --bars );
-  footers.remove( footers.tqat( idx ) );
+  footers.remove( footers.at( idx ) );
   update();
 
   return true;
@@ -103,7 +103,7 @@ void BarGraph::paintEvent( TQPaintEvent* )
 
   TQPixmap pm( w, h );
   TQPainter p;
-  p.tqbegin( &pm, this );
+  p.begin( &pm, this );
   p.setFont( TQFont( p.font().family(), fontSize ) );
   TQFontMetrics fm( p.font() );
 
@@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* )
 
   /* Draw white line along the bottom and the right side of the
    * widget to create a 3D like look. */
-  p.setPen( TQColor( tqcolorGroup().light() ) );
+  p.setPen( TQColor( colorGroup().light() ) );
   p.drawLine( 0, h - 1, w - 1, h - 1 );
   p.drawLine( w - 1, 0, w - 1, h - 1 );
 
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
index 7163f9b99..3917fc86b 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc
@@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti
   else
     mPlotter = new BarGraph( frame() );
 
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 
   /* All RMB clicks to the mPlotter widget will be handled by 
    * SensorDisplay::eventFilter. */
@@ -94,11 +94,11 @@ void DancingBars::configureSettings()
   TQValueList< TQStringList > list;
   for ( uint i = mBars - 1; i < mBars; i-- ) {
     TQStringList entry;
-    entry << sensors().tqat( i )->hostName();
-    entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() );
+    entry << sensors().at( i )->hostName();
+    entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() );
     entry << mPlotter->footers[ i ];
-    entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() );
-    entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) );
+    entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() );
+    entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) );
 
     list.append( entry );
   }
@@ -135,8 +135,8 @@ void DancingBars::applySettings()
   for ( uint i = 0; i < sensors().count(); i++ ) {
     bool found = false;
     for ( it = list.begin(); it != list.end(); ++it ) {
-      if ( (*it)[ 0 ] == sensors().tqat( i )->hostName() &&
-           (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() ) ) {
+      if ( (*it)[ 0 ] == sensors().at( i )->hostName() &&
+           (*it)[ 1 ] == KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() ) ) {
         mPlotter->footers[ i ] = (*it)[ 2 ];
         found = true;
         break;
@@ -147,7 +147,7 @@ void DancingBars::applySettings()
       removeSensor( i );
   }
 
-  tqrepaint();
+  repaint();
   setModified( true );
 }
 
@@ -158,7 +158,7 @@ void DancingBars::applyStyle()
   mPlotter->backgroundColor = KSGRD::Style->backgroundColor();
   mPlotter->fontSize = KSGRD::Style->fontSize();
 
-  tqrepaint();
+  repaint();
   setModified( true );
 }
 
@@ -185,8 +185,8 @@ bool DancingBars::addSensor( const TQString &hostName, const TQString &name,
   TQString tooltip;
   for ( uint i = 0; i < mBars; ++i ) {
     tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
-                                   .arg( sensors().tqat( i )->hostName() )
-                                   .arg( sensors().tqat( i )->name() );
+                                   .arg( sensors().at( i )->hostName() )
+                                   .arg( sensors().at( i )->name() );
   }
   TQToolTip::remove( mPlotter );
   TQToolTip::add( mPlotter, tooltip );
@@ -209,8 +209,8 @@ bool DancingBars::removeSensor( uint pos )
   TQString tooltip;
   for ( uint i = 0; i < mBars; ++i ) {
     tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
-                                   .arg( sensors().tqat( i )->hostName() )
-                                   .arg( sensors().tqat( i )->name() );
+                                   .arg( sensors().at( i )->hostName() )
+                                   .arg( sensors().at( i )->name() );
   }
   TQToolTip::remove( mPlotter );
   TQToolTip::add( mPlotter, tooltip );
@@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* )
     frame()->setGeometry( 0, 0, width(), height() );
 }
 
-TQSize DancingBars::tqsizeHint()
+TQSize DancingBars::sizeHint()
 {
   if ( noFrame() )
-    return ( mPlotter->tqsizeHint() );
+    return ( mPlotter->sizeHint() );
   else
-    return ( frame()->tqsizeHint() );
+    return ( frame()->sizeHint() );
 }
 
 void DancingBars::answerReceived( int id, const TQString &answer )
@@ -272,7 +272,7 @@ void DancingBars::answerReceived( int id, const TQString &answer )
         mPlotter->changeRange( info.min(), info.max() );
 			}
 
-    sensors().tqat( id - 100 )->setUnit( info.unit() );
+    sensors().at( id - 100 )->setUnit( info.unit() );
 	}
 }
 
@@ -331,9 +331,9 @@ bool DancingBars::saveSettings( TQDomDocument &doc, TQDomElement &element,
   for ( uint i = 0; i < mBars; ++i ) {
     TQDomElement beam = doc.createElement( "beam" );
     element.appendChild( beam );
-    beam.setAttribute( "hostName", sensors().tqat( i )->hostName() );
-    beam.setAttribute( "sensorName", sensors().tqat( i )->name() );
-    beam.setAttribute( "sensorType", sensors().tqat( i )->type() );
+    beam.setAttribute( "hostName", sensors().at( i )->hostName() );
+    beam.setAttribute( "sensorName", sensors().at( i )->name() );
+    beam.setAttribute( "sensorType", sensors().at( i )->type() );
     beam.setAttribute( "sensorDescr", mPlotter->footers[ i ] );
   }
 
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h
index 35feaa07f..3ccc03f86 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.h
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h
@@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay
 
     void updateSamples( const TQMemArray<double> &samples );
 
-    virtual TQSize tqsizeHint();
+    virtual TQSize sizeHint();
 
     virtual void answerReceived( int id, const TQString &answer );
 
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
index b1e6fc0d5..d0febd3f2 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -33,7 +33,7 @@
 #include <tqframe.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
@@ -48,7 +48,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
   TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
-  TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 );
+  TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 );
 
   mTitle = new KLineEdit( groupBox );
   TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) );
@@ -57,7 +57,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( groupBox, 0, 0 );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 );
+  boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 );
   boxLayout->setColStretch( 2, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox );
@@ -85,7 +85,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 );
+  boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
   mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );
@@ -103,7 +103,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( groupBox, 0, 0 );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 );
+  boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 );
   boxLayout->setColStretch( 1, 1 );
 
   mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox );
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
index 09a6e7a94..220df65b9 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
@@ -52,7 +52,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
   mPlotter->setTitle( title );
   mPlotter->setThinFrame(!isApplet);   //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect
 
-  setMinimumSize( tqsizeHint() );
+  setMinimumSize( sizeHint() );
 
   /* All RMB clicks to the mPlotter widget will be handled by 
    * SensorDisplay::eventFilter. */
@@ -101,10 +101,10 @@ void FancyPlotter::configureSettings()
   for ( uint i = 0; i < mBeams; ++i ) {
     TQStringList entry;
     entry << TQString::number(i);
-    entry << sensors().tqat( i )->hostName();
-    entry << KSGRD::SensorMgr->translateSensor( sensors().tqat( i )->name() );
-    entry << KSGRD::SensorMgr->translateUnit( sensors().tqat( i )->unit() );
-    entry << ( sensors().tqat( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) );
+    entry << sensors().at( i )->hostName();
+    entry << KSGRD::SensorMgr->translateSensor( sensors().at( i )->name() );
+    entry << KSGRD::SensorMgr->translateUnit( sensors().at( i )->unit() );
+    entry << ( sensors().at( i )->isOk() ? i18n( "OK" ) : i18n( "Error" ) );
     entry << ( mPlotter->beamColors()[ i ].name() );
 
     list.append( entry );
@@ -214,10 +214,10 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
   if ( type != "integer" && type != "float" )
     return false;
 
-  if ( mBeams > 0 && hostName != sensors().tqat( 0 )->hostName() ) {
+  if ( mBeams > 0 && hostName != sensors().at( 0 )->hostName() ) {
     KMessageBox::sorry( this, TQString( "All sensors of this display need "
                                        "to be from the host %1!" )
-                        .arg( sensors().tqat( 0 )->hostName() ) );
+                        .arg( sensors().at( 0 )->hostName() ) );
 
     /* We have to enforce this since the answers to value requests
      * need to be received in order. */
@@ -238,8 +238,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
   TQString tooltip;
   for ( uint i = 0; i < mBeams; ++i ) {
     tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
-                                   .arg( sensors().tqat( mBeams - i - 1 )->hostName() )
-                                   .arg( sensors().tqat( mBeams - i - 1  )->name() );
+                                   .arg( sensors().at( mBeams - i - 1 )->hostName() )
+                                   .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
   TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
@@ -263,8 +263,8 @@ bool FancyPlotter::removeSensor( uint pos )
   TQString tooltip;
   for ( uint i = 0; i < mBeams; ++i ) {
     tooltip += TQString( "%1%2:%3" ).arg( i != 0 ? "\n" : "" )
-                                   .arg( sensors().tqat( mBeams - i - 1 )->hostName() )
-                                   .arg( sensors().tqat( mBeams - i - 1  )->name() );
+                                   .arg( sensors().at( mBeams - i - 1 )->hostName() )
+                                   .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
   TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
@@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* )
     frame()->setGeometry( 0, 0, width(), height() );
 }
 
-TQSize FancyPlotter::tqsizeHint()
+TQSize FancyPlotter::sizeHint()
 {
   if ( noFrame() )
-    return mPlotter->tqsizeHint();
+    return mPlotter->sizeHint();
   else
-    return frame()->tqsizeHint();
+    return frame()->sizeHint();
 }
 
 void FancyPlotter::answerReceived( int id, const TQString &answer )
@@ -319,7 +319,7 @@ void FancyPlotter::answerReceived( int id, const TQString &answer )
       if ( info.min() == 0.0 && info.max() == 0.0 )
         mPlotter->setUseAutoRange( true );
     }
-    sensors().tqat( id - 100 )->setUnit( info.unit() );
+    sensors().at( id - 100 )->setUnit( info.unit() );
   }
 }
 
@@ -405,9 +405,9 @@ bool FancyPlotter::saveSettings( TQDomDocument &doc, TQDomElement &element,
   for ( uint i = 0; i < mBeams; ++i ) {
     TQDomElement beam = doc.createElement( "beam" );
     element.appendChild( beam );
-    beam.setAttribute( "hostName", sensors().tqat( i )->hostName() );
-    beam.setAttribute( "sensorName", sensors().tqat( i )->name() );
-    beam.setAttribute( "sensorType", sensors().tqat( i )->type() );
+    beam.setAttribute( "hostName", sensors().at( i )->hostName() );
+    beam.setAttribute( "sensorName", sensors().at( i )->name() );
+    beam.setAttribute( "sensorType", sensors().at( i )->type() );
     saveColor( beam, "color", mPlotter->beamColors()[ i ] );
   }
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
index 00d88223a..2f0e36c60 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h
@@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay
 
     bool removeSensor( uint pos );
 
-    virtual TQSize tqsizeHint(void);
+    virtual TQSize sizeHint(void);
 
     virtual void answerReceived( int id, const TQString &answer );
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
index 91b908553..5b3159519 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -34,7 +34,7 @@
 #include <tqgroupbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
@@ -79,7 +79,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() );
+  boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 2, 1 );
 
   mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox );
@@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   boxLayout->addWidget( label, 1, 0 );
 
   mMinValue = new KLineEdit( groupBox );
-  mMinValue->tqsetAlignment( AlignRight );
+  mMinValue->setAlignment( AlignRight );
   mMinValue->setEnabled( false );
   TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) );
   boxLayout->addWidget( mMinValue, 1, 1 );
@@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   boxLayout->addWidget( label, 1, 3 );
 
   mMaxValue = new KLineEdit( groupBox );
-  mMaxValue->tqsetAlignment( AlignRight );
+  mMaxValue->setAlignment( AlignRight );
   mMaxValue->setEnabled( false );
   TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) );
   boxLayout->addWidget( mMaxValue, 1, 4 );
@@ -109,7 +109,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( groupBox, 0, 0 );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() );
+  boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() );
   boxLayout->setRowStretch( 1, 1 );
 
   mHorizontalScale = new KIntNumInput( 1, groupBox );
@@ -127,7 +127,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() );
+  boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
   mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox );
@@ -166,7 +166,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() );
+  boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
 
   mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox );
@@ -191,7 +191,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   pageLayout->addWidget( groupBox, 1, 0 );
 
   groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page );
-  boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() );
+  boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() );
 
   label = new TQLabel( i18n( "Vertical lines:" ), groupBox );
   boxLayout->addWidget( label, 0, 0 );
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index e9fc17c24..c980196e6 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cc
@@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending
 PrivateListView::PrivateListView(TQWidget *parent, const char *name)
 	: TQListView(parent, name)
 {
-	TQColorGroup cg = tqcolorGroup();
+	TQColorGroup cg = colorGroup();
 
 	cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
 	cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
@@ -116,8 +116,8 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name)
 
 void PrivateListView::update(const TQString& answer)
 {
-	tqsetUpdatesEnabled(false);
-	viewport()->tqsetUpdatesEnabled(false);
+	setUpdatesEnabled(false);
+	viewport()->setUpdatesEnabled(false);
 
 	int vpos = verticalScrollBar()->value();
 	int hpos = horizontalScrollBar()->value();
@@ -143,8 +143,8 @@ void PrivateListView::update(const TQString& answer)
 	verticalScrollBar()->setValue(vpos);
 	horizontalScrollBar()->setValue(hpos);
 
-	viewport()->tqsetUpdatesEnabled(true);
-	tqsetUpdatesEnabled(true);
+	viewport()->setUpdatesEnabled(true);
+	setUpdatesEnabled(true);
 
 	triggerUpdate();
 }
@@ -239,7 +239,7 @@ ListView::addSensor(const TQString& hostName, const TQString& sensorName, const
 void
 ListView::updateList()
 {
-	sendRequest(sensors().tqat(0)->hostName(), sensors().tqat(0)->name(), 19);
+	sendRequest(sensors().at(0)->hostName(), sensors().at(0)->name(), 19);
 }
 
 void
@@ -290,12 +290,12 @@ ListView::restoreSettings(TQDomElement& element)
 {
 	addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title"));
 
-	TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
-	tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
-	tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
-	tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
+	TQColorGroup colorGroup = monitor->colorGroup();
+	colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
+	colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
+	colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor()));
 
-	monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
+	monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
 
 	SensorDisplay::restoreSettings(element);
 
@@ -307,14 +307,14 @@ ListView::restoreSettings(TQDomElement& element)
 bool
 ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 {
-	element.setAttribute("hostName", sensors().tqat(0)->hostName());
-	element.setAttribute("sensorName", sensors().tqat(0)->name());
-	element.setAttribute("sensorType", sensors().tqat(0)->type());
+	element.setAttribute("hostName", sensors().at(0)->hostName());
+	element.setAttribute("sensorName", sensors().at(0)->name());
+	element.setAttribute("sensorType", sensors().at(0)->type());
 
-	TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
-	saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link));
-	saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text));
-	saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base));
+	TQColorGroup colorGroup = monitor->colorGroup();
+	saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link));
+	saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text));
+	saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base));
 
 	SensorDisplay::saveSettings(doc, element);
 
@@ -331,10 +331,10 @@ ListView::configureSettings()
 	Q_CHECK_PTR(lvs);
 	connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
 
-	TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
-	lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link));
-	lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text));
-	lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base));
+	TQColorGroup colorGroup = monitor->colorGroup();
+	lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
+	lvs->setTextColor(colorGroup.color(TQColorGroup::Text));
+	lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base));
 	lvs->setTitle(title());
 
 	if (lvs->exec())
@@ -347,11 +347,11 @@ ListView::configureSettings()
 void
 ListView::applySettings()
 {
-	TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
-	tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
-	tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor());
-	tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
-	monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
+	TQColorGroup colorGroup = monitor->colorGroup();
+	colorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
+	colorGroup.setColor(TQColorGroup::Text, lvs->textColor());
+	colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
+	monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
 
 	setTitle(lvs->title());
 
@@ -361,11 +361,11 @@ ListView::applySettings()
 void
 ListView::applyStyle()
 {
-	TQColorGroup tqcolorGroup = monitor->tqcolorGroup();
-	tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
-	tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
-	tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
-	monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup));
+	TQColorGroup colorGroup = monitor->colorGroup();
+	colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
+	colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
+	colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
+	monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
 
 	setModified(true);
 }
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h
index 3a79a20b3..643df8747 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -57,9 +57,9 @@ class PrivateListViewItem : public TQListViewItem
 public:
 	PrivateListViewItem(PrivateListView *parent = 0);
 
-	void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) {
-		TQColorGroup cgroup = _parent->tqcolorGroup();
-		TQListViewItem::paintCell(p, cgroup, column, width, tqalignment);
+	void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) {
+		TQColorGroup cgroup = _parent->colorGroup();
+		TQListViewItem::paintCell(p, cgroup, column, width, alignment);
 		p->setPen(cgroup.color(TQColorGroup::Link));
 		p->drawLine(0, height() - 1, width - 1, height() - 1);
 	}
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
index 53124ca65..98bf0e207 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
@@ -55,7 +55,7 @@
             <property name="title">
                 <string>Colors</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index 314690513..7de7899ab 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -51,7 +51,7 @@ LogFile::LogFile(TQWidget *parent, const char *name, const TQString& title)
 
 LogFile::~LogFile(void)
 {
-	sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43);
+	sendRequest(sensors().at(0)->hostName(), TQString("logfile_unregister %1" ).arg(logFileID), 43);
 }
 
 bool
@@ -64,10 +64,10 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
 
 	TQString sensorID = sensorName.right(sensorName.length() - (sensorName.findRev("/") + 1));
 
-	sendRequest(sensors().tqat(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42);
+	sendRequest(sensors().at(0)->hostName(), TQString("logfile_register %1" ).arg(sensorID), 42);
 
 	if (title.isEmpty())
-		setTitle(sensors().tqat(0)->hostName() + ":" + sensorID);
+		setTitle(sensors().at(0)->hostName() + ":" + sensorID);
 	else
 		setTitle(title);
 
@@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
 
 void LogFile::configureSettings(void)
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	lfs = new LogFileSettings(this);
 	Q_CHECK_PTR(lfs);
@@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index)
 
 void LogFile::applySettings(void)
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color());
 	cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color());
@@ -166,7 +166,7 @@ void LogFile::applySettings(void)
 void
 LogFile::applyStyle()
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
 	cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@@ -179,7 +179,7 @@ bool
 LogFile::restoreSettings(TQDomElement& element)
 {
 	TQFont font;
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
 	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
@@ -206,14 +206,14 @@ LogFile::restoreSettings(TQDomElement& element)
 bool
 LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 {
-	element.setAttribute("hostName", sensors().tqat(0)->hostName());
-	element.setAttribute("sensorName", sensors().tqat(0)->name());
-	element.setAttribute("sensorType", sensors().tqat(0)->type());
+	element.setAttribute("hostName", sensors().at(0)->hostName());
+	element.setAttribute("sensorName", sensors().at(0)->name());
+	element.setAttribute("sensorType", sensors().at(0)->type());
 
 	element.setAttribute("font", monitor->font().toString());
 
-	saveColor(element, "textColor", monitor->tqcolorGroup().text());
-	saveColor(element, "backgroundColor", monitor->tqcolorGroup().base());
+	saveColor(element, "textColor", monitor->colorGroup().text());
+	saveColor(element, "backgroundColor", monitor->colorGroup().base());
 
 	for (TQStringList::Iterator it = filterRules.begin();
 		 it != filterRules.end(); it++)
@@ -234,8 +234,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 void
 LogFile::updateMonitor()
 {
-	sendRequest(sensors().tqat(0)->hostName(),
-				TQString("%1 %2" ).arg(sensors().tqat(0)->name()).arg(logFileID), 19);
+	sendRequest(sensors().at(0)->hostName(),
+				TQString("%1 %2" ).arg(sensors().at(0)->name()).arg(logFileID), 19);
 }
 
 void
diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
index a1cc1572c..c346dfbe3 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
+++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
@@ -142,7 +142,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>16</height>
@@ -172,7 +172,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -264,7 +264,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -313,7 +313,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
index 7050decde..8a9cc9b60 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
@@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name,
 	Q_CHECK_PTR(lcd);
 	lcd->setSegmentStyle(TQLCDNumber::Filled);
 	setDigitColor(KSGRD::Style->backgroundColor());
-	lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+	lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
 					   TQSizePolicy::Expanding, false));
 
 	setBackgroundColor(KSGRD::Style->backgroundColor());
@@ -166,9 +166,9 @@ MultiMeter::restoreSettings(TQDomElement& element)
 bool
 MultiMeter::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 {
-	element.setAttribute("hostName", sensors().tqat(0)->hostName());
-	element.setAttribute("sensorName", sensors().tqat(0)->name());
-	element.setAttribute("sensorType", sensors().tqat(0)->type());
+	element.setAttribute("hostName", sensors().at(0)->hostName());
+	element.setAttribute("sensorName", sensors().at(0)->name());
+	element.setAttribute("sensorType", sensors().at(0)->type());
 	element.setAttribute("showUnit", showUnit());
 	element.setAttribute("lowerLimitActive", (int) lowerLimitActive);
 	element.setAttribute("lowerLimit", (int) lowerLimit);
@@ -225,7 +225,7 @@ MultiMeter::applySettings()
 	alarmDigitColor = mms->alarmDigitColor();
 	setBackgroundColor(mms->meterBackgroundColor());
 
-	tqrepaint();
+	repaint();
 	setModified(true);
 }
 
@@ -234,7 +234,7 @@ MultiMeter::applyStyle()
 {
 	normalDigitColor = KSGRD::Style->firstForegroundColor();
 	setBackgroundColor(KSGRD::Style->backgroundColor());
-	tqrepaint();
+	repaint();
 	setModified(true);
 }
 
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
index 40209feac..a04dcbb6b 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -96,7 +96,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -121,7 +121,7 @@
                                 <property name="enabled">
                                     <bool>false</bool>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>70</width>
                                         <height>0</height>
@@ -162,7 +162,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -187,7 +187,7 @@
                                 <property name="enabled">
                                     <bool>false</bool>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>70</width>
                                         <height>0</height>
@@ -334,14 +334,14 @@
         <slot access="public" specifier="">update()</slot>
         <slot access="public" specifier="">update(int,int,int,int)</slot>
         <slot access="public" specifier="">update(const QRect&amp;)</slot>
-        <slot access="public" specifier="">tqrepaint()</slot>
-        <slot access="public" specifier="">tqrepaint(bool)</slot>
-        <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot>
-        <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot>
-        <slot access="public" specifier="">tqrepaint(const QRect&amp;)</slot>
-        <slot access="public" specifier="">tqrepaint(const QRect&amp;,bool)</slot>
-        <slot access="public" specifier="">tqrepaint(const QRegion&amp;)</slot>
-        <slot access="public" specifier="">tqrepaint(const QRegion&amp;,bool)</slot>
+        <slot access="public" specifier="">repaint()</slot>
+        <slot access="public" specifier="">repaint(bool)</slot>
+        <slot access="public" specifier="">repaint(int,int,int,int)</slot>
+        <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot>
+        <slot access="public" specifier="">repaint(const QRect&amp;)</slot>
+        <slot access="public" specifier="">repaint(const QRect&amp;,bool)</slot>
+        <slot access="public" specifier="">repaint(const QRegion&amp;)</slot>
+        <slot access="public" specifier="">repaint(const QRegion&amp;,bool)</slot>
         <slot access="public" specifier="">show()</slot>
         <slot access="public" specifier="">hide()</slot>
         <slot access="public" specifier="">setShown(bool)</slot>
@@ -377,8 +377,8 @@
         <property type="Bool">enabled</property>
         <property type="Rect">geometry</property>
         <property type="SizePolicy">sizePolicy</property>
-        <property type="Size">tqminimumSize</property>
-        <property type="Size">tqmaximumSize</property>
+        <property type="Size">minimumSize</property>
+        <property type="Size">maximumSize</property>
         <property type="Size">sizeIncrement</property>
         <property type="Size">baseSize</property>
         <property type="Color">paletteForegroundColor</property>
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index 6068e85e5..fdd579858 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -40,7 +40,7 @@
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqgroupbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kapplication.h>
 #include <kpushbutton.h>
@@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	cbFilter->insertItem(i18n("System Processes"), 1);
 	cbFilter->insertItem(i18n("User Processes"), 2);
 	cbFilter->insertItem(i18n("Own Processes"), 3);
-	cbFilter->setMinimumSize(cbFilter->tqsizeHint());
+	cbFilter->setMinimumSize(cbFilter->sizeHint());
 	// Create the check box to switch between tree view and list view.
 	xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
 	Q_CHECK_PTR(xbTreeView);
-	xbTreeView->setMinimumSize(xbTreeView->tqsizeHint());
+	xbTreeView->setMinimumSize(xbTreeView->sizeHint());
 	connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
 			this, TQT_SLOT(setTreeView(bool)));
 
@@ -116,13 +116,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	bRefresh = new KPushButton( KGuiItem(  i18n( "&Refresh" ), "reload" ),
             this, "bRefresh" );
 	Q_CHECK_PTR(bRefresh);
-	bRefresh->setMinimumSize(bRefresh->tqsizeHint());
+	bRefresh->setMinimumSize(bRefresh->sizeHint());
 	connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
 
 	// Create the 'Kill' button.
 	bKill = new KPushButton(i18n("&Kill"), this, "bKill");
 	Q_CHECK_PTR(bKill);
-	bKill->setMinimumSize(bKill->tqsizeHint());
+	bKill->setMinimumSize(bKill->sizeHint());
 	connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
 	/* Disable the kill button until we know that the daemon supports the
 	 * kill command. */
@@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 
 	setPlotterWidget(pList);
 
-	setMinimumSize(tqsizeHint());
+	setMinimumSize(sizeHint());
 	fixTabOrder(); 
 }
 
@@ -213,13 +213,13 @@ ProcessController::addSensor(const TQString& hostName,
 void
 ProcessController::updateList()
 {
-	sendRequest(sensors().tqat(0)->hostName(), "ps", 2);
+	sendRequest(sensors().at(0)->hostName(), "ps", 2);
 }
 
 void
 ProcessController::killProcess(int pid, int sig)
 {
-	sendRequest(sensors().tqat(0)->hostName(),
+	sendRequest(sensors().at(0)->hostName(),
 				TQString("kill %1 %2" ).arg(pid).arg(sig), 3);
 
 	if ( !timerOn() )
@@ -269,7 +269,7 @@ ProcessController::killProcess()
 	// send kill signal to all seleted processes
 	TQValueListConstIterator<int> it;
 	for (it = selectedPIds.begin(); it != selectedPIds.end(); ++it)
-		sendRequest(sensors().tqat(0)->hostName(), TQString("kill %1 %2" ).arg(*it)
+		sendRequest(sensors().at(0)->hostName(), TQString("kill %1 %2" ).arg(*it)
 					.arg(MENU_ID_SIGKILL), 3);
 
 	if ( !timerOn())
@@ -283,9 +283,9 @@ void
 ProcessController::reniceProcess(const TQValueList<int> &pids, int niceValue)
 {
 	for( TQValueList<int>::ConstIterator it = pids.constBegin(), end = pids.constEnd(); it != end; ++it )
-		sendRequest(sensors().tqat(0)->hostName(),
+		sendRequest(sensors().at(0)->hostName(),
 					TQString("setpriority %1 %2" ).arg(*it).arg(niceValue), 5);
-	sendRequest(sensors().tqat(0)->hostName(), "ps", 2);  //update the display afterwards
+	sendRequest(sensors().at(0)->hostName(), "ps", 2);  //update the display afterwards
 }
 
 void
@@ -401,7 +401,7 @@ ProcessController::answerReceived(int id, const TQString& answer)
 void
 ProcessController::sensorError(int, bool err)
 {
-	if (err == sensors().tqat(0)->isOk())
+	if (err == sensors().at(0)->isOk())
 	{
 		if (!err)
 		{
@@ -409,15 +409,15 @@ ProcessController::sensorError(int, bool err)
 			 * (re-)established we need to requests the full set of
 			 * properties again, since the back-end might be a new
 			 * one. */
-			sendRequest(sensors().tqat(0)->hostName(), "test kill", 4);
-			sendRequest(sensors().tqat(0)->hostName(), "ps?", 1);
-			sendRequest(sensors().tqat(0)->hostName(), "ps", 2);
+			sendRequest(sensors().at(0)->hostName(), "test kill", 4);
+			sendRequest(sensors().at(0)->hostName(), "ps?", 1);
+			sendRequest(sensors().at(0)->hostName(), "ps", 2);
 		}
 
 		/* This happens only when the sensorOk status needs to be changed. */
-		sensors().tqat(0)->setIsOk( !err );
+		sensors().at(0)->setIsOk( !err );
 	}
-	setSensorOk(sensors().tqat(0)->isOk());
+	setSensorOk(sensors().at(0)->isOk());
 }
 
 bool
@@ -452,9 +452,9 @@ ProcessController::restoreSettings(TQDomElement& element)
 bool
 ProcessController::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 {
-	element.setAttribute("hostName", sensors().tqat(0)->hostName());
-	element.setAttribute("sensorName", sensors().tqat(0)->name());
-	element.setAttribute("sensorType", sensors().tqat(0)->type());
+	element.setAttribute("hostName", sensors().at(0)->hostName());
+	element.setAttribute("sensorName", sensors().at(0)->name());
+	element.setAttribute("sensorType", sensors().at(0)->type());
 	element.setAttribute("tree", (uint) xbTreeView->isChecked());
 	element.setAttribute("filter", cbFilter->currentItem());
 	element.setAttribute("sortColumn", pList->getSortColumn());
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 003050e8f..d1cff84d1 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -297,8 +297,8 @@ ProcessList::update(const TQString& list)
 	/* Disable painting to avoid flickering effects,
 	 * especially when in tree view mode.
 	 * Ditto for the scrollbar. */
-	tqsetUpdatesEnabled(false);
-	viewport()->tqsetUpdatesEnabled(false);
+	setUpdatesEnabled(false);
+	viewport()->setUpdatesEnabled(false);
 
 	pl.clear();
 
@@ -349,8 +349,8 @@ ProcessList::update(const TQString& list)
 	horizontalScrollBar()->setValue(hpos);
 
 	// Re-enable painting, and force an update.
-	tqsetUpdatesEnabled(true);
-	viewport()->tqsetUpdatesEnabled(true);
+	setUpdatesEnabled(true);
+	viewport()->setUpdatesEnabled(true);
 
 	triggerUpdate();
 
@@ -532,8 +532,8 @@ ProcessList::deleteLeaves(void)
 	{
 		unsigned int i;
 		for (i = 0; i < pl.count() &&
-				 (!isLeafProcess(pl.tqat(i)->pid()) ||
-				  matchesFilter(pl.tqat(i))); i++)
+				 (!isLeafProcess(pl.at(i)->pid()) ||
+				  matchesFilter(pl.at(i))); i++)
 			;
 		if (i == pl.count())
 			return;
@@ -546,7 +546,7 @@ bool
 ProcessList::isLeafProcess(int pid)
 {
 	for (unsigned int i = 0; i < pl.count(); i++)
-		if (pl.tqat(i)->ppid() == pid)
+		if (pl.at(i)->ppid() == pid)
 			return (false);
 
 	return (true);
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
index f5d13ed5c..dfd535883 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
@@ -43,7 +43,7 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio,
 			   "the number is the higher the priority.\n\n"
 			   "Please enter the desired nice level:").arg(pid);
 	message = new TQLabel(msg, page);
-	message->setMinimumSize(message->tqsizeHint());
+	message->setMinimumSize(message->sizeHint());
 	vLay->addWidget(message);
 
 	/*
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
index 1d490973c..49abd03c6 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.h
@@ -27,7 +27,7 @@
 
 #include <kdialogbase.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlcdnumber.h>
 #include <tqpushbutton.h>
 #include <tqslider.h>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index 7acd11501..03ee4b991 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
@@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
   if(!nf) {
     mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
     mFrame->setFlat(true);
-    mFrame->tqsetAlignment(Qt::AlignHCenter);
+    mFrame->setAlignment(Qt::AlignHCenter);
     mFrame->setInsideMargin(2);
 
     setTitle( title );
@@ -219,14 +219,14 @@ void SensorDisplay::sensorError( int sensorId, bool err )
   if ( sensorId >= (int)mSensors.count() || sensorId < 0 )
     return;
 
-  if ( err == mSensors.tqat( sensorId )->isOk() ) {
+  if ( err == mSensors.at( sensorId )->isOk() ) {
     // this happens only when the sensorOk status needs to be changed.
-		mSensors.tqat( sensorId )->setIsOk( !err );
+		mSensors.at( sensorId )->setIsOk( !err );
 	}
 
   bool ok = true;
   for ( uint i = 0; i < mSensors.count(); ++i )
-    if ( !mSensors.tqat( i )->isOk() ) {
+    if ( !mSensors.at( i )->isOk() ) {
       ok = false;
       break;
     }
@@ -524,7 +524,7 @@ void SensorDisplay::reorderSensors(const TQValueList<int> &orderOfSensors)
 {
   TQPtrList<SensorProperties> newSensors;
   for ( uint i = 0; i < orderOfSensors.count(); ++i ) {
-    newSensors.append( mSensors.tqat(orderOfSensors[i] ));
+    newSensors.append( mSensors.at(orderOfSensors[i] ));
   }
 
   mSensors.setAutoDelete( false );
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index 383e7b53c..939b66d6d 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
@@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent)
 	pixmap_waiting = UserIcon( "waiting" );
 
 	lvi->setPixmap(0, pixmap_waiting);
-	lvi->setTextColor(monitor->tqcolorGroup().text());
+	lvi->setTextColor(monitor->colorGroup().text());
 
 	monitor->insertItem(lvi);
 }
@@ -72,8 +72,8 @@ void
 LogSensor::stopLogging(void)
 {
 	lvi->setPixmap(0, pixmap_waiting);
-	lvi->setTextColor(monitor->tqcolorGroup().text());
-	lvi->tqrepaint();
+	lvi->setTextColor(monitor->colorGroup().text());
+	lvi->repaint();
 	timerOff();
 }
 
@@ -104,21 +104,21 @@ LogSensor::answerReceived(int id, const TQString& answer)
 			{
 				timerOff();
 				lowerLimitActive = false;
-				lvi->setTextColor(monitor->tqcolorGroup().foreground());
-				lvi->tqrepaint();
+				lvi->setTextColor(monitor->colorGroup().foreground());
+				lvi->repaint();
 				KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName));
 				timerOn();
 			} else if (upperLimitActive && value > upperLimit)
 			{
 				timerOff();
 				upperLimitActive = false;
-				lvi->setTextColor(monitor->tqcolorGroup().foreground());
-				lvi->tqrepaint();
+				lvi->setTextColor(monitor->colorGroup().foreground());
+				lvi->repaint();
 				KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
 				timerOn();
 			}
-			TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date());
-			TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().time());
+			TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date());
+			TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time());
 
 			stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value);
 		}
@@ -139,7 +139,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t
 	monitor->addColumn(i18n("Host Name"));
 	monitor->addColumn(i18n("Log File"));
 
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 	cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
 	cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
 	cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor());
@@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor)
 void
 SensorLogger::configureSettings()
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
 	Q_CHECK_PTR(sls);
@@ -254,7 +254,7 @@ SensorLogger::configureSettings()
 void
 SensorLogger::applySettings()
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	setTitle(sls->title());
 
@@ -269,7 +269,7 @@ SensorLogger::applySettings()
 void
 SensorLogger::applyStyle(void)
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
 	cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@@ -282,7 +282,7 @@ SensorLogger::applyStyle(void)
 bool
 SensorLogger::restoreSettings(TQDomElement& element)
 {
-	TQColorGroup cgroup = monitor->tqcolorGroup();
+	TQColorGroup cgroup = monitor->colorGroup();
 
 	cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
 	cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
@@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
 bool
 SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 {
-	saveColor(element, "textColor", monitor->tqcolorGroup().text());
-	saveColor(element, "backgroundColor", monitor->tqcolorGroup().base());
-	saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground());
+	saveColor(element, "textColor", monitor->colorGroup().text());
+	saveColor(element, "backgroundColor", monitor->colorGroup().base());
+	saveColor(element, "alarmColor", monitor->colorGroup().foreground());
 
 	for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next())
 	{
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
index db247238b..6630d57e1 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h
@@ -44,10 +44,10 @@ public:
 
 	void setTextColor(const TQColor& color) { textColor = color; }
 
-	void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) {
+	void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) {
 		TQColorGroup cgroup(cg);
 		cgroup.setColor(TQColorGroup::Text, textColor);
-		TQListViewItem::paintCell(p, cgroup, column, width, tqalignment);
+		TQListViewItem::paintCell(p, cgroup, column, width, alignment);
 	
 	}
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
index a6f686db3..a183c76e1 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
@@ -20,7 +20,7 @@
 #include "SensorLoggerDlg.h"
 #include "SensorLoggerDlgWidget.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <klocale.h>
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
index 78d99b953..144335654 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -127,7 +127,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
@@ -168,7 +168,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -193,7 +193,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>70</width>
                             <height>0</height>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
index f253e3ecc..7a546e7b6 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
@@ -61,7 +61,7 @@
             <property name="title">
                 <string>Colors</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="vAlign" stdset="0">
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
index dbf4e7fc2..3d4d9c6f6 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
@@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
 
   // Anything smaller than this does not make sense.
   setMinimumSize( 16, 16 );
-  tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+  setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
                  TQSizePolicy::Expanding, false ) );
 
   mShowVerticalLines = true;
@@ -134,8 +134,8 @@ void SignalPlotter::reorderBeams( const TQValueList<int>& newOrder )
 
   for(uint i = 0; i < newOrder.count(); i++) {
     int newIndex = newOrder[i];
-    newBeamData.append(mBeamData.tqat(newIndex));
-    newBeamColor.append(*mBeamColor.tqat(newIndex));
+    newBeamData.append(mBeamData.at(newIndex));
+    newBeamColor.append(*mBeamColor.at(newIndex));
   }
   mBeamData = newBeamData;
   mBeamColor = newBeamColor;
@@ -159,7 +159,7 @@ TQValueList<TQColor> &SignalPlotter::beamColors()
 
 void SignalPlotter::removeBeam( uint pos )
 {
-  mBeamColor.remove( mBeamColor.tqat( pos ) );
+  mBeamColor.remove( mBeamColor.at( pos ) );
   double *p = mBeamData.take( pos );
   delete [] p;
 }
@@ -374,7 +374,7 @@ void SignalPlotter::updateDataBuffers()
       memset( nd, 0, sizeof( double ) * ( newSampleNum - overlap ) );
 
     // copy overlap from old buffer to new buffer
-    memcpy( nd + ( newSampleNum - overlap ), mBeamData.tqat( i ) +
+    memcpy( nd + ( newSampleNum - overlap ), mBeamData.at( i ) +
             ( mSamples - overlap ), overlap * sizeof( double ) );
 
     double *p = mBeamData.take( i );
@@ -396,12 +396,12 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
 
   TQPixmap pm( w, h );
   TQPainter p;
-  p.tqbegin( &pm, this );
+  p.begin( &pm, this );
 
   pm.fill( mBackgroundColor );
   /* Draw white line along the bottom and the right side of the
    * widget to create a 3D like look. */
-  p.setPen( TQColor( tqcolorGroup().light() ) );
+  p.setPen( TQColor( colorGroup().light() ) );
   if(mShowThinFrame) {
     p.drawLine( 0, h - 1, w - 1, h - 1 );
     p.drawLine( w - 1, 0, w - 1, h - 1 );
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc
index ac0793a9a..285524e84 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -21,11 +21,11 @@
 
 */
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqcursor.h>
 #include <tqdragobject.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -241,7 +241,7 @@ void WorkSheet::cut()
   if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
     return;
 
-  TQClipboard* clip = TQApplication::tqclipboard();
+  TQClipboard* clip = TQApplication::clipboard();
 
   clip->setText( currentDisplayAsXML() );
 
@@ -253,7 +253,7 @@ void WorkSheet::copy()
   if ( !currentDisplay() || currentDisplay()->isA( "DummyDisplay" ) )
     return;
 
-  TQClipboard* clip = TQApplication::tqclipboard();
+  TQClipboard* clip = TQApplication::clipboard();
 
   clip->setText( currentDisplayAsXML() );
 }
@@ -264,7 +264,7 @@ void WorkSheet::paste()
   if ( !currentDisplay( &row, &column ) )
     return;
 
-  TQClipboard* clip = TQApplication::tqclipboard();
+  TQClipboard* clip = TQApplication::clipboard();
 
   TQDomDocument doc;
   /* Get text from clipboard and check for a valid XML header and
@@ -450,14 +450,14 @@ void WorkSheet::dropEvent( TQDropEvent *e )
      * event and replace or add sensor. */
     for ( uint r = 0; r < mRows; ++r )
       for ( uint c = 0; c < mColumns; ++c )
-        if ( mDisplayList[ r ][ c ]->tqgeometry().contains( e->pos() ) ) {
+        if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) {
           addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c );
           return;
         }
   }
 }
 
-TQSize WorkSheet::tqsizeHint() const
+TQSize WorkSheet::sizeHint() const
 {
   return TQSize( 200,150 );
 }
@@ -531,7 +531,7 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
     mDisplayList[ row ][ column ]->show();
   }
 
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 
   setModified( true );
 }
diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index 61ae0c46e..37bafbda3 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard
     void titleChanged( TQWidget *sheet );
 
   protected:
-    virtual TQSize tqsizeHint() const;
+    virtual TQSize sizeHint() const;
     void dragEnterEvent( TQDragEnterEvent* );
     void dropEvent( TQDropEvent* );
     void customEvent( TQCustomEvent* );
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index aaa0c77b2..f4818d85f 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -29,7 +29,7 @@
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -46,11 +46,11 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
   TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
   TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page );
-  group->tqlayout()->setMargin( marginHint() );
-  group->tqlayout()->setSpacing( spacingHint() );
+  group->layout()->setMargin( marginHint() );
+  group->layout()->setSpacing( spacingHint() );
 
-  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 );
+  groupLayout->setAlignment( Qt::AlignTop );
 
   mSheetTitle = new KLineEdit( group );
   groupLayout->addWidget( mSheetTitle, 0, 0 );
@@ -58,11 +58,11 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
   topLayout->addWidget( group );
 
   group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page );
-  group->tqlayout()->setMargin( marginHint() );
-  group->tqlayout()->setSpacing( spacingHint() );
+  group->layout()->setMargin( marginHint() );
+  group->layout()->setSpacing( spacingHint() );
 
-  groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  groupLayout = new TQGridLayout( group->layout(), 3, 2 );
+  groupLayout->setAlignment( Qt::AlignTop );
 
   TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
   groupLayout->addWidget( label, 0, 0 );
@@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
 
   mSheetTitle->setFocus();
 
-  resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) );
+  resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) );
 }
 
 WorkSheetSettings::~WorkSheetSettings()
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index 0f87323d4..bd0942d3a 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -25,7 +25,7 @@
 
 #include <tqbuttongroup.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <tqtooltip.h>
@@ -59,9 +59,9 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
 
   TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical,
                                           i18n( "Connection Type" ), page );
-  TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4,
+  TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4,
       spacingHint() );
-  groupLayout->tqsetAlignment( Qt::AlignTop );
+  groupLayout->setAlignment( Qt::AlignTop );
 
   mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
   mUseSsh->setEnabled( true );
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cc
index 67a0ccbee..d05af4ec8 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cc
@@ -122,7 +122,7 @@ const TQColor& StyleEngine::sensorColor( uint pos )
   static TQColor dummy;
 
   if ( pos < mSensorColors.count() )
-    return *mSensorColors.tqat( pos );
+    return *mSensorColors.at( pos );
   else
     return dummy;
 }
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index 34f33a43d..b0c0b9dcc 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -23,7 +23,7 @@
 
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -162,7 +162,7 @@ void StyleSettings::setSensorColors( const TQValueList<TQColor> &list )
 
   for ( uint i = 0; i < list.count(); ++i ) {
     TQPixmap pm( 12, 12 );
-		pm.fill( *list.tqat( i ) );
+		pm.fill( *list.at( i ) );
     mColorListBox->insertItem( pm, i18n( "Color %1" ).arg( i ) );
 	}
 }
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index 5e1d8d8b2..3038e86cd 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -26,7 +26,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqspinbox.h>
 #include <tqwhatsthis.h>