Remove additional unneeded tq method conversions

(cherry picked from commit 5491e8ebc4)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent bfc6df8461
commit 3fa8b75592

@ -80,7 +80,7 @@ void AcqStatus::Item::setStatus( const std::string &s, int i )
} }
void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg, void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
@ -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, tqalignment ); KListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }
} }
@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
} }
triggerUpdate (); triggerUpdate ();
// tqrepaint (); // repaint ();
if (TotalBytes > 0) if (TotalBytes > 0)
emit totalProgress( emit totalProgress(
@ -253,8 +253,8 @@ bool AcqStatus::MediaChange(string Media,string Drive)
int res = KMessageBox::warningContinueCancel( int res = KMessageBox::warningContinueCancel(
this, i18n( "Please insert the disc " this, i18n( "Please insert the disc "
"labeled '%1' in the drive " "labeled '%1' in the drive "
"'%2' and press enter" ).tqarg( "'%2' and press enter" ).arg(
u8( Media ) ).tqarg( u8( Drive ) ), u8( Media ) ).arg( u8( Drive ) ),
i18n( "Media Change" ) ); i18n( "Media Change" ) );
if ( res == KMessageBox::Cancel ) if ( res == KMessageBox::Cancel )
cancel(); cancel();

@ -67,7 +67,7 @@ protected:
virtual ~Item (); virtual ~Item ();
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
void setProgress (int); void setProgress (int);
virtual int compare (TQListViewItem *i, int col, bool ascend) const; virtual int compare (TQListViewItem *i, int col, bool ascend) const;

@ -305,21 +305,21 @@ void Application::redo() {
TQString Application::changeString() { TQString Application::changeString() {
component::State &s = cache().state(); component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " ) return i18n( " Install %1, upgrade %2, remove %3 " )
.tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() ) .arg( s.newInstallCount() ).arg( s.upgradeCount() )
.tqarg( s.removeCount() ); .arg( s.removeCount() );
} }
TQString Application::statusString() { TQString Application::statusString() {
component::State &s = cache().state(); component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " ) return i18n( " %1 installed, %2 upgradable, %3 available " )
.tqarg( s.installedCount() ).tqarg( s.upgradableCount() ) .arg( s.installedCount() ).arg( s.upgradableCount() )
.tqarg( s.availableCount() ); .arg( s.availableCount() );
} }
TQString Application::sizesString() { TQString Application::sizesString() {
TQString dl = cache().state().downloadSizeString(); TQString dl = cache().state().downloadSizeString();
TQString inst = cache().state().installSizeString(); TQString inst = cache().state().installSizeString();
return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst ); return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
} }
void Application::setStatusBar( KStatusBar *s ) { void Application::setStatusBar( KStatusBar *s ) {

@ -86,7 +86,7 @@
<property name="text"> <property name="text">
<string>(description)</string> <string>(description)</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -250,7 +250,7 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
std::cerr << "updateStatus: seen = " << m_seenOpCount std::cerr << "updateStatus: seen = " << m_seenOpCount
<< ", total = " << m_totalOpCount << std::endl; << ", total = " << m_totalOpCount << std::endl;
statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount, statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) ); u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
} }
} }

@ -294,11 +294,11 @@ void ExtendableItem::paintBranches( TQPainter *p,
} }
/* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg, /* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
KListViewItem::paintCell( &_p, cg, column, width, tqalignment ); KListViewItem::paintCell( &_p, cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} */ } */

@ -448,7 +448,7 @@ ListerItem::~ListerItem()
} }
void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg, void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
if ( width <= 0 ) if ( width <= 0 )
return; return;
@ -473,10 +473,10 @@ void ListerItem::paintCell ( TQPainter *p, const TQColorGroup &cg,
if ( extender() ) { // make the icon appear at top... this if ( extender() ) { // make the icon appear at top... this
// probably breaks big-text displays? // probably breaks big-text displays?
// --> somewhat, but not too badly // --> somewhat, but not too badly
tqalignment &= ~AlignVertical_Mask; alignment &= ~AlignVertical_Mask;
tqalignment |= AlignTop; alignment |= AlignTop;
} }
KListViewItem::paintCell( &_p, _cg, column, width, tqalignment ); KListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }

@ -238,7 +238,7 @@ public:
entity::Entity entity() { return m_entity; } entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; } const entity::Entity entity() const { return m_entity; }
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
virtual bool less( const ExtendableItem * ) const; virtual bool less( const ExtendableItem * ) const;
Lister *lister() { Lister *lister() {
return dynamic_cast< Lister* >( listView() ); return dynamic_cast< Lister* >( listView() );

@ -85,7 +85,7 @@
<property name="text"> <property name="text">
<string>name</string> <string>name</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -123,7 +123,7 @@
<property name="text"> <property name="text">
<string>status</string> <string>status</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -148,7 +148,7 @@
<property name="text"> <property name="text">
<string>change</string> <string>change</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>

@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
/* TQString hexColor( TQColor c ) /* TQString hexColor( TQColor c )
{ {
TQString r( "#%1%2%3" ); TQString r( "#%1%2%3" );
return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 ); return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
} */ } */
TQString colorify( TQColor c, TQString s ) TQString colorify( TQColor c, TQString s )

@ -74,7 +74,7 @@
<property name="text"> <property name="text">
<string>maintainer</string> <string>maintainer</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

@ -150,7 +150,7 @@ void EntryItem::setText( int c, const TQString &_s )
} }
void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();

@ -57,7 +57,7 @@ public:
TQString text( int c ) const; TQString text( int c ) const;
void setText( int c, const TQString &s ); void setText( int c, const TQString &s );
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
protected: protected:
Sources::Entry m_entry; Sources::Entry m_entry;
}; };

@ -32,7 +32,7 @@
<property name="text"> <property name="text">
<string>Show: </string> <string>Show: </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -153,7 +153,7 @@
<property name="text"> <property name="text">
<string>with: </string> <string>with: </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

@ -67,7 +67,7 @@ App::App( KCmdLineArgs *args ) {
qs_pkgname = a; qs_pkgname = a;
kdDebug() << "The package '"<<a<<"' could not be found." << endl; kdDebug() << "The package '"<<a<<"' could not be found." << endl;
KMessageBox::sorry( KMessageBox::sorry(
this, i18n( "The package '%1' could not be found." ).tqarg(u8(qs_pkgname)), this, i18n( "The package '%1' could not be found." ).arg(u8(qs_pkgname)),
i18n( "Could not commit changes" ) ); i18n( "Could not commit changes" ) );
exit(1); exit(1);
} }

@ -35,7 +35,7 @@
<property name="text"> <property name="text">
<string>&lt;p align="center"&gt;&lt;/p&gt;</string> <string>&lt;p align="center"&gt;&lt;/p&gt;</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -34,7 +34,7 @@
<property name="text"> <property name="text">
<string>A new distribution version is available! Click next if you wish to upgrade now.</string> <string>A new distribution version is available! Click next if you wish to upgrade now.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -115,7 +115,7 @@
<property name="text"> <property name="text">
<string>Ready to upgrade! Click finish to close the Adept Package Manager and launch the distribution upgrade tool.</string> <string>Ready to upgrade! Click finish to close the Adept Package Manager and launch the distribution upgrade tool.</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -80,7 +80,7 @@ void AcqStatus::Item::setStatus( const std::string &s, int i )
} }
void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg, void AcqStatus::Item::paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();
@ -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, tqalignment ); KListViewItem::paintCell( &_p, _cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} }
} }
@ -230,7 +230,7 @@ bool AcqStatus::Pulse(pkgAcquire *Owner)
} }
triggerUpdate (); triggerUpdate ();
// tqrepaint (); // repaint ();
if (TotalBytes > 0) if (TotalBytes > 0)
emit totalProgress( emit totalProgress(
@ -253,8 +253,8 @@ bool AcqStatus::MediaChange(string Media,string Drive)
int res = KMessageBox::warningContinueCancel( int res = KMessageBox::warningContinueCancel(
this, i18n( "Please insert the disc " this, i18n( "Please insert the disc "
"labeled '%1' in the drive " "labeled '%1' in the drive "
"'%2' and press enter" ).tqarg( "'%2' and press enter" ).arg(
u8( Media ) ).tqarg( u8( Drive ) ), u8( Media ) ).arg( u8( Drive ) ),
i18n( "Media Change" ) ); i18n( "Media Change" ) );
if ( res == KMessageBox::Cancel ) if ( res == KMessageBox::Cancel )
cancel(); cancel();

@ -67,7 +67,7 @@ protected:
virtual ~Item (); virtual ~Item ();
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
void setProgress (int); void setProgress (int);
virtual int compare (TQListViewItem *i, int col, bool ascend) const; virtual int compare (TQListViewItem *i, int col, bool ascend) const;

@ -153,21 +153,21 @@ void Application::redo() {
TQString Application::changeString() { TQString Application::changeString() {
component::State &s = cache().state(); component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " ) return i18n( " Install %1, upgrade %2, remove %3 " )
.tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() ) .arg( s.newInstallCount() ).arg( s.upgradeCount() )
.tqarg( s.removeCount() ); .arg( s.removeCount() );
} }
TQString Application::statusString() { TQString Application::statusString() {
component::State &s = cache().state(); component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " ) return i18n( " %1 installed, %2 upgradable, %3 available " )
.tqarg( s.installedCount() ).tqarg( s.upgradableCount() ) .arg( s.installedCount() ).arg( s.upgradableCount() )
.tqarg( s.availableCount() ); .arg( s.availableCount() );
} }
TQString Application::sizesString() { TQString Application::sizesString() {
TQString dl = cache().state().downloadSizeString(); TQString dl = cache().state().downloadSizeString();
TQString inst = cache().state().installSizeString(); TQString inst = cache().state().installSizeString();
return i18n( " download: %1, installation: %2 " ).tqarg( dl ).tqarg( inst ); return i18n( " download: %1, installation: %2 " ).arg( dl ).arg( inst );
} }
void Application::setStatusBar( KStatusBar *s ) { void Application::setStatusBar( KStatusBar *s ) {

@ -86,7 +86,7 @@
<property name="text"> <property name="text">
<string>(description)</string> <string>(description)</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>WordBreak|AlignVCenter</set> <set>WordBreak|AlignVCenter</set>
</property> </property>
</widget> </widget>

@ -250,7 +250,7 @@ void DPkgPM::updateStatus( std::string pkg, std::string ev, std::string r )
std::cerr << "updateStatus: seen = " << m_seenOpCount std::cerr << "updateStatus: seen = " << m_seenOpCount
<< ", total = " << m_totalOpCount << std::endl; << ", total = " << m_totalOpCount << std::endl;
statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount, statusChanged( ( m_seenOpCount * 100 ) / m_totalOpCount,
u8( msg ).tqarg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) ); u8( msg ).arg( pkg ) + ( ( r == "") ? "" : (" (" + r + ")") ) );
} }
} }

@ -287,11 +287,11 @@ void ExtendableItem::paintBranches( TQPainter *p,
} }
/* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg, /* void ExtendableItem::paintCell( TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQPixmap pm( width, height() ); TQPixmap pm( width, height() );
TQPainter _p( &pm ); TQPainter _p( &pm );
KListViewItem::paintCell( &_p, cg, column, width, tqalignment ); KListViewItem::paintCell( &_p, cg, column, width, alignment );
p->drawPixmap( 0, 0, pm ); p->drawPixmap( 0, 0, pm );
} */ } */

@ -390,7 +390,7 @@ TQString ListerItem::text( int column ) const
} }
void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg, void ListerItem::paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
if ( width <= 0 ) if ( width <= 0 )
return; return;

@ -199,7 +199,7 @@ public:
entity::Entity entity() { return m_entity; } entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; } const entity::Entity entity() const { return m_entity; }
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
virtual bool less( const ExtendableItem * ) const; virtual bool less( const ExtendableItem * ) const;
Lister *lister() { Lister *lister() {
return dynamic_cast< Lister* >( listView() ); return dynamic_cast< Lister* >( listView() );

@ -102,7 +102,7 @@
<property name="text"> <property name="text">
<string>name</string> <string>name</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -124,7 +124,7 @@
<property name="text"> <property name="text">
<string>status</string> <string>status</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>
@ -149,7 +149,7 @@
<property name="text"> <property name="text">
<string>change</string> <string>change</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignTop</set> <set>AlignTop</set>
</property> </property>
</widget> </widget>

@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
/* TQString hexColor( TQColor c ) /* TQString hexColor( TQColor c )
{ {
TQString r( "#%1%2%3" ); TQString r( "#%1%2%3" );
return r.tqarg( c.red(), -2, 16 ).tqarg( c.green(), -2, 16 ).tqarg( c.blue(), -2, 16 ); return r.arg( c.red(), -2, 16 ).arg( c.green(), -2, 16 ).arg( c.blue(), -2, 16 );
} */ } */
TQString colorify( TQColor c, TQString s ) TQString colorify( TQColor c, TQString s )

@ -74,7 +74,7 @@
<property name="text"> <property name="text">
<string>maintainer</string> <string>maintainer</string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignBottom</set> <set>AlignBottom</set>
</property> </property>
</widget> </widget>

@ -150,7 +150,7 @@ void EntryItem::setText( int c, const TQString &_s )
} }
void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg, void EntryItem::paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment ) int column, int width, int alignment )
{ {
TQColorGroup _cg( cg ); TQColorGroup _cg( cg );
TQColor c = _cg.text(); TQColor c = _cg.text();

@ -56,7 +56,7 @@ public:
TQString text( int c ) const; TQString text( int c ) const;
void setText( int c, const TQString &s ); void setText( int c, const TQString &s );
virtual void paintCell (TQPainter *p, const TQColorGroup &cg, virtual void paintCell (TQPainter *p, const TQColorGroup &cg,
int column, int width, int tqalignment); int column, int width, int alignment);
protected: protected:
Sources::Entry m_entry; Sources::Entry m_entry;
}; };

@ -32,7 +32,7 @@
<property name="text"> <property name="text">
<string>Show: </string> <string>Show: </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter</set> <set>AlignVCenter</set>
</property> </property>
</widget> </widget>
@ -153,7 +153,7 @@
<property name="text"> <property name="text">
<string>with: </string> <string>with: </string>
</property> </property>
<property name="tqalignment"> <property name="alignment">
<set>AlignVCenter|AlignRight</set> <set>AlignVCenter|AlignRight</set>
</property> </property>
</widget> </widget>

Loading…
Cancel
Save