From 0d48fca8ae41ab963c780104fdeca45d7dad0a51 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:06:13 -0600 Subject: [PATCH] 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 +- libktorrent/expandablewidget.cpp | 4 ++-- libktorrent/labelview.cpp | 14 +++++------ libktorrent/labelviewitembase.ui | 2 +- libktorrent/pluginmanagerwidget.ui | 2 +- libktorrent/torrent/peerid.cpp | 2 +- plugins/infowidget/chunkdownloadviewbase.ui | 14 +++++------ plugins/infowidget/statustabbase.ui | 20 ++++++++-------- plugins/infowidget/trackerviewbase.ui | 4 ++-- plugins/ipfilter/convert_dlg.ui | 2 +- plugins/ipfilter/ipblockingpref.ui | 4 ++-- plugins/partfileimport/importdlgbase.ui | 8 +++---- plugins/rssfeed/rssfeedwidget.ui | 26 ++++++++++----------- plugins/scanfolder/sfprefwidgetbase.ui | 2 +- plugins/scheduler/bwspage.ui | 16 ++++++------- plugins/search/htmlpart.cpp | 2 +- plugins/search/searchpref.ui | 8 +++---- plugins/search/searchwidget.cpp | 4 ++-- plugins/stats/StatsCon.cc | 12 +++++----- plugins/stats/StatsSpd.cc | 18 +++++++------- plugins/stats/sprefwgt.ui | 20 ++++++++-------- plugins/stats/statsconwgt.ui | 2 +- plugins/stats/statsspdwgt.ui | 2 +- plugins/upnp/upnpwidget.ui | 4 ++-- plugins/webinterface/webinterfacepref.ui | 10 ++++---- 41 files changed, 175 insertions(+), 175 deletions(-) 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 diff --git a/libktorrent/expandablewidget.cpp b/libktorrent/expandablewidget.cpp index a6ec44d..fe7a0df 100644 --- a/libktorrent/expandablewidget.cpp +++ b/libktorrent/expandablewidget.cpp @@ -53,7 +53,7 @@ namespace kt se->pos = pos; se->next = begin; - // remove old top from tqlayout + // remove old top from layout top_layout->remove(begin->w); // create new toplevel splitter @@ -84,7 +84,7 @@ namespace kt // make se new top of stack begin = se; - // add toplevel splitter to tqlayout + // add toplevel splitter to layout top_layout->add(s); // show s diff --git a/libktorrent/labelview.cpp b/libktorrent/labelview.cpp index 3823516..d7ce947 100644 --- a/libktorrent/labelview.cpp +++ b/libktorrent/labelview.cpp @@ -105,13 +105,13 @@ namespace kt class LabelViewBox : public TQWidget { - TQVBoxLayout* tqlayout; + TQVBoxLayout* layout; public: LabelViewBox(TQWidget* parent) : TQWidget(parent) { setPaletteBackgroundColor(KGlobalSettings::baseColor()); - tqlayout = new TQVBoxLayout(this); - tqlayout->setMargin(0); + layout = new TQVBoxLayout(this); + layout->setMargin(0); } virtual ~LabelViewBox() @@ -120,24 +120,24 @@ namespace kt void add(LabelViewItem* item) { item->reparent(this,TQPoint(0,0)); - tqlayout->add(item); + layout->add(item); item->show(); } void remove(LabelViewItem* item) { item->hide(); - tqlayout->remove(item); + layout->remove(item); item->reparent(0,TQPoint(0,0)); } void sorted(const std::list items) { for (LabelViewCItr i = items.begin();i != items.end();i++) - tqlayout->remove(*i); + layout->remove(*i); for (LabelViewCItr i = items.begin();i != items.end();i++) - tqlayout->add(*i); + layout->add(*i); } }; diff --git a/libktorrent/labelviewitembase.ui b/libktorrent/labelviewitembase.ui index 861f703..fbce874 100644 --- a/libktorrent/labelviewitembase.ui +++ b/libktorrent/labelviewitembase.ui @@ -35,7 +35,7 @@ - tqlayout3 + layout3 diff --git a/libktorrent/pluginmanagerwidget.ui b/libktorrent/pluginmanagerwidget.ui index a43575b..6b077f5 100644 --- a/libktorrent/pluginmanagerwidget.ui +++ b/libktorrent/pluginmanagerwidget.ui @@ -34,7 +34,7 @@ - tqlayout1 + layout1 diff --git a/libktorrent/torrent/peerid.cpp b/libktorrent/torrent/peerid.cpp index 802fca6..e6a3387 100644 --- a/libktorrent/torrent/peerid.cpp +++ b/libktorrent/torrent/peerid.cpp @@ -174,7 +174,7 @@ namespace bt Map["TS"] = "Torrent Storm"; Map["TT"] = "TuoTu"; Map["UL"] = "uLeecher!"; - Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is tqunicode for µ + Map["UT"] = TQString("%1Torrent").arg(TQChar(0x00B5)); // µTorrent, 0x00B5 is unicode for µ Map["WT"] = "BitLet"; Map["WY"] = "FireTorrent"; Map["XL"] = "Xunlei"; diff --git a/plugins/infowidget/chunkdownloadviewbase.ui b/plugins/infowidget/chunkdownloadviewbase.ui index ddac38e..a68b412 100644 --- a/plugins/infowidget/chunkdownloadviewbase.ui +++ b/plugins/infowidget/chunkdownloadviewbase.ui @@ -21,7 +21,7 @@ - tqlayout8 + layout8 @@ -29,7 +29,7 @@ - tqlayout11 + layout11 @@ -67,7 +67,7 @@ - tqlayout14 + layout14 @@ -105,7 +105,7 @@ - tqlayout13 + layout13 @@ -143,7 +143,7 @@ - tqlayout38 + layout38 @@ -181,7 +181,7 @@ - tqlayout38_2 + layout38_2 @@ -219,7 +219,7 @@ - tqlayout24 + layout24 diff --git a/plugins/infowidget/statustabbase.ui b/plugins/infowidget/statustabbase.ui index 789c0e6..fc6a187 100644 --- a/plugins/infowidget/statustabbase.ui +++ b/plugins/infowidget/statustabbase.ui @@ -41,7 +41,7 @@ - tqlayout16 + layout16 @@ -49,7 +49,7 @@ - tqlayout15 + layout15 @@ -115,7 +115,7 @@ - tqlayout14 + layout14 @@ -181,7 +181,7 @@ - tqlayout12 + layout12 @@ -266,7 +266,7 @@ - tqlayout17 + layout17 @@ -274,7 +274,7 @@ - tqlayout23 + layout23 @@ -282,7 +282,7 @@ - tqlayout25 + layout25 @@ -431,7 +431,7 @@ - tqlayout16 + layout16 @@ -459,7 +459,7 @@ - tqlayout15 + layout15 @@ -497,7 +497,7 @@ - tqlayout11 + layout11 diff --git a/plugins/infowidget/trackerviewbase.ui b/plugins/infowidget/trackerviewbase.ui index ef49ec3..24d92c2 100644 --- a/plugins/infowidget/trackerviewbase.ui +++ b/plugins/infowidget/trackerviewbase.ui @@ -50,7 +50,7 @@ - tqlayout8 + layout8 @@ -129,7 +129,7 @@ - tqlayout6 + layout6 diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui index 2a1938c..23e59ef 100644 --- a/plugins/ipfilter/convert_dlg.ui +++ b/plugins/ipfilter/convert_dlg.ui @@ -82,7 +82,7 @@ - tqlayout6 + layout6 diff --git a/plugins/ipfilter/ipblockingpref.ui b/plugins/ipfilter/ipblockingpref.ui index a74fe6d..bd58d65 100644 --- a/plugins/ipfilter/ipblockingpref.ui +++ b/plugins/ipfilter/ipblockingpref.ui @@ -63,7 +63,7 @@ - tqlayout5 + layout5 @@ -92,7 +92,7 @@ - tqlayout3 + layout3 diff --git a/plugins/partfileimport/importdlgbase.ui b/plugins/partfileimport/importdlgbase.ui index f171831..29697e3 100644 --- a/plugins/partfileimport/importdlgbase.ui +++ b/plugins/partfileimport/importdlgbase.ui @@ -21,7 +21,7 @@ - tqlayout6 + layout6 @@ -29,7 +29,7 @@ - tqlayout5 + layout5 @@ -67,7 +67,7 @@ - tqlayout4 + layout4 @@ -102,7 +102,7 @@ - tqlayout3 + layout3 diff --git a/plugins/rssfeed/rssfeedwidget.ui b/plugins/rssfeed/rssfeedwidget.ui index 4a35633..62c2af8 100644 --- a/plugins/rssfeed/rssfeedwidget.ui +++ b/plugins/rssfeed/rssfeedwidget.ui @@ -48,7 +48,7 @@ - tqlayout2 + layout2 @@ -194,7 +194,7 @@ - tqlayout13 + layout13 @@ -277,7 +277,7 @@ - tqlayout47 + layout47 @@ -367,7 +367,7 @@ - tqlayout28 + layout28 @@ -476,7 +476,7 @@ - tqlayout14 + layout14 @@ -484,7 +484,7 @@ - tqlayout9 + layout9 @@ -526,7 +526,7 @@ - tqlayout12 + layout12 @@ -565,7 +565,7 @@ - tqlayout11 + layout11 @@ -573,7 +573,7 @@ - tqlayout28 + layout28 @@ -648,7 +648,7 @@ - tqlayout9 + layout9 @@ -686,7 +686,7 @@ - tqlayout10 + layout10 @@ -792,7 +792,7 @@ - tqlayout33 + layout33 @@ -880,7 +880,7 @@ - tqlayout13 + layout13 diff --git a/plugins/scanfolder/sfprefwidgetbase.ui b/plugins/scanfolder/sfprefwidgetbase.ui index 3fd83e4..e9ddfdc 100644 --- a/plugins/scanfolder/sfprefwidgetbase.ui +++ b/plugins/scanfolder/sfprefwidgetbase.ui @@ -21,7 +21,7 @@ - tqlayout16 + layout16 diff --git a/plugins/scheduler/bwspage.ui b/plugins/scheduler/bwspage.ui index 547bee1..547de3f 100644 --- a/plugins/scheduler/bwspage.ui +++ b/plugins/scheduler/bwspage.ui @@ -36,7 +36,7 @@ - tqlayout21 + layout21 @@ -411,7 +411,7 @@ - tqlayout8 + layout8 @@ -461,7 +461,7 @@ - tqlayout9 + layout9 @@ -511,7 +511,7 @@ - tqlayout10 + layout10 @@ -596,7 +596,7 @@ - tqlayout34 + layout34 @@ -650,7 +650,7 @@ - tqlayout32 + layout32 @@ -658,7 +658,7 @@ - tqlayout31 + layout31 @@ -737,7 +737,7 @@ - tqlayout29 + layout29 diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index bad55d6..d4b39e1 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -60,7 +60,7 @@ namespace kt void HTMLPart::copy() { TQString txt = selectedText(); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); // Copy text into the clipboard if (cb) cb->setText(txt,TQClipboard::Clipboard); diff --git a/plugins/search/searchpref.ui b/plugins/search/searchpref.ui index fb03f02..2baa1af 100644 --- a/plugins/search/searchpref.ui +++ b/plugins/search/searchpref.ui @@ -65,7 +65,7 @@ - tqlayout29 + layout29 @@ -129,7 +129,7 @@ - tqlayout22 + layout22 @@ -152,7 +152,7 @@ - tqlayout23 + layout23 @@ -235,7 +235,7 @@ - tqlayout5 + layout5 diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 67f6dfa..01c27f7 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -59,8 +59,8 @@ namespace kt SearchWidget::SearchWidget(SearchPlugin* sp) : html_part(0),sp(sp) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); - tqlayout->setAutoAdd(true); + TQVBoxLayout* layout = new TQVBoxLayout(this); + layout->setAutoAdd(true); sbar = new SearchBar(this); html_part = new HTMLPart(this); diff --git a/plugins/stats/StatsCon.cc b/plugins/stats/StatsCon.cc index 548b38a..568005d 100644 --- a/plugins/stats/StatsCon.cc +++ b/plugins/stats/StatsCon.cc @@ -26,16 +26,16 @@ StatsCon::StatsCon(TQWidget * p) : StatsConWgt(p), pmPeersConCht(new ChartDrawe pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements())) { PeersConGbw->setColumnLayout(0, Qt::Vertical ); - PeersConGbw->tqlayout()->setSpacing( 6 ); - PeersConGbw->tqlayout()->setMargin( 11 ); + PeersConGbw->layout()->setSpacing( 6 ); + PeersConGbw->layout()->setMargin( 11 ); - pmPeersConLay = new TQVBoxLayout(PeersConGbw -> tqlayout()); + pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout()); DHTGbw->setColumnLayout(0, Qt::Vertical ); - DHTGbw->tqlayout()->setSpacing( 6 ); - DHTGbw->tqlayout()->setMargin( 11 ); + DHTGbw->layout()->setSpacing( 6 ); + DHTGbw->layout()->setMargin( 11 ); - pmDHTLay = new TQVBoxLayout(DHTGbw -> tqlayout()); + pmDHTLay = new TQVBoxLayout(DHTGbw -> layout()); //------------- diff --git a/plugins/stats/StatsSpd.cc b/plugins/stats/StatsSpd.cc index 0ea427a..c8cb157 100644 --- a/plugins/stats/StatsSpd.cc +++ b/plugins/stats/StatsSpd.cc @@ -29,22 +29,22 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p), { DownSpeedGbw->setColumnLayout(0, Qt::Vertical ); - DownSpeedGbw->tqlayout()->setSpacing( 6 ); - DownSpeedGbw->tqlayout()->setMargin( 11 ); + DownSpeedGbw->layout()->setSpacing( 6 ); + DownSpeedGbw->layout()->setMargin( 11 ); - pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> tqlayout()); + pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout()); UpSpeedGbw->setColumnLayout(0, Qt::Vertical ); - UpSpeedGbw->tqlayout()->setSpacing( 6 ); - UpSpeedGbw->tqlayout()->setMargin( 11 ); + UpSpeedGbw->layout()->setSpacing( 6 ); + UpSpeedGbw->layout()->setMargin( 11 ); - pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> tqlayout()); + pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout()); PeersSpdGbw->setColumnLayout(0, Qt::Vertical ); - PeersSpdGbw->tqlayout()->setSpacing( 6 ); - PeersSpdGbw->tqlayout()->setMargin( 11 ); + PeersSpdGbw->layout()->setSpacing( 6 ); + PeersSpdGbw->layout()->setMargin( 11 ); - pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> tqlayout()); + pmPeersSpdLay = new TQVBoxLayout(PeersSpdGbw -> layout()); //----------------- diff --git a/plugins/stats/sprefwgt.ui b/plugins/stats/sprefwgt.ui index 0ad1c7f..b6ce139 100644 --- a/plugins/stats/sprefwgt.ui +++ b/plugins/stats/sprefwgt.ui @@ -32,7 +32,7 @@ - tqlayout2 + layout2 @@ -78,7 +78,7 @@ - tqlayout4 + layout4 @@ -140,7 +140,7 @@ - tqlayout11 + layout11 @@ -197,7 +197,7 @@ - tqlayout3 + layout3 @@ -275,7 +275,7 @@ - tqlayout7 + layout7 @@ -314,7 +314,7 @@ - tqlayout5 + layout5 @@ -346,7 +346,7 @@ - tqlayout5_2 + layout5_2 @@ -378,7 +378,7 @@ - tqlayout5_3 + layout5_3 @@ -410,7 +410,7 @@ - tqlayout5_5 + layout5_5 @@ -442,7 +442,7 @@ - tqlayout5_4 + layout5_4 diff --git a/plugins/stats/statsconwgt.ui b/plugins/stats/statsconwgt.ui index c76e6eb..3565a3c 100644 --- a/plugins/stats/statsconwgt.ui +++ b/plugins/stats/statsconwgt.ui @@ -18,7 +18,7 @@ - tqlayout3 + layout3 diff --git a/plugins/stats/statsspdwgt.ui b/plugins/stats/statsspdwgt.ui index 25a3cd8..b04e19a 100644 --- a/plugins/stats/statsspdwgt.ui +++ b/plugins/stats/statsspdwgt.ui @@ -18,7 +18,7 @@ - tqlayout5 + layout5 diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui index 3dc7944..d06576a 100644 --- a/plugins/upnp/upnpwidget.ui +++ b/plugins/upnp/upnpwidget.ui @@ -21,7 +21,7 @@ - tqlayout1 + layout1 @@ -77,7 +77,7 @@ - tqlayout3 + layout3 diff --git a/plugins/webinterface/webinterfacepref.ui b/plugins/webinterface/webinterfacepref.ui index a36f7f8..4927673 100644 --- a/plugins/webinterface/webinterfacepref.ui +++ b/plugins/webinterface/webinterfacepref.ui @@ -46,7 +46,7 @@ - tqlayout5 + layout5 @@ -128,7 +128,7 @@ - tqlayout4 + layout4 @@ -151,7 +151,7 @@ - tqlayout6 + layout6 @@ -159,7 +159,7 @@ - tqlayout5 + layout5 @@ -192,7 +192,7 @@ - tqlayout7 + layout7