From b3fda942e32c9626085145deeec300480e50ea85 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:57:59 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- adept/adept/acqprogress.cpp | 10 +++++----- adept/adept/acqprogress.h | 8 ++++---- adept/adept/dpkgpm-gui.h | 2 +- adept/adept/extendablelist.cpp | 16 ++++++++-------- adept/adept/extendablelist.h | 16 ++++++++-------- adept/adept/filterlist.cpp | 2 +- adept/adept/filterlist.h | 2 +- adept/adept/lister.cpp | 4 ++-- adept/adept/packagedetails.cpp | 2 +- adept/adept/packagedetails.h | 2 +- adept/adept/packagedetailsui.ui | 4 ++-- adept/adept/sourceseditor.cpp | 6 +++--- adept/adept/sourceseditor.h | 10 +++++----- adept/adept/sourceseditorui.ui | 2 +- adept/adept/tagchooser.cpp | 8 ++++---- adept/adept/tagchooser.h | 6 +++--- adept/batch/app.h | 4 ++-- adept/installer/app.cpp | 2 +- adept/installer/app.h | 10 +++++----- adept/libadept/acqprogress.cpp | 10 +++++----- adept/libadept/acqprogress.h | 8 ++++---- adept/libadept/dpkgpm-gui.h | 2 +- adept/libadept/extendablelist.cpp | 14 +++++++------- adept/libadept/extendablelist.h | 16 ++++++++-------- adept/libadept/filterlist.cpp | 2 +- adept/libadept/filterlist.h | 2 +- adept/libadept/lister.cpp | 4 ++-- adept/libadept/packagedetails.cpp | 2 +- adept/libadept/packagedetails.h | 2 +- adept/libadept/packagedetailsui.ui | 4 ++-- adept/libadept/sourceseditor.cpp | 6 +++--- adept/libadept/sourceseditor.h | 10 +++++----- adept/libadept/sourceseditorui.ui | 2 +- adept/libadept/tagchooser.cpp | 8 ++++---- adept/libadept/tagchooser.h | 6 +++--- adept/manager/app.cpp | 26 +++++++++++++------------- adept/manager/app.h | 20 ++++++++++---------- adept/notifier/app.cpp | 2 +- adept/notifier/app.h | 6 +++--- adept/updater/app.h | 8 ++++---- 40 files changed, 138 insertions(+), 138 deletions(-) diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp index 91ba78a..3f42ad6 100644 --- a/adept/adept/acqprogress.cpp +++ b/adept/adept/acqprogress.cpp @@ -29,8 +29,8 @@ using namespace std; namespace adept { -AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit) -: KListViewItem( parent ) +AcqStatus::Item::Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit) +: TDEListViewItem( parent ) { m_pbcol = 0; m_prog = new ItemProgress( 0, 0 ); @@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg, TQPixmap pm( width, height() ); TQPainter _p( &pm ); _cg.setColor( TQColorGroup::Text, c ); - KListViewItem::paintCell( &_p, _cg, column, width, alignment ); + TDEListViewItem::paintCell( &_p, _cg, column, width, alignment ); p->drawPixmap( 0, 0, pm ); } } @@ -110,7 +110,7 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm) } AcqStatus::AcqStatus(TQWidget *parent, const char *name) - : KListView (parent, name), m_idOffset( 0 ), m_continue( true ) + : TDEListView (parent, name), m_idOffset( 0 ), m_continue( true ) { // m_lastItem = 0; addColumn( i18n( "Progress" ) ); @@ -135,7 +135,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm) void AcqStatus::clear() { - KListView::clear(); + TDEListView::clear(); m_idOffset += m_items.size(); m_items.clear(); // got deleted by klistview already } diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h index e5fc535..3e67668 100644 --- a/adept/adept/acqprogress.h +++ b/adept/adept/acqprogress.h @@ -23,7 +23,7 @@ class TQGridLayout; namespace adept { -class AcqStatus : public KListView, public aptFront::ProgressCallback +class AcqStatus : public TDEListView, public aptFront::ProgressCallback { Q_OBJECT @@ -54,7 +54,7 @@ protected: std::string m_status; int m_spin; }; - class Item : public KListViewItem { + class Item : public TDEListViewItem { protected: ItemProgress *m_prog; int m_pbcol; @@ -62,7 +62,7 @@ protected: pkgAcquire::ItemDesc m_item; public: - Item (KListView *parent, pkgAcquire::ItemDesc &item, + Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit = false); virtual ~Item (); @@ -75,7 +75,7 @@ protected: void setStatus( const std::string &, int = 0 ); void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight( height() + 6 ); } }; diff --git a/adept/adept/dpkgpm-gui.h b/adept/adept/dpkgpm-gui.h index 03f5092..970b2d6 100644 --- a/adept/adept/dpkgpm-gui.h +++ b/adept/adept/dpkgpm-gui.h @@ -12,7 +12,7 @@ #include #include -class KListBox; +class TDEListBox; namespace KParts { class Part; } diff --git a/adept/adept/extendablelist.cpp b/adept/adept/extendablelist.cpp index 3cadcc9..346f7d2 100644 --- a/adept/adept/extendablelist.cpp +++ b/adept/adept/extendablelist.cpp @@ -12,7 +12,7 @@ using namespace adept; ExtendableList::ExtendableList( TQWidget *p, const char *n ) - : KListView( p, n ), + : TDEListView( p, n ), m_toggleColumn( 0 ), m_inDtor( false ), m_extenderUpdateScheduled( false ), m_needSort( false ), @@ -49,10 +49,10 @@ void ExtendableList::keyPressEvent( TQKeyEvent *e ) { return item->showExtender(); } } - KListView::keyPressEvent( e ); + TDEListView::keyPressEvent( e ); if ( e->key() == TQt::Key_Left || e->key() == TQt::Key_Right ) item->updateIcon(); - } else return KListView::keyPressEvent( e ); + } else return TDEListView::keyPressEvent( e ); } void ExtendableList::openToplevel() { @@ -129,25 +129,25 @@ void ExtendableList::delayedUpdateExtenders() void ExtendableList::clear() { kdDebug() << "ExtendableList::clear()" << endl; - KListView::clear(); + TDEListView::clear(); kdDebug() << "end of ExtendableList::clear()" << endl; } void ExtendableList::show() { - KListView::show(); + TDEListView::show(); updateExtenders(); } void ExtendableList::showEvent( TQShowEvent *e ) { - KListView::showEvent( e ); + TDEListView::showEvent( e ); updateExtenders(); } void ExtendableList::resizeEvent( TQResizeEvent *e ) { - KListView::resizeEvent( e ); + TDEListView::resizeEvent( e ); updateExtenders(); // delayedUpdateExtenders(); } @@ -298,7 +298,7 @@ void ExtendableItem::paintBranches( TQPainter *p, { TQPixmap pm( width, height() ); TQPainter _p( &pm ); - KListViewItem::paintCell( &_p, cg, column, width, alignment ); + TDEListViewItem::paintCell( &_p, cg, column, width, alignment ); p->drawPixmap( 0, 0, pm ); } */ diff --git a/adept/adept/extendablelist.h b/adept/adept/extendablelist.h index 161dad3..fb78ebb 100644 --- a/adept/adept/extendablelist.h +++ b/adept/adept/extendablelist.h @@ -17,7 +17,7 @@ class ExtendableItem; class ExtendableList; class ItemExtender; -class ExtendableList : public KListView { +class ExtendableList : public TDEListView { Q_OBJECT public: @@ -65,27 +65,27 @@ protected: bool m_extenderHighlight:1; }; -class ExtendableItem : public KListViewItem { +class ExtendableItem : public TDEListViewItem { public: ExtendableItem( ExtendableList *l ) - : KListViewItem( l ), m_extender( 0 ) { + : TDEListViewItem( l ), m_extender( 0 ) { } ExtendableItem( ExtendableList *l, ExtendableItem *prev ) - : KListViewItem( l, prev ), m_extender( 0 ) { + : TDEListViewItem( l, prev ), m_extender( 0 ) { } ExtendableItem( ExtendableItem *p, ExtendableItem *prev ) - : KListViewItem( p, prev ), m_extender( 0 ) { + : TDEListViewItem( p, prev ), m_extender( 0 ) { } ExtendableItem( ExtendableItem *p ) - : KListViewItem( p ), m_extender( 0 ) { + : TDEListViewItem( p ), m_extender( 0 ) { } virtual void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); updateIcon(); } void toggleExtender(); @@ -117,7 +117,7 @@ public: virtual int compare( TQListViewItem *other, int col, bool ascending ) const; virtual ~ExtendableItem(); - virtual void setHeight( int h ) { KListViewItem::setHeight( h ); } + virtual void setHeight( int h ) { TDEListViewItem::setHeight( h ); } protected: ItemExtender *m_extender; }; diff --git a/adept/adept/filterlist.cpp b/adept/adept/filterlist.cpp index 9e6c607..dae8b74 100644 --- a/adept/adept/filterlist.cpp +++ b/adept/adept/filterlist.cpp @@ -93,7 +93,7 @@ void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) { m_itemsSeen = childCount(); updateHeight(); } // hmm, doesn't work... bah :p - KListView::drawContents( p, a, b, c, d ); + TDEListView::drawContents( p, a, b, c, d ); } void FilterList::plugLister( Lister *l ) { diff --git a/adept/adept/filterlist.h b/adept/adept/filterlist.h index 57c5eaf..a4aa83f 100644 --- a/adept/adept/filterlist.h +++ b/adept/adept/filterlist.h @@ -74,7 +74,7 @@ class FilterList : public ExtendableList public: friend class FilterItem; typedef predicate::Predicate< entity::Entity > Predicate; - // typedef std::map< KListViewItem *, Predicate > Map; + // typedef std::map< TDEListViewItem *, Predicate > Map; FilterList( TQWidget *parent = 0, const char *name = 0 ); typedef predicate::And< entity::Entity > And; void appendPredicate( Predicate p ); diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp index a5875b1..0b618af 100644 --- a/adept/adept/lister.cpp +++ b/adept/adept/lister.cpp @@ -476,7 +476,7 @@ void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg, alignment &= ~AlignVertical_Mask; alignment |= AlignTop; } - KListViewItem::paintCell( &_p, _cg, column, width, alignment ); + TDEListViewItem::paintCell( &_p, _cg, column, width, alignment ); p->drawPixmap( 0, 0, pm ); } @@ -487,7 +487,7 @@ void Lister::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ ) m_context = dynamic_cast< ListerItem * >( it ); VectorRange sel = selection(); // entity::Package p = (dynamic_cast(it)->entity()); - KPopupMenu *m = new KPopupMenu (this); + TDEPopupMenu *m = new TDEPopupMenu (this); utils::Range< Actor > r = actor::Global< entity::Package >::list(); int id = 8; try { diff --git a/adept/adept/packagedetails.cpp b/adept/adept/packagedetails.cpp index bfe1f9a..7009c8a 100644 --- a/adept/adept/packagedetails.cpp +++ b/adept/adept/packagedetails.cpp @@ -32,7 +32,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n ) m_fileListRunning( false ) { m_toolbar->setIconSize( 22 ); - m_toolbar->setIconText( KToolBar::IconTextRight ); + m_toolbar->setIconText( TDEToolBar::IconTextRight ); m_toolbar->insertButton( u8( "back" ), BBack, false, i18n( "Back" ) ); m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) ); diff --git a/adept/adept/packagedetails.h b/adept/adept/packagedetails.h index 379ae06..de80edf 100644 --- a/adept/adept/packagedetails.h +++ b/adept/adept/packagedetails.h @@ -13,7 +13,7 @@ #ifndef EPT_PACKGEDETAILS_H #define EPT_PACKGEDETAILS_H -class KToolBarButton; +class TDEToolBarButton; class TQThread; namespace adept { diff --git a/adept/adept/packagedetailsui.ui b/adept/adept/packagedetailsui.ui index f2b03d7..3cdc418 100644 --- a/adept/adept/packagedetailsui.ui +++ b/adept/adept/packagedetailsui.ui @@ -25,7 +25,7 @@ 0 - + m_toolbar @@ -458,7 +458,7 @@ image0 - KToolBar + TDEToolBar
ktoolbar.h
-1 diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp index 8755968..345c58d 100644 --- a/adept/adept/sourceseditor.cpp +++ b/adept/adept/sourceseditor.cpp @@ -50,7 +50,7 @@ void SourcesEditor::newAdd() void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) { EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() ); if (!s) return; - KPopupMenu *m = new KPopupMenu (this); + TDEPopupMenu *m = new TDEPopupMenu (this); m->insertItem( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 ); m->insertItem( i18n( "Clone" ), 1 ); m->insertItem( i18n( "Remove" ), 2 ); @@ -146,7 +146,7 @@ void EntryItem::setText( int c, const TQString &_s ) if (c == 2) e.setDistribution( s ); if (c == 3) e.setComponents( s ); setEntry( e ); - KListViewItem::setText( c, _s ); // stop qlistview from looping infinitely + TDEListViewItem::setText( c, _s ); // stop qlistview from looping infinitely } void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, @@ -159,7 +159,7 @@ void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, if (!entry().enabled()) c = TQt::gray; _cg.setColor( TQColorGroup::Text, c ); - KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); + TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); p->drawPixmap( 0, 0, pm ); } diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h index be0b368..37ae0b0 100644 --- a/adept/adept/sourceseditor.h +++ b/adept/adept/sourceseditor.h @@ -32,7 +32,7 @@ protected: std::string m_filename; }; -class EntryItem : public KListViewItem { +class EntryItem : public TDEListViewItem { public: Sources::Entry entry() const { return m_entry; @@ -40,12 +40,12 @@ public: void setEntry( const Sources::Entry &e ) { m_entry = e; } - EntryItem( Sources::Entry e, KListView *v, EntryItem *prev ) - : KListViewItem( v, prev ), m_entry( e ) { + EntryItem( Sources::Entry e, TDEListView *v, EntryItem *prev ) + : TDEListViewItem( v, prev ), m_entry( e ) { init(); } - EntryItem( Sources::Entry e, KListView *v ) - : KListViewItem( v ), m_entry( e ) { + EntryItem( Sources::Entry e, TDEListView *v ) + : TDEListViewItem( v ), m_entry( e ) { init(); } void init() { diff --git a/adept/adept/sourceseditorui.ui b/adept/adept/sourceseditorui.ui index b93b384..92f0a67 100644 --- a/adept/adept/sourceseditorui.ui +++ b/adept/adept/sourceseditorui.ui @@ -19,7 +19,7 @@ unnamed - + Type diff --git a/adept/adept/tagchooser.cpp b/adept/adept/tagchooser.cpp index 49d0265..0e2cdce 100644 --- a/adept/adept/tagchooser.cpp +++ b/adept/adept/tagchooser.cpp @@ -11,7 +11,7 @@ using namespace adept; FacetItem::FacetItem( TagChooser *t ) - : KListViewItem( t ) + : TDEListViewItem( t ) { } @@ -25,12 +25,12 @@ void FacetItem::removeTag( TagItem::Tag t ) { } TagItem::TagItem( FacetItem *p ) - : KListViewItem( p ), m_toplevel( false ) + : TDEListViewItem( p ), m_toplevel( false ) { } TagItem::TagItem( TagChooser *l ) - : KListViewItem( l ), m_toplevel( true ) + : TDEListViewItem( l ), m_toplevel( true ) { } @@ -41,7 +41,7 @@ TQString TagItem::text( int c ) const } TagChooser::TagChooser( TQWidget *p, const char *n ) - : KListView( p, n ) + : TDEListView( p, n ) { observeComponent< cache::component::PackageTags >(); // addColumn( " ", 20 ); diff --git a/adept/adept/tagchooser.h b/adept/adept/tagchooser.h index 55eadd0..9f6f076 100644 --- a/adept/adept/tagchooser.h +++ b/adept/adept/tagchooser.h @@ -22,7 +22,7 @@ class FacetItem; class FacetExtender; class TagChooser; -class TagItem : public KListViewItem { +class TagItem : public TDEListViewItem { public: typedef ept::debtags::Tag Tag; virtual TQString text( int ) const; @@ -35,7 +35,7 @@ protected: Tag m_tag; }; -class FacetItem : public KListViewItem +class FacetItem : public TDEListViewItem { public: typedef ept::debtags::Facet Facet; @@ -47,7 +47,7 @@ protected: Facet m_facet; }; -class TagChooser : public KListView, public cache::Observer // ExtendableList +class TagChooser : public TDEListView, public cache::Observer // ExtendableList { Q_OBJECT diff --git a/adept/batch/app.h b/adept/batch/app.h index 7c0a7ac..7aa69d4 100644 --- a/adept/batch/app.h +++ b/adept/batch/app.h @@ -18,7 +18,7 @@ class TQVBox; class TQWidgetStack; class TQSplitter; -class KAction; +class TDEAction; class KPushButton; namespace adept { class AcqProgressWidget; @@ -27,7 +27,7 @@ class AcqProgressWidget; using namespace aptFront; using namespace adept; -class App : public KMainWindow, Application { +class App : public TDEMainWindow, Application { Q_OBJECT public: diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp index 809e762..0cf9f91 100644 --- a/adept/installer/app.cpp +++ b/adept/installer/app.cpp @@ -272,7 +272,7 @@ void App::setupActions() KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() ); m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() ); m_redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), actionCollection() ); - m_previewAction = new KToggleAction( + m_previewAction = new TDEToggleAction( i18n( "Review Changes" ), u8( "adept_preview" ), 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(), "review" ); diff --git a/adept/installer/app.h b/adept/installer/app.h index b344e4a..e20640c 100644 --- a/adept/installer/app.h +++ b/adept/installer/app.h @@ -17,7 +17,7 @@ class TQVBox; class TQWidgetStack; class TQSplitter; -class KAction; +class TDEAction; class KPushButton; class TDEProcess; namespace adept { @@ -35,7 +35,7 @@ struct IconPolicy : GroupedDesktopSelector::IconPolicy { virtual TQString iconForGroup( TQString ); }; -class App : public KMainWindow, Application { +class App : public TDEMainWindow, Application { Q_OBJECT public: @@ -97,10 +97,10 @@ protected: adept::Browser *m_preview; // other stuff - std::vector m_actions; + std::vector m_actions; TQMap< TQString, TQString > m_icons; - KAction *m_undo, *m_redo; - KToggleAction *m_previewAction; + TDEAction *m_undo, *m_redo; + TDEToggleAction *m_previewAction; State m_state, m_lastState; typedef std::list< component::State::Request > RequestList; diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp index 91ba78a..3f42ad6 100644 --- a/adept/libadept/acqprogress.cpp +++ b/adept/libadept/acqprogress.cpp @@ -29,8 +29,8 @@ using namespace std; namespace adept { -AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit) -: KListViewItem( parent ) +AcqStatus::Item::Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit) +: TDEListViewItem( parent ) { m_pbcol = 0; m_prog = new ItemProgress( 0, 0 ); @@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg, TQPixmap pm( width, height() ); TQPainter _p( &pm ); _cg.setColor( TQColorGroup::Text, c ); - KListViewItem::paintCell( &_p, _cg, column, width, alignment ); + TDEListViewItem::paintCell( &_p, _cg, column, width, alignment ); p->drawPixmap( 0, 0, pm ); } } @@ -110,7 +110,7 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm) } AcqStatus::AcqStatus(TQWidget *parent, const char *name) - : KListView (parent, name), m_idOffset( 0 ), m_continue( true ) + : TDEListView (parent, name), m_idOffset( 0 ), m_continue( true ) { // m_lastItem = 0; addColumn( i18n( "Progress" ) ); @@ -135,7 +135,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm) void AcqStatus::clear() { - KListView::clear(); + TDEListView::clear(); m_idOffset += m_items.size(); m_items.clear(); // got deleted by klistview already } diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h index e5fc535..3e67668 100644 --- a/adept/libadept/acqprogress.h +++ b/adept/libadept/acqprogress.h @@ -23,7 +23,7 @@ class TQGridLayout; namespace adept { -class AcqStatus : public KListView, public aptFront::ProgressCallback +class AcqStatus : public TDEListView, public aptFront::ProgressCallback { Q_OBJECT @@ -54,7 +54,7 @@ protected: std::string m_status; int m_spin; }; - class Item : public KListViewItem { + class Item : public TDEListViewItem { protected: ItemProgress *m_prog; int m_pbcol; @@ -62,7 +62,7 @@ protected: pkgAcquire::ItemDesc m_item; public: - Item (KListView *parent, pkgAcquire::ItemDesc &item, + Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit = false); virtual ~Item (); @@ -75,7 +75,7 @@ protected: void setStatus( const std::string &, int = 0 ); void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight( height() + 6 ); } }; diff --git a/adept/libadept/dpkgpm-gui.h b/adept/libadept/dpkgpm-gui.h index 03f5092..970b2d6 100644 --- a/adept/libadept/dpkgpm-gui.h +++ b/adept/libadept/dpkgpm-gui.h @@ -12,7 +12,7 @@ #include #include -class KListBox; +class TDEListBox; namespace KParts { class Part; } diff --git a/adept/libadept/extendablelist.cpp b/adept/libadept/extendablelist.cpp index d6471ba..41dabcd 100644 --- a/adept/libadept/extendablelist.cpp +++ b/adept/libadept/extendablelist.cpp @@ -12,7 +12,7 @@ using namespace adept; ExtendableList::ExtendableList( TQWidget *p, const char *n ) - : KListView( p, n ), + : TDEListView( p, n ), m_toggleColumn( 0 ), m_inDtor( false ), m_extenderUpdateScheduled( false ), m_needSort( false ), @@ -48,7 +48,7 @@ void ExtendableList::keyPressEvent( TQKeyEvent *e ) { return item->showExtender(); } } - return KListView::keyPressEvent( e ); + return TDEListView::keyPressEvent( e ); } void ExtendableList::openToplevel() { @@ -125,25 +125,25 @@ void ExtendableList::delayedUpdateExtenders() void ExtendableList::clear() { kdDebug() << "ExtendableList::clear()" << endl; - KListView::clear(); + TDEListView::clear(); kdDebug() << "end of ExtendableList::clear()" << endl; } void ExtendableList::show() { - KListView::show(); + TDEListView::show(); updateExtenders(); } void ExtendableList::showEvent( TQShowEvent *e ) { - KListView::showEvent( e ); + TDEListView::showEvent( e ); updateExtenders(); } void ExtendableList::resizeEvent( TQResizeEvent *e ) { - KListView::resizeEvent( e ); + TDEListView::resizeEvent( e ); updateExtenders(); // delayedUpdateExtenders(); } @@ -291,7 +291,7 @@ void ExtendableItem::paintBranches( TQPainter *p, { TQPixmap pm( width, height() ); TQPainter _p( &pm ); - KListViewItem::paintCell( &_p, cg, column, width, alignment ); + TDEListViewItem::paintCell( &_p, cg, column, width, alignment ); p->drawPixmap( 0, 0, pm ); } */ diff --git a/adept/libadept/extendablelist.h b/adept/libadept/extendablelist.h index 22c00c1..c36d5fb 100644 --- a/adept/libadept/extendablelist.h +++ b/adept/libadept/extendablelist.h @@ -17,7 +17,7 @@ class ExtendableItem; class ExtendableList; class ItemExtender; -class ExtendableList : public KListView { +class ExtendableList : public TDEListView { Q_OBJECT public: @@ -65,27 +65,27 @@ protected: bool m_extenderHighlight:1; }; -class ExtendableItem : public KListViewItem { +class ExtendableItem : public TDEListViewItem { public: ExtendableItem( ExtendableList *l ) - : KListViewItem( l ), m_extender( 0 ) { + : TDEListViewItem( l ), m_extender( 0 ) { } ExtendableItem( ExtendableList *l, ExtendableItem *prev ) - : KListViewItem( l, prev ), m_extender( 0 ) { + : TDEListViewItem( l, prev ), m_extender( 0 ) { } ExtendableItem( ExtendableItem *p, ExtendableItem *prev ) - : KListViewItem( p, prev ), m_extender( 0 ) { + : TDEListViewItem( p, prev ), m_extender( 0 ) { } ExtendableItem( ExtendableItem *p ) - : KListViewItem( p ), m_extender( 0 ) { + : TDEListViewItem( p ), m_extender( 0 ) { } virtual void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); updateIcon(); } void toggleExtender(); @@ -116,7 +116,7 @@ public: virtual int compare( TQListViewItem *other, int col, bool ascending ) const; virtual ~ExtendableItem(); - virtual void setHeight( int h ) { KListViewItem::setHeight( h ); } + virtual void setHeight( int h ) { TDEListViewItem::setHeight( h ); } protected: ItemExtender *m_extender; }; diff --git a/adept/libadept/filterlist.cpp b/adept/libadept/filterlist.cpp index 207a5db..456735c 100644 --- a/adept/libadept/filterlist.cpp +++ b/adept/libadept/filterlist.cpp @@ -92,7 +92,7 @@ void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) { m_itemsSeen = childCount(); updateHeight(); } // hmm, doesn't work... bah :p - KListView::drawContents( p, a, b, c, d ); + TDEListView::drawContents( p, a, b, c, d ); } void FilterList::plugLister( Lister *l ) { diff --git a/adept/libadept/filterlist.h b/adept/libadept/filterlist.h index 951e188..a83dc97 100644 --- a/adept/libadept/filterlist.h +++ b/adept/libadept/filterlist.h @@ -67,7 +67,7 @@ class FilterList : public ExtendableList public: friend class FilterItem; typedef predicate::Predicate< entity::Entity > Predicate; - // typedef std::map< KListViewItem *, Predicate > Map; + // typedef std::map< TDEListViewItem *, Predicate > Map; FilterList( TQWidget *parent = 0, const char *name = 0 ); typedef predicate::And< entity::Entity > And; void appendPredicate( Predicate p ); diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp index 7b3b865..32283ad 100644 --- a/adept/libadept/lister.cpp +++ b/adept/libadept/lister.cpp @@ -406,7 +406,7 @@ void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg, c = actionColor( p ); } _cg.setColor( TQColorGroup::Text, c ); - KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); + TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); p->drawPixmap( 0, 0, pm ); } @@ -417,7 +417,7 @@ void Lister::contextMenu( TQListViewItem *it, const TQPoint &pt, int /*c*/ ) m_context = dynamic_cast< ListerItem * >( it ); VectorRange sel = selection(); // entity::Package p = (dynamic_cast(it)->entity()); - KPopupMenu *m = new KPopupMenu (this); + TDEPopupMenu *m = new TDEPopupMenu (this); utils::Range< Actor > r = actor::Global< entity::Package >::list(); int id = 8; try { diff --git a/adept/libadept/packagedetails.cpp b/adept/libadept/packagedetails.cpp index 4411e9b..0092415 100644 --- a/adept/libadept/packagedetails.cpp +++ b/adept/libadept/packagedetails.cpp @@ -29,7 +29,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n ) m_fileListRunning( false ) { m_toolbar->setIconSize( 22 ); - m_toolbar->setIconText( KToolBar::IconTextRight ); + m_toolbar->setIconText( TDEToolBar::IconTextRight ); m_toolbar->insertButton( u8( "back" ), BBack, false, i18n( "Back" ) ); m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) ); diff --git a/adept/libadept/packagedetails.h b/adept/libadept/packagedetails.h index b8301af..5951928 100644 --- a/adept/libadept/packagedetails.h +++ b/adept/libadept/packagedetails.h @@ -11,7 +11,7 @@ #ifndef EPT_PACKGEDETAILS_H #define EPT_PACKGEDETAILS_H -class KToolBarButton; +class TDEToolBarButton; class TQThread; namespace adept { diff --git a/adept/libadept/packagedetailsui.ui b/adept/libadept/packagedetailsui.ui index 65b4812..5a3249b 100644 --- a/adept/libadept/packagedetailsui.ui +++ b/adept/libadept/packagedetailsui.ui @@ -25,7 +25,7 @@ 0 - + m_toolbar @@ -416,7 +416,7 @@ image0 - KToolBar + TDEToolBar
ktoolbar.h
-1 diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp index 7874b9a..1423e4b 100644 --- a/adept/libadept/sourceseditor.cpp +++ b/adept/libadept/sourceseditor.cpp @@ -50,7 +50,7 @@ void SourcesEditor::newAdd() void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) { EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() ); if (!s) return; - KPopupMenu *m = new KPopupMenu (this); + TDEPopupMenu *m = new TDEPopupMenu (this); m->insertItem( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 ); m->insertItem( i18n( "Clone" ), 1 ); m->insertItem( i18n( "Remove" ), 2 ); @@ -146,7 +146,7 @@ void EntryItem::setText( int c, const TQString &_s ) if (c == 2) e.setDistribution( s ); if (c == 3) e.setComponents( s ); setEntry( e ); - KListViewItem::setText( c, _s ); // stop qlistview from looping infinitely + TDEListViewItem::setText( c, _s ); // stop qlistview from looping infinitely } void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, @@ -159,7 +159,7 @@ void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, if (!entry().enabled()) c = TQt::gray; _cg.setColor( TQColorGroup::Text, c ); - KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); + TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); p->drawPixmap( 0, 0, pm ); } diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h index 1e304c5..284074a 100644 --- a/adept/libadept/sourceseditor.h +++ b/adept/libadept/sourceseditor.h @@ -31,7 +31,7 @@ protected: std::string m_filename; }; -class EntryItem : public KListViewItem { +class EntryItem : public TDEListViewItem { public: Sources::Entry entry() const { return m_entry; @@ -39,12 +39,12 @@ public: void setEntry( const Sources::Entry &e ) { m_entry = e; } - EntryItem( Sources::Entry e, KListView *v, EntryItem *prev ) - : KListViewItem( v, prev ), m_entry( e ) { + EntryItem( Sources::Entry e, TDEListView *v, EntryItem *prev ) + : TDEListViewItem( v, prev ), m_entry( e ) { init(); } - EntryItem( Sources::Entry e, KListView *v ) - : KListViewItem( v ), m_entry( e ) { + EntryItem( Sources::Entry e, TDEListView *v ) + : TDEListViewItem( v ), m_entry( e ) { init(); } void init() { diff --git a/adept/libadept/sourceseditorui.ui b/adept/libadept/sourceseditorui.ui index b93b384..92f0a67 100644 --- a/adept/libadept/sourceseditorui.ui +++ b/adept/libadept/sourceseditorui.ui @@ -19,7 +19,7 @@ unnamed - + Type diff --git a/adept/libadept/tagchooser.cpp b/adept/libadept/tagchooser.cpp index 6ade10b..56070a3 100644 --- a/adept/libadept/tagchooser.cpp +++ b/adept/libadept/tagchooser.cpp @@ -10,7 +10,7 @@ using namespace adept; FacetItem::FacetItem( TagChooser *t ) - : KListViewItem( t ) + : TDEListViewItem( t ) { } @@ -24,12 +24,12 @@ void FacetItem::removeTag( TagItem::Tag t ) { } TagItem::TagItem( FacetItem *p ) - : KListViewItem( p ), m_toplevel( false ) + : TDEListViewItem( p ), m_toplevel( false ) { } TagItem::TagItem( TagChooser *l ) - : KListViewItem( l ), m_toplevel( true ) + : TDEListViewItem( l ), m_toplevel( true ) { } @@ -40,7 +40,7 @@ TQString TagItem::text( int c ) const } TagChooser::TagChooser( TQWidget *p, const char *n ) - : KListView( p, n ) + : TDEListView( p, n ) { observeComponent< cache::component::PackageTags >(); // addColumn( " ", 20 ); diff --git a/adept/libadept/tagchooser.h b/adept/libadept/tagchooser.h index 1fcc688..fdd7e3d 100644 --- a/adept/libadept/tagchooser.h +++ b/adept/libadept/tagchooser.h @@ -21,7 +21,7 @@ class FacetItem; class FacetExtender; class TagChooser; -class TagItem : public KListViewItem { +class TagItem : public TDEListViewItem { public: typedef cache::entity::Tag Tag; virtual TQString text( int ) const; @@ -34,7 +34,7 @@ protected: Tag m_tag; }; -class FacetItem : public KListViewItem +class FacetItem : public TDEListViewItem { public: typedef cache::entity::Facet Facet; @@ -46,7 +46,7 @@ protected: Facet m_facet; }; -class TagChooser : public KListView, public cache::Observer // ExtendableList +class TagChooser : public TDEListView, public cache::Observer // ExtendableList { Q_OBJECT diff --git a/adept/manager/app.cpp b/adept/manager/app.cpp index f1330d2..e1e2254 100644 --- a/adept/manager/app.cpp +++ b/adept/manager/app.cpp @@ -107,49 +107,49 @@ void TestApp::delayed() { void TestApp::setupActions() { - (new KAction( + (new TDEAction( i18n( "Fetch Updates" ), u8( "adept_update" ), 0, TQT_TQOBJECT(this), TQT_SLOT( update() ), actionCollection(), "update" ))->setEnabled( false ); - (new KAction( + (new TDEAction( i18n( "Reload Cache" ), u8( "adept_reload" ), 0, TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" ))->setEnabled( false ); - m_upgrade = new KAction( + m_upgrade = new TDEAction( i18n( "Safe Upgrade" ), u8( "adept_upgrade" ), 0, TQT_TQOBJECT(this), TQT_SLOT( upgrade() ), actionCollection(), "upgrade" ); - m_distUpgrade = new KAction( + m_distUpgrade = new TDEAction( i18n( "Full Upgrade" ), u8( "adept_distupgrade" ), 0, TQT_TQOBJECT(this), TQT_SLOT( distUpgrade() ), actionCollection(), "dist-upgrade" ); - m_commit = new KAction( + m_commit = new TDEAction( i18n( "Apply Changes" ), u8( "adept_commit" ), 0, TQT_TQOBJECT(this), TQT_SLOT( commit() ), actionCollection(), "commit" ); - m_sourcesAction = new KToggleAction( + m_sourcesAction = new TDEToggleAction( i18n( "Manage Repositories" ), u8( "adept_sourceseditor" ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleSources() ), actionCollection(), "sourceseditor" ); - m_previewAction = new KToggleAction( + m_previewAction = new TDEToggleAction( i18n( "Preview Changes" ), u8( "adept_preview" ), 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(), "preview" ); - m_progressAction = new KToggleAction( + m_progressAction = new TDEToggleAction( i18n( "Show Last Download" ), u8( "adept_download_out" ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDownload() ), actionCollection(), "download_out" ); - m_commitProgressAction = new KToggleAction( + m_commitProgressAction = new TDEToggleAction( i18n( "Show Last DPkg Run" ), u8( "adept_commit_out" ), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleCommit() ), actionCollection(), "commit_out" ); - m_listAction = new KToggleAction( + m_listAction = new TDEToggleAction( i18n( "Show Package List" ), u8( "adept_packagelist" ), 0, TQT_TQOBJECT(this), TQT_SLOT( closeModes() ), actionCollection(), "packagelist" ); @@ -196,9 +196,9 @@ void TestApp::updateActionState() bool e = m_actionsEnabled; bool w = cache::Global::get().writeable(); component::State &s = cache::Global::get().state(); - KActionPtrList a = actionCollection()->actions(); + TDEActionPtrList a = actionCollection()->actions(); /* View menus seem to be BROKEN HERE?! */ - for (KActionPtrList::iterator i = a.begin(); i != a.end(); ++i) { + for (TDEActionPtrList::iterator i = a.begin(); i != a.end(); ++i) { if ( u8( (*i)->name() ) == u8( "update" ) ) { (*i)->setEnabled( e && w ); } else if ( u8( (*i)->name() ) == u8( "preview" ) ) { @@ -215,7 +215,7 @@ void TestApp::updateActionState() template< typename T, typename In > void TestApp::aptAction( In b, In e ) { - const KAction *a = dynamic_cast( sender() ); // HACK + const TDEAction *a = dynamic_cast( sender() ); // HACK typename T::Vector v = T::list(); for (typename T::Vector::iterator i = v.begin(); i != v.end(); ++i) { if( a->name() == i->name() ) { diff --git a/adept/manager/app.h b/adept/manager/app.h index 6a385b6..866b094 100644 --- a/adept/manager/app.h +++ b/adept/manager/app.h @@ -16,7 +16,7 @@ class TQVBox; class TQWidgetStack; class TQSplitter; -class KAction; +class TDEAction; namespace adept { class AcqProgressWidget; } @@ -24,7 +24,7 @@ class AcqProgressWidget; using namespace aptFront; using namespace adept; -class TestApp : public KMainWindow, Application { +class TestApp : public TDEMainWindow, Application { Q_OBJECT public: @@ -88,13 +88,13 @@ protected slots: protected: void updateActionState(); void guardLister( adept::Lister * ); - void addMode( Mode m, KToggleAction *a, TQWidget *w ) { + void addMode( Mode m, TDEToggleAction *a, TQWidget *w ) { m_modeActionMap[ m ] = a; m_modeWidgetMap[ m ] = w; a->setChecked( false ); } - KToggleAction *modeAction( Mode m ) { + TDEToggleAction *modeAction( Mode m ) { return m_modeActionMap[ m ]; } @@ -122,19 +122,19 @@ protected: adept::CommitProgress *m_commitProgress; // other stuff - std::vector m_actions; + std::vector m_actions; TQMap< TQString, TQString > m_icons; - KAction *m_undo, *m_redo; + TDEAction *m_undo, *m_redo; int m_rebuilds; bool m_actionsEnabled; - KAction *m_commit, *m_upgrade, *m_distUpgrade; - KToggleAction *m_sourcesAction, *m_commitProgressAction, *m_listAction, + TDEAction *m_commit, *m_upgrade, *m_distUpgrade; + TDEToggleAction *m_sourcesAction, *m_commitProgressAction, *m_listAction, *m_previewAction, *m_progressAction; - std::map< Mode, KToggleAction * > m_modeActionMap; + std::map< Mode, TDEToggleAction * > m_modeActionMap; std::map< Mode, TQWidget * > m_modeWidgetMap; - KToggleAction *m_modesClosed; + TDEToggleAction *m_modesClosed; private: template void plugAptActions(); // template void updateAptActions( In b, In e ); diff --git a/adept/notifier/app.cpp b/adept/notifier/app.cpp index 81fe41c..81cc7fd 100644 --- a/adept/notifier/app.cpp +++ b/adept/notifier/app.cpp @@ -43,7 +43,7 @@ TrayWindow::TrayWindow(TQWidget *parent, const char *name) // setPixmap( loadIcon( u8( "adept_notifier_warning" ) ) ); } -void TrayWindow::contextMenuAboutToShow( KPopupMenu *r ) { +void TrayWindow::contextMenuAboutToShow( TDEPopupMenu *r ) { kdDebug() << "TrayWindow::contextMenu()" << endl; r->clear(); m_about->plug( r ); diff --git a/adept/notifier/app.h b/adept/notifier/app.h index 6efdf36..4e073db 100644 --- a/adept/notifier/app.h +++ b/adept/notifier/app.h @@ -8,7 +8,7 @@ #include class TQWidget; -class KAction; +class TDEAction; // class TDEGlobalAccel; // the status indicator in system tray @@ -20,7 +20,7 @@ public: TrayWindow(TQWidget *parent=0, const char *name=0); void setAvailableUpdates( int n ); int updates() { return m_updates; } - void contextMenuAboutToShow ( KPopupMenu * ); + void contextMenuAboutToShow ( TDEPopupMenu * ); signals: void clicked(); void aboutSelected(); @@ -28,7 +28,7 @@ protected: void mouseReleaseEvent( TQMouseEvent * ); void resizeEvent( TQResizeEvent * ); int m_updates; - KAction *m_quit, *m_about; + TDEAction *m_quit, *m_about; }; // the apport indicator in system tray diff --git a/adept/updater/app.h b/adept/updater/app.h index 2935e2f..82696b6 100644 --- a/adept/updater/app.h +++ b/adept/updater/app.h @@ -15,7 +15,7 @@ class TQVBox; class TQWidgetStack; class TQSplitter; -class KAction; +class TDEAction; class KPushButton; namespace adept { class AcqProgressWidget; @@ -24,7 +24,7 @@ class AcqProgressWidget; using namespace aptFront; using namespace adept; -class TestApp : public KMainWindow, Application { +class TestApp : public TDEMainWindow, Application { Q_OBJECT public: @@ -68,9 +68,9 @@ protected: adept::Browser *m_list; // other stuff - std::vector m_actions; + std::vector m_actions; TQMap< TQString, TQString > m_icons; - KAction *m_undo, *m_redo; + TDEAction *m_undo, *m_redo; cache::component::History< cache::component::State > *m_history; };