From 9771f17f8cc5252b12ec5f3edf47ff9bffdf997f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:16:01 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- lib/compatibility/knewstuff/downloaddialog.cpp | 26 +++++++++++++------------- lib/compatibility/knewstuff/downloaddialog.h | 6 +++--- lib/compatibility/knewstuff/knewstuff.cpp | 6 +++--- lib/compatibility/knewstuff/knewstuff.h | 8 ++++---- lib/compatibility/knewstuff/providerdialog.cpp | 8 ++++---- lib/compatibility/knewstuff/providerdialog.h | 4 ++-- 6 files changed, 29 insertions(+), 29 deletions(-) (limited to 'lib/compatibility/knewstuff') diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp index afc27b16..670d989e 100644 --- a/lib/compatibility/knewstuff/downloaddialog.cpp +++ b/lib/compatibility/knewstuff/downloaddialog.cpp @@ -46,11 +46,11 @@ using namespace KNS; -class NumSortListViewItem : public KListViewItem +class NumSortListViewItem : public TDEListViewItem { public: NumSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) : - KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) + TDEListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) { } @@ -62,7 +62,7 @@ class NumSortListViewItem : public KListViewItem s.sprintf("%08d", text(col).toInt()); return s; } - return KListViewItem::key( col, asc ); + return TDEListViewItem::key( col, asc ); } }; @@ -136,10 +136,10 @@ void DownloadDialog::load(TQString providerList) void DownloadDialog::clear() { - TQMap* >::Iterator it; + TQMap* >::Iterator it; for(it = m_map.begin(); it != m_map.end(); ++it) { - TQValueList *v = it.data(); + TQValueList *v = it.data(); kdDebug() << "clear listviews in " << v << endl; if(v) { @@ -179,7 +179,7 @@ void DownloadDialog::addProvider(Provider *p) KTabCtl *ctl; TQWidget *w_d, *w_r, *w_l; TQWidget *w2; - KListView *lvtmp_r, *lvtmp_d, *lvtmp_l; + TDEListView *lvtmp_r, *lvtmp_d, *lvtmp_l; TQTextBrowser *rt; TQString tmp; int ret; @@ -217,19 +217,19 @@ void DownloadDialog::addProvider(Provider *p) TQHBoxLayout *box = new TQHBoxLayout(frame); box->add(ctl); - lvtmp_r = new KListView(w_r); + lvtmp_r = new TDEListView(w_r); lvtmp_r->addColumn(i18n("Name")); lvtmp_r->addColumn(i18n("Version")); lvtmp_r->addColumn(i18n("Rating")); lvtmp_r->setSorting(2, false); - lvtmp_d = new KListView(w_d); + lvtmp_d = new TDEListView(w_d); lvtmp_d->addColumn(i18n("Name")); lvtmp_d->addColumn(i18n("Version")); lvtmp_d->addColumn(i18n("Downloads")); lvtmp_d->setSorting(2, false); - lvtmp_l = new KListView(w_l); + lvtmp_l = new TDEListView(w_l); lvtmp_l->addColumn(i18n("Name")); lvtmp_l->addColumn(i18n("Version")); lvtmp_l->addColumn(i18n("Release Date")); @@ -264,7 +264,7 @@ void DownloadDialog::addProvider(Provider *p) TQVBoxLayout *box4 = new TQVBoxLayout(w_l); box4->add(lvtmp_l); - TQValueList *v = new TQValueList; + TQValueList *v = new TQValueList; *v << lvtmp_r << lvtmp_d << lvtmp_l; m_map[frame] = v; m_rts[frame] = rt; @@ -363,11 +363,11 @@ void DownloadDialog::addEntry(Entry *entry) else if(installed < 0) pix = TDEGlobal::iconLoader()->loadIcon("history", KIcon::Small); else pix = TQPixmap(); - KListViewItem *tmp_r = new KListViewItem(lv_r, + TDEListViewItem *tmp_r = new TDEListViewItem(lv_r, entry->name(), entry->version(), TQString("%1").arg(entry->rating())); - KListViewItem *tmp_d = new NumSortListViewItem(lv_d, + TDEListViewItem *tmp_d = new NumSortListViewItem(lv_d, entry->name(), entry->version(), TQString("%1").arg(entry->downloads())); - KListViewItem *tmp_l = new KListViewItem(lv_l, + TDEListViewItem *tmp_l = new TDEListViewItem(lv_l, entry->name(), entry->version(), TDEGlobal::locale()->formatDate(entry->releaseDate())); tmp_r->setPixmap(0, pix); diff --git a/lib/compatibility/knewstuff/downloaddialog.h b/lib/compatibility/knewstuff/downloaddialog.h index 3c7257d7..7f1fd602 100644 --- a/lib/compatibility/knewstuff/downloaddialog.h +++ b/lib/compatibility/knewstuff/downloaddialog.h @@ -28,7 +28,7 @@ namespace TDEIO class Job; } -class KListView; +class TDEListView; class TQTextBrowser; class TQFrame; class KNewStuffGeneric; @@ -212,7 +212,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase ProviderLoader *m_loader; TQString m_entryname; - KListView *lv_r, *lv_d, *lv_l; + TDEListView *lv_r, *lv_d, *lv_l; TQTextBrowser *m_rt; TQFrame *m_frame; TQListViewItem *m_entryitem; @@ -220,7 +220,7 @@ class KDE_EXPORT DownloadDialog : public KDialogBase Entry *m_entry; KNewStuffGeneric *m_s; int m_curtab; - TQMap* > m_map; + TQMap* > m_map; TQMap m_providers; TQMap m_rts; TQMap* > m_buttons; diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp index 6bfbb333..d36a1ef1 100644 --- a/lib/compatibility/knewstuff/knewstuff.cpp +++ b/lib/compatibility/knewstuff/knewstuff.cpp @@ -30,12 +30,12 @@ using namespace KNS; -KAction* KNS::standardAction(const TQString& what, +TDEAction* KNS::standardAction(const TQString& what, const TQObject *recvr, - const char *slot, KActionCollection* parent, + const char *slot, TDEActionCollection* parent, const char *name) { - return new KAction(i18n("Download New %1").arg(what), "knewstuff", + return new TDEAction(i18n("Download New %1").arg(what), "knewstuff", 0, recvr, slot, parent, name); } diff --git a/lib/compatibility/knewstuff/knewstuff.h b/lib/compatibility/knewstuff/knewstuff.h index 455063a3..1e4f65c7 100644 --- a/lib/compatibility/knewstuff/knewstuff.h +++ b/lib/compatibility/knewstuff/knewstuff.h @@ -26,17 +26,17 @@ class TQObject; class TQWidget; -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; namespace KNS { class Engine; class Entry; -KAction* standardAction(const TQString& what, +TDEAction* standardAction(const TQString& what, const TQObject *recvr, const char *slot, - KActionCollection* parent, + TDEActionCollection* parent, const char *name = 0); } diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp index a6625870..23aa9438 100644 --- a/lib/compatibility/knewstuff/providerdialog.cpp +++ b/lib/compatibility/knewstuff/providerdialog.cpp @@ -34,11 +34,11 @@ using namespace KNS; -class ProviderItem : public KListViewItem +class ProviderItem : public TDEListViewItem { public: - ProviderItem( KListView *parent, Provider *provider ) : - KListViewItem( parent ), mProvider( provider ) + ProviderItem( TDEListView *parent, Provider *provider ) : + TDEListViewItem( parent ), mProvider( provider ) { setText( 0, provider->name() ); } @@ -61,7 +61,7 @@ ProviderDialog::ProviderDialog( Engine *engine, TQWidget *parent ) : TQLabel *description = new TQLabel( i18n("Please select one of the providers listed below:"), topPage ); topLayout->addWidget( description ); - mListView = new KListView( topPage ); + mListView = new TDEListView( topPage ); mListView->addColumn( i18n("Name") ); topLayout->addWidget( mListView ); } diff --git a/lib/compatibility/knewstuff/providerdialog.h b/lib/compatibility/knewstuff/providerdialog.h index a17ddac3..c9002bb8 100644 --- a/lib/compatibility/knewstuff/providerdialog.h +++ b/lib/compatibility/knewstuff/providerdialog.h @@ -22,7 +22,7 @@ #include -class KListView; +class TDEListView; namespace KNS { @@ -69,7 +69,7 @@ class ProviderDialog : public KDialogBase private: Engine *mEngine; - KListView *mListView; + TDEListView *mListView; }; } -- cgit v1.2.1