diff options
Diffstat (limited to 'kparts')
| -rw-r--r-- | kparts/browserrun.cpp | 4 | ||||
| -rw-r--r-- | kparts/dockmainwindow.cpp | 2 | ||||
| -rw-r--r-- | kparts/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | kparts/part.cpp | 4 | ||||
| -rw-r--r-- | kparts/partmanager.cpp | 4 | ||||
| -rw-r--r-- | kparts/plugin.cpp | 2 | ||||
| -rw-r--r-- | kparts/tests/example.cpp | 2 | ||||
| -rw-r--r-- | kparts/tests/normalktm.cpp | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/kparts/browserrun.cpp b/kparts/browserrun.cpp index 0500e0631..8bec0e790 100644 --- a/kparts/browserrun.cpp +++ b/kparts/browserrun.cpp @@ -399,9 +399,9 @@ void BrowserRun::simpleSave( const KURL & url, const TQString & suggestedFilenam // the duplicated code) with shiny new KDownload class for 3.2 (pfeiffer) // Until the shiny new class comes about, send the suggestedFilename // along with the actual URL to download. (DA) - cmd += " " + KProcess::quote(url.url()); + cmd += " " + TDEProcess::quote(url.url()); if ( !suggestedFilename.isEmpty() ) - cmd +=" " + KProcess::quote(suggestedFilename); + cmd +=" " + TDEProcess::quote(suggestedFilename); kdDebug(1000) << "Calling command " << cmd << endl; // slave is already on hold (slotBrowserMimetype()) diff --git a/kparts/dockmainwindow.cpp b/kparts/dockmainwindow.cpp index 9f7703ab6..9d8d73057 100644 --- a/kparts/dockmainwindow.cpp +++ b/kparts/dockmainwindow.cpp @@ -97,7 +97,7 @@ void DockMainWindow::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; } 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" diff --git a/kparts/part.cpp b/kparts/part.cpp index d2efbeeac..68e9dbbf2 100644 --- a/kparts/part.cpp +++ b/kparts/part.cpp @@ -110,9 +110,9 @@ void PartBase::setInstance( TDEInstance *inst ) void PartBase::setInstance( TDEInstance *inst, bool bLoadPlugins ) { KXMLGUIClient::setInstance( inst ); - KGlobal::locale()->insertCatalogue( inst->instanceName() ); + TDEGlobal::locale()->insertCatalogue( inst->instanceName() ); // install 'instancename'data resource type - KGlobal::dirs()->addResourceType( inst->instanceName() + "data", + TDEGlobal::dirs()->addResourceType( inst->instanceName() + "data", KStandardDirs::kde_default( "data" ) + TQString::fromLatin1( inst->instanceName() ) + '/' ); if ( bLoadPlugins ) 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 diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index 1e5ca9008..b36d4dbc6 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -220,7 +220,7 @@ bool Plugin::hasPlugin( TQObject* parent, const TQString& library ) void Plugin::setInstance( TDEInstance *instance ) { - KGlobal::locale()->insertCatalogue( instance->instanceName() ); + TDEGlobal::locale()->insertCatalogue( instance->instanceName() ); KXMLGUIClient::setInstance( instance ); } diff --git a/kparts/tests/example.cpp b/kparts/tests/example.cpp index 3675781ea..4628e8ca7 100644 --- a/kparts/tests/example.cpp +++ b/kparts/tests/example.cpp @@ -63,7 +63,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } diff --git a/kparts/tests/normalktm.cpp b/kparts/tests/normalktm.cpp index 82c464a5a..913686bf9 100644 --- a/kparts/tests/normalktm.cpp +++ b/kparts/tests/normalktm.cpp @@ -61,7 +61,7 @@ Shell::~Shell() void Shell::slotFileOpen() { - if ( ! m_part1->openURL( locate("data", KGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) + if ( ! m_part1->openURL( locate("data", TDEGlobal::instance()->instanceName()+"/kpartstest_shell.rc" ) ) ) KMessageBox::error(this,"Couldn't open file !"); } |