Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

5 files changed, 10 insertions, 10 deletions

diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp
index 9c8d72112..7aa5d0212 100644
--- a/tdeparts/dockmainwindow.cpp
+++ b/tdeparts/dockmainwindow.cpp
@@ -62,7 +62,7 @@ DockMainWindow::DockMainWindow( TQWidget* parent, const char *name, WFlags f )
   : KDockMainWindow( parent, name, f )
 {
   d = new DockMainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 DockMainWindow::~DockMainWindow()
@@ -97,7 +97,7 @@ void DockMainWindow::createGUI( Part * part )
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+    loadPlugins( this, this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
diff --git a/tdeparts/factory.cpp b/tdeparts/factory.cpp
index ce758288b..0b7d1c84c 100644
--- a/tdeparts/factory.cpp
+++ b/tdeparts/factory.cpp
@@ -77,6 +77,6 @@ Part *Factory::createPartObject( TQWidget *, const char *, TQObject *, const cha
 TQObject *Factory::createObject( TQObject *parent, const char *name, const char *classname, const TQStringList &args )
 {
   assert( !parent || parent->isWidgetType() );
-  return createPart( TQT_TQWIDGET( parent ), name, parent, name, classname, args );
+  return createPart( static_cast<TQWidget*>( parent ), name, parent, name, classname, args );
 }
 #include "factory.moc"
diff --git a/tdeparts/historyprovider.cpp b/tdeparts/historyprovider.cpp
index 9c893ae53..067895872 100644
--- a/tdeparts/historyprovider.cpp
+++ b/tdeparts/historyprovider.cpp
@@ -40,7 +40,7 @@ public:
 HistoryProvider * HistoryProvider::self()
 {
     if ( !s_self )
-	s_self = new HistoryProvider( TQT_TQOBJECT(kapp), "history provider" );
+	s_self = new HistoryProvider( kapp, "history provider" );
     return s_self;
 }
 
diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp
index b3245da9b..80bfb6071 100644
--- a/tdeparts/mainwindow.cpp
+++ b/tdeparts/mainwindow.cpp
@@ -61,21 +61,21 @@ MainWindow::MainWindow( TQWidget* parent,  const char *name, WFlags f )
     : TDEMainWindow( parent, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::MainWindow( const char *name, WFlags f )
   : TDEMainWindow( 0L, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::MainWindow( int cflags, TQWidget* parent,  const char *name, WFlags f )
     : TDEMainWindow( cflags, parent, name, f )
 {
   d = new MainWindowPrivate();
-  PartBase::setPartObject( TQT_TQOBJECT(this) );
+  PartBase::setPartObject( this );
 }
 
 MainWindow::~MainWindow()
@@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part )
 
   if ( !d->m_bShellGUIActivated )
   {
-    loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() );
+    loadPlugins( this, this, TDEGlobal::instance() );
     createShellGUI();
     d->m_bShellGUIActivated = true;
   }
diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp
index 140db74e2..8a41eb18c 100644
--- a/tdeparts/partmanager.cpp
+++ b/tdeparts/partmanager.cpp
@@ -183,7 +183,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
   if ( !obj->isWidgetType() )
     return false;
 
-  TQWidget *w = TQT_TQWIDGET( obj );
+  TQWidget *w = static_cast<TQWidget*>( obj );
 
   if ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
        w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) )
@@ -419,7 +419,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget )
   //tree recursively (Simon)
   if ( part && !d->m_bAllowNestedParts )
   {
-    TQObject *parentPart = TQT_TQOBJECT(part->parent()); // ### this relies on people using KParts::Factory!
+    TQObject *parentPart = part->parent(); // ### this relies on people using KParts::Factory!
     if ( parentPart && parentPart->inherits( "KParts::Part" ) )
     {
       KParts::Part *parPart = static_cast<KParts::Part *>( parentPart );