diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kparts/partmanager.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kparts/partmanager.cpp')
| -rw-r--r-- | kparts/partmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 8d9ff1994..0f3bc347d 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -479,7 +479,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activeWidget, &ev ); } } - // Set the new active instance in KGlobal + // Set the new active instance in TDEGlobal setActiveInstance( d->m_activePart ? d->m_activePart->instance() : 0L ); kdDebug(1000) << this << " emitting activePartChanged " << d->m_activePart << endl; @@ -489,7 +489,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) void PartManager::setActiveInstance( TDEInstance * instance ) { // It's a separate method to allow redefining this behavior - KGlobal::_activeInstance = instance; + TDEGlobal::_activeInstance = instance; } Part *PartManager::activePart() const |