summaryrefslogtreecommitdiffstats
path: root/kparts/partmanager.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kparts/partmanager.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz
tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip
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/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kparts/partmanager.cpp')
-rw-r--r--kparts/partmanager.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp
index 2059af928..0ff139532 100644
--- a/kparts/partmanager.cpp
+++ b/kparts/partmanager.cpp
@@ -97,7 +97,7 @@ PartManager::PartManager( TQWidget * parent, const char * name )
{
d = new PartManagerPrivate;
- tqApp->installEventFilter( this );
+ qApp->installEventFilter( this );
d->m_policy = Direct;
@@ -109,7 +109,7 @@ PartManager::PartManager( TQWidget *topLevel, TQObject *parent, const char *name
{
d = new PartManagerPrivate;
- tqApp->installEventFilter( this );
+ qApp->installEventFilter( this );
d->m_policy = Direct;
@@ -129,7 +129,7 @@ PartManager::~PartManager()
}
// core dumps ... setActivePart( 0L );
- tqApp->removeEventFilter( this );
+ qApp->removeEventFilter( this );
delete d;
}
@@ -206,7 +206,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
{
TQPoint pos;
- if ( !d->m_managedTopLevelWidgets.tqcontainsRef( w->tqtopLevelWidget() ) )
+ if ( !d->m_managedTopLevelWidgets.containsRef( w->topLevelWidget() ) )
return false;
if ( d->m_bIgnoreScrollBars && w->inherits( "QScrollBar" ) )
@@ -215,9 +215,9 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
if ( mev ) // mouse press or mouse double-click event
{
pos = mev->globalPos();
- part = tqfindPartFromWidget( w, pos );
+ part = findPartFromWidget( w, pos );
} else
- part = tqfindPartFromWidget( w );
+ part = findPartFromWidget( w );
#ifdef DEBUG_PARTMANAGER
TQCString evType = ( ev->type() == TQEvent::MouseButtonPress ) ? "MouseButtonPress"
@@ -288,7 +288,7 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
return false;
}
- w = w->tqparentWidget();
+ w = w->parentWidget();
if ( w && ( ( w->testWFlags( WType_Dialog ) && w->isModal() ) ||
w->testWFlags( WType_Popup ) || w->testWFlags( WStyle_Tool ) ) )
@@ -307,19 +307,19 @@ bool PartManager::eventFilter( TQObject *obj, TQEvent *ev )
return false;
}
-Part * PartManager::tqfindPartFromWidget( TQWidget * widget, const TQPoint &pos )
+Part * PartManager::findPartFromWidget( TQWidget * widget, const TQPoint &pos )
{
TQPtrListIterator<Part> it ( d->m_parts );
for ( ; it.current() ; ++it )
{
Part *part = it.current()->hitTest( widget, pos );
- if ( part && d->m_parts.tqfindRef( part ) != -1 )
+ if ( part && d->m_parts.findRef( part ) != -1 )
return part;
}
return 0L;
}
-Part * PartManager::tqfindPartFromWidget( TQWidget * widget )
+Part * PartManager::findPartFromWidget( TQWidget * widget )
{
TQPtrListIterator<Part> it ( d->m_parts );
for ( ; it.current() ; ++it )
@@ -332,7 +332,7 @@ Part * PartManager::tqfindPartFromWidget( TQWidget * widget )
void PartManager::addPart( Part *part, bool setActive )
{
- if ( d->m_parts.tqfindRef( part ) != -1 ) // don't add parts more than once :)
+ if ( d->m_parts.findRef( part ) != -1 ) // don't add parts more than once :)
{
#ifdef DEBUG_PARTMANAGER
kdWarning(1000) << k_funcinfo << part << " already added" << kdBacktrace(5) << endl;
@@ -368,7 +368,7 @@ void PartManager::addPart( Part *part, bool setActive )
void PartManager::removePart( Part *part )
{
- if ( d->m_parts.tqfindRef( part ) == -1 )
+ if ( d->m_parts.findRef( part ) == -1 )
{
kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(part->name()) << endl;
return;
@@ -390,11 +390,11 @@ void PartManager::removePart( Part *part )
setSelectedPart( 0 );
}
-void PartManager::tqreplacePart( Part * oldPart, Part * newPart, bool setActive )
+void PartManager::replacePart( Part * oldPart, Part * newPart, bool setActive )
{
- //kdDebug(1000) << "tqreplacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl;
+ //kdDebug(1000) << "replacePart " << oldPart->name() << "-> " << newPart->name() << " setActive=" << setActive << endl;
// This methods does exactly removePart + addPart but without calling setActivePart(0) in between
- if ( d->m_parts.tqfindRef( oldPart ) == -1 )
+ if ( d->m_parts.findRef( oldPart ) == -1 )
{
kdFatal(1000) << TQString("Can't remove part %1, not in KPartManager's list.").arg(oldPart->name()) << endl;
return;
@@ -410,7 +410,7 @@ void PartManager::tqreplacePart( Part * oldPart, Part * newPart, bool setActive
void PartManager::setActivePart( Part *part, TQWidget *widget )
{
- if ( part && d->m_parts.tqfindRef( part ) == -1 )
+ if ( part && d->m_parts.findRef( part ) == -1 )
{
kdWarning( 1000 ) << "PartManager::setActivePart : trying to activate a non-registered part! " << part->name() << endl;
return; // don't allow someone call setActivePart with a part we don't know about
@@ -565,7 +565,7 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel )
if ( !topLevel->isTopLevel() )
return;
- if ( d->m_managedTopLevelWidgets.tqcontainsRef( topLevel ) )
+ if ( d->m_managedTopLevelWidgets.containsRef( topLevel ) )
return;
d->m_managedTopLevelWidgets.append( topLevel );
@@ -578,7 +578,7 @@ void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel )
if ( !topLevel->isTopLevel() )
return;
- if ( d->m_managedTopLevelWidgets.tqfindRef( topLevel ) == -1 )
+ if ( d->m_managedTopLevelWidgets.findRef( topLevel ) == -1 )
return;
d->m_managedTopLevelWidgets.remove();