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 +++++++++++++------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'lib/compatibility/knewstuff/downloaddialog.cpp') 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; -- cgit v1.2.3