From b492b550f35c84160958775c14ea7037c5b12181 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:19:21 -0600 Subject: Rename obsolete tq methods to standard names --- twin/clients/modernsystem/modernsys.cpp | 2 +- twin/kcmtwin/twindecoration/buttons.cpp | 4 ++-- twin/kcmtwin/twindecoration/twindecoration.cpp | 4 ++-- twin/kcmtwin/twinoptions/windows.cpp | 6 +++--- twin/lib/kdecoration.cpp | 2 +- twin/popupinfo.cpp | 2 +- twin/workspace.cpp | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'twin') diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index cbe17099e..3d71afd7e 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -570,7 +570,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) TQPainter p( widget() ); TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->colorGroup().tqbrush(TQColorGroup::Background).pixmap() ? + TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? widget()->colorGroup().brush(TQColorGroup::Background) : options()->colorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index c686ac8c8..3cf0ab78d 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name) TQDataStream stream(data, IO_WriteOnly); stream << btn.name; stream << btn.icon; - stream << btn.type.tqunicode(); + stream << btn.type.unicode(); stream << (int) btn.duplicate; stream << (int) btn.supported; setEncodedData( data ); @@ -152,7 +152,7 @@ TQSize ButtonSource::sizeHint() const TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 1dd86a833..278371a60 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); + pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 1b0b2773c..accacb3fd 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), KDialog::spacingHint()); TQBoxLayout *cLay = new TQHBoxLayout(fLay); @@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); @@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp index 837036ea5..c9888ff96 100644 --- a/twin/lib/kdecoration.cpp +++ b/twin/lib/kdecoration.cpp @@ -395,7 +395,7 @@ const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) return(*d->cg[idx]); d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::tqpalette().active(). + Qt::black, TQApplication::palette().active(). base()); return(*d->cg[idx]); } diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index 455e6aa7d..a2760d336 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -75,7 +75,7 @@ void PopupInfo::reset() void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); - tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), + style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TQStyle::Style_Default ); paintContents(); } diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 020224faf..79d064aeb 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -1969,7 +1969,7 @@ void Workspace::slotGrabWindow() } } - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( snapshot ); } else @@ -1982,7 +1982,7 @@ void Workspace::slotGrabWindow() void Workspace::slotGrabDesktop() { TQPixmap p = TQPixmap::grabWindow( qt_xrootwin() ); - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setPixmap( p ); } -- cgit v1.2.3