From 0d48fca8ae41ab963c780104fdeca45d7dad0a51 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:06:13 -0600 Subject: Rename obsolete tq methods to standard names --- apps/ktorrent/addpeerwidgetbase.ui | 4 ++-- apps/ktorrent/advancedpref.ui | 20 ++++++++++---------- apps/ktorrent/downloadpref.ui | 22 +++++++++++----------- apps/ktorrent/fileselectdlgbase.ui | 10 +++++----- apps/ktorrent/filterbar.cpp | 20 ++++++++++---------- apps/ktorrent/generalpref.ui | 10 +++++----- apps/ktorrent/ipfilterwidgetbase.ui | 4 ++-- apps/ktorrent/ktorrentview.cpp | 4 ++-- apps/ktorrent/newui/button.cpp | 6 +++--- apps/ktorrent/newui/buttonbar.h | 2 +- apps/ktorrent/pastedialog.cpp | 2 +- apps/ktorrent/pastedlgbase.ui | 4 ++-- apps/ktorrent/queuedlg.ui | 12 ++++++------ apps/ktorrent/scandlgbase.ui | 8 ++++---- apps/ktorrent/speedlimitsdlgbase.ui | 10 +++++----- apps/ktorrent/torrentcreatordlgbase.ui | 8 ++++---- apps/ktupnptest/mainwidget.ui | 2 +- 17 files changed, 74 insertions(+), 74 deletions(-) (limited to 'apps') diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui index 6aee5e0..d3359a2 100644 --- a/apps/ktorrent/addpeerwidgetbase.ui +++ b/apps/ktorrent/addpeerwidgetbase.ui @@ -21,7 +21,7 @@ - tqlayout10 + layout10 @@ -86,7 +86,7 @@ - tqlayout11 + layout11 diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui index 0b8f00a..8a54e29 100644 --- a/apps/ktorrent/advancedpref.ui +++ b/apps/ktorrent/advancedpref.ui @@ -32,7 +32,7 @@ - tqlayout15 + layout15 @@ -127,7 +127,7 @@ - tqlayout25 + layout25 @@ -179,7 +179,7 @@ - tqlayout5 + layout5 @@ -234,7 +234,7 @@ - tqlayout5_2 + layout5_2 @@ -294,7 +294,7 @@ - tqlayout8 + layout8 @@ -359,7 +359,7 @@ - tqlayout7 + layout7 @@ -416,7 +416,7 @@ - tqlayout10 + layout10 @@ -483,7 +483,7 @@ - tqlayout33 + layout33 @@ -491,7 +491,7 @@ - tqlayout32 + layout32 @@ -572,7 +572,7 @@ - tqlayout7 + layout7 diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui index 47f1f4c..378cbbc 100644 --- a/apps/ktorrent/downloadpref.ui +++ b/apps/ktorrent/downloadpref.ui @@ -29,7 +29,7 @@ - tqlayout49 + layout49 @@ -37,7 +37,7 @@ - tqlayout42 + layout42 @@ -45,7 +45,7 @@ - tqlayout16 + layout16 @@ -106,7 +106,7 @@ - tqlayout46 + layout46 @@ -164,7 +164,7 @@ - tqlayout45 + layout45 @@ -214,7 +214,7 @@ - tqlayout48 + layout48 @@ -222,7 +222,7 @@ - tqlayout14 + layout14 @@ -316,7 +316,7 @@ - tqlayout42 + layout42 @@ -356,7 +356,7 @@ - tqlayout18 + layout18 @@ -425,7 +425,7 @@ - tqlayout41 + layout41 @@ -546,7 +546,7 @@ - tqlayout40 + layout40 diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui index f289025..546d72c 100644 --- a/apps/ktorrent/fileselectdlgbase.ui +++ b/apps/ktorrent/fileselectdlgbase.ui @@ -21,7 +21,7 @@ - tqlayout4 + layout4 @@ -44,7 +44,7 @@ - tqlayout6 + layout6 @@ -52,7 +52,7 @@ - tqlayout5 + layout5 @@ -246,7 +246,7 @@ - tqlayout33 + layout33 @@ -280,7 +280,7 @@ - tqlayout34 + layout34 diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp index 0be4049..6084e66 100644 --- a/apps/ktorrent/filterbar.cpp +++ b/apps/ktorrent/filterbar.cpp @@ -42,30 +42,30 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : TQVBoxLayout* foo = new TQVBoxLayout(this); foo->addSpacing(gap); - TQHBoxLayout* tqlayout = new TQHBoxLayout(foo); - tqlayout->addSpacing(gap); + TQHBoxLayout* layout = new TQHBoxLayout(foo); + layout->addSpacing(gap); m_close = new KToolBarButton("fileclose",0,this); connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide())); - tqlayout->addWidget(m_close); + layout->addWidget(m_close); m_filter = new TQLabel(i18n("Find:"), this); - tqlayout->addWidget(m_filter); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addWidget(m_filter); + layout->addSpacing(KDialog::spacingHint()); m_filterInput = new KLineEdit(this); - tqlayout->addWidget(m_filterInput); + layout->addWidget(m_filterInput); m_clear = new KPushButton(this); m_clear->setIconSet(SmallIcon("clear_left")); m_clear->setFlat(true); - tqlayout->addWidget(m_clear); - tqlayout->addSpacing(gap); + layout->addWidget(m_clear); + layout->addSpacing(gap); m_case_sensitive = new TQCheckBox(i18n("Case sensitive"),this); m_case_sensitive->setChecked(true); - tqlayout->addWidget(m_case_sensitive); - tqlayout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); + layout->addWidget(m_case_sensitive); + layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotChangeFilter(const TQString&))); diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui index a1ba5e9..529686f 100644 --- a/apps/ktorrent/generalpref.ui +++ b/apps/ktorrent/generalpref.ui @@ -104,7 +104,7 @@ - tqlayout7 + layout7 @@ -174,7 +174,7 @@ - tqlayout3 + layout3 @@ -237,7 +237,7 @@ - tqlayout13 + layout13 @@ -310,7 +310,7 @@ - tqlayout24 + layout24 @@ -355,7 +355,7 @@ - tqlayout14 + layout14 diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui index e29ffe7..7d8c383 100644 --- a/apps/ktorrent/ipfilterwidgetbase.ui +++ b/apps/ktorrent/ipfilterwidgetbase.ui @@ -82,7 +82,7 @@ - tqlayout8 + layout8 @@ -111,7 +111,7 @@ - tqlayout7 + layout7 diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp index 5c04732..447eaee 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/apps/ktorrent/ktorrentview.cpp @@ -85,8 +85,8 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e) KTorrentView::KTorrentView(TQWidget *parent) : TQWidget(parent),menu(0),current_group(0),running(0),total(0),view(0),filter_bar(0) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); - tqlayout->setAutoAdd(true); + TQVBoxLayout* layout = new TQVBoxLayout(this); + layout->setAutoAdd(true); view = new TorrentView(this); filter_bar = new FilterBar(this); filter_bar->setHidden(true); diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp index 4819657..100ab62 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/apps/ktorrent/newui/button.cpp @@ -133,7 +133,7 @@ void Button::drawButton(TQPainter *p) tqstyle().drawControl(TQStyle::CE_PushButton,&p2,this, TQRect(0,0,pm.width(),pm.height()), colorGroup(),flags); - tqstyle().drawControl(TQStyle::CE_PushButtonLabel, &p2, this, + style().drawControl(TQStyle::CE_PushButtonLabel, &p2, this, TQRect(0,0,pm.width(),pm.height()), colorGroup(), flags, TQStyleOption()); @@ -211,7 +211,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX( h, ih ); } if ( isMenuButton() ) - w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); + w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this); if ( pixmap() ) { TQPixmap *pm = (TQPixmap *)pixmap(); w += pm->width(); @@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX(h, sz.height()); } - return (tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h index d517cd7..8128fe6 100644 --- a/apps/ktorrent/newui/buttonbar.h +++ b/apps/ktorrent/newui/buttonbar.h @@ -32,7 +32,7 @@ namespace Ideal { class Button; class ButtonBar; -/**@short A tqlayout for a ButtonBar class. +/**@short A layout for a ButtonBar class. Overrides minimumSize method to allow shrinking button bar buttons.*/ class ButtonLayout: public TQBoxLayout{ diff --git a/apps/ktorrent/pastedialog.cpp b/apps/ktorrent/pastedialog.cpp index 7d3bff9..f96381b 100644 --- a/apps/ktorrent/pastedialog.cpp +++ b/apps/ktorrent/pastedialog.cpp @@ -33,7 +33,7 @@ PasteDialog::PasteDialog(KTorrentCore* core, TQWidget *parent, const char *name) :PasteDlgBase(parent, name) { m_core = core; - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); TQString text = cb->text(TQClipboard::Clipboard); KURL url = KURL::fromPathOrURL(text); if ( url.isValid() ) diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui index 700d12d..9121734 100644 --- a/apps/ktorrent/pastedlgbase.ui +++ b/apps/ktorrent/pastedlgbase.ui @@ -38,7 +38,7 @@ - tqlayout2 + layout2 @@ -75,7 +75,7 @@ - tqlayout4 + layout4 diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui index 7e4769f..00a194f 100644 --- a/apps/ktorrent/queuedlg.ui +++ b/apps/ktorrent/queuedlg.ui @@ -47,7 +47,7 @@ - tqlayout25 + layout25 @@ -121,7 +121,7 @@ - tqlayout26 + layout26 @@ -263,7 +263,7 @@ - tqlayout15 + layout15 @@ -337,7 +337,7 @@ - tqlayout27 + layout27 @@ -392,7 +392,7 @@ - tqlayout7 + layout7 @@ -400,7 +400,7 @@ - tqlayout49 + layout49 diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui index 189e551..18c76f1 100644 --- a/apps/ktorrent/scandlgbase.ui +++ b/apps/ktorrent/scandlgbase.ui @@ -40,7 +40,7 @@ - tqlayout5 + layout5 @@ -48,7 +48,7 @@ - tqlayout3 + layout3 @@ -74,7 +74,7 @@ - tqlayout4 + layout4 @@ -148,7 +148,7 @@ - tqlayout8 + layout8 diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui index 17dc49c..520a705 100644 --- a/apps/ktorrent/speedlimitsdlgbase.ui +++ b/apps/ktorrent/speedlimitsdlgbase.ui @@ -29,7 +29,7 @@ - tqlayout8 + layout8 @@ -37,7 +37,7 @@ - tqlayout7 + layout7 @@ -63,7 +63,7 @@ - tqlayout5 + layout5 @@ -83,7 +83,7 @@ - tqlayout6 + layout6 @@ -125,7 +125,7 @@ - tqlayout3 + layout3 diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui index d051a0e..a9199bc 100644 --- a/apps/ktorrent/torrentcreatordlgbase.ui +++ b/apps/ktorrent/torrentcreatordlgbase.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -66,7 +66,7 @@ - tqlayout7 + layout7 @@ -188,7 +188,7 @@ - tqlayout9 + layout9 @@ -319,7 +319,7 @@ - tqlayout9 + layout9 diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui index e46bbd1..ed2022c 100644 --- a/apps/ktupnptest/mainwidget.ui +++ b/apps/ktupnptest/mainwidget.ui @@ -23,7 +23,7 @@ - tqlayout1 + layout1 -- cgit v1.2.3