From 1fffbdafa12271a1a635caf46777fb8acfb6f31b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:36 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076. --- lib/compatibility/knewstuff/downloaddialog.cpp | 44 ++++++++++++------------ lib/compatibility/knewstuff/downloaddialog.h | 2 +- lib/compatibility/knewstuff/engine.cpp | 6 ++-- lib/compatibility/knewstuff/entry.cpp | 2 +- lib/compatibility/knewstuff/knewstuff.cpp | 2 +- lib/compatibility/knewstuff/knewstuffgeneric.cpp | 4 +-- lib/compatibility/knewstuff/knewstuffsecure.cpp | 6 ++-- lib/compatibility/knewstuff/providerdialog.cpp | 2 +- lib/compatibility/knewstuff/security.cpp | 2 +- lib/compatibility/knewstuff/uploaddialog.cpp | 2 +- 10 files changed, 36 insertions(+), 36 deletions(-) (limited to 'lib/compatibility/knewstuff') diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index 3b8f053d..87c35918 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -37,11 +37,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include // hack using namespace KNS; @@ -321,7 +321,7 @@ void DownloadDialog::slotResult(KIO::Job *job) m_data[job] = ""; } -int DownloadDialog::installStatus(Entry *entry) +int DownloadDialog::installtqStatus(Entry *entry) { TQDate date; TQString datestring; @@ -357,16 +357,16 @@ void DownloadDialog::addEntry(Entry *entry) slotPage(m_frame); } }*/ - installed = installStatus(entry); + installed = installtqStatus(entry); if(installed > 0) pix = KGlobal::iconLoader()->loadIcon("ok", KIcon::Small); else if(installed < 0) pix = KGlobal::iconLoader()->loadIcon("history", KIcon::Small); else pix = TQPixmap(); KListViewItem *tmp_r = new KListViewItem(lv_r, - entry->name(), entry->version(), TQString("%1").arg(entry->rating())); + entry->name(), entry->version(), TQString("%1").tqarg(entry->rating())); KListViewItem *tmp_d = new NumSortListViewItem(lv_d, - entry->name(), entry->version(), TQString("%1").arg(entry->downloads())); + entry->name(), entry->version(), TQString("%1").tqarg(entry->downloads())); KListViewItem *tmp_l = new KListViewItem(lv_l, entry->name(), entry->version(), KGlobal::locale()->formatDate(entry->releaseDate())); @@ -403,23 +403,23 @@ void DownloadDialog::slotDetails() "Downloads: %7\n" "Release date: %8\n" "Summary: %9\n" - ).arg(e->name() - ).arg(e->author() - ).arg(e->license() - ).arg(e->version() - ).arg(e->release() - ).arg(e->rating() - ).arg(e->downloads() - ).arg(KGlobal::locale()->formatDate(e->releaseDate()) - ).arg(e->summary(lang) + ).tqarg(e->name() + ).tqarg(e->author() + ).tqarg(e->license() + ).tqarg(e->version() + ).tqarg(e->release() + ).tqarg(e->rating() + ).tqarg(e->downloads() + ).tqarg(KGlobal::locale()->formatDate(e->releaseDate()) + ).tqarg(e->summary(lang) ); info.append(i18n ( "Preview: %1\n" "Payload: %2\n" - ).arg(e->preview().url() - ).arg(e->payload().url() + ).tqarg(e->preview().url() + ).tqarg(e->payload().url() )); KMessageBox::information(this, info, i18n("Details")); @@ -514,17 +514,17 @@ void DownloadDialog::slotSelected() { if(!e->preview(lang).isValid()) { - m_rt->setText(TQString("%1
%2
%3

%4
(%5)").arg( - e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(e->summary(lang)).arg(e->license())); + m_rt->setText(TQString("%1
%2
%3

%4
(%5)").tqarg( + e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(e->summary(lang)).tqarg(e->license())); } else { KIO::NetAccess::download(e->preview(lang), tmp, this); - m_rt->setText(TQString("%1
%2
%3


%5
(%6)").arg( - e->name()).arg(e->author()).arg(KGlobal::locale()->formatDate(e->releaseDate())).arg(tmp).arg(e->summary(lang)).arg(e->license())); + m_rt->setText(TQString("%1
%2
%3


%5
(%6)").tqarg( + e->name()).tqarg(e->author()).tqarg(KGlobal::locale()->formatDate(e->releaseDate())).tqarg(tmp).tqarg(e->summary(lang)).tqarg(e->license())); } - if(installStatus(e) == 1) enabled = false; + if(installtqStatus(e) == 1) enabled = false; else enabled = true; TQPushButton *de, *in; diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h index 99fb82a9..b5c1de0a 100644 --- a/lib/compatibility/knewstuff/downloaddialog.h +++ b/lib/compatibility/knewstuff/downloaddialog.h @@ -208,7 +208,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase Entry *getEntry(); void loadProvider(Provider *p); void install(Entry *e); - int installStatus(Entry *e); + int installtqStatus(Entry *e); ProviderLoader *m_loader; TQString m_entryname; diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp index ca63ea98..e15b27c6 100644 --- a/lib/compatibility/knewstuff/engine.cpp +++ b/lib/compatibility/knewstuff/engine.cpp @@ -283,11 +283,11 @@ void Engine::upload( Entry *entry ) } TQString text = i18n("The files to be uploaded have been created at:\n"); - text.append( i18n("Data file: %1\n").arg( mUploadFile) ); + text.append( i18n("Data file: %1\n").tqarg( mUploadFile) ); if (!mPreviewFile.isEmpty()) { - text.append( i18n("Preview image: %1\n").arg( mPreviewFile) ); + text.append( i18n("Preview image: %1\n").tqarg( mPreviewFile) ); } - text.append( i18n("Content information: %1\n").arg( mUploadMetaFile) ); + text.append( i18n("Content information: %1\n").tqarg( mUploadMetaFile) ); text.append( i18n("Those files can now be uploaded.\n") ); text.append( i18n("Beware that any people might have access to them at any time.") ); diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp index b7149428..0f3b98b4 100644 --- a/lib/compatibility/knewstuff/entry.cpp +++ b/lib/compatibility/knewstuff/entry.cpp @@ -26,7 +26,7 @@ using namespace KNS; Entry::Entry() : - mRelease( 0 ), mReleaseDate( TQDate::currentDate() ), mRating( 0 ), + mRelease( 0 ), mReleaseDate( TQDate::tqcurrentDate() ), mRating( 0 ), mDownloads( 0 ) { } diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp index 6a37aa61..7fa15372 100644 --- a/lib/compatibility/knewstuff/knewstuff.cpp +++ b/lib/compatibility/knewstuff/knewstuff.cpp @@ -35,7 +35,7 @@ KAction* KNS::standardAction(const TQString& what, const char *slot, KActionCollection* parent, const char *name) { - return new KAction(i18n("Download New %1").arg(what), "knewstuff", + return new KAction(i18n("Download New %1").tqarg(what), "knewstuff", 0, recvr, slot, parent, name); } diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp index 93610a20..c7b4b855 100644 --- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp +++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include @@ -131,7 +131,7 @@ TQString KNewStuffGeneric::downloadDestination( KNS::Entry *entry ) if ( KStandardDirs::exists( file ) ) { int result = KMessageBox::warningContinueCancel( parentWidget(), i18n("The file '%1' already exists. Do you want to override it?") - .arg( file ), + .tqarg( file ), TQString(), i18n("Overwrite") ); if ( result == KMessageBox::Cancel ) return TQString(); } diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp index 7b98dbba..d9bf82af 100644 --- a/lib/compatibility/knewstuff/knewstuffsecure.cpp +++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp @@ -128,16 +128,16 @@ void KNewStuffSecure::slotValidated(int result) valid = false; } else { - signatureStr = i18n("The resource was signed with key 0x%1, belonging to %2 <%3>.").arg(key.id.right(8)).arg(key.name).arg(key.mail); + signatureStr = i18n("The resource was signed with key 0x%1, belonging to %2 <%3>.").tqarg(key.id.right(8)).tqarg(key.name).tqarg(key.mail); } } if (!valid) { signatureStr.prepend( "
"); - 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) + 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?").tqarg(errorString).tqarg(signatureStr), i18n("Problematic Resource File")) == KMessageBox::Continue) valid = true; } else - KMessageBox::information(parentWidget(), 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.").tqarg(signatureStr), i18n("Valid Resource"), "Show Valid Signature Information"); if (valid) { installResource(); diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp index f87ba458..a6625870 100644 --- a/lib/compatibility/knewstuff/providerdialog.cpp +++ b/lib/compatibility/knewstuff/providerdialog.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp index 8ef377b7..9dc5615a 100644 --- a/lib/compatibility/knewstuff/security.cpp +++ b/lib/compatibility/knewstuff/security.cpp @@ -174,7 +174,7 @@ void Security::slotDataArrived(KProcIO *procIO) { TQCString password; KeyStruct key = m_keys[m_secretKey]; - int result = KPasswordDialog::getPassword(password, i18n("Enter passphrase for key 0x%1, belonging to
%2<%3>:").arg(m_secretKey).arg(key.name).arg(key.mail)); + int result = KPasswordDialog::getPassword(password, i18n("Enter passphrase for key 0x%1, belonging to
%2<%3>:").tqarg(m_secretKey).tqarg(key.name).tqarg(key.mail)); if (result == KPasswordDialog::Accepted) { procIO->writeStdin(password, true); diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp index 2c418c10..4eaed4aa 100644 --- a/lib/compatibility/knewstuff/uploaddialog.cpp +++ b/lib/compatibility/knewstuff/uploaddialog.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.3