summaryrefslogtreecommitdiffstats
path: root/keduca/libkeduca
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-25 00:32:27 -0600
committerTimothy Pearson <[email protected]>2013-01-25 00:32:27 -0600
commit9f2c757e1a1694373c11427a00502c2ff4c2d403 (patch)
tree7d90e91214976a7d23d89ec3474515cf46069704 /keduca/libkeduca
parentcee429821aa6f1acc97fb482d325fb4eb37376ca (diff)
downloadtdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.tar.gz
tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'keduca/libkeduca')
-rw-r--r--keduca/libkeduca/fileread.cpp22
-rw-r--r--keduca/libkeduca/fileread.h2
-rw-r--r--keduca/libkeduca/kgallerydialog.cpp8
-rw-r--r--keduca/libkeduca/kgallerydialog.h2
4 files changed, 17 insertions, 17 deletions
diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp
index ad72b7e3..24d66339 100644
--- a/keduca/libkeduca/fileread.cpp
+++ b/keduca/libkeduca/fileread.cpp
@@ -43,7 +43,7 @@ FileRead::~FileRead()
bool FileRead::openFile(const KURL &url) {
TQString tmpFile;
bool returnval=false;
- if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+ if( TDEIO::NetAccess::download( url, tmpFile, 0 ) )
{
returnval=loadFile( tmpFile );
if (returnval) {
@@ -51,7 +51,7 @@ bool FileRead::openFile(const KURL &url) {
kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
}
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}else
kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
@@ -584,11 +584,11 @@ TQPixmap FileRead::getPicturePixmap()
KURL picture ( getPicture() );
TQPixmap pict;
- if( KIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
+ if( TDEIO::NetAccess::download( picture, _tmpfileImage, 0 ) )
{
kdDebug()<<"... load successful: "<< _tmpfileImage <<endl;
pict = TQPixmap( _tmpfileImage );
- KIO::NetAccess::removeTempFile( _tmpfileImage );
+ TDEIO::NetAccess::removeTempFile( _tmpfileImage );
}
else
{
@@ -669,8 +669,8 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed )
// otherwise, we already had a temp file
if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) {
// upload the file
- KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+ TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
return true;
}
}
@@ -804,9 +804,9 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom
if( copyimages == true && copyJOB.count() > 0 )
{
KURL::List KurlLIST( copyJOB );
- KIO::CopyJob *copyjob;
+ TDEIO::CopyJob *copyjob;
- copyjob = KIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
+ copyjob = TDEIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true);
}
_changed=false;
return true;
@@ -846,8 +846,8 @@ bool FileRead::saveResults( const KURL &url, const TQString &results )
// otherwise, we already had a temp file
if( saveResults(_tmpfile->name(), results) ) {
// upload the file
- KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
- connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) );
+ TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ );
+ connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) );
return true;
}
}
@@ -934,7 +934,7 @@ bool FileRead::isResult()
return _listResults.count() > 0 ? true : false;
}
-void FileRead::slotUploadFinished( KIO::Job * job )
+void FileRead::slotUploadFinished( TDEIO::Job * job )
{
if (job->error()) {
emit canceled( job->errorString() );
diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h
index dd4caa08..3199f0ad 100644
--- a/keduca/libkeduca/fileread.h
+++ b/keduca/libkeduca/fileread.h
@@ -232,7 +232,7 @@ protected:
bool saveResults( const TQString &filename, const TQString &results );
protected slots:
- void slotUploadFinished( KIO::Job * job );
+ void slotUploadFinished( TDEIO::Job * job );
signals:
/* Stolen from kparts */
diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp
index 10c6ce43..f7e11da3 100644
--- a/keduca/libkeduca/kgallerydialog.cpp
+++ b/keduca/libkeduca/kgallerydialog.cpp
@@ -44,7 +44,7 @@ KGalleryDialog::~KGalleryDialog()
bool KGalleryDialog::openFile(const KURL &url) {
TQString tmpFile;
bool returnval=false;
- if( KIO::NetAccess::download( url, tmpFile, this ) )
+ if( TDEIO::NetAccess::download( url, tmpFile, this ) )
{
returnval=loadFile( tmpFile );
if (returnval) {
@@ -52,7 +52,7 @@ bool KGalleryDialog::openFile(const KURL &url) {
kdDebug()<<"... load successful: "<<_currentURL.url()<<endl;
}
- KIO::NetAccess::removeTempFile( tmpFile );
+ TDEIO::NetAccess::removeTempFile( tmpFile );
}else
kdDebug()<<"FileRead::openFile(): download NOT successful: "<<url.url()<<endl;
@@ -104,7 +104,7 @@ bool KGalleryDialog::loadFile( const TQString &filename )
/** Read servers */
void KGalleryDialog::configRead()
{
- KConfig *appconfig = TDEGlobal::config();
+ TDEConfig *appconfig = TDEGlobal::config();
TQStringList servers;
TQStringList ipservers;
TQStringList::Iterator it_ipservers;
@@ -140,7 +140,7 @@ void KGalleryDialog::configWrite()
{
TQStringList servers;
TQStringList ipservers;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup( "kgallerydialog" );
config->writeEntry("Splitter_size", _split->sizes() );
diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h
index cce2acaf..227acd3f 100644
--- a/keduca/libkeduca/kgallerydialog.h
+++ b/keduca/libkeduca/kgallerydialog.h
@@ -31,7 +31,7 @@
// forward declarations
class KTempFile;
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
class KGalleryDialog : public KGalleryDialogBase {
Q_OBJECT