diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /knewstuff | |
parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'knewstuff')
-rw-r--r-- | knewstuff/downloaddialog.cpp | 38 | ||||
-rw-r--r-- | knewstuff/downloaddialog.h | 12 | ||||
-rw-r--r-- | knewstuff/engine.cpp | 46 | ||||
-rw-r--r-- | knewstuff/engine.h | 18 | ||||
-rw-r--r-- | knewstuff/knewstuffgeneric.h | 4 | ||||
-rw-r--r-- | knewstuff/knewstuffsecure.cpp | 10 | ||||
-rw-r--r-- | knewstuff/provider.cpp | 16 | ||||
-rw-r--r-- | knewstuff/provider.h | 6 | ||||
-rw-r--r-- | knewstuff/uploaddialog.cpp | 4 |
9 files changed, 77 insertions, 77 deletions
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 6a54e3a78..f8e03295c 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -52,8 +52,8 @@ struct DownloadDialog::Private TQWidget *m_page; KListView *m_lvtmp_r, *m_lvtmp_d, *m_lvtmp_l; TQPtrList<Entry> m_installlist; - TQMap<KIO::Job*, Provider*> m_variantjobs; - TQMap<KIO::Job*, TQStringList> m_variants; + TQMap<TDEIO::Job*, Provider*> m_variantjobs; + TQMap<TDEIO::Job*, TQStringList> m_variants; TQMap<Provider*, Provider*> m_newproviders; }; @@ -237,7 +237,7 @@ void DownloadDialog::addProvider(Provider *p) { if(!p->icon().protocol().isEmpty()) { - ret = KIO::NetAccess::download(p->icon(), tmp, this); + ret = TDEIO::NetAccess::download(p->icon(), tmp, this); if(ret) pix = TQPixmap(tmp); } else @@ -331,7 +331,7 @@ void DownloadDialog::addProvider(Provider *p) TQTimer::singleShot(100, this, TQT_SLOT(slotFinish())); } -void DownloadDialog::slotResult(KIO::Job *job) +void DownloadDialog::slotResult(TDEIO::Job *job) { TQDomDocument dom; TQDomElement knewstuff; @@ -459,7 +459,7 @@ void DownloadDialog::addEntry(Entry *entry) kdDebug() << "added entry " << entry->name() << endl; } -void DownloadDialog::slotData(KIO::Job *job, const TQByteArray &a) +void DownloadDialog::slotData(TDEIO::Job *job, const TQByteArray &a) { TQCString tmp(a, a.size() + 1); m_data[job].append(TQString::fromUtf8(tmp)); @@ -539,8 +539,8 @@ void DownloadDialog::slotInstall() KURL source = e->payload(); KURL dest = KURL(m_s->downloadDestination(e)); - KIO::FileCopyJob *job = KIO::file_copy(source, dest, -1, true); - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotInstalled(KIO::Job*))); + TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*))); } } @@ -580,12 +580,12 @@ void DownloadDialog::install(Entry *e) d->m_lvtmp_d->setEnabled( true ); } -void DownloadDialog::slotInstalled(KIO::Job *job) +void DownloadDialog::slotInstalled(TDEIO::Job *job) { bool ret = job && (job->error() == 0); if(ret) { - KIO::FileCopyJob *cjob = ::tqqt_cast<KIO::FileCopyJob*>(job); + TDEIO::FileCopyJob *cjob = ::tqqt_cast<TDEIO::FileCopyJob*>(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -673,7 +673,7 @@ void DownloadDialog::slotSelected() } else { - ret = KIO::NetAccess::download(e->preview(lang), tmp, this); + ret = TDEIO::NetAccess::download(e->preview(lang), tmp, this); } TQString desc = TQString("<b>%1</b><br>").arg(e->name(lang)); @@ -770,7 +770,7 @@ void DownloadDialog::slotPage(TQWidget *w) void DownloadDialog::loadProvider(Provider *p) { - TQMap<KIO::Job*, Provider*>::Iterator it; + TQMap<TDEIO::Job*, Provider*>::Iterator it; for(it = d->m_variantjobs.begin(); it != d->m_variantjobs.end(); it++) { @@ -810,15 +810,15 @@ void DownloadDialog::loadProvider(Provider *p) TQString url = it.key(); TQStringList urlvariants = it.data(); - KIO::TransferJob *variantjob = KIO::get(url); + TDEIO::TransferJob *variantjob = TDEIO::get(url); d->m_newproviders[p] = p; d->m_variantjobs[variantjob] = p; d->m_variants[variantjob] = urlvariants; m_data[variantjob] = ""; - connect(variantjob, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(variantjob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } if(variants.count() == 0) return; @@ -827,7 +827,7 @@ void DownloadDialog::loadProvider(Provider *p) kdDebug() << "-- reached old downloadurl section; variants left: " << variants.count() << endl; - KIO::TransferJob *job = KIO::get(p->downloadUrl()); + TDEIO::TransferJob *job = TDEIO::get(p->downloadUrl()); d->m_newproviders[p] = p; d->m_variantjobs[job] = p; @@ -835,9 +835,9 @@ void DownloadDialog::loadProvider(Provider *p) //m_jobs[job] = p; // not used anymore due to variants m_data[job] = ""; - connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_SLOT(slotResult(KIO::Job*))); - connect(job, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(KIO::Job*, const TQByteArray&))); + connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void DownloadDialog::setType(TQString type) diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h index 1f879d938..cfcd4858f 100644 --- a/knewstuff/downloaddialog.h +++ b/knewstuff/downloaddialog.h @@ -23,7 +23,7 @@ #include <kdialogbase.h> #include <knewstuff/provider.h> -namespace KIO +namespace TDEIO { class Job; } @@ -211,11 +211,11 @@ class KDE_EXPORT DownloadDialog : public KDialogBase void slotOk(); private slots: - void slotResult(KIO::Job *job); - void slotData(KIO::Job *job, const TQByteArray &a); + void slotResult(TDEIO::Job *job); + void slotData(TDEIO::Job *job, const TQByteArray &a); void slotInstall(); void slotDetails(); - void slotInstalled(KIO::Job *job); + void slotInstalled(TDEIO::Job *job); void slotTab(); void slotSelected(); void slotPage(TQWidget *w); @@ -244,8 +244,8 @@ class KDE_EXPORT DownloadDialog : public KDialogBase TQMap<TQWidget*, Provider*> m_providers; TQMap<TQWidget*, TQTextBrowser*> m_rts; TQMap<TQWidget*, TQValueList<TQPushButton*>* > m_buttons; - TQMap<KIO::Job*, Provider*> m_jobs; - TQMap<KIO::Job*, TQString> m_data; + TQMap<TDEIO::Job*, Provider*> m_jobs; + TQMap<TDEIO::Job*, TQString> m_data; TQString m_filter; Engine *m_engine; Private *d; diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index e460c2318..7152a0ccd 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -104,18 +104,18 @@ void Engine::getMetaInformation( Provider::List *providers ) for ( p = providers->first(); p; p = providers->next() ) { if ( p->downloadUrl().isEmpty() ) continue; - KIO::TransferJob *job = KIO::get( p->downloadUrl(), false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotNewStuffJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotNewStuffJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); mNewStuffJobData.insert( job, "" ); mProviderJobs[ job ] = p; } } -void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) +void Engine::slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ) { if ( data.isEmpty() ) return; @@ -126,7 +126,7 @@ void Engine::slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ) mNewStuffJobData[ job ].append( TQString::fromUtf8( str ) ); } -void Engine::slotNewStuffJobResult( KIO::Job *job ) +void Engine::slotNewStuffJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error downloading new stuff descriptions." << endl; @@ -199,12 +199,12 @@ void Engine::download( Entry *entry ) kdDebug() << " SOURCE: " << source.url() << endl; kdDebug() << " DESTINATION: " << destination.url() << endl; - KIO::FileCopyJob *job = KIO::file_copy( source, destination, -1, true ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotDownloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); } -void Engine::slotDownloadJobResult( KIO::Job *job ) +void Engine::slotDownloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error downloading new stuff payload." << endl; @@ -321,9 +321,9 @@ void Engine::upload( Entry *entry ) KURL destination = mUploadProvider->uploadUrl(); destination.setFileName( fi.fileName() ); - KIO::FileCopyJob *job = KIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPayloadJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); } else { emit uploadFinished( false ); } @@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry ) return true; } -void Engine::slotUploadPayloadJobResult( KIO::Job *job ) +void Engine::slotUploadPayloadJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error uploading new stuff payload." << endl; @@ -383,12 +383,12 @@ void Engine::slotUploadPayloadJobResult( KIO::Job *job ) KURL previewDestination = mUploadProvider->uploadUrl(); previewDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadPreviewJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadPreviewJobResult( KIO::Job *job ) +void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) { if ( job->error() ) { kdDebug() << "Error uploading new stuff preview." << endl; @@ -402,12 +402,12 @@ void Engine::slotUploadPreviewJobResult( KIO::Job *job ) KURL metaDestination = mUploadProvider->uploadUrl(); metaDestination.setFileName( fi.fileName() ); - KIO::FileCopyJob *newJob = KIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); - connect( newJob, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotUploadMetaJobResult( KIO::Job * ) ) ); + TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); + connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); } -void Engine::slotUploadMetaJobResult( KIO::Job *job ) +void Engine::slotUploadMetaJobResult( TDEIO::Job *job ) { mUploadMetaFile = TQString::null; if ( job->error() ) { diff --git a/knewstuff/engine.h b/knewstuff/engine.h index f4b0b4920..374f9122d 100644 --- a/knewstuff/engine.h +++ b/knewstuff/engine.h @@ -27,7 +27,7 @@ #include "entry.h" #include "provider.h" -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KNewStuff; @@ -143,14 +143,14 @@ class KDE_EXPORT Engine : public TQObject void getMetaInformation( Provider::List *providers ); void selectUploadProvider( Provider::List *providers ); - void slotNewStuffJobData( KIO::Job *job, const TQByteArray &data ); - void slotNewStuffJobResult( KIO::Job *job ); + void slotNewStuffJobData( TDEIO::Job *job, const TQByteArray &data ); + void slotNewStuffJobResult( TDEIO::Job *job ); - void slotDownloadJobResult( KIO::Job *job ); + void slotDownloadJobResult( TDEIO::Job *job ); - void slotUploadPayloadJobResult( KIO::Job *job ); - void slotUploadPreviewJobResult (KIO::Job *job ); - void slotUploadMetaJobResult( KIO::Job *job ); + void slotUploadPayloadJobResult( TDEIO::Job *job ); + void slotUploadPreviewJobResult (TDEIO::Job *job ); + void slotUploadMetaJobResult( TDEIO::Job *job ); protected: bool createMetaFile( Entry * ); @@ -160,8 +160,8 @@ class KDE_EXPORT Engine : public TQObject ProviderLoader *mProviderLoader; - TQMap<KIO::Job *,TQString> mNewStuffJobData; - TQMap<KIO::Job *,Provider *> mProviderJobs; + TQMap<TDEIO::Job *,TQString> mNewStuffJobData; + TQMap<TDEIO::Job *,Provider *> mProviderJobs; TQPtrList<Entry> mNewStuffList; diff --git a/knewstuff/knewstuffgeneric.h b/knewstuff/knewstuffgeneric.h index 6347bf539..053f83a05 100644 --- a/knewstuff/knewstuffgeneric.h +++ b/knewstuff/knewstuffgeneric.h @@ -23,7 +23,7 @@ #include "knewstuff.h" -class KConfig; +class TDEConfig; /** * @short Basic KNewStuff class with predefined actions. @@ -80,7 +80,7 @@ class KDE_EXPORT KNewStuffGeneric : public KNewStuff private: TQString destinationPath( KNS::Entry *entry ); - KConfig *mConfig; + TDEConfig *mConfig; }; #endif diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index 5010b5084..f467530c8 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -144,7 +144,7 @@ void KNewStuffSecure::slotValidated(int result) emit installFinished(); } else { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->deleteGroup("KNewStuffStatus"); cfg->setGroup("KNewStuffStatus"); for (TQMap<TQString, TQString>::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) @@ -159,7 +159,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); @@ -179,7 +179,7 @@ void KNewStuffSecure::uploadResource(const TQString& fileName) m_tempDir->setAutoDelete(true); TQFileInfo f(fileName); m_signedFileName = m_tempDir->name() + "/" + f.fileName(); - KIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(fileName), KURL::fromPathOrURL(m_signedFileName), -1, true); Security::ref()->signFile(m_signedFileName); } @@ -215,7 +215,7 @@ void KNewStuffSecure::slotFileSigned(int result) file.close(); } tar.close(); - KIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); + TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); KNewStuff::upload(m_signedFileName, TQString::null); disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); } @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); + TDEIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index b9dd24ed8..a29183532 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -219,7 +219,7 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) mProviders.clear(); mJobData = ""; - KConfig *cfg = TDEGlobal::config(); + TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup("KNewStuff"); TQString providersUrl = providersList; @@ -236,16 +236,16 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl; - KIO::TransferJob *job = KIO::get( KURL( providersUrl ), false, false ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), - TQT_SLOT( slotJobResult( KIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( KIO::Job *, const TQByteArray & ) ) ); + TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), + TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); // job->dumpObjectInfo(); } -void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) +void ProviderLoader::slotJobData( TDEIO::Job *, const TQByteArray &data ) { kdDebug() << "ProviderLoader::slotJobData()" << endl; @@ -256,7 +256,7 @@ void ProviderLoader::slotJobData( KIO::Job *, const TQByteArray &data ) mJobData.append( TQString::fromUtf8( str ) ); } -void ProviderLoader::slotJobResult( KIO::Job *job ) +void ProviderLoader::slotJobResult( TDEIO::Job *job ) { if ( job->error() ) { job->showErrorDialog( TQT_TQWIDGET(parent()) ); diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 829e52d71..2a0d54a12 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -28,7 +28,7 @@ #include <kurl.h> -namespace KIO { class Job; } +namespace TDEIO { class Job; } namespace KNS { @@ -198,8 +198,8 @@ class KDE_EXPORT ProviderLoader : public TQObject void providersLoaded( Provider::List * ); protected slots: - void slotJobData( KIO::Job *, const TQByteArray & ); - void slotJobResult( KIO::Job * ); + void slotJobData( TDEIO::Job *, const TQByteArray & ); + void slotJobResult( TDEIO::Job * ); private: TQWidget *mParentWidget; diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp index 0a9ec85c0..f82e466ff 100644 --- a/knewstuff/uploaddialog.cpp +++ b/knewstuff/uploaddialog.cpp @@ -136,7 +136,7 @@ void UploadDialog::slotOk() entry->setSummary( mSummaryEdit->text(), mLanguageCombo->currentText() ); if ( mPayloadUrl.isValid() ) { - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) ); conf->writeEntry("name", mNameEdit->text()); conf->writeEntry("author", mAuthorEdit->text()); @@ -164,7 +164,7 @@ void UploadDialog::setPayloadFile( const TQString &payloadFile ) { mPayloadUrl = payloadFile; - KConfig *conf = kapp->config(); + TDEConfig *conf = kapp->config(); conf->setGroup( TQString("KNewStuffUpload:%1").arg(mPayloadUrl.fileName()) ); TQString name = conf->readEntry("name"); TQString author = conf->readEntry("author"); |