From 68de9c7a2183849c2a79e96c6b0f1ea4987e9474 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:18:28 -0600 Subject: Rename obsolete tq methods to standard names --- .../smooth-blend/client/config/configdialog.ui | 2 +- twin-styles/smooth-blend/client/smoothblend.cc | 56 +++++++++++----------- twin-styles/smooth-blend/client/smoothblend.h | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'twin-styles/smooth-blend') diff --git a/twin-styles/smooth-blend/client/config/configdialog.ui b/twin-styles/smooth-blend/client/config/configdialog.ui index 1e3fddf6..7c330098 100644 --- a/twin-styles/smooth-blend/client/config/configdialog.ui +++ b/twin-styles/smooth-blend/client/config/configdialog.ui @@ -292,7 +292,7 @@ - tqlayout14 + layout14 diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc index ab711bf4..69c3bf76 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -51,7 +51,7 @@ bool smoothblendFactory::menuClose = false; static const int TOPMARGIN = 4; // do not change static const int DECOHEIGHT = 4; // do not change static const int SIDETITLEMARGIN = 2; -// Default button tqlayout +// Default button layout const char default_left[] = "M"; const char default_right[] = "HIAX"; @@ -600,7 +600,7 @@ void smoothblendClient::init() { } void smoothblendClient::_resetLayout() { - // basic tqlayout: + // basic layout: // _______________________________________________________________ // | topSpacer | // |_______________________________________________________________| @@ -697,9 +697,9 @@ void smoothblendClient::_resetLayout() ////////////////////////////////////////////////////////////////////////////// // addButtons() // ------------ -// Add buttons to title tqlayout +// Add buttons to title layout -void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int button_size) { +void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int button_size) { TQString tip; if (s.length() > 0) { for (unsigned n=0; n < s.length(); n++) { @@ -710,8 +710,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "splat.png", i18n("Menu"),ButtonMenu,button_size); connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); connect(button[ButtonMenu], TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); - tqlayout->addWidget(button[ButtonMenu]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMenu]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -726,8 +726,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true); connect(button[ButtonSticky], TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); - tqlayout->addWidget(button[ButtonSticky]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonSticky]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -737,8 +737,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size); connect(button[ButtonHelp], TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp())); - tqlayout->addWidget(button[ButtonHelp]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonHelp]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -748,8 +748,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size); connect(button[ButtonMin], TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); - tqlayout->addWidget(button[ButtonMin]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMin]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -764,8 +764,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true); connect(button[ButtonMax], TQT_SIGNAL(clicked()), this, TQT_SLOT(maxButtonPressed())); - tqlayout->addWidget(button[ButtonMax]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonMax]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -775,8 +775,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size); connect(button[ButtonClose], TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); - tqlayout->addWidget(button[ButtonClose]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonClose]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -787,8 +787,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int i18n("Keep Above Others"), ButtonAbove, button_size, true); connect(button[ButtonAbove], TQT_SIGNAL(clicked()), this, TQT_SLOT(aboveButtonPressed())); - tqlayout->addWidget(button[ButtonAbove]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonAbove]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -799,8 +799,8 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int i18n("Keep Below Others"), ButtonBelow, button_size, true); connect(button[ButtonBelow], TQT_SIGNAL(clicked()), this, TQT_SLOT(belowButtonPressed())); - tqlayout->addWidget(button[ButtonBelow]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonBelow]); + if (n < s.length()-1) layout->addSpacing(1); } break; @@ -815,13 +815,13 @@ void smoothblendClient::addButtons(TQBoxLayout *tqlayout, const TQString& s, int new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true); connect(button[ButtonShade], TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeButtonPressed())); - tqlayout->addWidget(button[ButtonShade]); - if (n < s.length()-1) tqlayout->addSpacing(1); + layout->addWidget(button[ButtonShade]); + if (n < s.length()-1) layout->addSpacing(1); } break; case '_': // Spacer item - tqlayout->addSpacing(::factory->frameSize()); + layout->addSpacing(::factory->frameSize()); } } } @@ -937,7 +937,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = 0; top = ::factory->buttonSize(); - // update tqlayout etc. + // update layout etc. topSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -949,7 +949,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co left = right = bottom = ::factory->frameSize(); top = ::factory->titleSize() + (FRAMESIZE*2); - // update tqlayout etc. + // update layout etc. topSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); decoSpacer_->changeSize(1, FRAMESIZE, TQSizePolicy::Expanding, TQSizePolicy::Fixed); leftSpacer_->changeSize(left, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding); @@ -958,7 +958,7 @@ void smoothblendClient::borders(int &left, int &right, int &top, int &bottom) co rightTitleSpacer_->changeSize(right,s_titleHeight,TQSizePolicy::Fixed, TQSizePolicy::Fixed); bottomSpacer_->changeSize(1, bottom, TQSizePolicy::Expanding, TQSizePolicy::Fixed); } - widget()->tqlayout()->activate(); + widget()->layout()->activate(); } ////////////////////////////////////////////////////////////////////////////// @@ -1183,7 +1183,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rltitle.width(), Rltitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // left mid tqlayout + // left mid layout painter.fillRect(Rleft,widgetGroup.background()); // right of buttons and title @@ -1192,7 +1192,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rrtitle.width(), Rrtitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // right mid tqlayout + // right mid layout painter.fillRect(Rright,widgetGroup.background()); // bottom diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h index 323b7dcd..eaca8373 100644 --- a/twin-styles/smooth-blend/client/smoothblend.h +++ b/twin-styles/smooth-blend/client/smoothblend.h @@ -204,7 +204,7 @@ public: } private: - void addButtons(TQBoxLayout* tqlayout, const TQString& buttons, int buttonSize = 18); + void addButtons(TQBoxLayout* layout, const TQString& buttons, int buttonSize = 18); bool eventFilter(TQObject *obj, TQEvent *e); void mouseDoubleClickEvent(TQMouseEvent *e); void wheelEvent(TQWheelEvent *e); -- cgit v1.2.3