summaryrefslogtreecommitdiffstats
path: root/kwin-styles
diff options
context:
space:
mode:
Diffstat (limited to 'kwin-styles')
-rw-r--r--kwin-styles/glow/config/glowconfigdialog.cpp2
-rw-r--r--kwin-styles/glow/glowclient.cpp2
-rw-r--r--kwin-styles/icewm/icewm.cpp8
-rw-r--r--kwin-styles/kde1/kde1client.cpp2
-rw-r--r--kwin-styles/openlook/OpenLook.cpp8
-rw-r--r--kwin-styles/riscos/Manager.cpp2
-rw-r--r--kwin-styles/smooth-blend/client/config/configdialog.ui2
-rw-r--r--kwin-styles/smooth-blend/client/smoothblend.cc56
-rw-r--r--kwin-styles/smooth-blend/client/smoothblend.h2
-rw-r--r--kwin-styles/system/systemclient.cpp4
10 files changed, 44 insertions, 44 deletions
diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp
index b72fcf5a..759edebf 100644
--- a/kwin-styles/glow/config/glowconfigdialog.cpp
+++ b/kwin-styles/glow/config/glowconfigdialog.cpp
@@ -79,7 +79,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
_button_glow_color_group_box = new TQGroupBox(
0, Qt::Horizontal, i18n("Button Glow Colors"), _main_group_box);
TQHBoxLayout *colorHBoxLayout =
- new TQHBoxLayout(_button_glow_color_group_box->tqlayout());
+ new TQHBoxLayout(_button_glow_color_group_box->layout());
// create buttons
TQSize buttonSize(BITMAP_SIZE, BITMAP_SIZE);
diff --git a/kwin-styles/glow/glowclient.cpp b/kwin-styles/glow/glowclient.cpp
index d15000be..8cec1ab0 100644
--- a/kwin-styles/glow/glowclient.cpp
+++ b/kwin-styles/glow/glowclient.cpp
@@ -746,7 +746,7 @@ void GlowClient::updateButtonPositions()
m_leftButtonList.clear();
m_rightButtonList.clear();
- // reset left and right button tqlayout
+ // reset left and right button layout
if(m_leftButtonLayout)
delete m_leftButtonLayout;
m_leftButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0);
diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp
index 07369fb2..eaaaa41d 100644
--- a/kwin-styles/icewm/icewm.cpp
+++ b/kwin-styles/icewm/icewm.cpp
@@ -892,7 +892,7 @@ void IceWMClient::init()
// No flicker thanks
widget()->setBackgroundMode( NoBackground );
- // Pack the windowWrapper() window within a grid tqlayout
+ // Pack the windowWrapper() window within a grid layout
grid = new TQGridLayout(widget(), 0, 0, 0);
grid->setResizeMode(TQLayout::FreeResize);
grid->addRowSpacing(0, borderSizeY); // Top grab bar
@@ -956,7 +956,7 @@ void IceWMClient::init()
}
-// Adds the buttons to the hbox tqlayout as per the buttons specified
+// Adds the buttons to the hbox layout as per the buttons specified
// in the button string 's'
void IceWMClient::addClientButtons( const TQString& s )
{
@@ -1057,7 +1057,7 @@ void IceWMClient::addClientButtons( const TQString& s )
}
-// Adds a pixmap to the titlebar tqlayout via the use of a nice TQSpacerItem
+// Adds a pixmap to the titlebar layout via the use of a nice TQSpacerItem
TQSpacerItem* IceWMClient::addPixmapSpacer( TQPixmap* p[], TQSizePolicy::SizeType s, int hsize )
{
TQSpacerItem* sp;
@@ -1503,7 +1503,7 @@ void IceWMClient::desktopChange()
}
-// Please don't modify the following unless you want tqlayout problems
+// Please don't modify the following unless you want layout problems
void IceWMClient::captionChange()
{
TQRect r( 0, borderSizeY, geometry().width(), titleBarHeight);
diff --git a/kwin-styles/kde1/kde1client.cpp b/kwin-styles/kde1/kde1client.cpp
index 7c12224d..49808ef3 100644
--- a/kwin-styles/kde1/kde1client.cpp
+++ b/kwin-styles/kde1/kde1client.cpp
@@ -19,7 +19,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include "kde1client_bitmaps.h"
-// Default button tqlayout
+// Default button layout
const char default_left[] = "MS";
const char default_right[] = "H_IAX";
diff --git a/kwin-styles/openlook/OpenLook.cpp b/kwin-styles/openlook/OpenLook.cpp
index 603b4857..f62fe8c1 100644
--- a/kwin-styles/openlook/OpenLook.cpp
+++ b/kwin-styles/openlook/OpenLook.cpp
@@ -339,7 +339,7 @@ OpenLook::maximizeChange()
void
OpenLook::doLayout()
{
- TQVBoxLayout * tqlayout = new TQVBoxLayout(widget(), openLookMargin);
+ TQVBoxLayout * layout = new TQVBoxLayout(widget(), openLookMargin);
titleSpacer_ =
new TQSpacerItem
@@ -350,12 +350,12 @@ OpenLook::doLayout()
TQSizePolicy::Fixed
);
- tqlayout->addItem(titleSpacer_);
+ layout->addItem(titleSpacer_);
- tqlayout->addSpacing(2);
+ layout->addSpacing(2);
TQBoxLayout * midLayout =
- new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight, 0, 0);
+ new TQBoxLayout(layout, TQBoxLayout::LeftToRight, 0, 0);
if (isPreview()) {
midLayout->addWidget(new TQLabel(
diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp
index f41fd073..c76a449f 100644
--- a/kwin-styles/riscos/Manager.cpp
+++ b/kwin-styles/riscos/Manager.cpp
@@ -282,7 +282,7 @@ void Manager::updateButtonVisibility()
break;
}
- tqlayout()->activate();
+ layout()->activate();
#endif
}
diff --git a/kwin-styles/smooth-blend/client/config/configdialog.ui b/kwin-styles/smooth-blend/client/config/configdialog.ui
index 1e3fddf6..7c330098 100644
--- a/kwin-styles/smooth-blend/client/config/configdialog.ui
+++ b/kwin-styles/smooth-blend/client/config/configdialog.ui
@@ -292,7 +292,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout14</cstring>
+ <cstring>layout14</cstring>
</property>
<hbox>
<property name="name">
diff --git a/kwin-styles/smooth-blend/client/smoothblend.cc b/kwin-styles/smooth-blend/client/smoothblend.cc
index 1f90a9d8..41875b2c 100644
--- a/kwin-styles/smooth-blend/client/smoothblend.cc
+++ b/kwin-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/kwin-styles/smooth-blend/client/smoothblend.h b/kwin-styles/smooth-blend/client/smoothblend.h
index 323b7dcd..eaca8373 100644
--- a/kwin-styles/smooth-blend/client/smoothblend.h
+++ b/kwin-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);
diff --git a/kwin-styles/system/systemclient.cpp b/kwin-styles/system/systemclient.cpp
index da9a7dfa..d183a7e4 100644
--- a/kwin-styles/system/systemclient.cpp
+++ b/kwin-styles/system/systemclient.cpp
@@ -13,7 +13,7 @@
#include <kapplication.h>
#include <kdebug.h>
-// Default button tqlayout
+// Default button layout
const char default_left[] = "X";
const char default_right[] = "HSIA";
@@ -78,7 +78,7 @@ static void create_pixmaps()
aUpperGradient->resize(32, 18);
iUpperGradient = new KPixmap;
iUpperGradient->resize(32, 18);
- TQColor bgColor = kapp->tqpalette().active().background();
+ TQColor bgColor = kapp->palette().active().background();
KPixmapEffect::gradient(*aUpperGradient,
KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130),
bgColor,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 06:43:26 +0000