diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-13 08:32:36 +0000 |
commit | f7e71d47719ab6094cf4a9fafffa5ea351973522 (patch) | |
tree | 30834aa632d442019e14f88685001d94657d060b /knewstuff | |
parent | b31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff) | |
download | tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip |
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems
with dependent modules such as kdebase. If it does then it needs to be fixed!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'knewstuff')
-rw-r--r-- | knewstuff/downloaddialog.cpp | 30 | ||||
-rw-r--r-- | knewstuff/engine.cpp | 10 | ||||
-rw-r--r-- | knewstuff/engine.h | 12 | ||||
-rw-r--r-- | knewstuff/entry.cpp | 16 | ||||
-rw-r--r-- | knewstuff/ghns.h | 2 | ||||
-rw-r--r-- | knewstuff/knewstuff.cpp | 12 | ||||
-rw-r--r-- | knewstuff/knewstuff.h | 10 | ||||
-rw-r--r-- | knewstuff/knewstuffgeneric.cpp | 2 | ||||
-rw-r--r-- | knewstuff/knewstuffsecure.cpp | 16 | ||||
-rw-r--r-- | knewstuff/knewstuffsecure.h | 4 | ||||
-rw-r--r-- | knewstuff/provider.cpp | 10 | ||||
-rw-r--r-- | knewstuff/provider.h | 6 | ||||
-rw-r--r-- | knewstuff/security.cpp | 16 | ||||
-rw-r--r-- | knewstuff/security.h | 2 | ||||
-rw-r--r-- | knewstuff/testnewstuff.h | 2 |
15 files changed, 75 insertions, 75 deletions
diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp index 4e1d298c8..521d13f24 100644 --- a/knewstuff/downloaddialog.cpp +++ b/knewstuff/downloaddialog.cpp @@ -225,7 +225,7 @@ void DownloadDialog::addProvider(Provider *p) if(m_map.count() == 0) { - frame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap("")); + frame = addPage(i18n("Welcome"), i18n("Welcome"), TQPixmap(TQString(""))); delete frame; } @@ -399,7 +399,7 @@ int DownloadDialog::installStatus(Entry *entry) if(datestring.isNull()) installed = 0; else { - date = TQDate::fromString(datestring, Qt::ISODate); + date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate)); if(!date.isValid()) installed = 0; else if(date < entry->releaseDate()) installed = -1; else installed = 1; @@ -421,19 +421,19 @@ void DownloadDialog::addEntry(Entry *entry, const TQStringList& variants) TQString lang = KGlobal::locale()->language(); - if(variants.contains("score")) + if(variants.tqcontains("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.contains("downloads")) + if(variants.tqcontains("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.contains("latest")) + if(variants.tqcontains("latest")) { KListViewItem *tmp_l = new DateSortListViewItem(lv_l, entry->name(lang), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); @@ -547,7 +547,7 @@ void DownloadDialog::slotInstall() void DownloadDialog::install(Entry *e) { kapp->config()->setGroup("KNewStuffStatus"); - kapp->config()->writeEntry(m_entryname, e->releaseDate().toString(Qt::ISODate)); + kapp->config()->writeEntry(m_entryname, TQString(e->releaseDate().toString(Qt::ISODate))); kapp->config()->sync(); TQPixmap pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); @@ -559,11 +559,11 @@ void DownloadDialog::install(Entry *e) m_entryitem->setPixmap(0, pix); TQListViewItem *item; - item = lv_r->findItem(e->name(lang), 0); + item = lv_r->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_d->findItem(e->name(lang), 0); + item = lv_d->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); - item = lv_l->findItem(e->name(lang), 0); + item = lv_l->tqfindItem(e->name(lang), 0); if(item) item->setPixmap(0, pix); } @@ -585,7 +585,7 @@ void DownloadDialog::slotInstalled(KIO::Job *job) bool ret = job && (job->error() == 0); if(ret) { - KIO::FileCopyJob *cjob = ::qt_cast<KIO::FileCopyJob*>(job); + KIO::FileCopyJob *cjob = ::tqqt_cast<KIO::FileCopyJob*>(job); if(cjob) { ret = m_s->install(cjob->destURL().path()); @@ -651,19 +651,19 @@ void DownloadDialog::slotSelected() if(m_curtab != 0) { lv_r->clearSelection(); - item = lv_r->findItem(e->name(lang), 0); + item = lv_r->tqfindItem(e->name(lang), 0); if(item) lv_r->setSelected(item, true); } if(m_curtab != 1) { lv_d->clearSelection(); - item = lv_d->findItem(e->name(lang), 0); + item = lv_d->tqfindItem(e->name(lang), 0); if(item) lv_d->setSelected(item, true); } if(m_curtab != 2) { lv_l->clearSelection(); - item = lv_l->findItem(e->name(lang), 0); + item = lv_l->tqfindItem(e->name(lang), 0); if(item) lv_l->setSelected(item, true); } @@ -743,7 +743,7 @@ void DownloadDialog::slotPage(TQWidget *w) kdDebug() << "changed widget!!!" << endl; - if(m_map.find(w) == m_map.end()) return; + if(m_map.tqfind(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.contains(url)) + if(!urls.tqcontains(url)) { urls[url] = TQStringList(); } diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp index 799ce9898..bfb1135dd 100644 --- a/knewstuff/engine.cpp +++ b/knewstuff/engine.cpp @@ -46,8 +46,8 @@ struct Engine::Private }; Engine::Engine( KNewStuff *newStuff, const TQString &type, - TQWidget *parentWidget ) : - mParentWidget( parentWidget ), mDownloadDialog( 0 ), + TQWidget *tqparentWidget ) : + mParentWidget( tqparentWidget ), 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 *parentWidget ) : - mParentWidget( parentWidget ), + const TQString &providerList, TQWidget *tqparentWidget ) : + mParentWidget( tqparentWidget ), mDownloadDialog( 0 ), mUploadDialog( 0 ), mProviderDialog( 0 ), mUploadProvider( 0 ), mProviderList( providerList ), d(new Private), @@ -164,7 +164,7 @@ void Engine::slotNewStuffJobResult( KIO::Job *job ) kdDebug() << " SUMMARY: " << entry->summary() << endl; kdDebug() << " VERSION: " << entry->version() << endl; - kdDebug() << " RELEASEDATE: " << entry->releaseDate().toString() << endl; + kdDebug() << " RELEASEDATE: " << TQString(entry->releaseDate().toString()) << endl; kdDebug() << " RATING: " << entry->rating() << endl; kdDebug() << " LANGS: " << entry->langs().join(", ") << endl; diff --git a/knewstuff/engine.h b/knewstuff/engine.h index d3834566f..14c7e2b3d 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 QObject +class KDE_EXPORT Engine : public TQObject { Q_OBJECT struct Private; @@ -58,18 +58,18 @@ class KDE_EXPORT Engine : public QObject @param newStuff a KNewStuff object @param type the Hotstuff data type such as "korganizer/calendar" - @param parentWidget the parent window + @param tqparentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, TQWidget *parentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, TQWidget *tqparentWidget = 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 parentWidget the parent window + @param tqparentWidget the parent window */ - Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); + Engine( KNewStuff *newStuff, const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); /** Destructor. @@ -88,7 +88,7 @@ class KDE_EXPORT Engine : public QObject @return parent widget */ - TQWidget *parentWidget() const { return mParentWidget; } + TQWidget *tqparentWidget() const { return mParentWidget; } /** Initiates the download process, retrieving provider lists and invoking diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp index cdbf4dbe7..e224bb0a3 100644 --- a/knewstuff/entry.cpp +++ b/knewstuff/entry.cpp @@ -47,11 +47,11 @@ static EntryPrivate *d(const Entry *e) d_ptr = new TQPtrDict<EntryPrivate>(); d_ptr->setAutoDelete(true); } - EntryPrivate *ret = d_ptr->find((void*)e); + EntryPrivate *ret = d_ptr->tqfind((void*)e); if(!ret) { ret = new EntryPrivate(); - d_ptr->replace((void*)e, ret); + d_ptr->tqreplace((void*)e, ret); } return ret; } @@ -84,7 +84,7 @@ void Entry::setName( const TQString &name, const TQString &lang ) { d(this)->mNameMap.insert( lang, name ); - if ( mLangs.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } // BCI part ends here @@ -105,7 +105,7 @@ Entry::~Entry() { if (d_ptr) { - EntryPrivate *p = d_ptr->find(this); + EntryPrivate *p = d_ptr->tqfind(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.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( 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.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( 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.find( lang ) == mLangs.end() ) mLangs.append( lang ); + if ( mLangs.tqfind( lang ) == mLangs.end() ) mLangs.append( lang ); } KURL Entry::preview( const TQString &lang ) const @@ -325,7 +325,7 @@ void Entry::parseDomElement( const TQDomElement &element ) if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() ); if ( e.tagName() == "release" ) setRelease( e.text().toInt() ); if ( e.tagName() == "releasedate" ) { - TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ); + TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate )); setReleaseDate( date ); } if ( e.tagName() == "preview" ) { diff --git a/knewstuff/ghns.h b/knewstuff/ghns.h index 0263c8f26..727dc6a0f 100644 --- a/knewstuff/ghns.h +++ b/knewstuff/ghns.h @@ -30,7 +30,7 @@ #include "knewstuff.h" -class GhnsWidget : public QWidget +class GhnsWidget : public TQWidget { Q_OBJECT public: diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp index 6a37aa61d..84fef0ac1 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 *parentWidget ) +KNewStuff::KNewStuff( const TQString &type, TQWidget *tqparentWidget ) { - mEngine = new Engine( this, type, parentWidget ); + mEngine = new Engine( this, type, tqparentWidget ); } -KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget ) +KNewStuff::KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget ) { - mEngine = new Engine( this, type, providerList, parentWidget ); + mEngine = new Engine( this, type, providerList, tqparentWidget ); } TQString KNewStuff::type() const @@ -54,9 +54,9 @@ TQString KNewStuff::type() const return mEngine->type(); } -TQWidget *KNewStuff::parentWidget() const +TQWidget *KNewStuff::tqparentWidget() const { - return mEngine->parentWidget(); + return mEngine->tqparentWidget(); } KNewStuff::~KNewStuff() diff --git a/knewstuff/knewstuff.h b/knewstuff/knewstuff.h index 5d2319aec..0891aa4de 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 parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, TQWidget *parentWidget = 0 ); + KNewStuff( const TQString &type, TQWidget *tqparentWidget = 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 parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuff( const TQString &type, const TQString &providerList, TQWidget *parentWidget = 0 ); + KNewStuff( const TQString &type, const TQString &providerList, TQWidget *tqparentWidget = 0 ); virtual ~KNewStuff(); /** @@ -99,7 +99,7 @@ class KDE_EXPORT KNewStuff /** Return parent widget. */ - TQWidget *parentWidget() const; + TQWidget *tqparentWidget() const; /** Start download process. diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp index 8438e25ea..6dfccf202 100644 --- a/knewstuff/knewstuffgeneric.cpp +++ b/knewstuff/knewstuffgeneric.cpp @@ -135,7 +135,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) TQString file = destinationPath(entry); if ( KStandardDirs::exists( file ) ) { - int result = KMessageBox::warningContinueCancel( parentWidget(), + int result = KMessageBox::warningContinueCancel( tqparentWidget(), 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 f68be7ae3..ed68fcf8a 100644 --- a/knewstuff/knewstuffsecure.cpp +++ b/knewstuff/knewstuffsecure.cpp @@ -33,8 +33,8 @@ using namespace KNS; -KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *parentWidget) - : KNewStuff(type, parentWidget) +KNewStuffSecure::KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget) + : KNewStuff(type, tqparentWidget) { 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(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")); + 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")); return ok; } @@ -134,10 +134,10 @@ void KNewStuffSecure::slotValidated(int result) if (!valid) { signatureStr.prepend( "<br>"); - if (KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(tqparentWidget(), i18n("<qt>There is a problem with the resource file you have downloaded. The errors are :<b>%1</b><br>%2<br><br>Installation of the resource is <b>not recommended</b>.<br><br>Do you want to proceed with the installation?</qt>").arg(errorString).arg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) valid = true; } else - KMessageBox::information(parentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); + KMessageBox::information(tqparentWidget(), i18n("<qt>%1<br><br>Press OK to install it.</qt>").arg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); if (valid) { installResource(); @@ -187,12 +187,12 @@ void KNewStuffSecure::slotFileSigned(int result) { if (result == 0) { - KMessageBox::error(parentWidget(), i18n("The signing failed for unknown reason.")); + KMessageBox::error(tqparentWidget(), i18n("The signing failed for unknown reason.")); } else { if (result & Security::BAD_PASSPHRASE) { - 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) + 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) { 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()), parentWidget()); + KIO::NetAccess::del(KURL().fromPathOrURL(m_tempDir->name()), tqparentWidget()); delete m_tempDir; m_tempDir = 0L; } diff --git a/knewstuff/knewstuffsecure.h b/knewstuff/knewstuffsecure.h index 1a6bc44a1..52a8d856b 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 parentWidget parent widget of dialogs opened by the KNewStuff + @param tqparentWidget parent widget of dialogs opened by the KNewStuff engine */ - KNewStuffSecure(const TQString &type, TQWidget *parentWidget=0); + KNewStuffSecure(const TQString &type, TQWidget *tqparentWidget=0); virtual ~KNewStuffSecure(); /** Installs the downloaded resource. Do not call or reimplement directly. diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp index c1d12853c..1d059d34f 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<ProviderPrivate>(); d_ptr_prov->setAutoDelete(true); } - ProviderPrivate *ret = d_ptr_prov->find((void*)p); + ProviderPrivate *ret = d_ptr_prov->tqfind((void*)p); if(!ret) { ret = new ProviderPrivate(); - d_ptr_prov->replace((void*)p, ret); + d_ptr_prov->tqreplace((void*)p, ret); } return ret; } @@ -89,7 +89,7 @@ Provider::~Provider() { if (d_ptr_prov) { - ProviderPrivate *p = d_ptr_prov->find(this); + ProviderPrivate *p = d_ptr_prov->tqfind(this); if (p) d_ptr_prov->remove(p); @@ -206,8 +206,8 @@ TQDomElement Provider::createDomElement( TQDomDocument &doc, TQDomElement &paren } -ProviderLoader::ProviderLoader( TQWidget *parentWidget ) : - TQObject( parentWidget ) +ProviderLoader::ProviderLoader( TQWidget *tqparentWidget ) : + TQObject( tqparentWidget ) { mProviders.setAutoDelete( true ); } diff --git a/knewstuff/provider.h b/knewstuff/provider.h index 6a0972319..98b5b7def 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 QObject +class KDE_EXPORT ProviderLoader : public TQObject { Q_OBJECT public: /** * Constructor. * - * @param parentWidget the parent widget + * @param tqparentWidget the parent widget */ - ProviderLoader( TQWidget *parentWidget ); + ProviderLoader( TQWidget *tqparentWidget ); /** * Starts asynchronously loading the list of providers of the diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp index 8ef377b78..7db2ccfe7 100644 --- a/knewstuff/security.cpp +++ b/knewstuff/security.cpp @@ -125,19 +125,19 @@ 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.find("(")!=-1) + if (key.name.tqfind("(")!=-1) key.name=key.name.section('(',0,0); m_keys[shortId] = key; } break; case Verify: - data = data.section("]",1,-1).stripWhiteSpace(); + data = TQString(data.section("]",1,-1)).stripWhiteSpace(); if (data.startsWith("GOODSIG")) { m_result &= SIGNED_BAD_CLEAR; m_result |= SIGNED_OK; TQString id = data.section(" ", 1 , 1).right(8); - if (!m_keys.contains(id)) + if (!m_keys.tqcontains(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.contains(id)) + if (!m_keys.tqcontains(id)) { m_result |= UNKNOWN; } else @@ -170,7 +170,7 @@ void Security::slotDataArrived(KProcIO *procIO) break; case Sign: - if (data.find("passphrase.enter") != -1) + if (data.tqfind("passphrase.enter") != -1) { TQCString password; KeyStruct key = m_keys[m_secretKey]; @@ -187,7 +187,7 @@ void Security::slotDataArrived(KProcIO *procIO) return; } } else - if (data.find("BAD_PASSPHRASE") != -1) + if (data.tqfind("BAD_PASSPHRASE") != -1) { m_result |= BAD_PASSPHRASE; } @@ -226,7 +226,7 @@ void Security::slotCheckValidity() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(file); + context.update(TQT_TQIODEVICE_OBJECT(file)); md5sum = context.hexDigest(); file.close(); } @@ -298,7 +298,7 @@ void Security::slotSignFile() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(file); + context.update(TQT_TQIODEVICE_OBJECT(file)); md5sum = context.hexDigest(); file.close(); } diff --git a/knewstuff/security.h b/knewstuff/security.h index 2a4eca536..2831770e0 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 QObject +class Security : public TQObject { Q_OBJECT public: diff --git a/knewstuff/testnewstuff.h b/knewstuff/testnewstuff.h index da0149fda..3af0d68cc 100644 --- a/knewstuff/testnewstuff.h +++ b/knewstuff/testnewstuff.h @@ -40,7 +40,7 @@ class TestNewStuff : public KNewStuff bool createUploadFile( const TQString &fileName ); }; -class MyWidget : public QWidget +class MyWidget : public TQWidget { Q_OBJECT public: |