TDE
/
adept
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/adept
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename a number of classes to enhance compatibility with KDE4

Browse Source
master
Timothy Pearson 12 years ago
parent dd1c3a7275
commit b3fda942e3
40 changed files with 138 additions and 138 deletions
Show Stats Download Patch File Download Diff File

10
adept/adept/acqprogress.cpp
Unescape View File

@ -29,8 +29,8 @@ using namespace std;
namespace adept { namespace adept {
AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit) AcqStatus::Item::Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit)
: KListViewItem( parent ) : TDEListViewItem( parent )
{ {
m_pbcol = 0; m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 ); m_prog = new ItemProgress( 0, 0 );
@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, alignment ); TDEListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }
} }
@ -110,7 +110,7 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
} }
AcqStatus::AcqStatus(TQWidget *parent, const char *name) 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; // m_lastItem = 0;
addColumn( i18n( "Progress" ) ); addColumn( i18n( "Progress" ) );
@ -135,7 +135,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
void AcqStatus::clear() void AcqStatus::clear()
{ {
KListView::clear(); TDEListView::clear();
m_idOffset += m_items.size(); m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already m_items.clear(); // got deleted by klistview already
} }

8
adept/adept/acqprogress.h
Unescape View File

@ -23,7 +23,7 @@ class TQGridLayout;
namespace adept { namespace adept {
class AcqStatus : public KListView, public aptFront::ProgressCallback class AcqStatus : public TDEListView, public aptFront::ProgressCallback
{ {
Q_OBJECT Q_OBJECT
@ -54,7 +54,7 @@ protected:
std::string m_status; std::string m_status;
int m_spin; int m_spin;
}; };
class Item : public KListViewItem { class Item : public TDEListViewItem {
protected: protected:
ItemProgress *m_prog; ItemProgress *m_prog;
int m_pbcol; int m_pbcol;
@ -62,7 +62,7 @@ protected:
pkgAcquire::ItemDesc m_item; pkgAcquire::ItemDesc m_item;
public: public:
Item (KListView *parent, pkgAcquire::ItemDesc &item, Item (TDEListView *parent, pkgAcquire::ItemDesc &item,
bool hit = false); bool hit = false);
virtual ~Item (); virtual ~Item ();
@ -75,7 +75,7 @@ protected:
void setStatus( const std::string &, int = 0 ); void setStatus( const std::string &, int = 0 );
void setup() { void setup() {
KListViewItem::setup(); TDEListViewItem::setup();
setHeight( height() + 6 ); setHeight( height() + 6 );
} }
}; };

2
adept/adept/dpkgpm-gui.h
Unescape View File

@ -12,7 +12,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <kdialogbase.h> #include <kdialogbase.h>
class KListBox; class TDEListBox;
namespace KParts { namespace KParts {
class Part; class Part;
} }

16
adept/adept/extendablelist.cpp
Unescape View File

@ -12,7 +12,7 @@
using namespace adept; using namespace adept;
ExtendableList::ExtendableList( TQWidget *p, const char *n ) ExtendableList::ExtendableList( TQWidget *p, const char *n )
: KListView( p, n ), : TDEListView( p, n ),
m_toggleColumn( 0 ), m_inDtor( false ), m_toggleColumn( 0 ), m_inDtor( false ),
m_extenderUpdateScheduled( false ), m_extenderUpdateScheduled( false ),
m_needSort( false ), m_needSort( false ),
@ -49,10 +49,10 @@ void ExtendableList::keyPressEvent( TQKeyEvent *e ) {
return item->showExtender(); return item->showExtender();
} }
} }
KListView::keyPressEvent( e ); TDEListView::keyPressEvent( e );
if ( e->key() == TQt::Key_Left || e->key() == TQt::Key_Right ) if ( e->key() == TQt::Key_Left || e->key() == TQt::Key_Right )
item->updateIcon(); item->updateIcon();
} else return KListView::keyPressEvent( e ); } else return TDEListView::keyPressEvent( e );
} }
void ExtendableList::openToplevel() { void ExtendableList::openToplevel() {
@ -129,25 +129,25 @@ void ExtendableList::delayedUpdateExtenders()
void ExtendableList::clear() void ExtendableList::clear()
{ {
kdDebug() << "ExtendableList::clear()" << endl; kdDebug() << "ExtendableList::clear()" << endl;
KListView::clear(); TDEListView::clear();
kdDebug() << "end of ExtendableList::clear()" << endl; kdDebug() << "end of ExtendableList::clear()" << endl;
} }
void ExtendableList::show() void ExtendableList::show()
{ {
KListView::show(); TDEListView::show();
updateExtenders(); updateExtenders();
} }
void ExtendableList::showEvent( TQShowEvent *e ) void ExtendableList::showEvent( TQShowEvent *e )
{ {
KListView::showEvent( e ); TDEListView::showEvent( e );
updateExtenders(); updateExtenders();
} }
void ExtendableList::resizeEvent( TQResizeEvent *e ) void ExtendableList::resizeEvent( TQResizeEvent *e )
{ {
KListView::resizeEvent( e ); TDEListView::resizeEvent( e );
updateExtenders(); updateExtenders();
// delayedUpdateExtenders(); // delayedUpdateExtenders();
} }
@ -298,7 +298,7 @@ void ExtendableItem::paintBranches( TQPainter *p,
{ {
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
KListViewItem::paintCell( &_p, cg, column, width, alignment ); TDEListViewItem::paintCell( &_p, cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} */ } */

16
adept/adept/extendablelist.h
Unescape View File

@ -17,7 +17,7 @@ class ExtendableItem;
class ExtendableList; class ExtendableList;
class ItemExtender; class ItemExtender;
class ExtendableList : public KListView { class ExtendableList : public TDEListView {
Q_OBJECT Q_OBJECT
public: public:
@ -65,27 +65,27 @@ protected:
bool m_extenderHighlight:1; bool m_extenderHighlight:1;
}; };
class ExtendableItem : public KListViewItem { class ExtendableItem : public TDEListViewItem {
public: public:
ExtendableItem( ExtendableList *l ) ExtendableItem( ExtendableList *l )
: KListViewItem( l ), m_extender( 0 ) { : TDEListViewItem( l ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableList *l, ExtendableItem *prev ) ExtendableItem( ExtendableList *l, ExtendableItem *prev )
: KListViewItem( l, prev ), m_extender( 0 ) { : TDEListViewItem( l, prev ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableItem *p, ExtendableItem *prev ) ExtendableItem( ExtendableItem *p, ExtendableItem *prev )
: KListViewItem( p, prev ), m_extender( 0 ) { : TDEListViewItem( p, prev ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableItem *p ) ExtendableItem( ExtendableItem *p )
: KListViewItem( p ), m_extender( 0 ) { : TDEListViewItem( p ), m_extender( 0 ) {
} }
virtual void setup() { virtual void setup() {
KListViewItem::setup(); TDEListViewItem::setup();
updateIcon(); updateIcon();
} }
void toggleExtender(); void toggleExtender();
@ -117,7 +117,7 @@ public:
virtual int compare( TQListViewItem *other, int col, bool ascending ) const; virtual int compare( TQListViewItem *other, int col, bool ascending ) const;
virtual ~ExtendableItem(); virtual ~ExtendableItem();
virtual void setHeight( int h ) { KListViewItem::setHeight( h ); } virtual void setHeight( int h ) { TDEListViewItem::setHeight( h ); }
protected: protected:
ItemExtender *m_extender; ItemExtender *m_extender;
}; };

2
adept/adept/filterlist.cpp
Unescape View File

@ -93,7 +93,7 @@ void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) {
m_itemsSeen = childCount(); m_itemsSeen = childCount();
updateHeight(); updateHeight();
} // hmm, doesn't work... bah :p } // 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 ) { void FilterList::plugLister( Lister *l ) {

2
adept/adept/filterlist.h
Unescape View File

@ -74,7 +74,7 @@ class FilterList : public ExtendableList
public: public:
friend class FilterItem; friend class FilterItem;
typedef predicate::Predicate< entity::Entity > Predicate; 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 ); FilterList( TQWidget *parent = 0, const char *name = 0 );
typedef predicate::And< entity::Entity > And; typedef predicate::And< entity::Entity > And;
void appendPredicate( Predicate p ); void appendPredicate( Predicate p );

4
adept/adept/lister.cpp
Unescape View File

@ -476,7 +476,7 @@ void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
alignment &= ~AlignVertical_Mask; alignment &= ~AlignVertical_Mask;
alignment |= AlignTop; alignment |= AlignTop;
} }
KListViewItem::paintCell( &_p, _cg, column, width, alignment ); TDEListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); 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 ); m_context = dynamic_cast< ListerItem * >( it );
VectorRange sel = selection(); VectorRange sel = selection();
// entity::Package p = (dynamic_cast<ListerItem *>(it)->entity()); // entity::Package p = (dynamic_cast<ListerItem *>(it)->entity());
KPopupMenu *m = new KPopupMenu (this); TDEPopupMenu *m = new TDEPopupMenu (this);
utils::Range< Actor > r = actor::Global< entity::Package >::list(); utils::Range< Actor > r = actor::Global< entity::Package >::list();
int id = 8; int id = 8;
try { try {

2
adept/adept/packagedetails.cpp
Unescape View File

@ -32,7 +32,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n )
m_fileListRunning( false ) m_fileListRunning( false )
{ {
m_toolbar->setIconSize( 22 ); 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( "back" ), BBack, false, i18n( "Back" ) );
m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) ); m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) );

2
adept/adept/packagedetails.h
Unescape View File

@ -13,7 +13,7 @@
#ifndef EPT_PACKGEDETAILS_H #ifndef EPT_PACKGEDETAILS_H
#define EPT_PACKGEDETAILS_H #define EPT_PACKGEDETAILS_H
class KToolBarButton; class TDEToolBarButton;
class TQThread; class TQThread;
namespace adept { namespace adept {

4
adept/adept/packagedetailsui.ui
Unescape View File

@ -25,7 +25,7 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KToolBar"> <widget class="TDEToolBar">
<property name="name"> <property name="name">
<cstring>m_toolbar</cstring> <cstring>m_toolbar</cstring>
</property> </property>
@ -458,7 +458,7 @@
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KToolBar</class> <class>TDEToolBar</class>
<header location="global">ktoolbar.h</header> <header location="global">ktoolbar.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>

6
adept/adept/sourceseditor.cpp
Unescape View File

@ -50,7 +50,7 @@ void SourcesEditor::newAdd()
void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) { void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) {
EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() ); EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() );
if (!s) return; 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( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 );
m->insertItem( i18n( "Clone" ), 1 ); m->insertItem( i18n( "Clone" ), 1 );
m->insertItem( i18n( "Remove" ), 2 ); 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 == 2) e.setDistribution( s );
if (c == 3) e.setComponents( s ); if (c == 3) e.setComponents( s );
setEntry( e ); 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, void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
@ -159,7 +159,7 @@ void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
if (!entry().enabled()) if (!entry().enabled())
c = TQt::gray; c = TQt::gray;
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }

10
adept/adept/sourceseditor.h
Unescape View File

@ -32,7 +32,7 @@ protected:
std::string m_filename; std::string m_filename;
}; };
class EntryItem : public KListViewItem { class EntryItem : public TDEListViewItem {
public: public:
Sources::Entry entry() const { Sources::Entry entry() const {
return m_entry; return m_entry;
@ -40,12 +40,12 @@ public:
void setEntry( const Sources::Entry &e ) { void setEntry( const Sources::Entry &e ) {
m_entry = e; m_entry = e;
} }
EntryItem( Sources::Entry e, KListView *v, EntryItem *prev ) EntryItem( Sources::Entry e, TDEListView *v, EntryItem *prev )
: KListViewItem( v, prev ), m_entry( e ) { : TDEListViewItem( v, prev ), m_entry( e ) {
init(); init();
} }
EntryItem( Sources::Entry e, KListView *v ) EntryItem( Sources::Entry e, TDEListView *v )
: KListViewItem( v ), m_entry( e ) { : TDEListViewItem( v ), m_entry( e ) {
init(); init();
} }
void init() { void init() {

2
adept/adept/sourceseditorui.ui
Unescape View File

@ -19,7 +19,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Type</string> <string>Type</string>

8
adept/adept/tagchooser.cpp
Unescape View File

@ -11,7 +11,7 @@
using namespace adept; using namespace adept;
FacetItem::FacetItem( TagChooser *t ) FacetItem::FacetItem( TagChooser *t )
: KListViewItem( t ) : TDEListViewItem( t )
{ {
} }
@ -25,12 +25,12 @@ void FacetItem::removeTag( TagItem::Tag t ) {
} }
TagItem::TagItem( FacetItem *p ) TagItem::TagItem( FacetItem *p )
: KListViewItem( p ), m_toplevel( false ) : TDEListViewItem( p ), m_toplevel( false )
{ {
} }
TagItem::TagItem( TagChooser *l ) 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 ) TagChooser::TagChooser( TQWidget *p, const char *n )
: KListView( p, n ) : TDEListView( p, n )
{ {
observeComponent< cache::component::PackageTags >(); observeComponent< cache::component::PackageTags >();
// addColumn( " ", 20 ); // addColumn( " ", 20 );

6
adept/adept/tagchooser.h
Unescape View File

@ -22,7 +22,7 @@ class FacetItem;
class FacetExtender; class FacetExtender;
class TagChooser; class TagChooser;
class TagItem : public KListViewItem { class TagItem : public TDEListViewItem {
public: public:
typedef ept::debtags::Tag Tag; typedef ept::debtags::Tag Tag;
virtual TQString text( int ) const; virtual TQString text( int ) const;
@ -35,7 +35,7 @@ protected:
Tag m_tag; Tag m_tag;
}; };
class FacetItem : public KListViewItem class FacetItem : public TDEListViewItem
{ {
public: public:
typedef ept::debtags::Facet Facet; typedef ept::debtags::Facet Facet;
@ -47,7 +47,7 @@ protected:
Facet m_facet; Facet m_facet;
}; };
class TagChooser : public KListView, public cache::Observer // ExtendableList class TagChooser : public TDEListView, public cache::Observer // ExtendableList
{ {
Q_OBJECT Q_OBJECT

4
adept/batch/app.h
Unescape View File

@ -18,7 +18,7 @@
class TQVBox; class TQVBox;
class TQWidgetStack; class TQWidgetStack;
class TQSplitter; class TQSplitter;
class KAction; class TDEAction;
class KPushButton; class KPushButton;
namespace adept { namespace adept {
class AcqProgressWidget; class AcqProgressWidget;
@ -27,7 +27,7 @@ class AcqProgressWidget;
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
class App : public KMainWindow, Application { class App : public TDEMainWindow, Application {
Q_OBJECT Q_OBJECT
public: public:

2
adept/installer/app.cpp
Unescape View File

@ -272,7 +272,7 @@ void App::setupActions()
KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() ); KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() );
m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() ); m_undo = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( undo() ), actionCollection() );
m_redo = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( redo() ), 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" ), i18n( "Review Changes" ), u8( "adept_preview" ),
0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(),
"review" ); "review" );

10
adept/installer/app.h
Unescape View File

@ -17,7 +17,7 @@
class TQVBox; class TQVBox;
class TQWidgetStack; class TQWidgetStack;
class TQSplitter; class TQSplitter;
class KAction; class TDEAction;
class KPushButton; class KPushButton;
class TDEProcess; class TDEProcess;
namespace adept { namespace adept {
@ -35,7 +35,7 @@ struct IconPolicy : GroupedDesktopSelector::IconPolicy {
virtual TQString iconForGroup( TQString ); virtual TQString iconForGroup( TQString );
}; };
class App : public KMainWindow, Application { class App : public TDEMainWindow, Application {
Q_OBJECT Q_OBJECT
public: public:
@ -97,10 +97,10 @@ protected:
adept::Browser *m_preview; adept::Browser *m_preview;
// other stuff // other stuff
std::vector<KAction *> m_actions; std::vector<TDEAction *> m_actions;
TQMap< TQString, TQString > m_icons; TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo; TDEAction *m_undo, *m_redo;
KToggleAction *m_previewAction; TDEToggleAction *m_previewAction;
State m_state, m_lastState; State m_state, m_lastState;
typedef std::list< component::State::Request > RequestList; typedef std::list< component::State::Request > RequestList;

10
adept/libadept/acqprogress.cpp
Unescape View File

@ -29,8 +29,8 @@ using namespace std;
namespace adept { namespace adept {
AcqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit) AcqStatus::Item::Item (TDEListView *parent, pkgAcquire::ItemDesc &item, bool hit)
: KListViewItem( parent ) : TDEListViewItem( parent )
{ {
m_pbcol = 0; m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 ); m_prog = new ItemProgress( 0, 0 );
@ -95,7 +95,7 @@ void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, alignment ); TDEListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }
} }
@ -110,7 +110,7 @@ AcqStatus::Item *AcqStatus::findItem (pkgAcquire::ItemDesc &Itm)
} }
AcqStatus::AcqStatus(TQWidget *parent, const char *name) 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; // m_lastItem = 0;
addColumn( i18n( "Progress" ) ); addColumn( i18n( "Progress" ) );
@ -135,7 +135,7 @@ void AcqStatus::Done (pkgAcquire::ItemDesc &Itm)
void AcqStatus::clear() void AcqStatus::clear()
{ {
KListView::clear(); TDEListView::clear();
m_idOffset += m_items.size(); m_idOffset += m_items.size();
m_items.clear(); // got deleted by klistview already m_items.clear(); // got deleted by klistview already
} }

8
adept/libadept/acqprogress.h
Unescape View File

@ -23,7 +23,7 @@ class TQGridLayout;
namespace adept { namespace adept {
class AcqStatus : public KListView, public aptFront::ProgressCallback class AcqStatus : public TDEListView, public aptFront::ProgressCallback
{ {
Q_OBJECT Q_OBJECT
@ -54,7 +54,7 @@ protected:
std::string m_status; std::string m_status;
int m_spin; int m_spin;
}; };
class Item : public KListViewItem { class Item : public TDEListViewItem {
protected: protected:
ItemProgress *m_prog; ItemProgress *m_prog;
int m_pbcol; int m_pbcol;
@ -62,7 +62,7 @@ protected:
pkgAcquire::ItemDesc m_item; pkgAcquire::ItemDesc m_item;
public: public:
Item (KListView *parent, pkgAcquire::ItemDesc &item, Item (TDEListView *parent, pkgAcquire::ItemDesc &item,
bool hit = false); bool hit = false);
virtual ~Item (); virtual ~Item ();
@ -75,7 +75,7 @@ protected:
void setStatus( const std::string &, int = 0 ); void setStatus( const std::string &, int = 0 );
void setup() { void setup() {
KListViewItem::setup(); TDEListViewItem::setup();
setHeight( height() + 6 ); setHeight( height() + 6 );
} }
}; };

2
adept/libadept/dpkgpm-gui.h
Unescape View File

@ -12,7 +12,7 @@
#include <kprocess.h> #include <kprocess.h>
#include <kdialogbase.h> #include <kdialogbase.h>
class KListBox; class TDEListBox;
namespace KParts { namespace KParts {
class Part; class Part;
} }

14
adept/libadept/extendablelist.cpp
Unescape View File

@ -12,7 +12,7 @@
using namespace adept; using namespace adept;
ExtendableList::ExtendableList( TQWidget *p, const char *n ) ExtendableList::ExtendableList( TQWidget *p, const char *n )
: KListView( p, n ), : TDEListView( p, n ),
m_toggleColumn( 0 ), m_inDtor( false ), m_toggleColumn( 0 ), m_inDtor( false ),
m_extenderUpdateScheduled( false ), m_extenderUpdateScheduled( false ),
m_needSort( false ), m_needSort( false ),
@ -48,7 +48,7 @@ void ExtendableList::keyPressEvent( TQKeyEvent *e ) {
return item->showExtender(); return item->showExtender();
} }
} }
return KListView::keyPressEvent( e ); return TDEListView::keyPressEvent( e );
} }
void ExtendableList::openToplevel() { void ExtendableList::openToplevel() {
@ -125,25 +125,25 @@ void ExtendableList::delayedUpdateExtenders()
void ExtendableList::clear() void ExtendableList::clear()
{ {
kdDebug() << "ExtendableList::clear()" << endl; kdDebug() << "ExtendableList::clear()" << endl;
KListView::clear(); TDEListView::clear();
kdDebug() << "end of ExtendableList::clear()" << endl; kdDebug() << "end of ExtendableList::clear()" << endl;
} }
void ExtendableList::show() void ExtendableList::show()
{ {
KListView::show(); TDEListView::show();
updateExtenders(); updateExtenders();
} }
void ExtendableList::showEvent( TQShowEvent *e ) void ExtendableList::showEvent( TQShowEvent *e )
{ {
KListView::showEvent( e ); TDEListView::showEvent( e );
updateExtenders(); updateExtenders();
} }
void ExtendableList::resizeEvent( TQResizeEvent *e ) void ExtendableList::resizeEvent( TQResizeEvent *e )
{ {
KListView::resizeEvent( e ); TDEListView::resizeEvent( e );
updateExtenders(); updateExtenders();
// delayedUpdateExtenders(); // delayedUpdateExtenders();
} }
@ -291,7 +291,7 @@ void ExtendableItem::paintBranches( TQPainter *p,
{ {
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
KListViewItem::paintCell( &_p, cg, column, width, alignment ); TDEListViewItem::paintCell( &_p, cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} */ } */

16
adept/libadept/extendablelist.h
Unescape View File

@ -17,7 +17,7 @@ class ExtendableItem;
class ExtendableList; class ExtendableList;
class ItemExtender; class ItemExtender;
class ExtendableList : public KListView { class ExtendableList : public TDEListView {
Q_OBJECT Q_OBJECT
public: public:
@ -65,27 +65,27 @@ protected:
bool m_extenderHighlight:1; bool m_extenderHighlight:1;
}; };
class ExtendableItem : public KListViewItem { class ExtendableItem : public TDEListViewItem {
public: public:
ExtendableItem( ExtendableList *l ) ExtendableItem( ExtendableList *l )
: KListViewItem( l ), m_extender( 0 ) { : TDEListViewItem( l ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableList *l, ExtendableItem *prev ) ExtendableItem( ExtendableList *l, ExtendableItem *prev )
: KListViewItem( l, prev ), m_extender( 0 ) { : TDEListViewItem( l, prev ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableItem *p, ExtendableItem *prev ) ExtendableItem( ExtendableItem *p, ExtendableItem *prev )
: KListViewItem( p, prev ), m_extender( 0 ) { : TDEListViewItem( p, prev ), m_extender( 0 ) {
} }
ExtendableItem( ExtendableItem *p ) ExtendableItem( ExtendableItem *p )
: KListViewItem( p ), m_extender( 0 ) { : TDEListViewItem( p ), m_extender( 0 ) {
} }
virtual void setup() { virtual void setup() {
KListViewItem::setup(); TDEListViewItem::setup();
updateIcon(); updateIcon();
} }
void toggleExtender(); void toggleExtender();
@ -116,7 +116,7 @@ public:
virtual int compare( TQListViewItem *other, int col, bool ascending ) const; virtual int compare( TQListViewItem *other, int col, bool ascending ) const;
virtual ~ExtendableItem(); virtual ~ExtendableItem();
virtual void setHeight( int h ) { KListViewItem::setHeight( h ); } virtual void setHeight( int h ) { TDEListViewItem::setHeight( h ); }
protected: protected:
ItemExtender *m_extender; ItemExtender *m_extender;
}; };

2
adept/libadept/filterlist.cpp
Unescape View File

@ -92,7 +92,7 @@ void FilterList::drawContents( TQPainter *p, int a, int b, int c, int d ) {
m_itemsSeen = childCount(); m_itemsSeen = childCount();
updateHeight(); updateHeight();
} // hmm, doesn't work... bah :p } // 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 ) { void FilterList::plugLister( Lister *l ) {

2
adept/libadept/filterlist.h
Unescape View File

@ -67,7 +67,7 @@ class FilterList : public ExtendableList
public: public:
friend class FilterItem; friend class FilterItem;
typedef predicate::Predicate< entity::Entity > Predicate; 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 ); FilterList( TQWidget *parent = 0, const char *name = 0 );
typedef predicate::And< entity::Entity > And; typedef predicate::And< entity::Entity > And;
void appendPredicate( Predicate p ); void appendPredicate( Predicate p );

4
adept/libadept/lister.cpp
Unescape View File

@ -406,7 +406,7 @@ void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg,
c = actionColor( p ); c = actionColor( p );
} }
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm ); 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 ); m_context = dynamic_cast< ListerItem * >( it );
VectorRange sel = selection(); VectorRange sel = selection();
// entity::Package p = (dynamic_cast<ListerItem *>(it)->entity()); // entity::Package p = (dynamic_cast<ListerItem *>(it)->entity());
KPopupMenu *m = new KPopupMenu (this); TDEPopupMenu *m = new TDEPopupMenu (this);
utils::Range< Actor > r = actor::Global< entity::Package >::list(); utils::Range< Actor > r = actor::Global< entity::Package >::list();
int id = 8; int id = 8;
try { try {

2
adept/libadept/packagedetails.cpp
Unescape View File

@ -29,7 +29,7 @@ PackageDetails::PackageDetails( TQWidget *w, const char *n )
m_fileListRunning( false ) m_fileListRunning( false )
{ {
m_toolbar->setIconSize( 22 ); 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( "back" ), BBack, false, i18n( "Back" ) );
m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) ); m_toolbar->insertButton( u8( "forward" ), BForward, false, i18n( "Forward" ) );

2
adept/libadept/packagedetails.h
Unescape View File

@ -11,7 +11,7 @@
#ifndef EPT_PACKGEDETAILS_H #ifndef EPT_PACKGEDETAILS_H
#define EPT_PACKGEDETAILS_H #define EPT_PACKGEDETAILS_H
class KToolBarButton; class TDEToolBarButton;
class TQThread; class TQThread;
namespace adept { namespace adept {

4
adept/libadept/packagedetailsui.ui
Unescape View File

@ -25,7 +25,7 @@
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KToolBar"> <widget class="TDEToolBar">
<property name="name"> <property name="name">
<cstring>m_toolbar</cstring> <cstring>m_toolbar</cstring>
</property> </property>
@ -416,7 +416,7 @@
<pixmap>image0</pixmap> <pixmap>image0</pixmap>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>KToolBar</class> <class>TDEToolBar</class>
<header location="global">ktoolbar.h</header> <header location="global">ktoolbar.h</header>
<sizehint> <sizehint>
<width>-1</width> <width>-1</width>

6
adept/libadept/sourceseditor.cpp
Unescape View File

@ -50,7 +50,7 @@ void SourcesEditor::newAdd()
void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) { void SourcesEditor::contextMenu( TQListViewItem *, const TQPoint &pt ) {
EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() ); EntryItem *s = dynamic_cast< EntryItem * >( m_list->selectedItem() );
if (!s) return; 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( s->entry().enabled() ? i18n( "Disable" ) : i18n( "Enable" ), 0 );
m->insertItem( i18n( "Clone" ), 1 ); m->insertItem( i18n( "Clone" ), 1 );
m->insertItem( i18n( "Remove" ), 2 ); 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 == 2) e.setDistribution( s );
if (c == 3) e.setComponents( s ); if (c == 3) e.setComponents( s );
setEntry( e ); 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, void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
@ -159,7 +159,7 @@ void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
if (!entry().enabled()) if (!entry().enabled())
c = TQt::gray; c = TQt::gray;
_cg.setColor( TQColorGroup::Text, c ); _cg.setColor( TQColorGroup::Text, c );
KListViewItem::paintCell( &_p, _cg, column, width, AlignTop ); TDEListViewItem::paintCell( &_p, _cg, column, width, AlignTop );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }

10
adept/libadept/sourceseditor.h
Unescape View File

@ -31,7 +31,7 @@ protected:
std::string m_filename; std::string m_filename;
}; };
class EntryItem : public KListViewItem { class EntryItem : public TDEListViewItem {
public: public:
Sources::Entry entry() const { Sources::Entry entry() const {
return m_entry; return m_entry;
@ -39,12 +39,12 @@ public:
void setEntry( const Sources::Entry &e ) { void setEntry( const Sources::Entry &e ) {
m_entry = e; m_entry = e;
} }
EntryItem( Sources::Entry e, KListView *v, EntryItem *prev ) EntryItem( Sources::Entry e, TDEListView *v, EntryItem *prev )
: KListViewItem( v, prev ), m_entry( e ) { : TDEListViewItem( v, prev ), m_entry( e ) {
init(); init();
} }
EntryItem( Sources::Entry e, KListView *v ) EntryItem( Sources::Entry e, TDEListView *v )
: KListViewItem( v ), m_entry( e ) { : TDEListViewItem( v ), m_entry( e ) {
init(); init();
} }
void init() { void init() {

2
adept/libadept/sourceseditorui.ui
Unescape View File

@ -19,7 +19,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Type</string> <string>Type</string>

8
adept/libadept/tagchooser.cpp
Unescape View File

@ -10,7 +10,7 @@
using namespace adept; using namespace adept;
FacetItem::FacetItem( TagChooser *t ) FacetItem::FacetItem( TagChooser *t )
: KListViewItem( t ) : TDEListViewItem( t )
{ {
} }
@ -24,12 +24,12 @@ void FacetItem::removeTag( TagItem::Tag t ) {
} }
TagItem::TagItem( FacetItem *p ) TagItem::TagItem( FacetItem *p )
: KListViewItem( p ), m_toplevel( false ) : TDEListViewItem( p ), m_toplevel( false )
{ {
} }
TagItem::TagItem( TagChooser *l ) 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 ) TagChooser::TagChooser( TQWidget *p, const char *n )
: KListView( p, n ) : TDEListView( p, n )
{ {
observeComponent< cache::component::PackageTags >(); observeComponent< cache::component::PackageTags >();
// addColumn( " ", 20 ); // addColumn( " ", 20 );

6
adept/libadept/tagchooser.h
Unescape View File

@ -21,7 +21,7 @@ class FacetItem;
class FacetExtender; class FacetExtender;
class TagChooser; class TagChooser;
class TagItem : public KListViewItem { class TagItem : public TDEListViewItem {
public: public:
typedef cache::entity::Tag Tag; typedef cache::entity::Tag Tag;
virtual TQString text( int ) const; virtual TQString text( int ) const;
@ -34,7 +34,7 @@ protected:
Tag m_tag; Tag m_tag;
}; };
class FacetItem : public KListViewItem class FacetItem : public TDEListViewItem
{ {
public: public:
typedef cache::entity::Facet Facet; typedef cache::entity::Facet Facet;
@ -46,7 +46,7 @@ protected:
Facet m_facet; Facet m_facet;
}; };
class TagChooser : public KListView, public cache::Observer // ExtendableList class TagChooser : public TDEListView, public cache::Observer // ExtendableList
{ {
Q_OBJECT Q_OBJECT

26
adept/manager/app.cpp
Unescape View File

@ -107,49 +107,49 @@ void TestApp::delayed() {
void TestApp::setupActions() void TestApp::setupActions()
{ {
(new KAction( (new TDEAction(
i18n( "Fetch Updates" ), u8( "adept_update" ), i18n( "Fetch Updates" ), u8( "adept_update" ),
0, TQT_TQOBJECT(this), TQT_SLOT( update() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( update() ), actionCollection(),
"update" ))->setEnabled( false ); "update" ))->setEnabled( false );
(new KAction( (new TDEAction(
i18n( "Reload Cache" ), u8( "adept_reload" ), i18n( "Reload Cache" ), u8( "adept_reload" ),
0, TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(),
"reload" ))->setEnabled( false ); "reload" ))->setEnabled( false );
m_upgrade = new KAction( m_upgrade = new TDEAction(
i18n( "Safe Upgrade" ), u8( "adept_upgrade" ), i18n( "Safe Upgrade" ), u8( "adept_upgrade" ),
0, TQT_TQOBJECT(this), TQT_SLOT( upgrade() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( upgrade() ), actionCollection(),
"upgrade" ); "upgrade" );
m_distUpgrade = new KAction( m_distUpgrade = new TDEAction(
i18n( "Full Upgrade" ), u8( "adept_distupgrade" ), i18n( "Full Upgrade" ), u8( "adept_distupgrade" ),
0, TQT_TQOBJECT(this), TQT_SLOT( distUpgrade() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( distUpgrade() ), actionCollection(),
"dist-upgrade" ); "dist-upgrade" );
m_commit = new KAction( m_commit = new TDEAction(
i18n( "Apply Changes" ), u8( "adept_commit" ), i18n( "Apply Changes" ), u8( "adept_commit" ),
0, TQT_TQOBJECT(this), TQT_SLOT( commit() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( commit() ), actionCollection(),
"commit" ); "commit" );
m_sourcesAction = new KToggleAction( m_sourcesAction = new TDEToggleAction(
i18n( "Manage Repositories" ), u8( "adept_sourceseditor" ), i18n( "Manage Repositories" ), u8( "adept_sourceseditor" ),
0, TQT_TQOBJECT(this), TQT_SLOT( toggleSources() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleSources() ), actionCollection(),
"sourceseditor" ); "sourceseditor" );
m_previewAction = new KToggleAction( m_previewAction = new TDEToggleAction(
i18n( "Preview Changes" ), u8( "adept_preview" ), i18n( "Preview Changes" ), u8( "adept_preview" ),
0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( togglePreview() ), actionCollection(),
"preview" ); "preview" );
m_progressAction = new KToggleAction( m_progressAction = new TDEToggleAction(
i18n( "Show Last Download" ), u8( "adept_download_out" ), i18n( "Show Last Download" ), u8( "adept_download_out" ),
0, TQT_TQOBJECT(this), TQT_SLOT( toggleDownload() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleDownload() ), actionCollection(),
"download_out" ); "download_out" );
m_commitProgressAction = new KToggleAction( m_commitProgressAction = new TDEToggleAction(
i18n( "Show Last DPkg Run" ), u8( "adept_commit_out" ), i18n( "Show Last DPkg Run" ), u8( "adept_commit_out" ),
0, TQT_TQOBJECT(this), TQT_SLOT( toggleCommit() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( toggleCommit() ), actionCollection(),
"commit_out" ); "commit_out" );
m_listAction = new KToggleAction( m_listAction = new TDEToggleAction(
i18n( "Show Package List" ), u8( "adept_packagelist" ), i18n( "Show Package List" ), u8( "adept_packagelist" ),
0, TQT_TQOBJECT(this), TQT_SLOT( closeModes() ), actionCollection(), 0, TQT_TQOBJECT(this), TQT_SLOT( closeModes() ), actionCollection(),
"packagelist" ); "packagelist" );
@ -196,9 +196,9 @@ void TestApp::updateActionState()
bool e = m_actionsEnabled; bool e = m_actionsEnabled;
bool w = cache::Global::get().writeable(); bool w = cache::Global::get().writeable();
component::State &s = cache::Global::get().state(); component::State &s = cache::Global::get().state();
KActionPtrList a = actionCollection()->actions(); TDEActionPtrList a = actionCollection()->actions();
/* View menus seem to be BROKEN HERE?! */ /* 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" ) ) { if ( u8( (*i)->name() ) == u8( "update" ) ) {
(*i)->setEnabled( e && w ); (*i)->setEnabled( e && w );
} else if ( u8( (*i)->name() ) == u8( "preview" ) ) { } else if ( u8( (*i)->name() ) == u8( "preview" ) ) {
@ -215,7 +215,7 @@ void TestApp::updateActionState()
template< typename T, typename In > template< typename T, typename In >
void TestApp::aptAction( In b, In e ) { void TestApp::aptAction( In b, In e ) {
const KAction *a = dynamic_cast<const KAction *>( sender() ); // HACK const TDEAction *a = dynamic_cast<const TDEAction *>( sender() ); // HACK
typename T::Vector v = T::list(); typename T::Vector v = T::list();
for (typename T::Vector::iterator i = v.begin(); i != v.end(); ++i) { for (typename T::Vector::iterator i = v.begin(); i != v.end(); ++i) {
if( a->name() == i->name() ) { if( a->name() == i->name() ) {

20
adept/manager/app.h
Unescape View File

@ -16,7 +16,7 @@
class TQVBox; class TQVBox;
class TQWidgetStack; class TQWidgetStack;
class TQSplitter; class TQSplitter;
class KAction; class TDEAction;
namespace adept { namespace adept {
class AcqProgressWidget; class AcqProgressWidget;
} }
@ -24,7 +24,7 @@ class AcqProgressWidget;
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
class TestApp : public KMainWindow, Application { class TestApp : public TDEMainWindow, Application {
Q_OBJECT Q_OBJECT
public: public:
@ -88,13 +88,13 @@ protected slots:
protected: protected:
void updateActionState(); void updateActionState();
void guardLister( adept::Lister * ); 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_modeActionMap[ m ] = a;
m_modeWidgetMap[ m ] = w; m_modeWidgetMap[ m ] = w;
a->setChecked( false ); a->setChecked( false );
} }
KToggleAction *modeAction( Mode m ) { TDEToggleAction *modeAction( Mode m ) {
return m_modeActionMap[ m ]; return m_modeActionMap[ m ];
} }
@ -122,19 +122,19 @@ protected:
adept::CommitProgress *m_commitProgress; adept::CommitProgress *m_commitProgress;
// other stuff // other stuff
std::vector<KAction *> m_actions; std::vector<TDEAction *> m_actions;
TQMap< TQString, TQString > m_icons; TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo; TDEAction *m_undo, *m_redo;
int m_rebuilds; int m_rebuilds;
bool m_actionsEnabled; bool m_actionsEnabled;
KAction *m_commit, *m_upgrade, *m_distUpgrade; TDEAction *m_commit, *m_upgrade, *m_distUpgrade;
KToggleAction *m_sourcesAction, *m_commitProgressAction, *m_listAction, TDEToggleAction *m_sourcesAction, *m_commitProgressAction, *m_listAction,
*m_previewAction, *m_progressAction; *m_previewAction, *m_progressAction;
std::map< Mode, KToggleAction * > m_modeActionMap; std::map< Mode, TDEToggleAction * > m_modeActionMap;
std::map< Mode, TQWidget * > m_modeWidgetMap; std::map< Mode, TQWidget * > m_modeWidgetMap;
KToggleAction *m_modesClosed; TDEToggleAction *m_modesClosed;
private: private:
template<typename T> void plugAptActions(); template<typename T> void plugAptActions();
// template<typename T, typename In> void updateAptActions( In b, In e ); // template<typename T, typename In> void updateAptActions( In b, In e );

2
adept/notifier/app.cpp
Unescape View File

@ -43,7 +43,7 @@ TrayWindow::TrayWindow(TQWidget *parent, const char *name)
// setPixmap( loadIcon( u8( "adept_notifier_warning" ) ) ); // setPixmap( loadIcon( u8( "adept_notifier_warning" ) ) );
} }
void TrayWindow::contextMenuAboutToShow( KPopupMenu *r ) { void TrayWindow::contextMenuAboutToShow( TDEPopupMenu *r ) {
kdDebug() << "TrayWindow::contextMenu()" << endl; kdDebug() << "TrayWindow::contextMenu()" << endl;
r->clear(); r->clear();
m_about->plug( r ); m_about->plug( r );

6
adept/notifier/app.h
Unescape View File

@ -8,7 +8,7 @@
#include <kprocess.h> #include <kprocess.h>
class TQWidget; class TQWidget;
class KAction; class TDEAction;
// class TDEGlobalAccel; // class TDEGlobalAccel;
// the status indicator in system tray // the status indicator in system tray
@ -20,7 +20,7 @@ public:
TrayWindow(TQWidget *parent=0, const char *name=0); TrayWindow(TQWidget *parent=0, const char *name=0);
void setAvailableUpdates( int n ); void setAvailableUpdates( int n );
int updates() { return m_updates; } int updates() { return m_updates; }
void contextMenuAboutToShow ( KPopupMenu * ); void contextMenuAboutToShow ( TDEPopupMenu * );
signals: signals:
void clicked(); void clicked();
void aboutSelected(); void aboutSelected();
@ -28,7 +28,7 @@ protected:
void mouseReleaseEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * );
void resizeEvent( TQResizeEvent * ); void resizeEvent( TQResizeEvent * );
int m_updates; int m_updates;
KAction *m_quit, *m_about; TDEAction *m_quit, *m_about;
}; };
// the apport indicator in system tray // the apport indicator in system tray

8
adept/updater/app.h
Unescape View File

@ -15,7 +15,7 @@
class TQVBox; class TQVBox;
class TQWidgetStack; class TQWidgetStack;
class TQSplitter; class TQSplitter;
class KAction; class TDEAction;
class KPushButton; class KPushButton;
namespace adept { namespace adept {
class AcqProgressWidget; class AcqProgressWidget;
@ -24,7 +24,7 @@ class AcqProgressWidget;
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
class TestApp : public KMainWindow, Application { class TestApp : public TDEMainWindow, Application {
Q_OBJECT Q_OBJECT
public: public:
@ -68,9 +68,9 @@ protected:
adept::Browser *m_list; adept::Browser *m_list;
// other stuff // other stuff
std::vector<KAction *> m_actions; std::vector<TDEAction *> m_actions;
TQMap< TQString, TQString > m_icons; TQMap< TQString, TQString > m_icons;
KAction *m_undo, *m_redo; TDEAction *m_undo, *m_redo;
cache::component::History< cache::component::State > *m_history; cache::component::History< cache::component::State > *m_history;
}; };

Write Preview
Loading…
Cancel
Save