From 3fe437def8063926892bddf2dcc733861308836d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:10:32 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- lib/kofficecore/KoMainWindow.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/kofficecore/KoMainWindow.cpp') diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 70275b6e..f06d2c46 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this))); // Load list of recent files - KConfig * config = instance ? instance->config() : TDEGlobal::config(); + TDEConfig * config = instance ? instance->config() : TDEGlobal::config(); m_recent->loadEntries( config ); createShellGUI(); @@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url ) void KoMainWindow::saveRecentFiles() { // Save list of recent files - KConfig * config = instance() ? instance()->config() : TDEGlobal::config(); + TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config(); kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl; m_recent->saveEntries( config ); config->sync(); @@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles() void KoMainWindow::reloadRecentFileList() { - KConfig * config = instance() ? instance()->config() : TDEGlobal::config(); + TDEConfig * config = instance() ? instance()->config() : TDEGlobal::config(); m_recent->loadEntries( config ); } @@ -542,7 +542,7 @@ KParts::PartManager *KoMainWindow::partManager() bool KoMainWindow::openDocument( const KURL & url ) { - if ( !KIO::NetAccess::exists(url,true,0) ) + if ( !TDEIO::NetAccess::exists(url,true,0) ) { KMessageBox::error(0L, i18n("The file %1 does not exist.").arg(url.url()) ); m_recent->removeURL(url); //remove the file from the recent-opened-file-list @@ -555,7 +555,7 @@ bool KoMainWindow::openDocument( const KURL & url ) // (not virtual) bool KoMainWindow::openDocument( KoDocument *newdoc, const KURL & url ) { - if (!KIO::NetAccess::exists(url,true,0) ) + if (!TDEIO::NetAccess::exists(url,true,0) ) { if (!newdoc->checkAutoSaveFile()) { @@ -847,7 +847,7 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) // this file exists and we are not just clicking "Save As" to change filter options // => ask for confirmation - if ( KIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions ) + if ( TDEIO::NetAccess::exists( newURL, false /*will write*/, this ) && !justChangingFilterOptions ) { bOk = KMessageBox::questionYesNo( this, i18n("A document with this name already exists.\n"\ -- cgit v1.2.1