Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit c4a6487c827add9382001ff1892b8fb3bfa94682)

4 files changed, 20 insertions, 20 deletions

diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..4e32dc630 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
@@ -58,7 +58,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
    * SensorDisplay::eventFilter. */
 	mPlotter->installEventFilter( this );
 
-  setPlotterWidget( TQT_TQWIDGET(mPlotter) );
+  setPlotterWidget( mPlotter );
 
   setModified( false );
 }
@@ -242,8 +242,8 @@ bool FancyPlotter::addSensor( const TQString &hostName, const TQString &name,
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
@@ -267,8 +267,8 @@ bool FancyPlotter::removeSensor( uint pos )
                                    .arg( sensors().at( mBeams - i - 1  )->name() );
   }
 
-  TQToolTip::remove( TQT_TQWIDGET(mPlotter) );
-  TQToolTip::add( TQT_TQWIDGET(mPlotter), tooltip );
+  TQToolTip::remove( mPlotter );
+  TQToolTip::add( mPlotter, tooltip );
 
   return true;
 }
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
index fe88f292f..e97fabffc 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui.h
@@ -9,8 +9,8 @@
 
 void MultiMeterSettingsWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
 
   m_title->setFocus();
 }
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
index 515cb13f6..ad1f2687b 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui.h
@@ -9,8 +9,8 @@
 
 void SensorLoggerDlgWidget::init()
 {
-  m_lowerLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_lowerLimit)));
-  m_upperLimit->setValidator(new KDoubleValidator(TQT_TQOBJECT(m_upperLimit)));
+  m_lowerLimit->setValidator(new KDoubleValidator(m_lowerLimit));
+  m_upperLimit->setValidator(new KDoubleValidator(m_upperLimit));
   m_timerInterval->setRange(1, 99, 1, true);
 
   m_fileName->setFocus();
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 2c2994eaa..2375cf8ee 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -105,39 +105,39 @@ TopLevel::TopLevel( const char *name )
   statusBar()->hide();
 
   // create actions for menue entries
-  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, TQT_TQOBJECT(mWorkSpace),
+  new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace,
 		   TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" );
   
-  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, TQT_TQOBJECT(mWorkSpace),
+  new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace,
 		   TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" );
   
   mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0,
-		   TQT_TQOBJECT(mWorkSpace), TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
+		   mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" );	
   
-  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, TQT_TQOBJECT(mWorkSpace),
+  new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace,
 		   TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" );
 
-  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, TQT_TQOBJECT(mWorkSpace),
+  new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace,
 		   TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" );
    
-  KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
+  KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() );
 
-  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, TQT_TQOBJECT(this),
+  new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this,
                TQT_SLOT( connectHost() ), actionCollection(), "connect_host" );
-  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, TQT_TQOBJECT(this),
+  new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this,
                TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" );
 
 //  KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() );
 //  KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() );
 //  KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() );
-  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, TQT_TQOBJECT(mWorkSpace),
+  new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace,
                TQT_SLOT( configure() ), actionCollection(), "configure_sheet" );
 
   new TDEAction( i18n( "Load Standard Sheets" ), "document-revert",
-               0, TQT_TQOBJECT(this), TQT_SLOT( resetWorkSheets() ),
+               0, this, TQT_SLOT( resetWorkSheets() ),
                actionCollection(), "revert_all_worksheets"  );
 
-  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, TQT_TQOBJECT(this),
+  new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this,
                TQT_SLOT( editStyle() ), actionCollection(), "configure_style" );
 
   // TODO remove resize and fix so sizeHints() determines default size.