summaryrefslogtreecommitdiffstats
path: root/kpresenter/KPrCanvas.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:10:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:10:32 -0600
commit3fe437def8063926892bddf2dcc733861308836d (patch)
tree021d66ad023a32bc8ea0074a1ab3d01316aff8b0 /kpresenter/KPrCanvas.cpp
parent5b8ab149469c8e186ee8b05d90c0103ae722dd85 (diff)
downloadkoffice-3fe437def8063926892bddf2dcc733861308836d.tar.gz
koffice-3fe437def8063926892bddf2dcc733861308836d.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kpresenter/KPrCanvas.cpp')
-rw-r--r--kpresenter/KPrCanvas.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index c72768a7..f14cad8d 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -2384,7 +2384,7 @@ bool KPrCanvas::exportPage( int nPage,
}
if( !bLocalFile ){
if( res ){
- res = KIO::NetAccess::upload( tmpFile->name(), fileURL, this );
+ res = TDEIO::NetAccess::upload( tmpFile->name(), fileURL, this );
}
}
}
@@ -3610,7 +3610,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
- static_cast<int>( MM_TO_POINT( top_margin ) ) );*/
}
- KConfig *config=KPrFactory::global()->config();
+ TDEConfig *config=KPrFactory::global()->config();
config->setGroup("Misc");
bool printNotes = config->readBoolEntry("PrintNotes", true);
@@ -4020,7 +4020,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
TQString filename;
if ( !url.isLocalFile() ) {
- if ( !KIO::NetAccess::download( url, filename, this ) )
+ if ( !TDEIO::NetAccess::download( url, filename, this ) )
continue;
} else {
filename = url.path();
@@ -4057,7 +4057,7 @@ void KPrCanvas::dropEvent( TQDropEvent *e )
setCursor( c );
}
}
- KIO::NetAccess::removeTempFile( filename );
+ TDEIO::NetAccess::removeTempFile( filename );
}
}
else if (m_currentTextObjectView)