diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:10:32 -0600 |
| commit | 3fe437def8063926892bddf2dcc733861308836d (patch) | |
| tree | 021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /kpresenter/KPrView.cpp | |
| parent | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff) | |
| download | koffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz koffice-3fe437def8063926892bddf2dcc733861308836d.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter/KPrView.cpp')
| -rw-r--r-- | kpresenter/KPrView.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index 37ce7db8..907aaf43 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -457,12 +457,12 @@ KPrView::~KPrView() delete m_findReplace; m_findReplace = 0L; if(sidebar) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); config->writeEntry("Sidebar", sidebar->isVisible()); } if(notebar) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); config->writeEntry("Notebar", notebar->isVisible()); } @@ -771,7 +771,7 @@ void KPrView::insertPicture() return; } TQString file; - if ( !KIO::NetAccess::download( url, file, this ) ) + if ( !TDEIO::NetAccess::download( url, file, this ) ) { m_canvas->setToolEditMode( TEM_MOUSE, false ); return; @@ -843,10 +843,10 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture) { picture.save( TQT_TQIODEVICE(&file) ); file.close(); - if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) ) + if ( !TDEIO::NetAccess::upload( tempFile.name(), url, this ) ) { KMessageBox::sorry( this, i18n( - "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ), + "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( TDEIO::NetAccess::lastErrorString() ), i18n("Save Failed") ); } } @@ -2231,7 +2231,7 @@ void KPrView::createGUI() { sidebar->outline()->setCurrentItem( sidebar->outline()->firstChild() ); sidebar->outline()->setSelected( sidebar->outline()->firstChild(), TRUE ); - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Sidebar", true)) { sidebar->hide(); @@ -2242,7 +2242,7 @@ void KPrView::createGUI() if ( notebar ) { - KConfig *config=TDEGlobal::config(); + TDEConfig *config=TDEGlobal::config(); config->setGroup("Global"); if(!config->readBoolEntry("Notebar", true)) { notebar->hide(); |