From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- knewstuff/data/README | 4 ++-- knewstuff/downloaddialog.cpp | 34 +++++++++++++++++----------------- knewstuff/downloaddialog.h | 2 +- knewstuff/engine.cpp | 8 ++++---- knewstuff/engine.h | 12 ++++++------ knewstuff/entry.cpp | 16 ++++++++-------- knewstuff/knewstuff.cpp | 12 ++++++------ knewstuff/knewstuff.h | 10 +++++----- knewstuff/knewstuffgeneric.cpp | 4 ++-- knewstuff/knewstuffsecure.cpp | 22 +++++++++++----------- knewstuff/knewstuffsecure.h | 4 ++-- knewstuff/provider.cpp | 10 +++++----- knewstuff/provider.h | 6 +++--- knewstuff/security.cpp | 10 +++++----- knewstuff/security.h | 2 +- 15 files changed, 78 insertions(+), 78 deletions(-) (limited to 'knewstuff') diff --git a/knewstuff/data/README b/knewstuff/data/README index 4417ccc89..6e50ceb2c 100644 --- a/knewstuff/data/README +++ b/knewstuff/data/README @@ -1,5 +1,5 @@ -This directory tqcontains example files for the providers list and the description +This directory contains example files for the providers list and the description of downloadable entries. -It also tqcontains the DTDs for the XML files. You can check the XML files for +It also contains the DTDs for the XML files. You can check the XML files for validity e.g with "xmllint --valid". diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 8cfe97acc..4e1d298c8 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -338,7 +338,7 @@ void DownloadDialog::slotResult(KIO::Job *job) kdDebug() << "got data: " << m_data[job] << endl; - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); dom.setContent(m_data[job]); knewstuff = dom.documentElement(); @@ -386,7 +386,7 @@ void DownloadDialog::slotResult(KIO::Job *job) } } -int DownloadDialog::installtqStatus(Entry *entry) +int DownloadDialog::installStatus(Entry *entry) { TQDate date; TQString datestring; @@ -394,7 +394,7 @@ int DownloadDialog::installtqStatus(Entry *entry) TQString lang = KGlobal::locale()->language(); - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); datestring = kapp->config()->readEntry(entry->name(lang)); if(datestring.isNull()) installed = 0; else @@ -413,7 +413,7 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) TQPixmap pix; int installed; - installed = installtqStatus(entry); + installed = installStatus(entry); if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small); @@ -421,19 +421,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) TQString lang = KGlobal::locale()->language(); - if(variants.tqcontains("score")) + if(variants.contains("score")) { KListViewItem *tmp_r = new NumSortListViewItem(lv_r, entry->name(lang), entry->version(), TQString("%1").arg(entry->rating())); tmp_r->setPixmap(0, pix); } - if(variants.tqcontains("downloads")) + if(variants.contains("downloads")) { KListViewItem *tmp_d = new NumSortListViewItem(lv_d, entry->name(lang), entry->version(), TQString("%1").arg(entry->downloads())); tmp_d->setPixmap(0, pix); } - if(variants.tqcontains("latest")) + if(variants.contains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); @@ -546,7 +546,7 @@ void DownloadDialog::slotInstall() void DownloadDialog::install(Entry *e) { - kapp->config()->setGroup("KNewStufftqStatus"); + kapp->config()->setGroup("KNewStuffStatus"); kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); kapp->config()->sync(); @@ -559,11 +559,11 @@ void DownloadDialog::install(Entry *e) m_entryitem->setPixmap(0, pix); TQListViewItem *item; - item = lv_r->tqfindItem(e->name(lang), 0); + item = lv_r->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_d->tqfindItem(e->name(lang), 0); + item = lv_d->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_l->tqfindItem(e->name(lang), 0); + item = lv_l->findItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); } @@ -651,19 +651,19 @@ void DownloadDialog::slotSelected() if(m_curtab != 0) { lv_r->clearSelection(); - item = lv_r->tqfindItem(e->name(lang), 0); + item = lv_r->findItem(e->name(lang), 0); if(item) lv_r->setSelected(item, true); } if(m_curtab != 1) { lv_d->clearSelection(); - item = lv_d->tqfindItem(e->name(lang), 0); + item = lv_d->findItem(e->name(lang), 0); if(item) lv_d->setSelected(item, true); } if(m_curtab != 2) { lv_l->clearSelection(); - item = lv_l->tqfindItem(e->name(lang), 0); + item = lv_l->findItem(e->name(lang), 0); if(item) lv_l->setSelected(item, true); } @@ -701,7 +701,7 @@ void DownloadDialog::slotSelected() m_rt->clear(); m_rt->setText(desc); - if(installtqStatus(e) == 1) enabled = false; + if(installStatus(e) == 1) enabled = false; else enabled = true; TQPushButton *de, *in; @@ -743,7 +743,7 @@ void DownloadDialog::slotPage(TQWidget *w) kdDebug() << "changed widget!!!" << endl; - if(m_map.tqfind(w) == m_map.end()) return; + if(m_map.find(w) == m_map.end()) return; d->m_page = w; @@ -794,7 +794,7 @@ void DownloadDialog::loadProvider(Provider *p) for(TQStringList::Iterator it = variants.begin(); it != variants.end(); it++) { TQString url = p->downloadUrlVariant((*it)).url(); - if(!urls.tqcontains(url)) + if(!urls.contains(url)) { urls[url] = TQStringList(); } diff --git a/knewstuff/downloaddialog.h b/knewstuff/downloaddialog.h index 235c6686d..2c30ee9ba 100644 --- a/knewstuff/downloaddialog.h +++ b/knewstuff/downloaddialog.h @@ -227,7 +227,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase Entry *getEntry(); void loadProvider(Provider *p); void install(Entry *e); - int installtqStatus(Entry *e); + int installStatus(Entry *e); TQListViewItem *currentEntryItem(); ProviderLoader *m_loader; diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index 5063f3ef6..799ce9898 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -46,8 +46,8 @@ struct Engine::Private }; Engine::Engine( KNewStuff *newStuff, const TQString &type, - TQWidget *tqparentWidget ) : - mParentWidget( tqparentWidget ), mDownloadDialog( 0 ), + TQWidget *parentWidget ) : + mParentWidget( parentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), d(new Private), mType( type ) { @@ -57,8 +57,8 @@ Engine::Engine( KNewStuff *newStuff, const TQString &type, } Engine::Engine( KNewStuff *newStuff, const TQString &type, - const TQString &providerList, TQWidget *tqparentWidget ) : - mParentWidget( tqparentWidget ), + const TQString &providerList, TQWidget *parentWidget ) : + mParentWidget( parentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), mProviderList( providerList ), d(new Private), diff --git a/knewstuff/engine.h b/knewstuff/engine.h index 14c7e2b3d..d3834566f 100644 --- a/knewstuff/engine.h +++ b/knewstuff/engine.h @@ -48,7 +48,7 @@ class ProviderDialog; * \par Maintainer: * Josef Spillner (spillner@kde.org) */ -class KDE_EXPORT Engine : public TQObject +class KDE_EXPORT Engine : public QObject { Q_OBJECT struct Private; @@ -58,18 +58,18 @@ class KDE_EXPORT Engine : public TQObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" - @param tqparentWidget the parent window + @param parentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 ); /** Constructor. @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" @param providerList the URL of the provider list - @param tqparentWidget the parent window + @param parentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); /** Destructor. @@ -88,7 +88,7 @@ class KDE_EXPORT Engine : public TQObject @return parent widget */ - TQWidget *tqparentWidget() const { return mParentWidget; } + TQWidget *parentWidget() const { return mParentWidget; } /** Initiates the download process, retrieving provider lists and invoking diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index 97950b9da..cdbf4dbe7 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -47,11 +47,11 @@ static EntryPrivate *d(const Entry *e) d_ptr = new TQPtrDict(); d_ptr->setAutoDelete(true); } - EntryPrivate *ret = d_ptr->tqfind((void*)e); + EntryPrivate *ret = d_ptr->find((void*)e); if(!ret) { ret = new EntryPrivate(); - d_ptr->tqreplace((void*)e, ret); + d_ptr->replace((void*)e, ret); } return ret; } @@ -84,13 +84,13 @@ void Entry::setName( const TQString &name, const TQString &lang ) { d(this)->mNameMap.insert( lang, name ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } // BCI part ends here Entry::Entry() : - mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ), + mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ), mDownloads( 0 ) { } @@ -105,7 +105,7 @@ Entry::~Entry() { if (d_ptr) { - EntryPrivate *p = d_ptr->tqfind(this); + EntryPrivate *p = d_ptr->find(this); if (p) d_ptr->remove(p); @@ -166,7 +166,7 @@ void Entry::setSummary( const TQString &text, const TQString &lang ) { mSummaryMap.insert( lang, text ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } TQString Entry::summary( const TQString &lang ) const @@ -221,7 +221,7 @@ void Entry::setPayload( const KURL &url, const TQString &lang ) { mPayloadMap.insert( lang, url ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::payload( const TQString &lang ) const @@ -244,7 +244,7 @@ void Entry::setPreview( const KURL &url, const TQString &lang ) { mPreviewMap.insert( lang, url ); - if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::preview( const TQString &lang ) const diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index 84fef0ac1..6a37aa61d 100644 --- a/knewstuff/knewstuff.cpp +++ b/knewstuff/knewstuff.cpp @@ -39,14 +39,14 @@ KAction* KNS::standardAction(const TQString& what, 0, recvr, slot, parent, name); } -KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget ) +KNewStuff::KNewStuff( const TQString &type, TQWidget *parentWidget ) { - mEngine = new Engine( this, type, tqparentWidget ); + mEngine = new Engine( this, type, parentWidget ); } -KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget ) +KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget ) { - mEngine = new Engine( this, type, providerList, tqparentWidget ); + mEngine = new Engine( this, type, providerList, parentWidget ); } TQString KNewStuff::type() const @@ -54,9 +54,9 @@ TQString KNewStuff::type() const return mEngine->type(); } -TQWidget *KNewStuff::tqparentWidget() const +TQWidget *KNewStuff::parentWidget() const { - return mEngine->tqparentWidget(); + return mEngine->parentWidget(); } KNewStuff::~KNewStuff() diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h index 0891aa4de..5d2319aec 100644 --- a/knewstuff/knewstuff.h +++ b/knewstuff/knewstuff.h @@ -74,10 +74,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, TQWidget *tqparentWidget = 0 ); + KNewStuff( const TQString &type, TQWidget *parentWidget = 0 ); /** Constructor. @@ -85,10 +85,10 @@ class KDE_EXPORT KNewStuff @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper @param providerList the URL of the provider list - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); + KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); virtual ~KNewStuff(); /** @@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff /** Return parent widget. */ - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; /** Start download process. diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index ef8615b36..8438e25ea 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -70,7 +70,7 @@ bool KNewStuffGeneric::install( const TQString &fileName ) kdDebug() << "InstallationCommand: " << cmd << endl; list = TQStringList::split( " ", cmd ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { - list2 << (*it).tqreplace("%f", fileName); + list2 << (*it).replace("%f", fileName); } KProcess proc; proc << list2; @@ -135,7 +135,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) TQString file = destinationPath(entry); if ( KStandardDirs::exists( file ) ) { - int result = KMessageBox::warningContinueCancel( tqparentWidget(), + int result = KMessageBox::warningContinueCancel( parentWidget(), i18n("The file '%1' already exists. Do you want to overwrite it?") .arg( file ), TQString::null, i18n("Overwrite") ); diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp index d3b3b333c..f68be7ae3 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -33,8 +33,8 @@ using namespace KNS; -KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget) - : KNewStuff(type, tqparentWidget) +KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *parentWidget) + : KNewStuff(type, parentWidget) { m_tempDir = 0L; connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool))); @@ -80,7 +80,7 @@ bool KNewStuffSecure::install(const TQString &fileName) } else ok = false; if (!ok) - KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); + KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded resource tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Resource Installation Error")); return ok; } @@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result) if (!valid) { signatureStr.prepend( "
"); - if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There is a problem with the resource file you have downloaded. The errors are :%1
%2

Installation of the resource is not recommended.

Do you want to proceed with the installation?").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There is a problem with the resource file you have downloaded. The errors are :%1
%2

Installation of the resource is not recommended.

Do you want to proceed with the installation?").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) valid = true; } else - KMessageBox::information(tqparentWidget(), i18n("%1

Press OK to install it.").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); + KMessageBox::information(parentWidget(), i18n("%1

Press OK to install it.").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); if (valid) { installResource(); @@ -145,8 +145,8 @@ void KNewStuffSecure::slotValidated(int result) } else { KConfig *cfg = KGlobal::config(); - cfg->deleteGroup("KNewStufftqStatus"); - cfg->setGroup("KNewStufftqStatus"); + cfg->deleteGroup("KNewStuffStatus"); + cfg->setGroup("KNewStuffStatus"); for (TQMap::ConstIterator it = m_installedResources.constBegin(); it != m_installedResources.constEnd(); ++it) { cfg->writeEntry(it.key(), it.data()); @@ -160,7 +160,7 @@ void KNewStuffSecure::slotValidated(int result) void KNewStuffSecure::downloadResource() { KConfig *cfg = KGlobal::config(); - m_installedResources = cfg->entryMap("KNewStufftqStatus"); + m_installedResources = cfg->entryMap("KNewStuffStatus"); engine()->ignoreInstallResult(true); KNewStuff::download(); } @@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result) { if (result == 0) { - KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason.")); + KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason.")); } else { if (result & Security::BAD_PASSPHRASE) { - if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) { disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); removeTempDirectory(); @@ -231,7 +231,7 @@ void KNewStuffSecure::removeTempDirectory() { if (m_tempDir) { - KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget()); + KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), parentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/knewstuffsecure.h b/knewstuff/knewstuffsecure.h index 52a8d856b..1a6bc44a1 100644 --- a/knewstuff/knewstuffsecure.h +++ b/knewstuff/knewstuffsecure.h @@ -46,10 +46,10 @@ public: @param type type of data to be handled, should be something like korganizer/calendar, kword/template, kdesktop/wallpaper - @param tqparentWidget parent widget of dialogs opened by the KNewStuff + @param parentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget=0); + KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0); virtual ~KNewStuffSecure(); /** Installs the downloaded resource. Do not call or reimplement directly. diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index 1d059d34f..c1d12853c 100644 --- a/knewstuff/provider.cpp +++ b/knewstuff/provider.cpp @@ -53,11 +53,11 @@ static ProviderPrivate *d_prov(const Provider *p) d_ptr_prov = new TQPtrDict(); d_ptr_prov->setAutoDelete(true); } - ProviderPrivate *ret = d_ptr_prov->tqfind((void*)p); + ProviderPrivate *ret = d_ptr_prov->find((void*)p); if(!ret) { ret = new ProviderPrivate(); - d_ptr_prov->tqreplace((void*)p, ret); + d_ptr_prov->replace((void*)p, ret); } return ret; } @@ -89,7 +89,7 @@ Provider::~Provider() { if (d_ptr_prov) { - ProviderPrivate *p = d_ptr_prov->tqfind(this); + ProviderPrivate *p = d_ptr_prov->find(this); if (p) d_ptr_prov->remove(p); @@ -206,8 +206,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren } -ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) : - TQObject( tqparentWidget ) +ProviderLoader::ProviderLoader( TQWidget *parentWidget ) : + TQObject( parentWidget ) { mProviders.setAutoDelete( true ); } diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 98b5b7def..6a0972319 100644 --- a/knewstuff/provider.h +++ b/knewstuff/provider.h @@ -169,16 +169,16 @@ class KDE_EXPORT Provider * the main provider database for this specific application. * It should probably not be used directly by the application. */ -class KDE_EXPORT ProviderLoader : public TQObject +class KDE_EXPORT ProviderLoader : public QObject { Q_OBJECT public: /** * Constructor. * - * @param tqparentWidget the parent widget + * @param parentWidget the parent widget */ - ProviderLoader( TQWidget *tqparentWidget ); + ProviderLoader( TQWidget *parentWidget ); /** * Starts asynchronously loading the list of providers of the diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index a6a25f07f..8ef377b78 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -125,7 +125,7 @@ void Security::slotDataArrived(KProcIO *procIO) key.mail=data.section('<', -1, -1); key.mail.truncate(key.mail.length() - 1); key.name=data.section('<',0,0); - if (key.name.tqfind("(")!=-1) + if (key.name.find("(")!=-1) key.name=key.name.section('(',0,0); m_keys[shortId] = key; } @@ -137,7 +137,7 @@ void Security::slotDataArrived(KProcIO *procIO) m_result &= SIGNED_BAD_CLEAR; m_result |= SIGNED_OK; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.tqcontains(id)) + if (!m_keys.contains(id)) { m_result |= UNKNOWN; } else @@ -154,7 +154,7 @@ void Security::slotDataArrived(KProcIO *procIO) { m_result |= SIGNED_BAD; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.tqcontains(id)) + if (!m_keys.contains(id)) { m_result |= UNKNOWN; } else @@ -170,7 +170,7 @@ void Security::slotDataArrived(KProcIO *procIO) break; case Sign: - if (data.tqfind("passphrase.enter") != -1) + if (data.find("passphrase.enter") != -1) { TQCString password; KeyStruct key = m_keys[m_secretKey]; @@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO) return; } } else - if (data.tqfind("BAD_PASSPHRASE") != -1) + if (data.find("BAD_PASSPHRASE") != -1) { m_result |= BAD_PASSPHRASE; } diff --git a/knewstuff/security.h b/knewstuff/security.h index 2831770e0..2a4eca536 100644 --- a/knewstuff/security.h +++ b/knewstuff/security.h @@ -41,7 +41,7 @@ It is a private class, not meant to be used by third party applications. namespace KNS { -class Security : public TQObject +class Security : public QObject { Q_OBJECT public: -- cgit v1.2.3