From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kparts/partmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kparts/partmanager.cpp') 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; -- cgit v1.2.1