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

Remove additional unneeded tq method conversions

Browse Source 
(cherry picked from commit 5491e8ebc4)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent bfc6df8461
commit 3fa8b75592
31 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File

10
adept/adept/acqprogress.cpp
Unescape Escape View File

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

2
adept/adept/acqprogress.h
Unescape Escape View File

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

10
adept/adept/application.cpp
Unescape Escape View File

@ -305,21 +305,21 @@ void Application::redo() {
TQString Application::changeString() {
component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " )
.tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
.tqarg( s.removeCount() );
.arg( s.newInstallCount() ).arg( s.upgradeCount() )
.arg( s.removeCount() );
}
TQString Application::statusString() {
component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " )
.tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
.tqarg( s.availableCount() );
.arg( s.installedCount() ).arg( s.upgradableCount() )
.arg( s.availableCount() );
}
TQString Application::sizesString() {
TQString dl = cache().state().downloadSizeString();
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 ) {

2
adept/adept/desktopentryui.ui
Unescape Escape View File

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

2
adept/adept/dpkgpm-gui.cpp
Unescape Escape View File

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

4
adept/adept/extendablelist.cpp
Unescape Escape View File

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

8
adept/adept/lister.cpp
Unescape Escape View File

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

2
adept/adept/lister.h
Unescape Escape View File

@ -238,7 +238,7 @@ public:
entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; }
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;
Lister *lister() {
return dynamic_cast< Lister* >( listView() );

6
adept/adept/listerextenderui.ui
Unescape Escape View File

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

2
adept/adept/packageinfo.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
/* TQString hexColor( TQColor c )
{
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 )

2
adept/adept/packageinfoui.ui
Unescape Escape View File

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

2
adept/adept/sourceseditor.cpp
Unescape Escape View File

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

2
adept/adept/sourceseditor.h
Unescape Escape View File

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

4
adept/adept/statefilterui.ui
Unescape Escape View File

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

2
adept/batch/app.cpp
Unescape Escape View File

@ -67,7 +67,7 @@ App::App( KCmdLineArgs *args ) {
qs_pkgname = a;
kdDebug() << "The package '"<<a<<"' could not be found." << endl;
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" ) );
exit(1);
}

2
adept/kubuntu_upgrader/errordialogbase.ui
Unescape Escape View File

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

4
adept/kubuntu_upgrader/upgradewizardbase.ui
Unescape Escape View File

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

10
adept/libadept/acqprogress.cpp
Unescape Escape View File

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

2
adept/libadept/acqprogress.h
Unescape Escape View File

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

10
adept/libadept/application.cpp
Unescape Escape View File

@ -153,21 +153,21 @@ void Application::redo() {
TQString Application::changeString() {
component::State &s = cache().state();
return i18n( " Install %1, upgrade %2, remove %3 " )
.tqarg( s.newInstallCount() ).tqarg( s.upgradeCount() )
.tqarg( s.removeCount() );
.arg( s.newInstallCount() ).arg( s.upgradeCount() )
.arg( s.removeCount() );
}
TQString Application::statusString() {
component::State &s = cache().state();
return i18n( " %1 installed, %2 upgradable, %3 available " )
.tqarg( s.installedCount() ).tqarg( s.upgradableCount() )
.tqarg( s.availableCount() );
.arg( s.installedCount() ).arg( s.upgradableCount() )
.arg( s.availableCount() );
}
TQString Application::sizesString() {
TQString dl = cache().state().downloadSizeString();
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 ) {

2
adept/libadept/desktopentryui.ui
Unescape Escape View File

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

2
adept/libadept/dpkgpm-gui.cpp
Unescape Escape View File

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

4
adept/libadept/extendablelist.cpp
Unescape Escape View File

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

2
adept/libadept/lister.cpp
Unescape Escape View File

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

2
adept/libadept/lister.h
Unescape Escape View File

@ -199,7 +199,7 @@ public:
entity::Entity entity() { return m_entity; }
const entity::Entity entity() const { return m_entity; }
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;
Lister *lister() {
return dynamic_cast< Lister* >( listView() );

6
adept/libadept/listerextenderui.ui
Unescape Escape View File

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

2
adept/libadept/packageinfo.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ TQColor actionColor( entity::Package p )
/* TQString hexColor( TQColor c )
{
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 )

2
adept/libadept/packageinfoui.ui
Unescape Escape View File

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

2
adept/libadept/sourceseditor.cpp
Unescape Escape View File

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

2
adept/libadept/sourceseditor.h
Unescape Escape View File

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

4
adept/libadept/statefilterui.ui
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save