From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kparts/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kparts/mainwindow.cpp') diff --git a/kparts/mainwindow.cpp b/kparts/mainwindow.cpp index c0c4cd086..ce963c23a 100644 --- a/kparts/mainwindow.cpp +++ b/kparts/mainwindow.cpp @@ -115,7 +115,7 @@ void MainWindow::createGUI( Part * part ) if ( !d->m_bShellGUIActivated ) { - loadPlugins( TQT_TQOBJECT(this), this, KGlobal::instance() ); + loadPlugins( TQT_TQOBJECT(this), this, TDEGlobal::instance() ); createShellGUI(); d->m_bShellGUIActivated = true; } @@ -134,7 +134,7 @@ void MainWindow::createGUI( Part * part ) TQApplication::sendEvent( part, &ev ); if ( autoSaveSettings() ) - applyMainWindowSettings( KGlobal::config(), autoSaveGroup() ); + applyMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); } setUpdatesEnabled( true ); @@ -185,7 +185,7 @@ void MainWindow::createShellGUI( bool create ) void KParts::MainWindow::saveNewToolbarConfig() { createGUI( d->m_activePart ); - applyMainWindowSettings( KGlobal::config() ); + applyMainWindowSettings( TDEGlobal::config() ); } #include "mainwindow.moc" -- cgit v1.2.1