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/mainwindow.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/mainwindow.cpp')
| -rw-r--r-- | kparts/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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" |