summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:34:41 -0600
committerSlávek Banko <[email protected]>2012-06-24 03:50:49 +0200
commit3fa8b755924adc6003be8c7d3df4e54a3220e5f5 (patch)
tree279e3c7d84037e2596e77f3feed60ab09e6f7b4e
parentbfc6df84615a92c380651726fc7c03d4fa704c2f (diff)
downloadadept-3fa8b755924adc6003be8c7d3df4e54a3220e5f5.tar.gz
adept-3fa8b755924adc6003be8c7d3df4e54a3220e5f5.zip
Remove additional unneeded tq method conversions
(cherry picked from commit 5491e8ebc41db9c0ff2ec86a66f73524dee0d4e4)
-rw-r--r--adept/adept/acqprogress.cpp10
-rw-r--r--adept/adept/acqprogress.h2
-rw-r--r--adept/adept/application.cpp10
-rw-r--r--adept/adept/desktopentryui.ui2
-rw-r--r--adept/adept/dpkgpm-gui.cpp2
-rw-r--r--adept/adept/extendablelist.cpp4
-rw-r--r--adept/adept/lister.cpp8
-rw-r--r--adept/adept/lister.h2
-rw-r--r--adept/adept/listerextenderui.ui6
-rw-r--r--adept/adept/packageinfo.cpp2
-rw-r--r--adept/adept/packageinfoui.ui2
-rw-r--r--adept/adept/sourceseditor.cpp2
-rw-r--r--adept/adept/sourceseditor.h2
-rw-r--r--adept/adept/statefilterui.ui4
-rw-r--r--adept/batch/app.cpp2
-rw-r--r--adept/kubuntu_upgrader/errordialogbase.ui2
-rw-r--r--adept/kubuntu_upgrader/upgradewizardbase.ui4
-rw-r--r--adept/libadept/acqprogress.cpp10
-rw-r--r--adept/libadept/acqprogress.h2
-rw-r--r--adept/libadept/application.cpp10
-rw-r--r--adept/libadept/desktopentryui.ui2
-rw-r--r--adept/libadept/dpkgpm-gui.cpp2
-rw-r--r--adept/libadept/extendablelist.cpp4
-rw-r--r--adept/libadept/lister.cpp2
-rw-r--r--adept/libadept/lister.h2
-rw-r--r--adept/libadept/listerextenderui.ui6
-rw-r--r--adept/libadept/packageinfo.cpp2
-rw-r--r--adept/libadept/packageinfoui.ui2
-rw-r--r--adept/libadept/sourceseditor.cpp2
-rw-r--r--adept/libadept/sourceseditor.h2
-rw-r--r--adept/libadept/statefilterui.ui4
31 files changed, 59 insertions, 59 deletions
diff --git a/adept/adept/acqprogress.cpp b/adept/adept/acqprogress.cpp
index 604b6df..ff31e8f 100644
--- a/adept/adept/acqprogress.cpp
+++ b/adept/adept/acqprogress.cpp
@@ -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();
diff --git a/adept/adept/acqprogress.h b/adept/adept/acqprogress.h
index 660c01c..e6990af 100644
--- a/adept/adept/acqprogress.h
+++ b/adept/adept/acqprogress.h
@@ -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;
diff --git a/adept/adept/application.cpp b/adept/adept/application.cpp
index 57e1265..a8334c8 100644
--- a/adept/adept/application.cpp
+++ b/adept/adept/application.cpp
@@ -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 ) {
diff --git a/adept/adept/desktopentryui.ui b/adept/adept/desktopentryui.ui
index 23cdb94..961b7f6 100644
--- a/adept/adept/desktopentryui.ui
+++ b/adept/adept/desktopentryui.ui
@@ -86,7 +86,7 @@
<property name="text">
<string>(description)</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/adept/adept/dpkgpm-gui.cpp b/adept/adept/dpkgpm-gui.cpp
index 29c8a98..a463c7d 100644
--- a/adept/adept/dpkgpm-gui.cpp
+++ b/adept/adept/dpkgpm-gui.cpp
@@ -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 + ")") ) );
}
}
diff --git a/adept/adept/extendablelist.cpp b/adept/adept/extendablelist.cpp
index 474f9c5..7c34304 100644
--- a/adept/adept/extendablelist.cpp
+++ b/adept/adept/extendablelist.cpp
@@ -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 );
} */
diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp
index 095088c..0ce89ce 100644
--- a/adept/adept/lister.cpp
+++ b/adept/adept/lister.cpp
@@ -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 );
}
diff --git a/adept/adept/lister.h b/adept/adept/lister.h
index 47f44e9..03506ab 100644
--- a/adept/adept/lister.h
+++ b/adept/adept/lister.h
@@ -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() );
diff --git a/adept/adept/listerextenderui.ui b/adept/adept/listerextenderui.ui
index 69d15df..ead2dac 100644
--- a/adept/adept/listerextenderui.ui
+++ b/adept/adept/listerextenderui.ui
@@ -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>
diff --git a/adept/adept/packageinfo.cpp b/adept/adept/packageinfo.cpp
index 001460a..5adf40d 100644
--- a/adept/adept/packageinfo.cpp
+++ b/adept/adept/packageinfo.cpp
@@ -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 )
diff --git a/adept/adept/packageinfoui.ui b/adept/adept/packageinfoui.ui
index 5664467..14ceec0 100644
--- a/adept/adept/packageinfoui.ui
+++ b/adept/adept/packageinfoui.ui
@@ -74,7 +74,7 @@
<property name="text">
<string>maintainer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
</widget>
diff --git a/adept/adept/sourceseditor.cpp b/adept/adept/sourceseditor.cpp
index 28a9d8e..8755968 100644
--- a/adept/adept/sourceseditor.cpp
+++ b/adept/adept/sourceseditor.cpp
@@ -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();
diff --git a/adept/adept/sourceseditor.h b/adept/adept/sourceseditor.h
index 295f3fa..7faa1a9 100644
--- a/adept/adept/sourceseditor.h
+++ b/adept/adept/sourceseditor.h
@@ -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;
};
diff --git a/adept/adept/statefilterui.ui b/adept/adept/statefilterui.ui
index 8744a4d..1f5b7d9 100644
--- a/adept/adept/statefilterui.ui
+++ b/adept/adept/statefilterui.ui
@@ -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>
diff --git a/adept/batch/app.cpp b/adept/batch/app.cpp
index 140e4d6..efe0e54 100644
--- a/adept/batch/app.cpp
+++ b/adept/batch/app.cpp
@@ -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);
}
diff --git a/adept/kubuntu_upgrader/errordialogbase.ui b/adept/kubuntu_upgrader/errordialogbase.ui
index 480a70f..cfd0e22 100644
--- a/adept/kubuntu_upgrader/errordialogbase.ui
+++ b/adept/kubuntu_upgrader/errordialogbase.ui
@@ -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>
diff --git a/adept/kubuntu_upgrader/upgradewizardbase.ui b/adept/kubuntu_upgrader/upgradewizardbase.ui
index e025337..b0b7425 100644
--- a/adept/kubuntu_upgrader/upgradewizardbase.ui
+++ b/adept/kubuntu_upgrader/upgradewizardbase.ui
@@ -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>
diff --git a/adept/libadept/acqprogress.cpp b/adept/libadept/acqprogress.cpp
index 604b6df..ff31e8f 100644
--- a/adept/libadept/acqprogress.cpp
+++ b/adept/libadept/acqprogress.cpp
@@ -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();
diff --git a/adept/libadept/acqprogress.h b/adept/libadept/acqprogress.h
index 660c01c..e6990af 100644
--- a/adept/libadept/acqprogress.h
+++ b/adept/libadept/acqprogress.h
@@ -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;
diff --git a/adept/libadept/application.cpp b/adept/libadept/application.cpp
index 92470a3..b950163 100644
--- a/adept/libadept/application.cpp
+++ b/adept/libadept/application.cpp
@@ -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 ) {
diff --git a/adept/libadept/desktopentryui.ui b/adept/libadept/desktopentryui.ui
index 23cdb94..961b7f6 100644
--- a/adept/libadept/desktopentryui.ui
+++ b/adept/libadept/desktopentryui.ui
@@ -86,7 +86,7 @@
<property name="text">
<string>(description)</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/adept/libadept/dpkgpm-gui.cpp b/adept/libadept/dpkgpm-gui.cpp
index 29c8a98..a463c7d 100644
--- a/adept/libadept/dpkgpm-gui.cpp
+++ b/adept/libadept/dpkgpm-gui.cpp
@@ -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 + ")") ) );
}
}
diff --git a/adept/libadept/extendablelist.cpp b/adept/libadept/extendablelist.cpp
index d37dd63..2277850 100644
--- a/adept/libadept/extendablelist.cpp
+++ b/adept/libadept/extendablelist.cpp
@@ -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 );
} */
diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp
index a1249ce..80f0071 100644
--- a/adept/libadept/lister.cpp
+++ b/adept/libadept/lister.cpp
@@ -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;
diff --git a/adept/libadept/lister.h b/adept/libadept/lister.h
index d1acc91..a85a8e1 100644
--- a/adept/libadept/lister.h
+++ b/adept/libadept/lister.h
@@ -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() );
diff --git a/adept/libadept/listerextenderui.ui b/adept/libadept/listerextenderui.ui
index 9226dad..f634979 100644
--- a/adept/libadept/listerextenderui.ui
+++ b/adept/libadept/listerextenderui.ui
@@ -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>
diff --git a/adept/libadept/packageinfo.cpp b/adept/libadept/packageinfo.cpp
index 001460a..5adf40d 100644
--- a/adept/libadept/packageinfo.cpp
+++ b/adept/libadept/packageinfo.cpp
@@ -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 )
diff --git a/adept/libadept/packageinfoui.ui b/adept/libadept/packageinfoui.ui
index 5664467..14ceec0 100644
--- a/adept/libadept/packageinfoui.ui
+++ b/adept/libadept/packageinfoui.ui
@@ -74,7 +74,7 @@
<property name="text">
<string>maintainer</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignBottom</set>
</property>
</widget>
diff --git a/adept/libadept/sourceseditor.cpp b/adept/libadept/sourceseditor.cpp
index 39c2084..7874b9a 100644
--- a/adept/libadept/sourceseditor.cpp
+++ b/adept/libadept/sourceseditor.cpp
@@ -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();
diff --git a/adept/libadept/sourceseditor.h b/adept/libadept/sourceseditor.h
index 780b40c..2eec7db 100644
--- a/adept/libadept/sourceseditor.h
+++ b/adept/libadept/sourceseditor.h
@@ -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;
};
diff --git a/adept/libadept/statefilterui.ui b/adept/libadept/statefilterui.ui
index 8744a4d..1f5b7d9 100644
--- a/adept/libadept/statefilterui.ui
+++ b/adept/libadept/statefilterui.ui
@@ -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>