diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kparts/partmanager.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kparts/partmanager.cpp')
| -rw-r--r-- | kparts/partmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kparts/partmanager.cpp b/kparts/partmanager.cpp index 97a8b9961..8d9ff1994 100644 --- a/kparts/partmanager.cpp +++ b/kparts/partmanager.cpp @@ -486,7 +486,7 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) emit activePartChanged( d->m_activePart ); } -void PartManager::setActiveInstance( KInstance * instance ) +void PartManager::setActiveInstance( TDEInstance * instance ) { // It's a separate method to allow redefining this behavior KGlobal::_activeInstance = instance; |