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

rename the following methods:

Browse Source 
tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/adept@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 22cbf2e118
commit b114f079ee
47 changed files with 203 additions and 203 deletions
Show Stats Download Patch File Download Diff File

12
adept/adept/acqprogress.cpp
Unescape View File

@ -29,8 +29,8 @@ using namespace std;
namespace adept { namespace adept {
AcqtqStatus::Item::Item (KListView *tqparent, pkgAcquire::ItemDesc &item, bool hit) AcqtqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
: KListViewItem( tqparent ) : KListViewItem( parent )
{ {
m_pbcol = 0; m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 ); m_prog = new ItemProgress( 0, 0 );
@ -109,8 +109,8 @@ AcqtqStatus::Item *AcqtqStatus::findItem (pkgAcquire::ItemDesc &Itm)
return m_items[ Itm.Owner->ID - m_idOffset ]; return m_items[ Itm.Owner->ID - m_idOffset ];
} }
AcqtqStatus::AcqtqStatus(TQWidget *tqparent, const char *name) AcqtqStatus::AcqtqStatus(TQWidget *parent, const char *name)
: KListView (tqparent, name), m_idOffset( 0 ), m_continue( true ) : KListView (parent, name), m_idOffset( 0 ), m_continue( true )
{ {
// m_lastItem = 0; // m_lastItem = 0;
addColumn( i18n( "Progress" ) ); addColumn( i18n( "Progress" ) );
@ -266,8 +266,8 @@ void AcqtqStatus::cancel()
m_continue = false; m_continue = false;
} }
AcqStatusDialog::AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal) AcqStatusDialog::AcqStatusDialog (TQWidget *parent, const char *name, bool modal)
: KDialogBase( tqparent, name, modal, : KDialogBase( parent, name, modal,
u8( "progress dialog (FIXME: waiting for headers, done)" ), u8( "progress dialog (FIXME: waiting for headers, done)" ),
Ok|Cancel, Cancel, true ) Ok|Cancel, Cancel, true )
{ {

10
adept/adept/acqprogress.h
Unescape View File

@ -30,8 +30,8 @@ class AcqtqStatus : public KListView, public aptFront::ProgressCallback
protected: protected:
class ItemProgress: public KProgress { class ItemProgress: public KProgress {
public: public:
ItemProgress( TQWidget *tqparent, const char *name = 0 ) ItemProgress( TQWidget *parent, const char *name = 0 )
: KProgress( tqparent, name ), m_spin( 0 ) {} : KProgress( parent, name ), m_spin( 0 ) {}
void settqStatus( const std::string &s, void settqStatus( const std::string &s,
int prog = 0 ) { int prog = 0 ) {
m_status = s; m_status = s;
@ -62,7 +62,7 @@ protected:
pkgAcquire::ItemDesc m_item; pkgAcquire::ItemDesc m_item;
public: public:
Item (KListView *tqparent, pkgAcquire::ItemDesc &item, Item (KListView *parent, pkgAcquire::ItemDesc &item,
bool hit = false); bool hit = false);
virtual ~Item (); virtual ~Item ();
@ -88,7 +88,7 @@ public:
enum tqStatus { StWaiting, StDownloading, StDone }; enum tqStatus { StWaiting, StDownloading, StDone };
AcqtqStatus (TQWidget *tqparent, const char *name); AcqtqStatus (TQWidget *parent, const char *name);
Item *findItem (pkgAcquire::ItemDesc &Itm); Item *findItem (pkgAcquire::ItemDesc &Itm);
virtual bool MediaChange (string Media,string Drive); virtual bool MediaChange (string Media,string Drive);
@ -121,7 +121,7 @@ protected:
aptFront::SharedPtr<AcqtqStatus> m_status; aptFront::SharedPtr<AcqtqStatus> m_status;
public: public:
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); }; aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal); AcqStatusDialog (TQWidget *parent, const char *name, bool modal);
public slots: public slots:
void statusChange (AcqtqStatus::tqStatus st); void statusChange (AcqtqStatus::tqStatus st);
}; };

4
adept/adept/acqprogresswidget.cpp
Unescape View File

@ -7,8 +7,8 @@
using namespace adept; using namespace adept;
AcqProgressWidget::AcqProgressWidget( TQWidget *tqparent, const char *name ) AcqProgressWidget::AcqProgressWidget( TQWidget *parent, const char *name )
: AcqProgressWidgetUi( tqparent, name ) : AcqProgressWidgetUi( parent, name )
{ {
m_statusRef = m_status; m_statusRef = m_status;
m_progress->setTotalSteps( 100 ); m_progress->setTotalSteps( 100 );

2
adept/adept/acqprogresswidget.h
Unescape View File

@ -16,7 +16,7 @@ class AcqProgressWidget : public AcqProgressWidgetUi {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
AcqProgressWidget (TQWidget *tqparent = 0, const char *name = 0); AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); }; aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
public slots: public slots:
void statusChange( AcqtqStatus::tqStatus ); void statusChange( AcqtqStatus::tqStatus );

4
adept/adept/application.cpp
Unescape View File

@ -31,8 +31,8 @@ using namespace cache;
#include <tqstringlist.h> #include <tqstringlist.h>
#define DPKG_FIXER_ARGS TQStringList::split(TQString(" "), TQString("dpkg --configure -a"), false) #define DPKG_FIXER_ARGS TQStringList::split(TQString(" "), TQString("dpkg --configure -a"), false)
DpkgFixer::DpkgFixer(struct Application* tqparent) DpkgFixer::DpkgFixer(struct Application* parent)
: m_parent(tqparent) : m_parent(parent)
{ {
m_fixer = 0; m_fixer = 0;
m_waiter = 0; m_waiter = 0;

2
adept/adept/changelog.h
Unescape View File

@ -29,7 +29,7 @@ namespace adept {
// Give me the changelog's URL // Give me the changelog's URL
TQString changelogUrl(); TQString changelogUrl();
void setParent(entity::Package tqparent) { m_pkg = tqparent; } void setParent(entity::Package parent) { m_pkg = parent; }
signals: signals:
void changelogNeeded(); void changelogNeeded();
void changelogReady(TQString content); void changelogReady(TQString content);

4
adept/adept/desktoplist.cpp
Unescape View File

@ -138,8 +138,8 @@ void DesktopEntry::notifyPostChange() {
m_check->blockSignals( false ); m_check->blockSignals( false );
} }
DesktopList::DesktopList( TQWidget *tqparent, const char *name ) DesktopList::DesktopList( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), m_polishing( 0 ), m_displayCheckboxes( true ) : ExtendableList( parent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
{ {
observeComponent< component::State >(); observeComponent< component::State >();
addColumn( i18n( "Application" ) ); addColumn( i18n( "Application" ) );

2
adept/adept/desktoplist.h
Unescape View File

@ -27,7 +27,7 @@ class DesktopList : public ExtendableList, public cache::Observer
TQ_OBJECT TQ_OBJECT
public: public:
typedef utils::Range< entity::Desktop > Range; typedef utils::Range< entity::Desktop > Range;
DesktopList( TQWidget *tqparent = 0, const char *name = 0 ); DesktopList( TQWidget *parent = 0, const char *name = 0 );
void insertRange( Range ); void insertRange( Range );
TQPixmap emptyIcon() { return m_emptyIcon; } TQPixmap emptyIcon() { return m_emptyIcon; }
void polishing(); void polishing();

4
adept/adept/easytagfilter.cpp
Unescape View File

@ -18,8 +18,8 @@ static void fillCombo( TQComboBox *c, const std::string f ) {
} }
} }
EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *tqparent, const char *name ) EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *parent, const char *name )
: EasyTagFilterUi( tqparent, name ) : EasyTagFilterUi( parent, name )
{ {
fillCombo( m_use, "use" ); fillCombo( m_use, "use" );
fillCombo( m_interface, "interface" ); fillCombo( m_interface, "interface" );

2
adept/adept/easytagfilter.h
Unescape View File

@ -82,7 +82,7 @@ class EasyTagFilterWidget : public EasyTagFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
EasyTagFilterWidget( TQWidget *tqparent, const char *name = 0 ); EasyTagFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

8
adept/adept/extendablelist.cpp
Unescape View File

@ -77,7 +77,7 @@ int ExtendableList::extenderOffset( ExtendableItem *i )
x += i->pixmap( m_toggleColumn )->width(); x += i->pixmap( m_toggleColumn )->width();
if ( rootIsDecorated() ) if ( rootIsDecorated() )
x += treeStepSize(); x += treeStepSize();
if ( i->tqparent() ) if ( i->parent() )
x += treeStepSize(); x += treeStepSize();
} }
@ -92,7 +92,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
// get at it (since setContentsPos in TQListView calls it // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() ); setContentsPos( contentsX(), contentsY() );
if ( !i->isVisible() || ( i->tqparent() && !i->tqparent()->isOpen() ) ) { if ( !i->isVisible() || ( i->parent() && !i->parent()->isOpen() ) ) {
kdDebug() << "hiding invisible item's extender" << endl; kdDebug() << "hiding invisible item's extender" << endl;
i->hideExtender(); i->hideExtender();
return; return;
@ -257,8 +257,8 @@ void ExtendableItem::updateIcon() {
setUpdatedIcon(p); setUpdatedIcon(p);
// umm hack // umm hack
if ( dynamic_cast< ExtendableItem * >( tqparent() ) ) if ( dynamic_cast< ExtendableItem * >( parent() ) )
dynamic_cast< ExtendableItem * >( tqparent() )->updateIcon(); dynamic_cast< ExtendableItem * >( parent() )->updateIcon();
} }

4
adept/adept/extendablelist.h
Unescape View File

@ -127,8 +127,8 @@ class ItemExtender : public TQWidget {
TQ_OBJECT TQ_OBJECT
public: public:
// ItemExtender( ExtendableItem *item ); // ItemExtender( ExtendableItem *item );
ItemExtender( TQWidget *tqparent, const char *n ) ItemExtender( TQWidget *parent, const char *n )
: TQWidget( tqparent, n ), m_item( 0 ) : TQWidget( parent, n ), m_item( 0 )
{} {}
virtual void setItem( ExtendableItem *i ) { virtual void setItem( ExtendableItem *i ) {

4
adept/adept/filterlist.cpp
Unescape View File

@ -49,8 +49,8 @@ void PredicateInterface::widgetsChanged() {
downcast< FilterItem >( item() ).setPredicate( m_pred ); downcast< FilterItem >( item() ).setPredicate( m_pred );
} }
FilterList::FilterList( TQWidget *tqparent, const char *name ) FilterList::FilterList( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), : ExtendableList( parent, name ),
m_pred( predicate::True< entity::Entity >() ), m_pred( predicate::True< entity::Entity >() ),
m_hidden( predicate::True< entity::Entity >() ) m_hidden( predicate::True< entity::Entity >() )
{ {

2
adept/adept/filterlist.h
Unescape View File

@ -75,7 +75,7 @@ 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< KListViewItem *, Predicate > Map;
FilterList( TQWidget *tqparent = 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 );
void plugLister( Lister *l ); void plugLister( Lister *l );

4
adept/adept/filterwidget.h
Unescape View File

@ -19,8 +19,8 @@ class FilterWidget : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
FilterWidget( TQWidget *tqparent = 0, const char *n = 0 ) FilterWidget( TQWidget *parent = 0, const char *n = 0 )
: TQWidget( tqparent, n ) {} : TQWidget( parent, n ) {}
virtual ListerPredicate predicate() = 0; virtual ListerPredicate predicate() = 0;
void connectLister( Lister *l ); void connectLister( Lister *l );
protected slots: protected slots:

20
adept/adept/lister.cpp
Unescape View File

@ -40,8 +40,8 @@ TQPixmap* main_icon = 0;
TQPixmap* non_main_icon = 0; TQPixmap* non_main_icon = 0;
#endif #endif
Lister::Lister( TQWidget *tqparent, const char *name ) Lister::Lister( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), : ExtendableList( parent, name ),
m_rangeProvider( 0 ), m_rangeProvider( 0 ),
m_baseF( predicate::True< entity::Entity >() ), m_baseF( predicate::True< entity::Entity >() ),
m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ), m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ),
@ -179,7 +179,7 @@ void Lister::cleanRebuild()
} }
Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p ) Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p )
: l( _l ), time( 0 ), items( 0 ), last( 0 ), tqparent( p ) : l( _l ), time( 0 ), items( 0 ), last( 0 ), parent( p )
{ {
} }
@ -204,19 +204,19 @@ Lister::Map::value_type Lister::CreateItem::operator()( entity::Entity e )
} }
if ( last ) { if ( last ) {
if ( tqparent ) if ( parent )
last = new ListerItem( tqparent, last, e ); last = new ListerItem( parent, last, e );
else else
last = new ListerItem( l, last, e ); last = new ListerItem( l, last, e );
} else { } else {
if ( tqparent ) if ( parent )
last = new ListerItem( tqparent, e ); last = new ListerItem( parent, e );
else else
last = new ListerItem( l, e ); last = new ListerItem( l, e );
} }
l->m_rebuildMutex.unlock(); l->m_rebuildMutex.unlock();
if ( e.is< entity::Relation >() ) if ( e.is< entity::Relation >() )
// this should be safe because the tqparent thread is waiting // this should be safe because the parent thread is waiting
// for us and ensures that universe (libapt-front) is kept // for us and ensures that universe (libapt-front) is kept
// unchanged while we run // unchanged while we run
l->insertRangeInternal( InsertRangePair( l->insertRangeInternal( InsertRangePair(
@ -535,8 +535,8 @@ ListerItemExtender::~ListerItemExtender()
{ {
} }
ListerItemExtender::ListerItemExtender( TQWidget *tqparent, const char * n) ListerItemExtender::ListerItemExtender( TQWidget *parent, const char * n)
: ListerItemExtenderUi( tqparent, n ) : ListerItemExtenderUi( parent, n )
{ {
observeComponent< component::State >(); observeComponent< component::State >();
adjustFontSize( m_description, -1 ); adjustFontSize( m_description, -1 );

12
adept/adept/lister.h
Unescape View File

@ -74,7 +74,7 @@ public:
virtual Range listerRange() = 0; virtual Range listerRange() = 0;
}; };
Lister (TQWidget *tqparent = 0, const char *name = 0); Lister (TQWidget *parent = 0, const char *name = 0);
~Lister(); ~Lister();
void setSource(); void setSource();
virtual void notifyPostChange( component::Base * ); virtual void notifyPostChange( component::Base * );
@ -128,7 +128,7 @@ protected:
int time; int time;
int items; int items;
ListerItem *last; ListerItem *last;
ListerItem *tqparent; ListerItem *parent;
}; };
bool cancelRebuild(); bool cancelRebuild();
@ -162,9 +162,9 @@ protected:
class ListerItemTooltip : public TQToolTip { class ListerItemTooltip : public TQToolTip {
public: public:
ListerItemTooltip(const Lister* tqparent) : ListerItemTooltip(const Lister* parent) :
TQToolTip(tqparent->viewport(),0), TQToolTip(parent->viewport(),0),
m_parent(tqparent) {}; m_parent(parent) {};
protected: protected:
const Lister* m_parent; const Lister* m_parent;
@ -176,7 +176,7 @@ class ListerItemExtender : public ListerItemExtenderUi,
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ListerItemExtender( TQWidget *tqparent = 0, const char * n = 0 ); ListerItemExtender( TQWidget *parent = 0, const char * n = 0 );
~ListerItemExtender(); ~ListerItemExtender();
virtual void resize( int w, int h ); virtual void resize( int w, int h );
void setItem( ExtendableItem *i ); void setItem( ExtendableItem *i );

4
adept/adept/quickfilter.cpp
Unescape View File

@ -11,8 +11,8 @@
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
QuickFilterWidget::QuickFilterWidget( TQWidget *tqparent, const char *name ) QuickFilterWidget::QuickFilterWidget( TQWidget *parent, const char *name )
: QuickFilterUi( tqparent, name ) : QuickFilterUi( parent, name )
{ {
setFocusProxy( m_match ); setFocusProxy( m_match );
connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ), connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ),

2
adept/adept/quickfilter.h
Unescape View File

@ -104,7 +104,7 @@ class QuickFilterWidget : public QuickFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
QuickFilterWidget( TQWidget *tqparent, const char *name = 0 ); QuickFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

38
adept/adept/statefilter.cpp
Unescape View File

@ -9,8 +9,8 @@
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name ) StateFilterWidget::StateFilterWidget( TQWidget *parent, const char *name )
: StateFilterUi( tqparent, name ) : StateFilterUi( parent, name )
{ {
TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING ); TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
TQObjectListIt it( *chld ); TQObjectListIt it( *chld );
@ -24,17 +24,17 @@ StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name )
StateFilterWidget::Predicate StateFilterWidget::predicate() StateFilterWidget::Predicate StateFilterWidget::predicate()
{ {
typedef StateFilter< entity::Package > F; typedef StateFilter< entity::Package > F;
unsigned tqmask = 0; unsigned mask = 0;
if (m_installed->isChecked()) tqmask |= F::Installed; if (m_installed->isChecked()) mask |= F::Installed;
if (m_notInstalled->isChecked()) tqmask |= F::NotInstalled; if (m_notInstalled->isChecked()) mask |= F::NotInstalled;
if (m_upgradable->isChecked()) tqmask |= F::Upgradable; if (m_upgradable->isChecked()) mask |= F::Upgradable;
if (m_keep->isChecked()) tqmask |= F::Keep; if (m_keep->isChecked()) mask |= F::Keep;
if (m_install->isChecked()) tqmask |= F::Install; if (m_install->isChecked()) mask |= F::Install;
if (m_remove->isChecked()) tqmask |= F::Remove; if (m_remove->isChecked()) mask |= F::Remove;
if (m_upgrade->isChecked()) tqmask |= F::Upgrade; if (m_upgrade->isChecked()) mask |= F::Upgrade;
StateFilter< entity::Package > f; StateFilter< entity::Package > f;
f.setMask( tqmask ); f.setMask( mask );
return predicate::adapt< entity::Entity >( f ); return predicate::adapt< entity::Entity >( f );
} }
@ -48,13 +48,13 @@ void StateFilterWidget::predicateChanged()
{ {
typedef StateFilter< entity::Package > F; typedef StateFilter< entity::Package > F;
F f = downcast< F >( m_pred ); F f = downcast< F >( m_pred );
unsigned tqmask = f.tqmask(); unsigned mask = f.mask();
blockedSet( m_installed, tqmask & F::Installed ); blockedSet( m_installed, mask & F::Installed );
blockedSet( m_notInstalled, tqmask & F::NotInstalled ); blockedSet( m_notInstalled, mask & F::NotInstalled );
blockedSet( m_upgradable, tqmask & F::Upgradable ); blockedSet( m_upgradable, mask & F::Upgradable );
blockedSet( m_keep, tqmask & F::Keep ); blockedSet( m_keep, mask & F::Keep );
blockedSet( m_install, tqmask & F::Install ); blockedSet( m_install, mask & F::Install );
blockedSet( m_upgrade, tqmask & F::Upgrade ); blockedSet( m_upgrade, mask & F::Upgrade );
blockedSet( m_remove, tqmask & F::Remove ); blockedSet( m_remove, mask & F::Remove );
} }

48
adept/adept/statefilter.h
Unescape View File

@ -36,7 +36,7 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
Upgrade = 1 << 6 }; Upgrade = 1 << 6 };
StateFilter() StateFilter()
: m_tqmask( 0xff ) { : m_mask( 0xff ) {
setupPredicate(); setupPredicate();
} }
@ -44,21 +44,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
predicate::Predicate< T > predicate::Predicate< T >
p0 = not predicate::True< T >(), p0 = not predicate::True< T >(),
p1 = not predicate::True< T >(); p1 = not predicate::True< T >();
if (m_tqmask & Installed) if (m_mask & Installed)
p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled ) p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled )
and not predicate::Factory< T >::member( &T::isUpgradable ) ); and not predicate::Factory< T >::member( &T::isUpgradable ) );
if (m_tqmask & NotInstalled) if (m_mask & NotInstalled)
p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled ); p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled );
if (m_tqmask & Upgradable) if (m_mask & Upgradable)
p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable ); p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable );
if (m_tqmask & Install) if (m_mask & Install)
p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall ); p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall );
if (m_tqmask & Remove) if (m_mask & Remove)
p1 = p1 or predicate::Factory< T >::member( &T::markedRemove ); p1 = p1 or predicate::Factory< T >::member( &T::markedRemove );
if (m_tqmask & Keep) if (m_mask & Keep)
p1 = p1 or predicate::Factory< T >::member( &T::markedKeep ); p1 = p1 or predicate::Factory< T >::member( &T::markedKeep );
if (m_tqmask & Upgrade) if (m_mask & Upgrade)
p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade ); p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade );
m_op = p0 and p1; m_op = p0 and p1;
@ -68,31 +68,31 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
std::ostringstream s; std::ostringstream s;
std::vector< std::string > r; std::vector< std::string > r;
s << "State filter: "; s << "State filter: ";
if (m_tqmask & Installed && m_tqmask & NotInstalled && m_tqmask & Upgradable) if (m_mask & Installed && m_mask & NotInstalled && m_mask & Upgradable)
r.push_back( "Any State" ); r.push_back( "Any State" );
else { else {
if (m_tqmask & Installed) if (m_mask & Installed)
r.push_back( i18n( "Installed" ).ascii() ); r.push_back( i18n( "Installed" ).ascii() );
if (m_tqmask & NotInstalled) if (m_mask & NotInstalled)
r.push_back( i18n( "Not Installed" ).ascii() ); r.push_back( i18n( "Not Installed" ).ascii() );
if (m_tqmask & Upgradable) if (m_mask & Upgradable)
r.push_back( i18n( "Upgradable" ).ascii() ); r.push_back( i18n( "Upgradable" ).ascii() );
} }
std::copy( r.begin(), r.end(), std::copy( r.begin(), r.end(),
std::ostream_iterator< std::string >( s, " " ) ); std::ostream_iterator< std::string >( s, " " ) );
s << "; "; s << "; ";
r.clear(); r.clear();
if (m_tqmask & Install && m_tqmask & Remove if (m_mask & Install && m_mask & Remove
&& m_tqmask & Keep && m_tqmask & Upgrade) && m_mask & Keep && m_mask & Upgrade)
r.push_back( i18n( "Any Action" ).ascii() ); r.push_back( i18n( "Any Action" ).ascii() );
else { else {
if (m_tqmask & Install) if (m_mask & Install)
r.push_back( i18n( "Install" ).ascii() ); r.push_back( i18n( "Install" ).ascii() );
if (m_tqmask & Remove) if (m_mask & Remove)
r.push_back( i18n( "Remove" ).ascii() ); r.push_back( i18n( "Remove" ).ascii() );
if (m_tqmask & Keep) if (m_mask & Keep)
r.push_back( i18n( "Keep" ).ascii() ); r.push_back( i18n( "Keep" ).ascii() );
if (m_tqmask & Upgrade) if (m_mask & Upgrade)
r.push_back( i18n( "Upgrade" ).ascii() ); r.push_back( i18n( "Upgrade" ).ascii() );
} }
std::copy( r.begin(), r.end(), std::copy( r.begin(), r.end(),
@ -100,12 +100,12 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
return s.str(); return s.str();
} }
unsigned tqmask() const { unsigned mask() const {
return m_tqmask; return m_mask;
} }
void setMask( unsigned m ) { void setMask( unsigned m ) {
m_tqmask = m; m_mask = m;
setupPredicate(); setupPredicate();
} }
@ -120,12 +120,12 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
} }
virtual void reset() { virtual void reset() {
m_tqmask = 0xff; m_mask = 0xff;
setupPredicate(); setupPredicate();
} }
protected: protected:
unsigned m_tqmask; unsigned m_mask;
predicate::Predicate< T > m_op; predicate::Predicate< T > m_op;
}; };
@ -134,7 +134,7 @@ class StateFilterWidget : public StateFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
StateFilterWidget( TQWidget *tqparent, const char *name = 0 ); StateFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

4
adept/kubuntu_upgrader/errordialog.cpp
Unescape View File

@ -22,8 +22,8 @@
#include "errordialog.h" #include "errordialog.h"
ErrorDialog::ErrorDialog(TQWidget* tqparent, TQString error_text, const char* name, bool modal, WFlags fl ) ErrorDialog::ErrorDialog(TQWidget* parent, TQString error_text, const char* name, bool modal, WFlags fl )
: ErrorDialogDlg(tqparent,name, modal,fl) : ErrorDialogDlg(parent,name, modal,fl)
{ {
errorLabel->setText( error_text ); errorLabel->setText( error_text );
} }

2
adept/kubuntu_upgrader/errordialog.h
Unescape View File

@ -31,7 +31,7 @@ class ErrorDialog : public ErrorDialogDlg
TQ_OBJECT TQ_OBJECT
public: public:
ErrorDialog(TQWidget* tqparent = 0, TQString error_text = TQString(), const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ErrorDialog(TQWidget* parent = 0, TQString error_text = TQString(), const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~ErrorDialog(); ~ErrorDialog();
/*$PUBLIC_FUNCTIONS$*/ /*$PUBLIC_FUNCTIONS$*/

4
adept/kubuntu_upgrader/upgradewizard.cpp
Unescape View File

@ -74,8 +74,8 @@ DistroEntry::~DistroEntry() {
free( upgrade_tool_sig_url ); free( upgrade_tool_sig_url );
} }
UpgradeWizard::UpgradeWizard(TQWidget* tqparent, const char* name, bool modal, WFlags fl) UpgradeWizard::UpgradeWizard(TQWidget* parent, const char* name, bool modal, WFlags fl)
: UpgradeWizardDlg(tqparent,name, modal,fl) : UpgradeWizardDlg(parent,name, modal,fl)
{ {
err_dlg = NULL; err_dlg = NULL;

2
adept/kubuntu_upgrader/upgradewizard.h
Unescape View File

@ -53,7 +53,7 @@ class UpgradeWizard : public UpgradeWizardDlg
TQ_OBJECT TQ_OBJECT
public: public:
UpgradeWizard(TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); UpgradeWizard(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~UpgradeWizard(); ~UpgradeWizard();
/*$PUBLIC_FUNCTIONS$*/ /*$PUBLIC_FUNCTIONS$*/

12
adept/libadept/acqprogress.cpp
Unescape View File

@ -29,8 +29,8 @@ using namespace std;
namespace adept { namespace adept {
AcqtqStatus::Item::Item (KListView *tqparent, pkgAcquire::ItemDesc &item, bool hit) AcqtqStatus::Item::Item (KListView *parent, pkgAcquire::ItemDesc &item, bool hit)
: KListViewItem( tqparent ) : KListViewItem( parent )
{ {
m_pbcol = 0; m_pbcol = 0;
m_prog = new ItemProgress( 0, 0 ); m_prog = new ItemProgress( 0, 0 );
@ -109,8 +109,8 @@ AcqtqStatus::Item *AcqtqStatus::findItem (pkgAcquire::ItemDesc &Itm)
return m_items[ Itm.Owner->ID - m_idOffset ]; return m_items[ Itm.Owner->ID - m_idOffset ];
} }
AcqtqStatus::AcqtqStatus(TQWidget *tqparent, const char *name) AcqtqStatus::AcqtqStatus(TQWidget *parent, const char *name)
: KListView (tqparent, name), m_idOffset( 0 ), m_continue( true ) : KListView (parent, name), m_idOffset( 0 ), m_continue( true )
{ {
// m_lastItem = 0; // m_lastItem = 0;
addColumn( i18n( "Progress" ) ); addColumn( i18n( "Progress" ) );
@ -266,8 +266,8 @@ void AcqtqStatus::cancel()
m_continue = false; m_continue = false;
} }
AcqStatusDialog::AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal) AcqStatusDialog::AcqStatusDialog (TQWidget *parent, const char *name, bool modal)
: KDialogBase( tqparent, name, modal, : KDialogBase( parent, name, modal,
u8( "progress dialog (FIXME: waiting for headers, done)" ), u8( "progress dialog (FIXME: waiting for headers, done)" ),
Ok|Cancel, Cancel, true ) Ok|Cancel, Cancel, true )
{ {

10
adept/libadept/acqprogress.h
Unescape View File

@ -30,8 +30,8 @@ class AcqtqStatus : public KListView, public aptFront::ProgressCallback
protected: protected:
class ItemProgress: public KProgress { class ItemProgress: public KProgress {
public: public:
ItemProgress( TQWidget *tqparent, const char *name = 0 ) ItemProgress( TQWidget *parent, const char *name = 0 )
: KProgress( tqparent, name ), m_spin( 0 ) {} : KProgress( parent, name ), m_spin( 0 ) {}
void settqStatus( const std::string &s, void settqStatus( const std::string &s,
int prog = 0 ) { int prog = 0 ) {
m_status = s; m_status = s;
@ -62,7 +62,7 @@ protected:
pkgAcquire::ItemDesc m_item; pkgAcquire::ItemDesc m_item;
public: public:
Item (KListView *tqparent, pkgAcquire::ItemDesc &item, Item (KListView *parent, pkgAcquire::ItemDesc &item,
bool hit = false); bool hit = false);
virtual ~Item (); virtual ~Item ();
@ -88,7 +88,7 @@ public:
enum tqStatus { StWaiting, StDownloading, StDone }; enum tqStatus { StWaiting, StDownloading, StDone };
AcqtqStatus (TQWidget *tqparent, const char *name); AcqtqStatus (TQWidget *parent, const char *name);
Item *findItem (pkgAcquire::ItemDesc &Itm); Item *findItem (pkgAcquire::ItemDesc &Itm);
virtual bool MediaChange (string Media,string Drive); virtual bool MediaChange (string Media,string Drive);
@ -121,7 +121,7 @@ protected:
aptFront::SharedPtr<AcqtqStatus> m_status; aptFront::SharedPtr<AcqtqStatus> m_status;
public: public:
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); }; aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_status.data(); };
AcqStatusDialog (TQWidget *tqparent, const char *name, bool modal); AcqStatusDialog (TQWidget *parent, const char *name, bool modal);
public slots: public slots:
void statusChange (AcqtqStatus::tqStatus st); void statusChange (AcqtqStatus::tqStatus st);
}; };

4
adept/libadept/acqprogresswidget.cpp
Unescape View File

@ -7,8 +7,8 @@
using namespace adept; using namespace adept;
AcqProgressWidget::AcqProgressWidget( TQWidget *tqparent, const char *name ) AcqProgressWidget::AcqProgressWidget( TQWidget *parent, const char *name )
: AcqProgressWidgetUi( tqparent, name ) : AcqProgressWidgetUi( parent, name )
{ {
m_statusRef = m_status; m_statusRef = m_status;
m_progress->setTotalSteps( 100 ); m_progress->setTotalSteps( 100 );

2
adept/libadept/acqprogresswidget.h
Unescape View File

@ -16,7 +16,7 @@ class AcqProgressWidget : public AcqProgressWidgetUi {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
AcqProgressWidget (TQWidget *tqparent = 0, const char *name = 0); AcqProgressWidget (TQWidget *parent = 0, const char *name = 0);
aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); }; aptFront::SharedPtr<aptFront::ProgressCallback> callback() { return m_statusRef.data(); };
public slots: public slots:
void statusChange( AcqtqStatus::tqStatus ); void statusChange( AcqtqStatus::tqStatus );

4
adept/libadept/desktoplist.cpp
Unescape View File

@ -138,8 +138,8 @@ void DesktopEntry::notifyPostChange() {
m_check->blockSignals( false ); m_check->blockSignals( false );
} }
DesktopList::DesktopList( TQWidget *tqparent, const char *name ) DesktopList::DesktopList( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), m_polishing( 0 ), m_displayCheckboxes( true ) : ExtendableList( parent, name ), m_polishing( 0 ), m_displayCheckboxes( true )
{ {
observeComponent< component::State >(); observeComponent< component::State >();
addColumn( i18n( "Application" ) ); addColumn( i18n( "Application" ) );

2
adept/libadept/desktoplist.h
Unescape View File

@ -27,7 +27,7 @@ class DesktopList : public ExtendableList, public cache::Observer
TQ_OBJECT TQ_OBJECT
public: public:
typedef utils::Range< entity::Desktop > Range; typedef utils::Range< entity::Desktop > Range;
DesktopList( TQWidget *tqparent = 0, const char *name = 0 ); DesktopList( TQWidget *parent = 0, const char *name = 0 );
void insertRange( Range ); void insertRange( Range );
TQPixmap emptyIcon() { return m_emptyIcon; } TQPixmap emptyIcon() { return m_emptyIcon; }
void polishing(); void polishing();

4
adept/libadept/easytagfilter.cpp
Unescape View File

@ -19,8 +19,8 @@ static void fillCombo( TQComboBox *c, const std::string f ) {
} }
} }
EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *tqparent, const char *name ) EasyTagFilterWidget::EasyTagFilterWidget( TQWidget *parent, const char *name )
: EasyTagFilterUi( tqparent, name ) : EasyTagFilterUi( parent, name )
{ {
fillCombo( m_use, "use" ); fillCombo( m_use, "use" );
fillCombo( m_interface, "interface" ); fillCombo( m_interface, "interface" );

2
adept/libadept/easytagfilter.h
Unescape View File

@ -82,7 +82,7 @@ class EasyTagFilterWidget : public EasyTagFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
EasyTagFilterWidget( TQWidget *tqparent, const char *name = 0 ); EasyTagFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

8
adept/libadept/extendablelist.cpp
Unescape View File

@ -73,7 +73,7 @@ int ExtendableList::extenderOffset( ExtendableItem *i )
x += i->pixmap( m_toggleColumn )->width(); x += i->pixmap( m_toggleColumn )->width();
if ( rootIsDecorated() ) if ( rootIsDecorated() )
x += treeStepSize(); x += treeStepSize();
if ( i->tqparent() ) if ( i->parent() )
x += treeStepSize(); x += treeStepSize();
} }
@ -88,7 +88,7 @@ void ExtendableList::updateExtender( ExtendableItem *i )
// get at it (since setContentsPos in TQListView calls it // get at it (since setContentsPos in TQListView calls it
setContentsPos( contentsX(), contentsY() ); setContentsPos( contentsX(), contentsY() );
if ( !i->isVisible() || ( i->tqparent() && !i->tqparent()->isOpen() ) ) { if ( !i->isVisible() || ( i->parent() && !i->parent()->isOpen() ) ) {
kdDebug() << "hiding invisible item's extender" << endl; kdDebug() << "hiding invisible item's extender" << endl;
i->hideExtender(); i->hideExtender();
return; return;
@ -250,8 +250,8 @@ void ExtendableItem::updateIcon() {
setPixmap( list()->toggleColumn(), p ); setPixmap( list()->toggleColumn(), p );
// umm hack // umm hack
if ( dynamic_cast< ExtendableItem * >( tqparent() ) ) if ( dynamic_cast< ExtendableItem * >( parent() ) )
dynamic_cast< ExtendableItem * >( tqparent() )->updateIcon(); dynamic_cast< ExtendableItem * >( parent() )->updateIcon();
} }

4
adept/libadept/extendablelist.h
Unescape View File

@ -126,8 +126,8 @@ class ItemExtender : public TQWidget {
TQ_OBJECT TQ_OBJECT
public: public:
// ItemExtender( ExtendableItem *item ); // ItemExtender( ExtendableItem *item );
ItemExtender( TQWidget *tqparent, const char *n ) ItemExtender( TQWidget *parent, const char *n )
: TQWidget( tqparent, n ), m_item( 0 ) : TQWidget( parent, n ), m_item( 0 )
{} {}
virtual void setItem( ExtendableItem *i ) { virtual void setItem( ExtendableItem *i ) {

4
adept/libadept/filterlist.cpp
Unescape View File

@ -48,8 +48,8 @@ void PredicateInterface::widgetsChanged() {
downcast< FilterItem >( item() ).setPredicate( m_pred ); downcast< FilterItem >( item() ).setPredicate( m_pred );
} }
FilterList::FilterList( TQWidget *tqparent, const char *name ) FilterList::FilterList( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), : ExtendableList( parent, name ),
m_pred( predicate::True< entity::Entity >() ), m_pred( predicate::True< entity::Entity >() ),
m_hidden( predicate::True< entity::Entity >() ) m_hidden( predicate::True< entity::Entity >() )
{ {

2
adept/libadept/filterlist.h
Unescape View File

@ -68,7 +68,7 @@ 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< KListViewItem *, Predicate > Map;
FilterList( TQWidget *tqparent = 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 );
void plugLister( Lister *l ); void plugLister( Lister *l );

4
adept/libadept/filterwidget.h
Unescape View File

@ -19,8 +19,8 @@ class FilterWidget : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
FilterWidget( TQWidget *tqparent = 0, const char *n = 0 ) FilterWidget( TQWidget *parent = 0, const char *n = 0 )
: TQWidget( tqparent, n ) {} : TQWidget( parent, n ) {}
virtual ListerPredicate predicate() = 0; virtual ListerPredicate predicate() = 0;
void connectLister( Lister *l ); void connectLister( Lister *l );
protected slots: protected slots:

20
adept/libadept/lister.cpp
Unescape View File

@ -33,8 +33,8 @@ using namespace aptFront::cache;
using namespace aptFront::utils; using namespace aptFront::utils;
using namespace adept; using namespace adept;
Lister::Lister( TQWidget *tqparent, const char *name ) Lister::Lister( TQWidget *parent, const char *name )
: ExtendableList( tqparent, name ), : ExtendableList( parent, name ),
m_rangeProvider( 0 ), m_rangeProvider( 0 ),
m_baseF( predicate::True< entity::Entity >() ), m_baseF( predicate::True< entity::Entity >() ),
m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ), m_interactiveF( True<entity::Entity>() ), m_itemCount( -1 ),
@ -156,7 +156,7 @@ void Lister::cleanRebuild()
} }
Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p ) Lister::CreateItem::CreateItem( Lister *_l, ListerItem *p )
: l( _l ), time( 0 ), items( 0 ), last( 0 ), tqparent( p ) : l( _l ), time( 0 ), items( 0 ), last( 0 ), parent( p )
{ {
} }
@ -181,19 +181,19 @@ Lister::Map::value_type Lister::CreateItem::operator()( entity::Entity e )
} }
if ( last ) { if ( last ) {
if ( tqparent ) if ( parent )
last = new ListerItem( tqparent, last, e ); last = new ListerItem( parent, last, e );
else else
last = new ListerItem( l, last, e ); last = new ListerItem( l, last, e );
} else { } else {
if ( tqparent ) if ( parent )
last = new ListerItem( tqparent, e ); last = new ListerItem( parent, e );
else else
last = new ListerItem( l, e ); last = new ListerItem( l, e );
} }
l->m_rebuildMutex.unlock(); l->m_rebuildMutex.unlock();
if ( e.is< entity::Relation >() ) if ( e.is< entity::Relation >() )
// this should be safe because the tqparent thread is waiting // this should be safe because the parent thread is waiting
// for us and ensures that universe (libapt-front) is kept // for us and ensures that universe (libapt-front) is kept
// unchanged while we run // unchanged while we run
l->insertRangeInternal( InsertRangePair( l->insertRangeInternal( InsertRangePair(
@ -465,8 +465,8 @@ ListerItemExtender::~ListerItemExtender()
{ {
} }
ListerItemExtender::ListerItemExtender( TQWidget *tqparent, const char * n) ListerItemExtender::ListerItemExtender( TQWidget *parent, const char * n)
: ListerItemExtenderUi( tqparent, n ) : ListerItemExtenderUi( parent, n )
{ {
observeComponent< component::State >(); observeComponent< component::State >();
adjustFontSize( m_description, -1 ); adjustFontSize( m_description, -1 );

6
adept/libadept/lister.h
Unescape View File

@ -56,7 +56,7 @@ public:
virtual Range listerRange() = 0; virtual Range listerRange() = 0;
}; };
Lister (TQWidget *tqparent = 0, const char *name = 0); Lister (TQWidget *parent = 0, const char *name = 0);
~Lister(); ~Lister();
void setSource(); void setSource();
virtual void notifyPostChange( component::Base * ); virtual void notifyPostChange( component::Base * );
@ -110,7 +110,7 @@ protected:
int time; int time;
int items; int items;
ListerItem *last; ListerItem *last;
ListerItem *tqparent; ListerItem *parent;
}; };
bool cancelRebuild(); bool cancelRebuild();
@ -146,7 +146,7 @@ class ListerItemExtender : public ListerItemExtenderUi,
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
ListerItemExtender( TQWidget *tqparent = 0, const char * n = 0 ); ListerItemExtender( TQWidget *parent = 0, const char * n = 0 );
~ListerItemExtender(); ~ListerItemExtender();
virtual void resize( int w, int h ); virtual void resize( int w, int h );
void setItem( ExtendableItem *i ); void setItem( ExtendableItem *i );

4
adept/libadept/quickfilter.cpp
Unescape View File

@ -11,8 +11,8 @@
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
QuickFilterWidget::QuickFilterWidget( TQWidget *tqparent, const char *name ) QuickFilterWidget::QuickFilterWidget( TQWidget *parent, const char *name )
: QuickFilterUi( tqparent, name ) : QuickFilterUi( parent, name )
{ {
setFocusProxy( m_match ); setFocusProxy( m_match );
connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ), connect( m_match, TQT_SIGNAL( textChanged( const TQString & ) ),

2
adept/libadept/quickfilter.h
Unescape View File

@ -104,7 +104,7 @@ class QuickFilterWidget : public QuickFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
QuickFilterWidget( TQWidget *tqparent, const char *name = 0 ); QuickFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

38
adept/libadept/statefilter.cpp
Unescape View File

@ -9,8 +9,8 @@
using namespace aptFront; using namespace aptFront;
using namespace adept; using namespace adept;
StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name ) StateFilterWidget::StateFilterWidget( TQWidget *parent, const char *name )
: StateFilterUi( tqparent, name ) : StateFilterUi( parent, name )
{ {
TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING ); TQObjectList *chld = queryList( TQCHECKBOX_OBJECT_NAME_STRING );
TQObjectListIt it( *chld ); TQObjectListIt it( *chld );
@ -24,17 +24,17 @@ StateFilterWidget::StateFilterWidget( TQWidget *tqparent, const char *name )
StateFilterWidget::Predicate StateFilterWidget::predicate() StateFilterWidget::Predicate StateFilterWidget::predicate()
{ {
typedef StateFilter< entity::Package > F; typedef StateFilter< entity::Package > F;
unsigned tqmask = 0; unsigned mask = 0;
if (m_installed->isChecked()) tqmask |= F::Installed; if (m_installed->isChecked()) mask |= F::Installed;
if (m_notInstalled->isChecked()) tqmask |= F::NotInstalled; if (m_notInstalled->isChecked()) mask |= F::NotInstalled;
if (m_upgradable->isChecked()) tqmask |= F::Upgradable; if (m_upgradable->isChecked()) mask |= F::Upgradable;
if (m_keep->isChecked()) tqmask |= F::Keep; if (m_keep->isChecked()) mask |= F::Keep;
if (m_install->isChecked()) tqmask |= F::Install; if (m_install->isChecked()) mask |= F::Install;
if (m_remove->isChecked()) tqmask |= F::Remove; if (m_remove->isChecked()) mask |= F::Remove;
if (m_upgrade->isChecked()) tqmask |= F::Upgrade; if (m_upgrade->isChecked()) mask |= F::Upgrade;
StateFilter< entity::Package > f; StateFilter< entity::Package > f;
f.setMask( tqmask ); f.setMask( mask );
return predicate::adapt< entity::Entity >( f ); return predicate::adapt< entity::Entity >( f );
} }
@ -48,13 +48,13 @@ void StateFilterWidget::predicateChanged()
{ {
typedef StateFilter< entity::Package > F; typedef StateFilter< entity::Package > F;
F f = downcast< F >( m_pred ); F f = downcast< F >( m_pred );
unsigned tqmask = f.tqmask(); unsigned mask = f.mask();
blockedSet( m_installed, tqmask & F::Installed ); blockedSet( m_installed, mask & F::Installed );
blockedSet( m_notInstalled, tqmask & F::NotInstalled ); blockedSet( m_notInstalled, mask & F::NotInstalled );
blockedSet( m_upgradable, tqmask & F::Upgradable ); blockedSet( m_upgradable, mask & F::Upgradable );
blockedSet( m_keep, tqmask & F::Keep ); blockedSet( m_keep, mask & F::Keep );
blockedSet( m_install, tqmask & F::Install ); blockedSet( m_install, mask & F::Install );
blockedSet( m_upgrade, tqmask & F::Upgrade ); blockedSet( m_upgrade, mask & F::Upgrade );
blockedSet( m_remove, tqmask & F::Remove ); blockedSet( m_remove, mask & F::Remove );
} }

48
adept/libadept/statefilter.h
Unescape View File

@ -36,7 +36,7 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
Upgrade = 1 << 6 }; Upgrade = 1 << 6 };
StateFilter() StateFilter()
: m_tqmask( 0xff ) { : m_mask( 0xff ) {
setupPredicate(); setupPredicate();
} }
@ -44,21 +44,21 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
predicate::Predicate< T > predicate::Predicate< T >
p0 = not predicate::True< T >(), p0 = not predicate::True< T >(),
p1 = not predicate::True< T >(); p1 = not predicate::True< T >();
if (m_tqmask & Installed) if (m_mask & Installed)
p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled ) p0 = p0 or (predicate::Factory< T >::member( &T::isInstalled )
and not predicate::Factory< T >::member( &T::isUpgradable ) ); and not predicate::Factory< T >::member( &T::isUpgradable ) );
if (m_tqmask & NotInstalled) if (m_mask & NotInstalled)
p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled ); p0 = p0 or not predicate::Factory< T >::member( &T::isInstalled );
if (m_tqmask & Upgradable) if (m_mask & Upgradable)
p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable ); p0 = p0 or predicate::Factory< T >::member( &T::isUpgradable );
if (m_tqmask & Install) if (m_mask & Install)
p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall ); p1 = p1 or predicate::Factory< T >::member( &T::markedNewInstall );
if (m_tqmask & Remove) if (m_mask & Remove)
p1 = p1 or predicate::Factory< T >::member( &T::markedRemove ); p1 = p1 or predicate::Factory< T >::member( &T::markedRemove );
if (m_tqmask & Keep) if (m_mask & Keep)
p1 = p1 or predicate::Factory< T >::member( &T::markedKeep ); p1 = p1 or predicate::Factory< T >::member( &T::markedKeep );
if (m_tqmask & Upgrade) if (m_mask & Upgrade)
p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade ); p1 = p1 or predicate::Factory< T >::member( &T::markedUpgrade );
m_op = p0 and p1; m_op = p0 and p1;
@ -68,31 +68,31 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
std::ostringstream s; std::ostringstream s;
std::vector< std::string > r; std::vector< std::string > r;
s << "State filter: "; s << "State filter: ";
if (m_tqmask & Installed && m_tqmask & NotInstalled && m_tqmask & Upgradable) if (m_mask & Installed && m_mask & NotInstalled && m_mask & Upgradable)
r.push_back( "Any State" ); r.push_back( "Any State" );
else { else {
if (m_tqmask & Installed) if (m_mask & Installed)
r.push_back( i18n( "Installed" ) ); r.push_back( i18n( "Installed" ) );
if (m_tqmask & NotInstalled) if (m_mask & NotInstalled)
r.push_back( i18n( "Not Installed" ) ); r.push_back( i18n( "Not Installed" ) );
if (m_tqmask & Upgradable) if (m_mask & Upgradable)
r.push_back( i18n( "Upgradable" ) ); r.push_back( i18n( "Upgradable" ) );
} }
std::copy( r.begin(), r.end(), std::copy( r.begin(), r.end(),
std::ostream_iterator< std::string >( s, " " ) ); std::ostream_iterator< std::string >( s, " " ) );
s << "; "; s << "; ";
r.clear(); r.clear();
if (m_tqmask & Install && m_tqmask & Remove if (m_mask & Install && m_mask & Remove
&& m_tqmask & Keep && m_tqmask & Upgrade) && m_mask & Keep && m_mask & Upgrade)
r.push_back( i18n( "Any Action" ) ); r.push_back( i18n( "Any Action" ) );
else { else {
if (m_tqmask & Install) if (m_mask & Install)
r.push_back( i18n( "Install" ) ); r.push_back( i18n( "Install" ) );
if (m_tqmask & Remove) if (m_mask & Remove)
r.push_back( i18n( "Remove" ) ); r.push_back( i18n( "Remove" ) );
if (m_tqmask & Keep) if (m_mask & Keep)
r.push_back( i18n( "Keep" ) ); r.push_back( i18n( "Keep" ) );
if (m_tqmask & Upgrade) if (m_mask & Upgrade)
r.push_back( i18n( "Upgrade" ) ); r.push_back( i18n( "Upgrade" ) );
} }
std::copy( r.begin(), r.end(), std::copy( r.begin(), r.end(),
@ -100,12 +100,12 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
return s.str(); return s.str();
} }
unsigned tqmask() const { unsigned mask() const {
return m_tqmask; return m_mask;
} }
void setMask( unsigned m ) { void setMask( unsigned m ) {
m_tqmask = m; m_mask = m;
setupPredicate(); setupPredicate();
} }
@ -120,12 +120,12 @@ struct StateFilter : predicate::Implementation< T, StateFilter< T > >,
} }
virtual void reset() { virtual void reset() {
m_tqmask = 0xff; m_mask = 0xff;
setupPredicate(); setupPredicate();
} }
protected: protected:
unsigned m_tqmask; unsigned m_mask;
predicate::Predicate< T > m_op; predicate::Predicate< T > m_op;
}; };
@ -134,7 +134,7 @@ class StateFilterWidget : public StateFilterUi
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
StateFilterWidget( TQWidget *tqparent, const char *name = 0 ); StateFilterWidget( TQWidget *parent, const char *name = 0 );
virtual Predicate predicate(); virtual Predicate predicate();
public slots: public slots:
void predicateChanged(); void predicateChanged();

4
adept/notifier/app.cpp
Unescape View File

@ -33,8 +33,8 @@ using namespace cache;
using namespace utils; using namespace utils;
using namespace adept; using namespace adept;
TrayWindow::TrayWindow(TQWidget *tqparent, const char *name) TrayWindow::TrayWindow(TQWidget *parent, const char *name)
: KSystemTray(tqparent, name), m_updates( 0 ) : KSystemTray(parent, name), m_updates( 0 )
{ {
setAvailableUpdates( m_updates ); setAvailableUpdates( m_updates );
// actionCollection()->remove( actionCollection()->action( "quit" ) ); // actionCollection()->remove( actionCollection()->action( "quit" ) );

2
adept/notifier/app.h
Unescape View File

@ -17,7 +17,7 @@ class TrayWindow : public KSystemTray
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
TrayWindow(TQWidget *tqparent=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 ( KPopupMenu * );

16
adept/tests/libcapture/tree-test.cpp
Unescape View File

@ -21,15 +21,15 @@ namespace tut {
class STF: public TreeFactory class STF: public TreeFactory
{ {
public: public:
TreePkgNode *makePkgNode (TreeNode *tqparent, pkgCache::PkgIterator P) TreePkgNode *makePkgNode (TreeNode *parent, pkgCache::PkgIterator P)
{ return new TreePkgNode (tqparent, P); } { return new TreePkgNode (parent, P); }
TreeBranchNode *makeBranchNode (TreeNode *tqparent, string id, string name) TreeBranchNode *makeBranchNode (TreeNode *parent, string id, string name)
{ return new TreeBranchNode (tqparent, id, name); } { return new TreeBranchNode (parent, id, name); }
TreeGroupNode *makeGroupNode (TreeNode *tqparent, pkgTagSection s) TreeGroupNode *makeGroupNode (TreeNode *parent, pkgTagSection s)
{ return new TreeGroupNode (tqparent, s); } { return new TreeGroupNode (parent, s); }
TreeBranchNode *makeRoot () { return new TreeBranchNode (0, "ROOT"); } TreeBranchNode *makeRoot () { return new TreeBranchNode (0, "ROOT"); }
TreeDepNode *makeDepNode (TreeNode *tqparent, pkgCache::DepIterator) { return 0; } TreeDepNode *makeDepNode (TreeNode *parent, pkgCache::DepIterator) { return 0; }
TreeVerNode *makeVerNode (TreeNode *tqparent, pkgCache::VerIterator) { return 0; } TreeVerNode *makeVerNode (TreeNode *parent, pkgCache::VerIterator) { return 0; }
}; };
/* class TestProd: public NodeProducer { /* class TestProd: public NodeProducer {

Write Preview
Loading…
Cancel
Save