From db02bba0ad6dfd6e15fd11bf7979dbc60e0aeb3b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:03:32 -0600 Subject: Rename obsolete tq methods to standard names --- adept/adept/commitprogressui.ui | 4 ++-- adept/adept/desktoplist.cpp | 10 +++++----- adept/adept/easytagfilterui.ui | 4 ++-- adept/adept/extendablelist.cpp | 2 +- adept/adept/groupeddesktopselector.cpp | 2 +- adept/adept/installerviewui.ui | 2 +- adept/adept/lister.cpp | 8 ++++---- adept/adept/listerextenderui.ui | 4 ++-- adept/adept/packagedetailsui.ui | 2 +- adept/adept/sourceseditorui.ui | 4 ++-- adept/adept/statefilterui.ui | 4 ++-- adept/adept/taglist.cpp | 4 ++-- adept/installer/app.cpp | 10 +++++----- adept/libadept/commitprogressui.ui | 4 ++-- adept/libadept/desktoplist.cpp | 10 +++++----- adept/libadept/easytagfilterui.ui | 4 ++-- adept/libadept/extendablelist.cpp | 2 +- adept/libadept/groupeddesktopselector.cpp | 2 +- adept/libadept/installerviewui.ui | 2 +- adept/libadept/lister.cpp | 8 ++++---- adept/libadept/listerextenderui.ui | 4 ++-- adept/libadept/packagedetailsui.ui | 2 +- adept/libadept/sourceseditorui.ui | 4 ++-- adept/libadept/statefilterui.ui | 4 ++-- adept/libadept/taglist.cpp | 4 ++-- 25 files changed, 55 insertions(+), 55 deletions(-) diff --git a/adept/adept/commitprogressui.ui b/adept/adept/commitprogressui.ui index 9b94594..cfa4e3f 100644 --- a/adept/adept/commitprogressui.ui +++ b/adept/adept/commitprogressui.ui @@ -79,7 +79,7 @@ - tqlayout6 + layout6 @@ -104,7 +104,7 @@ - tqlayout5 + layout5 diff --git a/adept/adept/desktoplist.cpp b/adept/adept/desktoplist.cpp index c522ff2..fe35fcd 100644 --- a/adept/adept/desktoplist.cpp +++ b/adept/adept/desktoplist.cpp @@ -27,16 +27,16 @@ DesktopEntry::DesktopEntry( TQWidget *p, const char *n ) void DesktopEntry::resize( int w, int h ) { // kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl; - int margin = tqlayout()->margin() + tqlayout()->spacing() * 2 + int margin = layout()->margin() + layout()->spacing() * 2 + 6 /* spacer */ + m_icon->width() + m_check->width(); - if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing(); + if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing(); int hFW1 = m_name->heightForWidth( w - margin ); int hFW2 = m_description->heightForWidth( w - margin ); /* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = " << hFW2 << endl; */ - int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2; - if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ ) - height = 32 + 2*tqlayout()->margin(); + int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2; + if ( height < 32 + 2*layout()->margin() /* icon size + margin */ ) + height = 32 + 2*layout()->margin(); // m_description->resize( w - margin, m_description->heightForWidth( w - margin ) ); TQWidget::resize( w, height ); } diff --git a/adept/adept/easytagfilterui.ui b/adept/adept/easytagfilterui.ui index 9c269c8..14a7b5f 100644 --- a/adept/adept/easytagfilterui.ui +++ b/adept/adept/easytagfilterui.ui @@ -43,7 +43,7 @@ - tqlayout4 + layout4 @@ -68,7 +68,7 @@ - tqlayout3 + layout3 diff --git a/adept/adept/extendablelist.cpp b/adept/adept/extendablelist.cpp index 7c34304..4c1451a 100644 --- a/adept/adept/extendablelist.cpp +++ b/adept/adept/extendablelist.cpp @@ -106,7 +106,7 @@ void ExtendableList::updateExtender( ExtendableItem *i ) i->extender()->height() ); if ( i->height() != i->extender()->frameSize().height() ) { i->setHeight( i->extender()->frameSize().height() ); - delayedUpdateExtenders(); // re-update since we broke tqlayout + delayedUpdateExtenders(); // re-update since we broke layout } i->extender()->setupColors(); diff --git a/adept/adept/groupeddesktopselector.cpp b/adept/adept/groupeddesktopselector.cpp index 3edc87d..5da34c0 100644 --- a/adept/adept/groupeddesktopselector.cpp +++ b/adept/adept/groupeddesktopselector.cpp @@ -38,7 +38,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n ) } // *hack* // AAAA hack - TQLayoutIterator li = tqlayout()->iterator(); + TQLayoutIterator li = layout()->iterator(); TQHBoxLayout *hbox = 0; while ( li.current() != 0 ) { hbox = dynamic_cast< TQHBoxLayout * >( li.current() ); diff --git a/adept/adept/installerviewui.ui b/adept/adept/installerviewui.ui index 29a31ea..cba6d5e 100644 --- a/adept/adept/installerviewui.ui +++ b/adept/adept/installerviewui.ui @@ -27,7 +27,7 @@ - tqlayout5 + layout5 diff --git a/adept/adept/lister.cpp b/adept/adept/lister.cpp index 0ce89ce..a5875b1 100644 --- a/adept/adept/lister.cpp +++ b/adept/adept/lister.cpp @@ -669,13 +669,13 @@ void ListerItemExtender::resize( int w, int h ) { // XXX the magic constants are probably style-dependent... AW int namew = - item()->lister()->extenderOffset( item() ) - - tqlayout()->margin() - - tqlayout()->spacing() + - layout()->margin() + - layout()->spacing() + item()->lister()->columnWidth( 0 ); int statw = item()->lister()->columnWidth( Lister::ColStatus ) - - tqlayout()->spacing(); + - layout()->spacing(); int chw = item()->lister()->columnWidth( Lister::ColRequested ) - - tqlayout()->spacing() - 3; // wth... + - layout()->spacing() - 3; // wth... m_name->setMinimumWidth( namew ); m_status->setMinimumWidth( statw ); m_change->setMinimumWidth( chw ); diff --git a/adept/adept/listerextenderui.ui b/adept/adept/listerextenderui.ui index ead2dac..c3a877c 100644 --- a/adept/adept/listerextenderui.ui +++ b/adept/adept/listerextenderui.ui @@ -61,7 +61,7 @@ - tqlayout7 + layout7 @@ -182,7 +182,7 @@ - tqlayout3 + layout3 diff --git a/adept/adept/packagedetailsui.ui b/adept/adept/packagedetailsui.ui index 4734c4c..9cbe245 100644 --- a/adept/adept/packagedetailsui.ui +++ b/adept/adept/packagedetailsui.ui @@ -293,7 +293,7 @@ - tqlayout9 + layout9 diff --git a/adept/adept/sourceseditorui.ui b/adept/adept/sourceseditorui.ui index 0ed83de..b93b384 100644 --- a/adept/adept/sourceseditorui.ui +++ b/adept/adept/sourceseditorui.ui @@ -88,7 +88,7 @@ - tqlayout5 + layout5 @@ -122,7 +122,7 @@ - tqlayout13 + layout13 diff --git a/adept/adept/statefilterui.ui b/adept/adept/statefilterui.ui index 1f5b7d9..6ce84d9 100644 --- a/adept/adept/statefilterui.ui +++ b/adept/adept/statefilterui.ui @@ -38,7 +38,7 @@ - tqlayout4 + layout4 @@ -89,7 +89,7 @@ - tqlayout5 + layout5 diff --git a/adept/adept/taglist.cpp b/adept/adept/taglist.cpp index 4538040..b7029be 100644 --- a/adept/adept/taglist.cpp +++ b/adept/adept/taglist.cpp @@ -92,7 +92,7 @@ void TagList::updateList() appendLabel( new TagLabel( *i, this, m_tagBox ) ); } } - m_tagBox->tqlayout()->addItem( m_tagSpacer ); + m_tagBox->layout()->addItem( m_tagSpacer ); update(); parentWidget()->adjustSize(); m_updateScheduled = false; @@ -134,5 +134,5 @@ void TagList::clearList() delete *i; } m_list.clear(); - m_tagBox->tqlayout()->removeItem( m_tagSpacer ); + m_tagBox->layout()->removeItem( m_tagSpacer ); } diff --git a/adept/installer/app.cpp b/adept/installer/app.cpp index 6a8f754..e85c576 100644 --- a/adept/installer/app.cpp +++ b/adept/installer/app.cpp @@ -210,9 +210,9 @@ bool App::confirmRequest( entity::Package p, component::State::Action a ) KDialogBase *db = new KDialogBase( KDialogBase::Plain, i18n( "Confirm action" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, this ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( db->plainPage() ); - tqlayout->setSpacing( 4 ); - // db->plainPage()->setLayout( tqlayout = new TQVBoxLayout( db->plainPage() ) ); + TQVBoxLayout *layout = new TQVBoxLayout( db->plainPage() ); + layout->setSpacing( 4 ); + // db->plainPage()->setLayout( layout = new TQVBoxLayout( db->plainPage() ) ); // TQVBox *vb = new TQVBox( db ); TQLabel *txt = new TQLabel( db->plainPage() ); txt->setAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); @@ -225,8 +225,8 @@ bool App::confirmRequest( entity::Package p, component::State::Action a ) l->setMinimumHeight( 220 ); l->setMinimumWidth( 320 ); l->setDisplayCheckboxes( false ); - tqlayout->addWidget( txt ); - tqlayout->addWidget( l ); + layout->addWidget( txt ); + layout->addWidget( l ); l->insertRange( filteredRange( d.entries(), Adaptor( &entity::Desktop::package, p ) ) ); db->adjustSize(); diff --git a/adept/libadept/commitprogressui.ui b/adept/libadept/commitprogressui.ui index 9b94594..cfa4e3f 100644 --- a/adept/libadept/commitprogressui.ui +++ b/adept/libadept/commitprogressui.ui @@ -79,7 +79,7 @@ - tqlayout6 + layout6 @@ -104,7 +104,7 @@ - tqlayout5 + layout5 diff --git a/adept/libadept/desktoplist.cpp b/adept/libadept/desktoplist.cpp index c522ff2..fe35fcd 100644 --- a/adept/libadept/desktoplist.cpp +++ b/adept/libadept/desktoplist.cpp @@ -27,16 +27,16 @@ DesktopEntry::DesktopEntry( TQWidget *p, const char *n ) void DesktopEntry::resize( int w, int h ) { // kdDebug() << "DesktopEntry::resize( " << w << ", " << h << " )" << endl; - int margin = tqlayout()->margin() + tqlayout()->spacing() * 2 + int margin = layout()->margin() + layout()->spacing() * 2 + 6 /* spacer */ + m_icon->width() + m_check->width(); - if ( m_check->isVisible() ) margin += m_check->width() + tqlayout()->spacing(); + if ( m_check->isVisible() ) margin += m_check->width() + layout()->spacing(); int hFW1 = m_name->heightForWidth( w - margin ); int hFW2 = m_description->heightForWidth( w - margin ); /* kdDebug() << "margin = " << margin << ", hFW1 = " << hFW1 << ", hFW2 = " << hFW2 << endl; */ - int height = 2 * tqlayout()->margin() + tqlayout()->spacing() + hFW1 + hFW2; - if ( height < 32 + 2*tqlayout()->margin() /* icon size + margin */ ) - height = 32 + 2*tqlayout()->margin(); + int height = 2 * layout()->margin() + layout()->spacing() + hFW1 + hFW2; + if ( height < 32 + 2*layout()->margin() /* icon size + margin */ ) + height = 32 + 2*layout()->margin(); // m_description->resize( w - margin, m_description->heightForWidth( w - margin ) ); TQWidget::resize( w, height ); } diff --git a/adept/libadept/easytagfilterui.ui b/adept/libadept/easytagfilterui.ui index 9c269c8..14a7b5f 100644 --- a/adept/libadept/easytagfilterui.ui +++ b/adept/libadept/easytagfilterui.ui @@ -43,7 +43,7 @@ - tqlayout4 + layout4 @@ -68,7 +68,7 @@ - tqlayout3 + layout3 diff --git a/adept/libadept/extendablelist.cpp b/adept/libadept/extendablelist.cpp index 2277850..16ebb96 100644 --- a/adept/libadept/extendablelist.cpp +++ b/adept/libadept/extendablelist.cpp @@ -102,7 +102,7 @@ void ExtendableList::updateExtender( ExtendableItem *i ) i->extender()->height() ); if ( i->height() != i->extender()->frameSize().height() ) { i->setHeight( i->extender()->frameSize().height() ); - delayedUpdateExtenders(); // re-update since we broke tqlayout + delayedUpdateExtenders(); // re-update since we broke layout } i->extender()->setupColors(); diff --git a/adept/libadept/groupeddesktopselector.cpp b/adept/libadept/groupeddesktopselector.cpp index 3edc87d..5da34c0 100644 --- a/adept/libadept/groupeddesktopselector.cpp +++ b/adept/libadept/groupeddesktopselector.cpp @@ -38,7 +38,7 @@ GroupedDesktopSelector::GroupedDesktopSelector( TQWidget *p, const char *n ) } // *hack* // AAAA hack - TQLayoutIterator li = tqlayout()->iterator(); + TQLayoutIterator li = layout()->iterator(); TQHBoxLayout *hbox = 0; while ( li.current() != 0 ) { hbox = dynamic_cast< TQHBoxLayout * >( li.current() ); diff --git a/adept/libadept/installerviewui.ui b/adept/libadept/installerviewui.ui index fe4b405..1f8f094 100644 --- a/adept/libadept/installerviewui.ui +++ b/adept/libadept/installerviewui.ui @@ -27,7 +27,7 @@ - tqlayout5 + layout5 diff --git a/adept/libadept/lister.cpp b/adept/libadept/lister.cpp index 80f0071..7b3b865 100644 --- a/adept/libadept/lister.cpp +++ b/adept/libadept/lister.cpp @@ -596,13 +596,13 @@ bool ListerItemExtender::eventFilter( TQObject *o, TQEvent *e ) void ListerItemExtender::resize( int w, int h ) { int namew = - item()->lister()->extenderOffset( item() ) - 2 - - tqlayout()->margin() - - tqlayout()->spacing() + - layout()->margin() + - layout()->spacing() + item()->lister()->columnWidth( 0 ); int statw = item()->lister()->columnWidth( 1 ) - - tqlayout()->spacing(); + - layout()->spacing(); int chw = item()->lister()->columnWidth( 2 ) - 2 - - tqlayout()->spacing(); + - layout()->spacing(); m_name->setMinimumWidth( namew ); m_status->setMinimumWidth( statw ); m_change->setMinimumWidth( chw ); diff --git a/adept/libadept/listerextenderui.ui b/adept/libadept/listerextenderui.ui index f634979..fb57707 100644 --- a/adept/libadept/listerextenderui.ui +++ b/adept/libadept/listerextenderui.ui @@ -78,7 +78,7 @@ - tqlayout7 + layout7 @@ -183,7 +183,7 @@ - tqlayout3 + layout3 diff --git a/adept/libadept/packagedetailsui.ui b/adept/libadept/packagedetailsui.ui index b09a30c..2ecd519 100644 --- a/adept/libadept/packagedetailsui.ui +++ b/adept/libadept/packagedetailsui.ui @@ -293,7 +293,7 @@ - tqlayout9 + layout9 diff --git a/adept/libadept/sourceseditorui.ui b/adept/libadept/sourceseditorui.ui index 0ed83de..b93b384 100644 --- a/adept/libadept/sourceseditorui.ui +++ b/adept/libadept/sourceseditorui.ui @@ -88,7 +88,7 @@ - tqlayout5 + layout5 @@ -122,7 +122,7 @@ - tqlayout13 + layout13 diff --git a/adept/libadept/statefilterui.ui b/adept/libadept/statefilterui.ui index 1f5b7d9..6ce84d9 100644 --- a/adept/libadept/statefilterui.ui +++ b/adept/libadept/statefilterui.ui @@ -38,7 +38,7 @@ - tqlayout4 + layout4 @@ -89,7 +89,7 @@ - tqlayout5 + layout5 diff --git a/adept/libadept/taglist.cpp b/adept/libadept/taglist.cpp index 3dc48f8..13717bc 100644 --- a/adept/libadept/taglist.cpp +++ b/adept/libadept/taglist.cpp @@ -88,7 +88,7 @@ void TagList::updateList() appendLabel( new TagLabel( *i, this, m_tagBox ) ); } } - m_tagBox->tqlayout()->addItem( m_tagSpacer ); + m_tagBox->layout()->addItem( m_tagSpacer ); update(); parentWidget()->adjustSize(); m_updateScheduled = false; @@ -130,5 +130,5 @@ void TagList::clearList() delete *i; } m_list.clear(); - m_tagBox->tqlayout()->removeItem( m_tagSpacer ); + m_tagBox->layout()->removeItem( m_tagSpacer ); } -- cgit v1.2.3