Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

39 files changed, 239 insertions, 239 deletions

diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc
index 5aef8a26f..5160dbddb 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cc
@@ -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/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc
index 4d0d3a0c7..245600cb6 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cc
@@ -110,7 +110,7 @@ int KSysGuardApplet::heightForWidth( int width ) const
 
 void KSysGuardApplet::resizeEvent( TQResizeEvent* )
 {
-  tqlayout();
+  layout();
 }
 
 void KSysGuardApplet::preferences()
@@ -154,7 +154,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified )
     save();
 }
 
-void KSysGuardApplet::tqlayout()
+void KSysGuardApplet::layout()
 {
   if ( orientation() == Horizontal ) {
     int h = height();
@@ -230,7 +230,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
         if ( wdg ) {
           delete mDockList[ dock ];
           mDockList[ dock ] = wdg;
-          tqlayout();
+          layout();
 
           connect( wdg, TQT_SIGNAL( modified( bool ) ),
                    TQT_SLOT( sensorDisplayModified( bool ) ) );
@@ -242,7 +242,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e )
           i18n( "The KSysGuard applet does not support displaying of "
                 "this type of sensor. Please choose another sensor." ) );
 
-        tqlayout();
+        layout();
       }
     }
 
@@ -487,7 +487,7 @@ void KSysGuardApplet::addEmptyDisplay( TQWidget **dock, uint pos )
   TQToolTip::add( dock[ pos ],
                  i18n( "Drag sensors from the KDE System Guard into this cell." ) );
 
-  tqlayout();
+  layout();
   if ( isVisible() )
     dock[ pos ]->show();
 }
diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h
index b4608631e..43027b05c 100644
--- a/ksysguard/gui/KSysGuardApplet.h
+++ b/ksysguard/gui/KSysGuardApplet.h
@@ -66,7 +66,7 @@ class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard
     void preferencesFinished();
 
   private:
-    void tqlayout();
+    void layout();
     void resizeDocks( uint newDockCount );
     void addEmptyDisplay( TQWidget **dock, uint pos );
 
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc
index 63e217660..1e51a5631 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ b/ksysguard/gui/SensorBrowser.cc
@@ -225,13 +225,13 @@ void SensorBrowser::answerReceived( int id, const TQString &answer )
           parent = lvi;
 
         // The child indicator might need to be updated.
-        tqrepaintItem( parent );
+        repaintItem( parent );
       } else
         parent = sibling;
     }
   }
 
-  tqrepaintItem( (*it)->listViewItem() );
+  repaintItem( (*it)->listViewItem() );
 }
 
 void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e )
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc
index 8c6ed7910..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 ) );
 }
 
@@ -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 e2b3917f5..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. */
@@ -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 );
 }
 
@@ -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 )
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 1a1476d8a..1b97cc25f 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
@@ -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 );
@@ -167,7 +167,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name )
   mSensorView->addColumn( i18n( "Sensor" ) );
   mSensorView->addColumn( i18n( "Label" ) );
   mSensorView->addColumn( i18n( "Unit" ) );
-  mSensorView->addColumn( i18n( "tqStatus" ) );
+  mSensorView->addColumn( i18n( "Status" ) );
   mSensorView->setAllColumnsShowFocus( true );
   pageLayout->addMultiCellWidget( mSensorView, 0, 2, 0, 0 );
 
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
index 912a85e42..0434877bb 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. */
@@ -182,7 +182,7 @@ void FancyPlotter::applySettings()
   for ( uint i = 0; i < sensors().count(); ++i )
         mPlotter->beamColors()[ i ] = TQColor( list[i][ 5 ] );
 
-  mPlotter->tqrepaint();
+  mPlotter->repaint();
   setModified( true );
 }
 
@@ -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 )
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 0609a139c..de345e7b8 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
@@ -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 );
@@ -231,7 +231,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
   mSensorView->addColumn( i18n( "Host" ) );
   mSensorView->addColumn( i18n( "Sensor" ) );
   mSensorView->addColumn( i18n( "Unit" ) );
-  mSensorView->addColumn( i18n( "tqStatus" ) );
+  mSensorView->addColumn( i18n( "Status" ) );
   mSensorView->setResizeMode(TQListView::LastColumn);
   mSensorView->header()->setResizeEnabled(false, 0);
   mSensorView->hideColumn(0);
@@ -532,7 +532,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const
     entry << it.current()->text( 3 );
     entry << it.current()->text( 4 );
     QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 );
-    TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) );
+    TQColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) );
     entry << ( color.name() );
 
     list.prepend( entry );
@@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor()
     return;
 
   TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 );
-  int result = KColorDialog::getColor( color, tqparentWidget() );
+  int result = KColorDialog::getColor( color, parentWidget() );
   if ( result == KColorDialog::Accepted ) {
     TQPixmap newPm( 12, 12 );
     newPm.fill( color );
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc
index cd14bccfb..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());
@@ -251,7 +251,7 @@ ListView::answerReceived(int id, const TQString& answer)
 	switch (id)
 	{
 		case 100: {
-			/* We have received the answer to a '?' command that tqcontains
+			/* We have received the answer to a '?' command that contains
 			 * the information about the table headers. */
 			KSGRD::SensorTokenizer lines(answer, '\n');
 			if (lines.count() != 2)
@@ -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);
 
@@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 	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 61d59e101..1c63d95cb 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.h
+++ b/ksysguard/gui/SensorDisplayLib/ListView.h
@@ -57,9 +57,9 @@ class PrivateListViewItem : public QListViewItem
 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 8e3bd6bff..f61f30dd7 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ListViewSettingsWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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">
@@ -68,7 +68,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -102,7 +102,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="1">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -173,6 +173,6 @@
     <function specifier="non virtual">setTextColor( const QColor &amp; c )</function>
     <function specifier="non virtual">setGridColor( const QColor &amp; c )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc
index ac3170ff3..7de7899ab 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc
@@ -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));
@@ -212,8 +212,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
 
 	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++)
diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
index 8a021af46..b5dcff0ee 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
+++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>LogFileSettings</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -72,7 +72,7 @@
                             </property>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout6</cstring>
+                                    <cstring>layout6</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -80,7 +80,7 @@
                                     </property>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout5</cstring>
+                                            <cstring>layout5</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -106,7 +106,7 @@
                                     </widget>
                                     <widget class="QLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout4</cstring>
+                                            <cstring>layout4</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
@@ -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>
@@ -340,6 +340,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
index 3a54aefd3..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());
@@ -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 9cc904ca1..7ecdef88f 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>MultiMeterSettingsWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -211,7 +211,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -245,7 +245,7 @@
                     </widget>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout2</cstring>
+                            <cstring>layout2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -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>
@@ -375,10 +375,10 @@
         <slot access="protected" specifier="">chooseColor()</slot>
         <property type="CString">name</property>
         <property type="Bool">enabled</property>
-        <property type="Rect">tqgeometry</property>
+        <property type="Rect">geometry</property>
         <property type="SizePolicy">sizePolicy</property>
-        <property type="Size">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>
@@ -467,8 +467,8 @@
     <function specifier="non virtual">setNormalDigitColor( const QColor &amp; c )</function>
     <function specifier="non virtual">setAlarmDigitColor( const QColor &amp; c )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
 </includehints>
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
index ba607b7fe..f02b02af9 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc
@@ -56,7 +56,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	dict.insert("PPID", new TQString(i18n("PPID")));
 	dict.insert("UID", new TQString(i18n("UID")));
 	dict.insert("GID", new TQString(i18n("GID")));
-	dict.insert("tqStatus", new TQString(i18n("tqStatus")));
+	dict.insert("Status", new TQString(i18n("Status")));
 	dict.insert("User%", new TQString(i18n("User%")));
 	dict.insert("System%", new TQString(i18n("System%")));
 	dict.insert("Nice", new TQString(i18n("Nice")));
@@ -65,7 +65,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
 	dict.insert("Login", new TQString(i18n("Login")));
 	dict.insert("Command", new TQString(i18n("Command")));
 
-	// Setup the tqgeometry management.
+	// Setup the geometry management.
 	gm = new TQVBoxLayout(this, 10);
 	Q_CHECK_PTR(gm);
 	gm->addSpacing(15);
@@ -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(); 
 }
 
@@ -247,7 +247,7 @@ ProcessController::killProcess()
 
 		KDialogBase *dlg = new KDialogBase (  i18n ("Kill Process"), 
 						      KDialogBase::Yes | KDialogBase::Cancel,
-						      KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(),
+						      KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(),
 						      "killconfirmation",
 			       			      true, true, KGuiItem(i18n("Kill")));
 
@@ -298,7 +298,7 @@ ProcessController::answerReceived(int id, const TQString& answer)
 	{
 	case 1:
 	{
-		/* We have received the answer to a ps? command that tqcontains
+		/* We have received the answer to a ps? command that contains
 		 * the information about the table headers. */
 		KSGRD::SensorTokenizer lines(answer, '\n');
 		if (lines.count() != 2)
@@ -325,7 +325,7 @@ ProcessController::answerReceived(int id, const TQString& answer)
 		break;
 	}
 	case 2:
-		/* We have received the answer to a ps command that tqcontains a
+		/* We have received the answer to a ps command that contains a
 		 * list of processes with various additional information. */
 		pList->update(answer);
 		pListSearchLine->searchLine()->updateSearch(); //re-apply the filter
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h
index f1b623780..4e2bba034 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h
@@ -44,7 +44,7 @@ extern KApplication* Kapp;
 
 /**
  * This widget implements a process list page. Besides the process
- * list which is implemented as a ProcessList, it tqcontains two
+ * list which is implemented as a ProcessList, it contains two
  * comboxes and two buttons.  The combo boxes are used to set the
  * update rate and the process filter.  The buttons are used to force
  * an immediate update and to kill a process.
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
index 1a0dd5ee5..2f5b3fe51 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc
@@ -611,7 +611,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
 		pix = KGlobal::iconLoader()->loadIcon(name, KIcon::Small,
 							  KIcon::SizeSmall, KIcon::DefaultState,
 							  0L, true);
-		if (pix.isNull() || !pix.tqmask())
+		if (pix.isNull() || !pix.mask())
 			pix = KGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User,
 								  KIcon::SizeSmall);
 
@@ -634,9 +634,9 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli)
 		{
 			icon.fill();
 			bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height());
-			TQBitmap tqmask(24, 16, true);
-			bitBlt(&tqmask, 4, 0, pix.tqmask(), 0, 0, pix.width(), pix.height());
-			icon.setMask(tqmask);
+			TQBitmap mask(24, 16, true);
+			bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height());
+			icon.setMask(mask);
 			pix = icon;
 		}
 		iconCache.insert(name, new TQPixmap(pix));
@@ -909,7 +909,7 @@ ProcessList::selectAllItems(bool select)
 	for ( ; it.current(); ++it )
 	{
 		it.current()->setSelected(select);
-		tqrepaintItem(it.current());
+		repaintItem(it.current());
 		if (select)
 			selectedPIds.append(it.current()->text(1).toInt());
 	}
@@ -928,7 +928,7 @@ ProcessList::selectAllChilds(int pid, bool select)
 		{
 			int currPId = it.current()->text(1).toInt();
 			it.current()->setSelected(select);
-			tqrepaintItem(it.current());
+			repaintItem(it.current());
 			if (select)
 				selectedPIds.append(currPId);
 			else
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h
index 07c3aca20..370fe23fd 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.h
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h
@@ -106,7 +106,7 @@ public:
 	/**
 	 * The udpate function can be used to update the displayed process
 	 * list.  A current list of processes is requested from the OS. In
-	 * case the list tqcontains invalid or corrupted info, FALSE is
+	 * case the list contains invalid or corrupted info, FALSE is
 	 * returned.
 	 */
 	bool update(const TQString& list);
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
index 8ba9129d0..dfd535883 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
@@ -43,12 +43,12 @@ 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);
 
 	/*
 	 * Create a slider with an LCD display to the right using a horizontal
-	 * tqlayout. The slider and the LCD are kept in sync through signals
+	 * layout. The slider and the LCD are kept in sync through signals
 	 */
 	input = new KIntNumInput(currentPPrio, page, 10);
 	input->setRange(-20, 19);
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
index a2bc6bb7a..c80ad65ee 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 );
@@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval()
     if ( dlg.useGlobalUpdate() ) {
       mUseGlobalUpdateInterval = true;
 
-      SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() );
+      SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
       if ( !sb ) {
         kdDebug(1215) << "dynamic cast lacks" << endl;
         setUpdateInterval( 2 );
@@ -247,7 +247,7 @@ void SensorDisplay::updateWhatsThis()
 void SensorDisplay::hosts( TQStringList& list )
 {
   for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() )
-    if ( !list.tqcontains( s->hostName() ) )
+    if ( !list.contains( s->hostName() ) )
       list.append( s->hostName() );
 }
 
@@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element )
   } else {
     mUseGlobalUpdateInterval = true;
 
-    SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() );
+    SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() );
     if ( !sb ) {
       kdDebug(1215) << "dynamic cast lacks" << endl;
       setUpdateInterval( 2 );
@@ -447,8 +447,8 @@ void SensorDisplay::setSensorOk( bool ok )
     mErrorIndicator = new TQWidget( mPlotterWdg );
     mErrorIndicator->setErasePixmap( errorIcon );
     mErrorIndicator->resize( errorIcon.size() );
-    if ( errorIcon.tqmask() )
-      mErrorIndicator->setMask( *errorIcon.tqmask() );
+    if ( errorIcon.mask() )
+      mErrorIndicator->setMask( *errorIcon.mask() );
     mErrorIndicator->move( 0, 0 );
     mErrorIndicator->show();
   }
@@ -463,7 +463,7 @@ void SensorDisplay::setTitle( const TQString &title )
   }
 
   /* Changing the frame title may increase the width of the frame and
-   * hence breaks the tqlayout. To avoid this, we save the original size
+   * hence breaks the layout. To avoid this, we save the original size
    * and restore it after we have set the frame title. */
   TQSize s = mFrame->size();
 
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
index 362f518e2..383bf525e 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 = TQDateTime::tqcurrentDateTime().date();
-			TQTime time = TQDateTime::tqcurrentDateTime().time();
+			TQDate date = TQDateTime::currentDateTime().date();
+			TQTime time = 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 c134da005..018e36bf9 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/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
index a281bb84b..26d3b2d49 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SensorLoggerDlgWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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>
@@ -251,8 +251,8 @@
     <function specifier="non virtual">setUpperLimit( double d )</function>
 </functions>
 
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
index 849062674..c86e671b2 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SensorLoggerSettingsWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -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">
@@ -77,7 +77,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -111,7 +111,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -175,6 +175,6 @@
     <function specifier="non virtual">setBackgroundColor( const QColor &amp; c )</function>
     <function specifier="non virtual">setAlarmColor( const QColor &amp; c )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
index 835f072b2..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;
@@ -390,7 +390,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
   uint w = width();
   uint h = height();
 
-  /* Do not do tqrepaints when the widget is not yet setup properly. */
+  /* Do not do repaints when the widget is not yet setup properly. */
   if ( w <= 2 )
     return;
 
@@ -401,7 +401,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
   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 c7cac3127..8d53edb6b 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cc
@@ -73,7 +73,7 @@ WorkSheet::WorkSheet( uint rows, uint columns, uint interval, TQWidget* parent,
   // Initialize worksheet with dummy displays.
   for ( uint r = 0; r < mRows; ++r )
     for ( uint c = 0; c < mColumns; ++c )
-      tqreplaceDisplay( r, c );
+      replaceDisplay( r, c );
 
   mGridLayout->activate();
 
@@ -159,14 +159,14 @@ bool WorkSheet::load( const TQString &fileName )
       return false;
     }
 
-    tqreplaceDisplay( row, column, element );
+    replaceDisplay( row, column, element );
   }
 
   // Fill empty cells with dummy displays
   for ( uint r = 0; r < mRows; ++r )
     for ( uint c = 0; c < mColumns; ++c )
       if ( !mDisplayList[ r ][ c ] )
-        tqreplaceDisplay( r, c );
+        replaceDisplay( r, c );
 
   setModified( false );
 
@@ -276,7 +276,7 @@ void WorkSheet::paste()
   }
 
   TQDomElement element = doc.documentElement();
-  tqreplaceDisplay( row, column, element );
+  replaceDisplay( row, column, element );
 }
 
 void WorkSheet::setFileName( const TQString &fileName )
@@ -319,7 +319,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName,
   }
 
   /* If the by 'row' and 'column' specified display is a TQGroupBox dummy
-   * display we tqreplace the widget. Otherwise we just try to add
+   * display we replace the widget. Otherwise we just try to add
    * the new sensor to an existing display. */
   if ( mDisplayList[ row ][ column ]->isA( "DummyDisplay" ) ) {
     KSGRD::SensorDisplay* newDisplay = 0;
@@ -362,7 +362,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName,
       return 0;
     }
 
-    tqreplaceDisplay( row, column, newDisplay );
+    replaceDisplay( row, column, newDisplay );
   }
 
   mDisplayList[ row ][ column ]->addSensor( hostName, sensorName, sensorType, sensorDescr );
@@ -447,17 +447,17 @@ void WorkSheet::dropEvent( TQDropEvent *e )
     }
 
     /* Find the sensor display that is supposed to get the drop
-     * event and tqreplace or add sensor. */
+     * 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().tqcontains( 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 );
 }
@@ -471,7 +471,7 @@ void WorkSheet::customEvent( TQCustomEvent *e )
   }
 }
 
-bool WorkSheet::tqreplaceDisplay( uint row, uint column, TQDomElement& element )
+bool WorkSheet::replaceDisplay( uint row, uint column, TQDomElement& element )
 {
   TQString classType = element.attribute( "class" );
   KSGRD::SensorDisplay* newDisplay;
@@ -501,12 +501,12 @@ bool WorkSheet::tqreplaceDisplay( uint row, uint column, TQDomElement& element )
   if ( !newDisplay->restoreSettings( element ) )
     return false;
 
-  tqreplaceDisplay( row, column, newDisplay );
+  replaceDisplay( row, column, newDisplay );
 
   return true;
 }
 
-void WorkSheet::tqreplaceDisplay( uint row, uint column, KSGRD::SensorDisplay* newDisplay )
+void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* newDisplay )
 {
   // remove the old display at this location
   delete mDisplayList[ row ][ column ];
@@ -531,7 +531,7 @@ void WorkSheet::tqreplaceDisplay( uint row, uint column, KSGRD::SensorDisplay* n
     mDisplayList[ row ][ column ]->show();
   }
 
-  setMinimumSize(tqsizeHint());
+  setMinimumSize(sizeHint());
 
   setModified( true );
 }
@@ -544,7 +544,7 @@ void WorkSheet::removeDisplay( KSGRD::SensorDisplay *display )
   for ( uint r = 0; r < mRows; ++r )
     for ( uint c = 0; c < mColumns; ++c )
       if ( mDisplayList[ r ][ c ] == display ) {
-        tqreplaceDisplay( r, c );
+        replaceDisplay( r, c );
         setModified( true );
         return;
       }
@@ -563,7 +563,7 @@ void WorkSheet::createGrid( uint rows, uint columns )
   mRows = rows;
   mColumns = columns;
 
-  // create grid tqlayout with specified dimentions
+  // create grid layout with specified dimentions
   mGridLayout = new TQGridLayout( this, mRows, mColumns, 5 );
 
   mDisplayList = new KSGRD::SensorDisplay**[ mRows ];
@@ -612,7 +612,7 @@ void WorkSheet::resizeGrid( uint newRows, uint newColumns )
   for ( r = 0; r < newRows; ++r )
     for ( c = 0; c < newColumns; ++c )
       if ( r >= mRows || c >= mColumns )
-        tqreplaceDisplay( r, c );
+        replaceDisplay( r, c );
 
   /* set stretch factors for new rows and columns (if any) */
   for ( r = mRows; r < newRows; ++r )
diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h
index 3f8e84575..37bafbda3 100644
--- a/ksysguard/gui/WorkSheet.h
+++ b/ksysguard/gui/WorkSheet.h
@@ -36,10 +36,10 @@ class TQString;
 class TQStringList;
 
 /**
-  A WorkSheet tqcontains the displays to visualize the sensor results. When
+  A WorkSheet contains the displays to visualize the sensor results. When
   creating the WorkSheet you must specify the number of columns. Displays
-  can be added and removed on the fly. The grid tqlayout will handle the
-  tqlayout. The number of columns can not be changed. Displays are added by
+  can be added and removed on the fly. The grid layout will handle the
+  layout. The number of columns can not be changed. Displays are added by
   dragging a sensor from the sensor browser over the WorkSheet.
  */
 class WorkSheet : public TQWidget, public KSGRD::SensorBoard
@@ -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* );
@@ -98,9 +98,9 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard
   private:
     void removeDisplay( KSGRD::SensorDisplay *display );
 
-    bool tqreplaceDisplay( uint row, uint column, TQDomElement& element );
+    bool replaceDisplay( uint row, uint column, TQDomElement& element );
 
-    void tqreplaceDisplay( uint row, uint column,
+    void replaceDisplay( uint row, uint column,
                          KSGRD::SensorDisplay* display = 0 );
 
     void collectHosts( TQStringList &list );
@@ -127,7 +127,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard
     /**
       This two dimensional array stores the pointers to the sensor displays
 	    or if no sensor is present at a position a pointer to a dummy widget.
-  	  The size of the array corresponds to the size of the grid tqlayout.
+  	  The size of the array corresponds to the size of the grid layout.
      */
     KSGRD::SensorDisplay*** mDisplayList;
 };
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc
index aaa0c77b2..3e4c28e50 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cc
@@ -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/Workspace.cc b/ksysguard/gui/Workspace.cc
index 54b756f49..3c1a92a56 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cc
@@ -162,7 +162,7 @@ bool Workspace::saveOnQuit()
     if ( (*it)->modified() ) {
       if ( !mAutoSave || (*it)->fileName().isEmpty() ) {
         int res = KMessageBox::warningYesNoCancel( this,
-                  i18n( "The worksheet '%1' tqcontains unsaved data.\n"
+                  i18n( "The worksheet '%1' contains unsaved data.\n"
                         "Do you want to save the worksheet?")
                   .arg( tabLabel( *it ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
         if ( res == KMessageBox::Yes )
@@ -302,7 +302,7 @@ void Workspace::deleteWorkSheet()
     if ( current->modified() ) {
       if ( !mAutoSave || current->fileName().isEmpty() ) {
         int res = KMessageBox::warningYesNoCancel( this,
-                            i18n( "The worksheet '%1' tqcontains unsaved data.\n"
+                            i18n( "The worksheet '%1' contains unsaved data.\n"
                                   "Do you want to save the worksheet?" )
                             .arg( tabLabel( current ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() );
         if ( res == KMessageBox::Cancel )
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc
index 0b4536f41..3885a9518 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cc
@@ -38,30 +38,30 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
                  parent, name, true, true )
 {
   TQFrame *page = plainPage();
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
-  tqlayout->setColStretch( 1, 1 );
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
+  layout->setColStretch( 1, 1 );
 
   TQLabel *label = new TQLabel( i18n( "Host:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mHostNames = new KComboBox( true, page );
   mHostNames->setMaxCount( 20 );
   mHostNames->setInsertionPolicy( TQComboBox::AtTop );
   mHostNames->setAutoCompletion( true );
   mHostNames->setDuplicatesEnabled( false );
-  tqlayout->addWidget( mHostNames, 0, 1 );
+  layout->addWidget( mHostNames, 0, 1 );
   label->setBuddy( mHostNames );
   TQWhatsThis::add( mHostNames, i18n( "Enter the name of the host you want to connect to." ) );
 
   mHostNameLabel = new TQLabel( page );
   mHostNameLabel->hide();
-  tqlayout->addWidget( mHostNameLabel, 0, 1 );
+  layout->addWidget( mHostNameLabel, 0, 1 );
 
   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 );
@@ -109,7 +109,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
   label = new TQLabel( i18n( "e.g. ssh -l root remote.host.org ksysguardd" ), group );
   groupLayout->addMultiCellWidget( label, 3, 3, 2, 3 );
 
-  tqlayout->addMultiCellWidget( group, 1, 1, 0, 1 );
+  layout->addMultiCellWidget( group, 1, 1, 0, 1 );
 
   connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ),
            mCommands, TQT_SLOT( setEnabled( bool ) ) );
diff --git a/ksysguard/gui/ksgrd/SensorClient.h b/ksysguard/gui/ksgrd/SensorClient.h
index e2831ebf3..d4e286cb1 100644
--- a/ksysguard/gui/ksgrd/SensorClient.h
+++ b/ksysguard/gui/ksgrd/SensorClient.h
@@ -103,7 +103,7 @@ class SensorTokenizer
 };
 
 /**
-  An integer info tqcontains 4 fields seperated by TABS, a description
+  An integer info contains 4 fields seperated by TABS, a description
   (name), the minimum and the maximum values and the unit.
   e.g. Swap Memory	0	133885952	KB
  */
@@ -137,7 +137,7 @@ class SensorIntegerInfo : public SensorTokenizer
 };
 
 /**
-  An float info tqcontains 4 fields seperated by TABS, a description
+  An float info contains 4 fields seperated by TABS, a description
   (name), the minimum and the maximum values and the unit.
   e.g. CPU Voltage 0.0	5.0	V
  */
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc
index 03d911464..6c7faf771 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cc
@@ -42,55 +42,55 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name )
                  Cancel, Ok, parent, name, true, true )
 {
   TQFrame *page = addPage( i18n( "Display Style" ) );
-  TQGridLayout *tqlayout = new TQGridLayout( page, 6, 2, 0, spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 6, 2, 0, spacingHint() );
 
   TQLabel *label = new TQLabel( i18n( "First foreground color:" ), page );
-  tqlayout->addWidget( label, 0, 0 );
+  layout->addWidget( label, 0, 0 );
 
   mFirstForegroundColor = new KColorButton( page );
-  tqlayout->addWidget( mFirstForegroundColor, 0, 1 );
+  layout->addWidget( mFirstForegroundColor, 0, 1 );
   label->setBuddy( mFirstForegroundColor );
 
   label = new TQLabel( i18n( "Second foreground color:" ), page );
-  tqlayout->addWidget( label, 1, 0 );
+  layout->addWidget( label, 1, 0 );
 
   mSecondForegroundColor = new KColorButton( page );
-  tqlayout->addWidget( mSecondForegroundColor, 1, 1 );
+  layout->addWidget( mSecondForegroundColor, 1, 1 );
   label->setBuddy( mSecondForegroundColor );
 
   label = new TQLabel( i18n( "Alarm color:" ), page );
-  tqlayout->addWidget( label, 2, 0 );
+  layout->addWidget( label, 2, 0 );
 
   mAlarmColor = new KColorButton( page );
-  tqlayout->addWidget( mAlarmColor, 2, 1 );
+  layout->addWidget( mAlarmColor, 2, 1 );
   label->setBuddy( mAlarmColor );
 
   label = new TQLabel( i18n( "Background color:" ), page );
-  tqlayout->addWidget( label, 3, 0 );
+  layout->addWidget( label, 3, 0 );
 
   mBackgroundColor = new KColorButton( page );
-  tqlayout->addWidget( mBackgroundColor, 3, 1 );
+  layout->addWidget( mBackgroundColor, 3, 1 );
   label->setBuddy( mBackgroundColor );
 
   label = new TQLabel( i18n( "Font size:" ), page );
-  tqlayout->addWidget( label, 4, 0 );
+  layout->addWidget( label, 4, 0 );
 
   mFontSize = new TQSpinBox( 7, 48, 1, page );
   mFontSize->setValue( 8 );
-  tqlayout->addWidget( mFontSize, 4, 1 );
+  layout->addWidget( mFontSize, 4, 1 );
   label->setBuddy( mFontSize );
 
-  tqlayout->setRowStretch( 5, 1 );
+  layout->setRowStretch( 5, 1 );
 
   page = addPage( i18n( "Sensor Colors" ) );
-  tqlayout = new TQGridLayout( page, 1, 2, 0, spacingHint() );
+  layout = new TQGridLayout( page, 1, 2, 0, spacingHint() );
 
   mColorListBox = new TQListBox( page );
-  tqlayout->addWidget( mColorListBox, 0, 0 );
+  layout->addWidget( mColorListBox, 0, 0 );
 
   mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page );
   mEditColorButton->setEnabled( false );
-  tqlayout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop );
+  layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop );
 
   connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
            TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc
index f52b2e2d8..5e1d8d8b2 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cc
@@ -38,18 +38,18 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name )
 {
   TQFrame *page = plainPage();
 
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() );
 
   mUseGlobalUpdate = new TQCheckBox( i18n( "Use update interval of worksheet" ), page );
-  tqlayout->addMultiCellWidget( mUseGlobalUpdate, 0, 0, 0, 1 );
+  layout->addMultiCellWidget( mUseGlobalUpdate, 0, 0, 0, 1 );
 
   mLabel = new TQLabel( i18n( "Update interval:" ), page );
-  tqlayout->addWidget( mLabel, 1, 0 );
+  layout->addWidget( mLabel, 1, 0 );
 
   mInterval = new TQSpinBox( 1, 300, 1, page );
   mInterval->setValue( 2 );
   mInterval->setSuffix( i18n( " sec" ) );
-  tqlayout->addWidget( mInterval, 1, 1 );
+  layout->addWidget( mInterval, 1, 1 );
   mLabel->setBuddy( mInterval );
   TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) );
 
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc
index 0deeec4a2..2be851232 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cc
@@ -140,7 +140,7 @@ TopLevel::TopLevel( const char *name )
   new KAction( i18n( "Configure &Style..." ), "colorize", 0, this,
                TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
 
-  // TODO remove resize and fix so tqsizeHints() determines default size.
+  // TODO remove resize and fix so sizeHints() determines default size.
   if (!initialGeometrySet())
     resize( 640, 480 );
   setupGUI(ToolBar | Keys | StatusBar | Create);
diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h
index f8e8c15c6..f41e6afb1 100644
--- a/ksysguard/gui/ksysguard.h
+++ b/ksysguard/gui/ksysguard.h
@@ -116,7 +116,7 @@ typedef unsigned long CARD32;
 class DCOPClientTransaction
 {
   public:
-    TQ_INT32 id;
+    Q_INT32 id;
     CARD32 key;
     TQCString senderId;
 };