diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp
index 199d339d..ea86dcb9 100644
--- a/kscreensaver/kdesavers/Euphoria.cpp
+++ b/kscreensaver/kdesavers/Euphoria.cpp
@@ -1024,7 +1024,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name )
modeW->setCurrentItem( _saver->mode() ); // set before we connect
connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
- setMinimumSize( tqsizeHint() );
+ setMinimumSize( sizeHint() );
}
diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp
index e49ca556..30978cae 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/kscreensaver/kdesavers/banner.cpp
@@ -116,7 +116,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
TQT_SLOT( slotColor(const TQColor &) ) );
TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group);
- cyclingColorCb->setMinimumSize(cyclingColorCb->tqsizeHint());
+ cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint());
gl->addMultiCellWidget(cyclingColorCb,5,5,0,1);
connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool)));
cyclingColorCb->setChecked(cyclingColor);
@@ -155,7 +155,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
TQT_SLOT( slotMessage( const TQString & ) ) );
TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main);
- timeCb->setFixedSize(timeCb->tqsizeHint());
+ timeCb->setFixedSize(timeCb->sizeHint());
tl->addWidget(timeCb,0,TQt::AlignLeft);
connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool)));
timeCb->setChecked(showTime);
@@ -191,7 +191,7 @@ void KBannerSetup::fillFontSizes()
comboSizes->blockSignals( true );
comboSizes->clear();
int i = 0;
- sizes = TQFontDatabase().tqpointSizes( fontFamily );
+ sizes = TQFontDatabase().pointSizes( fontFamily );
sizes << 96 << 128 << 156 << 0;
int current = 0;
while ( sizes[i] )
diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui
index 5fbadc0c..8adcaa35 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/kscreensaver/kdesavers/firesaversetup.ui
@@ -94,7 +94,7 @@
Expanding
-
+
201
31
@@ -129,7 +129,7 @@
Expanding
-
+
30
220
@@ -146,7 +146,7 @@
Expanding
-
+
30
210
@@ -171,7 +171,7 @@
Expanding
-
+
43
180
@@ -182,13 +182,13 @@
previewFrame
-
+
240
180
-
+
240
180
@@ -236,7 +236,7 @@
Expanding
-
+
30
180
@@ -333,7 +333,7 @@
Expanding
-
+
260
21
@@ -412,7 +412,7 @@
Expanding
-
+
125
21
@@ -488,7 +488,7 @@
Expanding
-
+
125
21
@@ -526,7 +526,7 @@
Fixed
-
+
16
20
@@ -562,7 +562,7 @@
Expanding
-
+
309
21
@@ -605,7 +605,7 @@
Expanding
-
+
31
20
@@ -635,7 +635,7 @@
Expanding
-
+
21
0
@@ -714,7 +714,7 @@
Fixed
-
+
16
80
@@ -828,7 +828,7 @@
Fixed
-
+
16
80
@@ -903,7 +903,7 @@
MinimumExpanding
-
+
41
20
@@ -954,7 +954,7 @@
Fixed
-
+
16
70
@@ -1097,7 +1097,7 @@
Expanding
-
+
91
21
@@ -1135,7 +1135,7 @@
Fixed
-
+
16
50
@@ -1247,7 +1247,7 @@
Expanding
-
+
149
21
@@ -1334,7 +1334,7 @@
Fixed
-
+
16
20
@@ -1400,7 +1400,7 @@
Expanding
-
+
131
21
@@ -1438,7 +1438,7 @@
Fixed
-
+
16
20
@@ -1504,7 +1504,7 @@
Expanding
-
+
117
21
@@ -1545,7 +1545,7 @@
Fixed
-
+
16
20
@@ -1611,7 +1611,7 @@
Expanding
-
+
110
21
@@ -1655,7 +1655,7 @@
Expanding
-
+
31
20
diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp
index 2c208b4c..802bef5e 100644
--- a/kscreensaver/kdesavers/fountain.cpp
+++ b/kscreensaver/kdesavers/fountain.cpp
@@ -218,8 +218,8 @@ Fountain::~Fountain()
/** load the particle file */
bool Fountain::loadParticle()
{
- /* tqStatus indicator */
- bool tqStatus = TRUE;
+ /* Status indicator */
+ bool Status = TRUE;
TQImage buf;
kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
@@ -238,7 +238,7 @@ bool Fountain::loadParticle()
}
/* Set the status to true */
- //tqStatus = TRUE;
+ //Status = TRUE;
glGenTextures(1, &texture[0]); /* create three textures */
glBindTexture(GL_TEXTURE_2D, texture[0]);
/* use linear filtering */
@@ -250,7 +250,7 @@ bool Fountain::loadParticle()
- return tqStatus;
+ return Status;
}
/** setup the GL enviroment */
void Fountain::initializeGL ()
diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui
index f77750aa..3b5eacd7 100644
--- a/kscreensaver/kdesavers/fountaincfg.ui
+++ b/kscreensaver/kdesavers/fountaincfg.ui
@@ -12,7 +12,7 @@
209
-
+
400
209
diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp
index 93ae1660..dd9520d5 100644
--- a/kscreensaver/kdesavers/gravity.cpp
+++ b/kscreensaver/kdesavers/gravity.cpp
@@ -206,8 +206,8 @@ Gravity::~Gravity()
/** load the particle file */
bool Gravity::loadParticle()
{
- /* tqStatus indicator */
- bool tqStatus = TRUE;
+ /* Status indicator */
+ bool Status = TRUE;
TQImage buf;
kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
@@ -226,7 +226,7 @@ bool Gravity::loadParticle()
}
/* Set the status to true */
- //tqStatus = TRUE;
+ //Status = TRUE;
glGenTextures(1, &texture[0]); /* create three textures */
glBindTexture(GL_TEXTURE_2D, texture[0]);
/* use linear filtering */
@@ -238,7 +238,7 @@ bool Gravity::loadParticle()
- return tqStatus;
+ return Status;
}
/** setup the GL enviroment */
void Gravity::initializeGL ()
diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui
index 062b6e83..2d809c1f 100644
--- a/kscreensaver/kdesavers/gravitycfg.ui
+++ b/kscreensaver/kdesavers/gravitycfg.ui
@@ -12,7 +12,7 @@
209
-
+
400
209
diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp
index 5ecea27c..cffa28e3 100644
--- a/kscreensaver/kdesavers/kclock.cpp
+++ b/kscreensaver/kdesavers/kclock.cpp
@@ -153,11 +153,11 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
bool rtl = kapp->reverseLayout();
TQHBox *qsscale = new TQHBox(main);
label = new TQLabel(i18n("Small"), qsscale);
- label->tqsetAlignment(rtl ? AlignRight : AlignLeft);
+ label->setAlignment(rtl ? AlignRight : AlignLeft);
label = new TQLabel(i18n("Medium"), qsscale);
- label->tqsetAlignment(AlignHCenter);
+ label->setAlignment(AlignHCenter);
label = new TQLabel(i18n("Big"), qsscale);
- label->tqsetAlignment(rtl ? AlignLeft : AlignRight);
+ label->setAlignment(rtl ? AlignLeft : AlignRight);
top->addWidget(qsscale);
TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main);
diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui
index 0b28fc61..d25cf5e0 100644
--- a/kscreensaver/kdesavers/pendulumcfg.ui
+++ b/kscreensaver/kdesavers/pendulumcfg.ui
@@ -20,13 +20,13 @@
2
-
+
0
0
-
+
1200
900
@@ -102,7 +102,7 @@ m<sub>1</sub>+m<sub>2</sub>
0
-
+
60
32767
@@ -146,7 +146,7 @@ l<sub>1</sub>+l<sub>2</sub>
0
-
+
60
32767
@@ -189,7 +189,7 @@ l<sub>1</sub>+l<sub>2</sub>
0
-
+
60
32767
@@ -232,7 +232,7 @@ l<sub>1</sub>+l<sub>2</sub>
0
-
+
60
32767
@@ -276,13 +276,13 @@ Change [s]
0
-
+
60
0
-
+
60
32767
@@ -303,7 +303,7 @@ Change [s]
barColorButton
-
+
40
32767
@@ -317,7 +317,7 @@ Change [s]
m1ColorButton
-
+
40
32767
@@ -331,7 +331,7 @@ Change [s]
m2ColorButton
-
+
40
32767
@@ -353,7 +353,7 @@ Change [s]
MinimumExpanding
-
+
20
0
@@ -374,7 +374,7 @@ Change [s]
0
-
+
200
150
@@ -401,7 +401,7 @@ Change [s]
Expanding
-
+
66
31
@@ -445,7 +445,7 @@ Change [s]
Expanding
-
+
65
31
diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp
index c4e8057c..d32a569b 100644
--- a/kscreensaver/kdesavers/polygon.cpp
+++ b/kscreensaver/kdesavers/polygon.cpp
@@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
saver = new kPolygonSaver( preview->winId() );
tl->addWidget(preview);
- setMinimumSize( tqsizeHint() );
+ setMinimumSize( sizeHint() );
}
kPolygonSetup::~kPolygonSetup()
diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui
index 8aa3cb53..c3884b22 100644
--- a/kscreensaver/kdesavers/rotationcfg.ui
+++ b/kscreensaver/kdesavers/rotationcfg.ui
@@ -20,13 +20,13 @@
0
-
+
0
0
-
+
1200
900
@@ -148,7 +148,7 @@
0
-
+
40
32767
@@ -186,7 +186,7 @@
0
-
+
50
32767
@@ -240,7 +240,7 @@
0
-
+
50
32767
@@ -262,7 +262,7 @@
Expanding
-
+
31
51
@@ -275,7 +275,7 @@
preview
-
+
200
150
@@ -302,7 +302,7 @@
Expanding
-
+
51
31
@@ -356,7 +356,7 @@
Expanding
-
+
61
31
diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui
index 89856efe..e63dbd55 100644
--- a/kscreensaver/kdesavers/slideshowcfg.ui
+++ b/kscreensaver/kdesavers/slideshowcfg.ui
@@ -58,7 +58,7 @@
Expanding
-
+
161
20
@@ -94,7 +94,7 @@
Expanding
-
+
20
19
diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp
index 7d94057f..d77a72aa 100644
--- a/kscreensaver/kdesavers/wave.cpp
+++ b/kscreensaver/kdesavers/wave.cpp
@@ -288,8 +288,8 @@ void Wave::paintGL ()
bool Wave::LoadGLTextures()
{
- /* tqStatus indicator */
- bool tqStatus = TRUE;
+ /* Status indicator */
+ bool Status = TRUE;
TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage();
kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl;
@@ -307,7 +307,7 @@ bool Wave::LoadGLTextures()
tex = convertToGLFormat( buf );
}
/* Set the status to true */
- //tqStatus = TRUE;
+ //Status = TRUE;
glGenTextures(1, &texture[0]); /* create three textures */
glBindTexture(GL_TEXTURE_2D, texture[0]);
/* use linear filtering */
@@ -320,5 +320,5 @@ bool Wave::LoadGLTextures()
kdDebug() << "Texture Loaded: " << tex.width() << "," << tex.height() << endl;
- return tqStatus;
+ return Status;
}
diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui
index fddbdae1..9ad24416 100644
--- a/kscreensaver/kdesavers/wavecfg.ui
+++ b/kscreensaver/kdesavers/wavecfg.ui
@@ -20,7 +20,7 @@
0
-
+
400
209
diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui
index 816784b6..a246d8f4 100644
--- a/kscreensaver/kpartsaver/configwidget.ui
+++ b/kscreensaver/kpartsaver/configwidget.ui
@@ -153,7 +153,7 @@
Fixed
-
+
20
21
diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp
index 84050b3e..57caa762 100644
--- a/kscreensaver/kpartsaver/kpartsaver.cpp
+++ b/kscreensaver/kpartsaver/kpartsaver.cpp
@@ -123,7 +123,7 @@ KPartSaver::KPartSaver( WId id )
// create background widget
m_back = new TQLabel( i18n("The screen saver is not configured yet."), this );
- m_back->tqsetAlignment( AlignCenter );
+ m_back->setAlignment( AlignCenter );
embed( m_back );
m_back->show();
@@ -257,7 +257,7 @@ void KPartSaver::next( bool random )
// create background widget
m_back = new TQLabel( i18n("All of your files are unsupported"), this );
- m_back->tqsetAlignment( AlignCenter );
+ m_back->setAlignment( AlignCenter );
embed( m_back );
m_back->show();
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index 6020bcdb..e0f8ce24 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -118,7 +118,7 @@ bool KXSConfigDialog::create()
descr.replace('\n',' ');
descr = descr.simplifyWhiteSpace();
TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() );
- l->tqsetAlignment ( WordBreak );
+ l->setAlignment ( WordBreak );
topLayout->addWidget( l );
}
} else {
diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp
index 242d2f75..ef700545 100644
--- a/kscreensaver/xsavers/helpers.cpp
+++ b/kscreensaver/xsavers/helpers.cpp
@@ -3,27 +3,27 @@
#include
void min_width(TQWidget *w) {
- w->setMinimumWidth(w->tqsizeHint().width());
+ w->setMinimumWidth(w->sizeHint().width());
}
void fixed_width(TQWidget *w) {
- w->setFixedWidth(w->tqsizeHint().width());
+ w->setFixedWidth(w->sizeHint().width());
}
void min_height(TQWidget *w) {
- w->setMinimumHeight(w->tqsizeHint().height());
+ w->setMinimumHeight(w->sizeHint().height());
}
void fixed_height(TQWidget *w) {
- w->setFixedHeight(w->tqsizeHint().height());
+ w->setFixedHeight(w->sizeHint().height());
}
void min_size(TQWidget *w) {
- w->setMinimumSize(w->tqsizeHint());
+ w->setMinimumSize(w->sizeHint());
}
void fixed_size(TQWidget *w) {
- w->setFixedSize(w->tqsizeHint());
+ w->setFixedSize(w->sizeHint());
}
KConfig *klock_config()
diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp
index d21f4770..f9343c2b 100644
--- a/kwin-styles/cde/cdeclient.cpp
+++ b/kwin-styles/cde/cdeclient.cpp
@@ -114,9 +114,9 @@ static inline const KDecorationOptions* options()
return KDecoration::options();
}
-static void fixColorGroup(TQColorGroup & tqcolorGroup)
+static void fixColorGroup(TQColorGroup & colorGroup)
{
- TQColor light = tqcolorGroup.light();
+ TQColor light = colorGroup.light();
int hue, saturation, value;
@@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & tqcolorGroup)
if (value < 128)
{
light.setHsv(hue, saturation, 128);
- tqcolorGroup.setColor(TQColorGroup::Light, light);
+ colorGroup.setColor(TQColorGroup::Light, light);
}
- TQColor dark = tqcolorGroup.dark();
+ TQColor dark = colorGroup.dark();
dark.hsv(&hue, &saturation, &value);
if (value < 84)
{
dark.setHsv(hue, saturation, 84);
- tqcolorGroup.setColor(TQColorGroup::Dark, dark);
+ colorGroup.setColor(TQColorGroup::Dark, dark);
}
}
@@ -420,7 +420,7 @@ void CdeClient::desktopChange()
// Nothing to do yet
}
-TQSize CdeClient::tqminimumSize() const
+TQSize CdeClient::minimumSize() const
{
return TQSize(2 * (s_buttonSize + s_frameWidth),
2 * s_frameWidth + s_buttonSize);
@@ -503,14 +503,14 @@ void CdeClient::paintEvent( TQPaintEvent* )
{
TQPainter p(widget());
- TQColorGroup tqcolorGroup;
+ TQColorGroup colorGroup;
if ( coloredFrame )
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
+ colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
else
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() );
+ colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() );
- fixColorGroup( tqcolorGroup );
+ fixColorGroup( colorGroup );
TQRect trect = titlebar->tqgeometry();
TQRect mrect = widget()->rect();
@@ -523,7 +523,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
}
p.setPen( TQt::NoPen );
- p.setBrush( tqcolorGroup.background() );
+ p.setBrush( colorGroup.background() );
if ( s_frameWidth > 1 )
@@ -546,24 +546,24 @@ void CdeClient::paintEvent( TQPaintEvent* )
// draw left and right frames:
qDrawShadePanel( &p, 1, longSide + 1,
s_frameWidth, mrect.height() - 2 * (longSide + 1),
- tqcolorGroup );
+ colorGroup );
qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1,
s_frameWidth, mrect.height() - 2 * (longSide + 1),
- tqcolorGroup );
+ colorGroup );
}
// draw top and bottom frames:
qDrawShadePanel( &p, longSide + 1, 1,
mrect.width() - 2 * (longSide + 1), s_frameWidth,
- tqcolorGroup );
+ colorGroup );
qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1,
mrect.width() - 2 * (longSide + 1), s_frameWidth,
- tqcolorGroup );
+ colorGroup );
// draw light corner parts:
- p.setPen( tqcolorGroup.light() );
+ p.setPen( colorGroup.light() );
// tl corner:
p.drawLine( 1, 1, longSide - 1, 1 );
@@ -601,7 +601,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
s_frameWidth + 1, mrect.height() - s_frameWidth - 1 );
// draw dark corner parts:
- p.setPen( tqcolorGroup.dark() );
+ p.setPen( colorGroup.dark() );
// tl corner:
if ( !shaded )
@@ -640,14 +640,14 @@ void CdeClient::paintEvent( TQPaintEvent* )
if ( !coloredFrame )
{
- tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() );
- fixColorGroup( tqcolorGroup );
- p.setBrush( tqcolorGroup.background() );
+ colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() );
+ fixColorGroup( colorGroup );
+ p.setBrush( colorGroup.background() );
}
// draw titlebar:
p.drawRect( trect );
- qDrawShadePanel( &p, trect, tqcolorGroup, titlebarPressed );
+ qDrawShadePanel( &p, trect, colorGroup, titlebarPressed );
// draw caption:
if ( titlebarPressed ) // move the caption right and down if the titlebar is pressed
@@ -672,7 +672,7 @@ void CdeClient::paintEvent( TQPaintEvent* )
// Draw a line behind the wrapped window to prevent having
// unpainted areas when we're shaded.
- p.setPen( tqcolorGroup.dark() );
+ p.setPen( colorGroup.dark() );
p.drawLine(s_frameWidth + 1, mrect.height() - s_frameWidth - 2,
mrect.width() - s_frameWidth - 2, mrect.height() - s_frameWidth - 2);
@@ -805,36 +805,36 @@ void CdeButton::drawButton( TQPainter* p )
p->setBrush( options()->color( KDecoration::ColorTitleBar, m_parent->isActive() ) );
p->drawRect( 0, 0, s_buttonSize, s_buttonSize );
- TQColorGroup tqcolorGroup =
- options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
+ TQColorGroup colorGroup =
+ options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() );
- fixColorGroup(tqcolorGroup);
+ fixColorGroup(colorGroup);
qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize,
- tqcolorGroup, isDown() );
+ colorGroup, isDown() );
switch ( m_btnType )
{
case (BtnMenu):
- qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup );
+ qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup );
break;
case (BtnHelp):
- p->setPen( tqcolorGroup.light() );
+ p->setPen( colorGroup.light() );
p->drawLineSegments( TQPointArray(16, helpLLines) );
- p->setPen( tqcolorGroup.dark() );
+ p->setPen( colorGroup.dark() );
p->drawLineSegments( TQPointArray(14, helpDLines) );
break;
case (BtnIconify):
- qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup );
+ qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup );
break;
case (BtnMax):
- qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup,
+ qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup,
m_parent->maximizeMode() == KDecoration::MaximizeFull );
break;
case (BtnClose):
- p->setPen( tqcolorGroup.dark() );
+ p->setPen( colorGroup.dark() );
p->drawLineSegments( TQPointArray(18, closeDLines) );
- p->setPen( tqcolorGroup.light() );
+ p->setPen( colorGroup.light() );
p->drawLineSegments( TQPointArray(15, closeLLines) );
break;
}
diff --git a/kwin-styles/cde/cdeclient.h b/kwin-styles/cde/cdeclient.h
index e3a0e9ad..402e0b3d 100644
--- a/kwin-styles/cde/cdeclient.h
+++ b/kwin-styles/cde/cdeclient.h
@@ -78,7 +78,7 @@ protected:
void activeChange();
void shadeChange();
void iconChange();
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void resize(const TQSize &size);
void borders(int &left, int &right, int &top, int &bottom) const;
void mousePressEvent( TQMouseEvent* );
diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp
index 5d3b4487..b72fcf5a 100644
--- a/kwin-styles/glow/config/glowconfigdialog.cpp
+++ b/kwin-styles/glow/config/glowconfigdialog.cpp
@@ -59,7 +59,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
_main_group_box = new TQWidget(parent);
TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box);
- main_group_boxLayout->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft);
+ main_group_boxLayout->setAlignment(TQt::AlignTop | TQt::AlignLeft);
main_group_boxLayout->setSpacing(6);
//-------------------------------------------------------------------------
@@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent )
_titlebarGradientTypeComboBox = new TQComboBox(_main_group_box);
KConfig *c = KGlobal::config();
- KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") );
+ KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") );
TQColor activeBackground = c->readColorEntry("activeBackground");
TQColor activeBlend = c->readColorEntry("activeBlend");
diff --git a/kwin-styles/glow/glowbutton.cpp b/kwin-styles/glow/glowbutton.cpp
index 87079c2e..1b7d344b 100644
--- a/kwin-styles/glow/glowbutton.cpp
+++ b/kwin-styles/glow/glowbutton.cpp
@@ -92,7 +92,7 @@ GlowButton::GlowButton(TQWidget *parent, const char *name,
m_timer = new TQTimer(this);
connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
m_pos = 0;
- m_timertqStatus = Stop;
+ m_timerStatus = Stop;
setTipText (tip);
setCursor(arrowCursor);
@@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e )
{
if( m_pos<0 )
m_pos=-m_pos;
- m_timertqStatus = Run;
+ m_timerStatus = Run;
if( ! m_timer->isActive() )
m_timer->start(m_updateTime);
TQButton::enterEvent(e);
@@ -168,7 +168,7 @@ void GlowButton::enterEvent( TQEvent *e )
void GlowButton::leaveEvent( TQEvent *e )
{
- m_timertqStatus = Stop;
+ m_timerStatus = Stop;
if( ! m_timer->isActive() )
m_timer->start(m_updateTime);
TQButton::leaveEvent(e);
@@ -196,7 +196,7 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e )
m_timer->start(m_updateTime);
}
if( ! tqgeometry().contains(p) ) {
- m_timertqStatus = Stop;
+ m_timerStatus = Stop;
}
TQMouseEvent me (e->type(), e->pos(), e->globalPos(),
(e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state());
@@ -210,7 +210,7 @@ void GlowButton::slotTimeout()
if( m_pos>=_steps-1 ) {
m_pos = -m_pos;
}
- if( m_timertqStatus==Stop ) {
+ if( m_timerStatus==Stop ) {
if( m_pos==0 ) {
m_timer->stop();
return;
diff --git a/kwin-styles/glow/glowbutton.h b/kwin-styles/glow/glowbutton.h
index d2e83beb..e3d159dd 100644
--- a/kwin-styles/glow/glowbutton.h
+++ b/kwin-styles/glow/glowbutton.h
@@ -73,7 +73,7 @@ protected slots:
void slotTimeout();
private:
- enum TimertqStatus { Run, Stop };
+ enum TimerStatus { Run, Stop };
int m_updateTime;
int _steps;
@@ -81,7 +81,7 @@ private:
TQTimer *m_timer;
int m_pos;
- TimertqStatus m_timertqStatus;
+ TimerStatus m_timerStatus;
int m_realizeButtons;
ButtonState _last_button;
diff --git a/kwin-styles/glow/glowclient.cpp b/kwin-styles/glow/glowclient.cpp
index 51c6e0d8..17e74a38 100644
--- a/kwin-styles/glow/glowclient.cpp
+++ b/kwin-styles/glow/glowclient.cpp
@@ -412,12 +412,12 @@ void GlowClient::paintEvent( TQPaintEvent * )
GlowClientConfig *conf = GlowClientGlobals::instance()->config();
TQRect r_this = widget()->rect();
TQRect r_title = _title_spacer->tqgeometry();
- TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive());
- TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive());
- TQColorGroup cg = widget()->tqcolorGroup();
+ TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive());
+ TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive());
+ TQColorGroup cg = widget()->colorGroup();
TQColor titleColor = options()->color(ColorTitleBar, isActive());
TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive());
- TQColor bgColor = widget()->tqcolorGroup().background();
+ TQColor bgColor = widget()->colorGroup().background();
TQPainter p;
TQPointArray pArray, pArray2, pArray3, pArray4;
@@ -503,7 +503,7 @@ void GlowClient::paintEvent( TQPaintEvent * )
// fill content widget
p.fillRect(1, tBSize.height(),
r_this.width()-2, r_this.height()-tBSize.height()-1,
- options()->tqcolorGroup(ColorFrame, isActive()).background());
+ options()->colorGroup(ColorFrame, isActive()).background());
p.end();
// paint resize handle if necessary
@@ -556,9 +556,9 @@ void GlowClient::captionChange()
widget()->update(_title_spacer->tqgeometry());
}
-TQSize GlowClient::tqminimumSize() const
+TQSize GlowClient::minimumSize() const
{
- return widget()->tqminimumSize();
+ return widget()->minimumSize();
}
void GlowClient::resize( const TQSize& s )
diff --git a/kwin-styles/glow/glowclient.h b/kwin-styles/glow/glowclient.h
index 9129dce0..7e0e15ee 100644
--- a/kwin-styles/glow/glowclient.h
+++ b/kwin-styles/glow/glowclient.h
@@ -152,7 +152,7 @@ public:
virtual void init();
virtual void borders( int&, int&, int&, int& ) const;
virtual void resize( const TQSize& );
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
protected:
virtual void resizeEvent( TQResizeEvent * );
diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp
index 47386962..8f1e98f7 100644
--- a/kwin-styles/icewm/icewm.cpp
+++ b/kwin-styles/icewm/icewm.cpp
@@ -772,7 +772,7 @@ IceWMButton::IceWMButton(IceWMClient *parent, const char *name, TQPixmap* (*p)[2
setBackgroundMode( TQWidget::NoBackground );
client = parent;
usePixmap( p );
- setFixedSize( tqsizeHint() );
+ setFixedSize( sizeHint() );
setToggleButton( isToggle );
}
@@ -785,7 +785,7 @@ void IceWMButton::setTipText(const TQString &tip) {
}
-TQSize IceWMButton::tqsizeHint() const
+TQSize IceWMButton::sizeHint() const
{
// Check for invalid data
if ( validPixmaps( (TQPixmap**) (*pix) ) ) // Cast to avoid dumb warning
@@ -1157,9 +1157,9 @@ void IceWMClient::resize( const TQSize& s )
}
-TQSize IceWMClient::tqminimumSize() const
+TQSize IceWMClient::minimumSize() const
{
- return widget()->tqminimumSize();
+ return widget()->minimumSize();
}
diff --git a/kwin-styles/icewm/icewm.h b/kwin-styles/icewm/icewm.h
index f343912c..975ccfbc 100644
--- a/kwin-styles/icewm/icewm.h
+++ b/kwin-styles/icewm/icewm.h
@@ -104,7 +104,7 @@ class IceWMButton : public TQButton
const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton );
void setTipText(const TQString &tip);
void usePixmap( TQPixmap* (*p)[2] );
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void turnOn( bool isOn );
ButtonState last_button;
@@ -150,7 +150,7 @@ class IceWMClient : public KDecoration
void iconChange();
virtual void desktopChange( );
virtual void borders(int&, int&, int&, int&) const;
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
protected slots:
void slotMaximize();
diff --git a/kwin-styles/kde1/kde1client.cpp b/kwin-styles/kde1/kde1client.cpp
index a5a5e892..b37f6f87 100644
--- a/kwin-styles/kde1/kde1client.cpp
+++ b/kwin-styles/kde1/kde1client.cpp
@@ -55,8 +55,8 @@ void create_pixmaps()
if ( pixmaps_created )
return;
pixmaps_created = true;
- TQColorGroup aGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, true);
- TQColorGroup iGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, false);
+ TQColorGroup aGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, true);
+ TQColorGroup iGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, false);
TQPainter aPainter, iPainter;
close_pix = new TQPixmap(16, 16);
@@ -465,7 +465,7 @@ void StdClient::paintEvent( TQPaintEvent* )
TQRegion r = widget()->rect();
r = r.subtract( t );
p.setClipRegion( r );
- qDrawWinPanel( &p, widget()->rect(), widget()->tqcolorGroup() );
+ qDrawWinPanel( &p, widget()->rect(), widget()->colorGroup() );
// t.setTop( 1 );
// p.setClipRegion( t );
// t.setTop( 0 );
@@ -480,7 +480,7 @@ void StdClient::paintEvent( TQPaintEvent* )
// p.drawLine(t.left(), t.top()+1, t.right(), t.top()+1);
if ( isActive() )
qDrawShadePanel( &p2, 0, 0, titleRect.width(), titleRect.height(),
- widget()->tqcolorGroup(), true, 1 );
+ widget()->colorGroup(), true, 1 );
titleRect.setLeft( 4 );
titleRect.setWidth( titleRect.width() - 2 );
p2.setPen(options()->color(KDecorationOptions::ColorFont, isActive()));
@@ -572,9 +572,9 @@ bool StdClient::eventFilter( TQObject* o, TQEvent* e )
}
}
-TQSize StdClient::tqminimumSize() const
+TQSize StdClient::minimumSize() const
{
- return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
+ return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
}
void StdClient::borders( int& left, int& right, int& top, int& bottom ) const
@@ -649,9 +649,9 @@ void StdToolClient::paintEvent( TQPaintEvent* )
TQPainter p( widget() );
TQRect t = titlebar->tqgeometry();
TQRect r = widget()->rect();
- qDrawWinPanel( &p, r, widget()->tqcolorGroup() );
+ qDrawWinPanel( &p, r, widget()->colorGroup() );
r.setTop( t.bottom()+1 );
- qDrawWinPanel( &p, r, widget()->tqcolorGroup() );
+ qDrawWinPanel( &p, r, widget()->colorGroup() );
p.fillRect( TQRect( TQPoint(t.topLeft() ), TQPoint( width() - t.left(), t.bottom() ) ),
options()->color(KDecorationOptions::ColorTitleBar, isActive()));
p.setPen( options()->color(KDecorationOptions::ColorTitleBar, isActive()).light() );
@@ -721,9 +721,9 @@ bool StdToolClient::eventFilter( TQObject* o, TQEvent* e )
}
}
-TQSize StdToolClient::tqminimumSize() const
+TQSize StdToolClient::minimumSize() const
{
- return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 ));
+ return widget()->minimumSize().expandedTo( TQSize( 100, 50 ));
}
void StdToolClient::borders( int& left, int& right, int& top, int& bottom ) const
diff --git a/kwin-styles/kde1/kde1client.h b/kwin-styles/kde1/kde1client.h
index b97afc3e..4fdfb473 100644
--- a/kwin-styles/kde1/kde1client.h
+++ b/kwin-styles/kde1/kde1client.h
@@ -33,7 +33,7 @@ public:
StdClient( KDecorationBridge* b, KDecorationFactory* f );
~StdClient();
void init();
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const;
void reset( unsigned long mask );
void resize( const TQSize& s );
@@ -72,7 +72,7 @@ public:
StdToolClient( KDecorationBridge* b, KDecorationFactory* f );
~StdToolClient();
void init();
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const;
void reset( unsigned long mask );
void resize( const TQSize& s );
diff --git a/kwin-styles/kstep/nextclient.cpp b/kwin-styles/kstep/nextclient.cpp
index 08867a62..0a6cea49 100644
--- a/kwin-styles/kstep/nextclient.cpp
+++ b/kwin-styles/kstep/nextclient.cpp
@@ -691,7 +691,7 @@ void NextClient::paintEvent( TQPaintEvent* )
p.drawTiledPixmap(t.x()+1, t.y()+1, t.width()-2, t.height()-2,
isActive() ? *aTitlePix : *iTitlePix);
qDrawShadePanel(&p, t.x(), t.y(), t.width(), t.height()-1,
- options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()));
+ options()->colorGroup(KDecoration::ColorTitleBar, isActive()));
p.drawLine(t.x(), t.bottom(), t.right(), t.bottom());
#if 0
@@ -716,7 +716,7 @@ void NextClient::paintEvent( TQPaintEvent* )
int corner = 16 + 3*handleSize/2;
qDrawShadePanel(&p,
fr.x() + 1, fr.bottom() - handleSize, corner-1, handleSize,
- options()->tqcolorGroup(KDecoration::ColorHandle, isActive()),
+ options()->colorGroup(KDecoration::ColorHandle, isActive()),
false);
p.drawTiledPixmap(fr.x() + 2, fr.bottom() - handleSize + 1,
corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix);
@@ -724,7 +724,7 @@ void NextClient::paintEvent( TQPaintEvent* )
qDrawShadePanel(&p,
fr.x() + corner, fr.bottom() - handleSize,
fr.width() - 2*corner, handleSize,
- options()->tqcolorGroup(KDecoration::ColorFrame, isActive()),
+ options()->colorGroup(KDecoration::ColorFrame, isActive()),
false);
p.drawTiledPixmap(fr.x() + corner + 1, fr.bottom() - handleSize + 1,
fr.width() - 2*corner - 2, handleSize - 2,
@@ -732,7 +732,7 @@ void NextClient::paintEvent( TQPaintEvent* )
qDrawShadePanel(&p,
fr.right() - corner + 1, fr.bottom() - handleSize, corner - 1, handleSize,
- options()->tqcolorGroup(KDecoration::ColorHandle, isActive()),
+ options()->colorGroup(KDecoration::ColorHandle, isActive()),
false);
p.drawTiledPixmap(fr.right() - corner + 2, fr.bottom() - handleSize + 1,
corner - 3, handleSize - 2, isActive() ? *aHandlePix : *iHandlePix);
@@ -854,7 +854,7 @@ void NextClient::keepBelowChange(bool below)
}
}
-TQSize NextClient::tqminimumSize() const
+TQSize NextClient::minimumSize() const
{
return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2);
}
diff --git a/kwin-styles/kstep/nextclient.h b/kwin-styles/kstep/nextclient.h
index b24da66d..40bd26b0 100644
--- a/kwin-styles/kstep/nextclient.h
+++ b/kwin-styles/kstep/nextclient.h
@@ -61,7 +61,7 @@ protected:
void activeChange();
void shadeChange();
void iconChange();
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void resize(const TQSize &size);
void borders(int &left, int &right, int &top, int &bottom) const;
void reset(unsigned long changed);
diff --git a/kwin-styles/openlook/OpenLook.cpp b/kwin-styles/openlook/OpenLook.cpp
index 294b678d..c3ac80b1 100644
--- a/kwin-styles/openlook/OpenLook.cpp
+++ b/kwin-styles/openlook/OpenLook.cpp
@@ -215,7 +215,7 @@ OpenLook::shadeChange()
{
}
-TQSize OpenLook::tqminimumSize() const
+TQSize OpenLook::minimumSize() const
{
int left, right, top, bottom;
borders(left, right, top, bottom);
@@ -252,9 +252,9 @@ OpenLook::paintEvent(TQPaintEvent * pe)
TQBrush titleBackground(options()->color(KDecoration::ColorTitleBar, true));
if (isActive())
- qDrawShadePanel(&p, tr, widget()->tqcolorGroup(), true, 1, &titleBackground);
+ qDrawShadePanel(&p, tr, widget()->colorGroup(), true, 1, &titleBackground);
else
- p.fillRect(tr, widget()->tqcolorGroup().brush(TQColorGroup::Background));
+ p.fillRect(tr, widget()->colorGroup().brush(TQColorGroup::Background));
p.setClipRegion(clipRegion);
@@ -482,7 +482,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const
int x2(r.right());
int y2(r.bottom());
- p.setPen(widget()->tqcolorGroup().light());
+ p.setPen(widget()->colorGroup().light());
p.drawLine(x1, y1, x2, y1);
p.drawLine(x1, y1 + 1, x1, y2);
@@ -490,7 +490,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const
p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour);
p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour);
- p.setPen(widget()->tqcolorGroup().dark());
+ p.setPen(widget()->colorGroup().dark());
p.drawLine(x2, y1 + 1, x2, y1 + openLookMargin-1);
@@ -513,7 +513,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const
int x2(r.right());
int y2(r.bottom());
- p.setPen(widget()->tqcolorGroup().light());
+ p.setPen(widget()->colorGroup().light());
p.drawLine(x1, y1, x2, y1);
p.drawLine(x1, y1 + 1, x1, y1 + openLookMargin-1);
@@ -522,7 +522,7 @@ OpenLook::paintTopRightRect(TQPainter & p) const
p.fillRect(x1 + 1, y1 + 1, r.width()-2, openLookMargin-2, handleColour);
p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour);
- p.setPen(widget()->tqcolorGroup().dark());
+ p.setPen(widget()->colorGroup().dark());
p.drawLine(x1 + 1, y1 + openLookMargin-1, x2 - openLookMargin+1, y1 + openLookMargin-1);
p.drawLine(x2, y1 + 1, x2, y2);
@@ -541,7 +541,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const
int x2(r.right());
int y2(r.bottom());
- p.setPen(widget()->tqcolorGroup().light());
+ p.setPen(widget()->colorGroup().light());
p.drawLine(x1, y1, x1 + openLookMargin-1, y1);
p.drawLine(x1, y1 + 1, x1, y2);
@@ -550,7 +550,7 @@ OpenLook::paintBottomLeftRect(TQPainter & p) const
p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour);
p.fillRect(x1 + 1, y1 + 1, openLookMargin-2, r.height()-2, handleColour);
- p.setPen(widget()->tqcolorGroup().dark());
+ p.setPen(widget()->colorGroup().dark());
p.drawLine(x1 + openLookMargin-1, y1 + 1, x1 + openLookMargin-1, y2 - openLookMargin);
p.drawLine(x1 + 1, y2, x2, y2);
@@ -569,7 +569,7 @@ OpenLook::paintBottomRightRect(TQPainter & p) const
int x2(r.right());
int y2(r.bottom());
- p.setPen(widget()->tqcolorGroup().light());
+ p.setPen(widget()->colorGroup().light());
p.drawLine(x1, y2 - openLookMargin+1, x1, y2);
p.drawLine(x1 + 1, y2 - openLookMargin+1, x2 - openLookMargin+1, y2 - openLookMargin+1);
@@ -579,7 +579,7 @@ OpenLook::paintBottomRightRect(TQPainter & p) const
p.fillRect(x1 + 1, y2 - openLookMargin + 2, r.width()-2, openLookMargin-2, handleColour);
p.fillRect(x2 - openLookMargin + 2, y1 + 1, openLookMargin-2, r.height()-2, handleColour);
- p.setPen(widget()->tqcolorGroup().dark());
+ p.setPen(widget()->colorGroup().dark());
p.drawLine(x1 + 1, y2, x2, y2);
p.drawLine(x2, y1 + 1, x2, y2 - 1);
@@ -609,16 +609,16 @@ OpenLook::paintButton(TQPainter & p) const
r.width() - 2,
r.height() - 2,
buttonDown_
- ? widget()->tqcolorGroup().dark()
+ ? widget()->colorGroup().dark()
: options()->color(KDecoration::ColorButtonBg, isActive())
);
- p.setPen(buttonDown_ ? widget()->tqcolorGroup().dark() : widget()->tqcolorGroup().light());
+ p.setPen(buttonDown_ ? widget()->colorGroup().dark() : widget()->colorGroup().light());
p.drawLine(r.left() + 1, r.top(), r.right() - 1, r.top());
p.drawLine(r.left(), r.top() + 1, r.left(), r.bottom() - 1);
- p.setPen(buttonDown_ ? widget()->tqcolorGroup().light() : widget()->tqcolorGroup().dark());
+ p.setPen(buttonDown_ ? widget()->colorGroup().light() : widget()->colorGroup().dark());
p.drawLine(r.right(), r.top() + 1, r.right(), r.bottom() - 1);
p.drawLine(r.left() + 1, r.bottom(), r.right() - 1, r.bottom());
@@ -638,7 +638,7 @@ OpenLook::paintArrow(TQPainter & p) const
TQPointArray poly(3);
- p.setBrush(widget()->tqcolorGroup().mid());
+ p.setBrush(widget()->colorGroup().mid());
poly.setPoint(0, x, y);
poly.setPoint(1, x + w - 1, y);
@@ -646,13 +646,13 @@ OpenLook::paintArrow(TQPainter & p) const
p.drawPolygon(poly);
- p.setPen(widget()->tqcolorGroup().dark());
+ p.setPen(widget()->colorGroup().dark());
p.drawLine(x, y, x + w - 1, y);
p.drawLine(x, y, x + (w / 2), y + h - 1);
- p.setPen(widget()->tqcolorGroup().light());
+ p.setPen(widget()->colorGroup().light());
p.drawLine(x + (w / 2), y + h - 1, x + w - 1, y);
}
@@ -669,10 +669,10 @@ OpenLook::paintBorder(TQPainter & p) const
uint r = widget()->rect().right();
uint b = widget()->rect().bottom();
- p.fillRect(x + cs, y, w - cs - cs, 2, widget()->tqcolorGroup().shadow());
- p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->tqcolorGroup().shadow());
- p.fillRect(x, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow());
- p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->tqcolorGroup().shadow());
+ p.fillRect(x + cs, y, w - cs - cs, 2, widget()->colorGroup().shadow());
+ p.fillRect(x + cs, b - 1, w - cs - cs, 2, widget()->colorGroup().shadow());
+ p.fillRect(x, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow());
+ p.fillRect(r - 1, y + cs, 2, h - cs - cs, widget()->colorGroup().shadow());
TQColor frameColour(options()->color(KDecoration::ColorFrame, isActive()));
@@ -687,7 +687,7 @@ OpenLook::paintBorder(TQPainter & p) const
titleRect().bottom() + 1,
width() - 2 * openLookMargin,
2,
- widget()->tqcolorGroup().background()
+ widget()->colorGroup().background()
);
}
diff --git a/kwin-styles/openlook/OpenLook.h b/kwin-styles/openlook/OpenLook.h
index d6a598ab..d0a945e2 100644
--- a/kwin-styles/openlook/OpenLook.h
+++ b/kwin-styles/openlook/OpenLook.h
@@ -60,7 +60,7 @@ namespace OpenLook
void iconChange();
void maximizeChange();
void borders(int &left, int &right, int &top, int &bottom) const;
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void resize( const TQSize& );
virtual void mouseDoubleClickEvent(TQMouseEvent *);
virtual void wheelEvent(TQWheelEvent *e);
diff --git a/kwin-styles/riscos/Button.cpp b/kwin-styles/riscos/Button.cpp
index 7bf4f477..b5cec59f 100644
--- a/kwin-styles/riscos/Button.cpp
+++ b/kwin-styles/riscos/Button.cpp
@@ -48,7 +48,7 @@ Button::~Button()
// Empty.
}
-void Button::tqsetAlignment(Alignment a)
+void Button::setAlignment(Alignment a)
{
alignment_ = a;
tqrepaint();
diff --git a/kwin-styles/riscos/Button.h b/kwin-styles/riscos/Button.h
index 0c7c66c5..712759c8 100644
--- a/kwin-styles/riscos/Button.h
+++ b/kwin-styles/riscos/Button.h
@@ -46,7 +46,7 @@ class Button : public TQWidget
const ButtonState realizeButton = Qt::LeftButton);
virtual ~Button();
- void tqsetAlignment(Alignment);
+ void setAlignment(Alignment);
Alignment tqalignment() const;
diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp
index 837bec9c..88f3f505 100644
--- a/kwin-styles/riscos/Manager.cpp
+++ b/kwin-styles/riscos/Manager.cpp
@@ -134,9 +134,9 @@ void Manager::resize(const TQSize &s)
widget()->resize(s);
}
-TQSize Manager::tqminimumSize() const
+TQSize Manager::minimumSize() const
{
- return widget()->tqminimumSize();
+ return widget()->minimumSize();
}
void Manager::activeChange()
@@ -678,7 +678,7 @@ void Manager::createTitle()
for (TQPtrListIterator