summaryrefslogtreecommitdiffstats
path: root/twin-styles
diff options
context:
space:
mode:
Diffstat (limited to 'twin-styles')
-rw-r--r--twin-styles/cde/cdeclient.cpp66
-rw-r--r--twin-styles/cde/cdeclient.h2
-rw-r--r--twin-styles/glow/config/glowconfigdialog.cpp4
-rw-r--r--twin-styles/glow/glowbutton.cpp10
-rw-r--r--twin-styles/glow/glowbutton.h4
-rw-r--r--twin-styles/glow/glowclient.cpp14
-rw-r--r--twin-styles/glow/glowclient.h2
-rw-r--r--twin-styles/icewm/icewm.cpp8
-rw-r--r--twin-styles/icewm/icewm.h4
-rw-r--r--twin-styles/kde1/kde1client.cpp20
-rw-r--r--twin-styles/kde1/kde1client.h4
-rw-r--r--twin-styles/kstep/nextclient.cpp10
-rw-r--r--twin-styles/kstep/nextclient.h2
-rw-r--r--twin-styles/openlook/OpenLook.cpp44
-rw-r--r--twin-styles/openlook/OpenLook.h2
-rw-r--r--twin-styles/riscos/Button.cpp2
-rw-r--r--twin-styles/riscos/Button.h2
-rw-r--r--twin-styles/riscos/Manager.cpp8
-rw-r--r--twin-styles/riscos/Manager.h2
-rw-r--r--twin-styles/riscos/Static.cpp24
-rw-r--r--twin-styles/smooth-blend/client/config/configdialog.ui6
-rw-r--r--twin-styles/smooth-blend/client/smoothblend.cc26
-rw-r--r--twin-styles/smooth-blend/client/smoothblend.h4
-rw-r--r--twin-styles/system/systemclient.cpp32
-rw-r--r--twin-styles/system/systemclient.h4
25 files changed, 153 insertions, 153 deletions
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 03eb14fa..0fb7ded7 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-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/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h
index e3a0e9ad..402e0b3d 100644
--- a/twin-styles/cde/cdeclient.h
+++ b/twin-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/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index f8ff62fd..0085edbe 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-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/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp
index 87079c2e..1b7d344b 100644
--- a/twin-styles/glow/glowbutton.cpp
+++ b/twin-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/twin-styles/glow/glowbutton.h b/twin-styles/glow/glowbutton.h
index d2e83beb..e3d159dd 100644
--- a/twin-styles/glow/glowbutton.h
+++ b/twin-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/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index 98133221..aee13ef1 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-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/twin-styles/glow/glowclient.h b/twin-styles/glow/glowclient.h
index 9129dce0..7e0e15ee 100644
--- a/twin-styles/glow/glowclient.h
+++ b/twin-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/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 4b9a064b..601fe3ca 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-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/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h
index f343912c..975ccfbc 100644
--- a/twin-styles/icewm/icewm.h
+++ b/twin-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/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index c6a7db98..9b802535 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-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/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h
index adedfaaf..b52f20a7 100644
--- a/twin-styles/kde1/kde1client.h
+++ b/twin-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/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index 08867a62..0a6cea49 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-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/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h
index b24da66d..40bd26b0 100644
--- a/twin-styles/kstep/nextclient.h
+++ b/twin-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/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp
index 46398e30..af3e5291 100644
--- a/twin-styles/openlook/OpenLook.cpp
+++ b/twin-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/twin-styles/openlook/OpenLook.h b/twin-styles/openlook/OpenLook.h
index 98db37af..4be8ca1a 100644
--- a/twin-styles/openlook/OpenLook.h
+++ b/twin-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/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp
index 7bf4f477..b5cec59f 100644
--- a/twin-styles/riscos/Button.cpp
+++ b/twin-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/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h
index 0c7c66c5..712759c8 100644
--- a/twin-styles/riscos/Button.h
+++ b/twin-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/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 837bec9c..88f3f505 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-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<Button> it(leftButtonList_); it.current(); ++it)
{
- it.current()->tqsetAlignment(Button::Left);
+ it.current()->setAlignment(Button::Left);
titleLayout_->addWidget(it.current());
}
@@ -689,7 +689,7 @@ void Manager::createTitle()
for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it)
{
- it.current()->tqsetAlignment(Button::Right);
+ it.current()->setAlignment(Button::Right);
titleLayout_->addWidget(it.current());
}
}
diff --git a/twin-styles/riscos/Manager.h b/twin-styles/riscos/Manager.h
index 5668a7fc..75810c91 100644
--- a/twin-styles/riscos/Manager.h
+++ b/twin-styles/riscos/Manager.h
@@ -56,7 +56,7 @@ class Manager : public KDecoration
void reset(unsigned long changed);
void borders(int&, int&, int&, int&) const;
void resize(const TQSize&);
- TQSize tqminimumSize() const;
+ TQSize minimumSize() const;
void activeChange();
void captionChange();
void iconChange();
diff --git a/twin-styles/riscos/Static.cpp b/twin-styles/riscos/Static.cpp
index 7aac6f5a..92d38ff0 100644
--- a/twin-styles/riscos/Static.cpp
+++ b/twin-styles/riscos/Static.cpp
@@ -372,22 +372,22 @@ void Static::_drawTitleTextAreaSides()
_drawBorder(temp, 4, titleHeight_ - 2);
painter_.begin(&aTitleTextLeft_);
- painter_.tqdrawPixmap(1, 1, temp, 0, 1);
+ painter_.drawPixmap(1, 1, temp, 0, 1);
painter_.end();
painter_.begin(&aTitleTextRight_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+ painter_.drawPixmap(0, 1, temp, 2, 1);
painter_.end();
palette_ = iTitlePal_;
_drawBorder(temp, 4, titleHeight_ - 2);
painter_.begin(&iTitleTextLeft_);
- painter_.tqdrawPixmap(1, 1, temp, 0, 1);
+ painter_.drawPixmap(1, 1, temp, 0, 1);
painter_.end();
painter_.begin(&iTitleTextRight_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+ painter_.drawPixmap(0, 1, temp, 2, 1);
painter_.end();
}
@@ -403,22 +403,22 @@ void Static::_drawResizeCentralAreaSides()
_drawBorder(temp, 4, resizeHeight_ - 3);
painter_.begin(&aResizeMidLeft_);
- painter_.tqdrawPixmap(0, 1, temp, 0, 1);
+ painter_.drawPixmap(0, 1, temp, 0, 1);
painter_.end();
painter_.begin(&aResizeMidRight_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+ painter_.drawPixmap(0, 1, temp, 2, 1);
painter_.end();
palette_ = iResizePal_;
_drawBorder(temp, 4, resizeHeight_ - 3);
painter_.begin(&iResizeMidLeft_);
- painter_.tqdrawPixmap(0, 1, temp, 0, 1);
+ painter_.drawPixmap(0, 1, temp, 0, 1);
painter_.end();
painter_.begin(&iResizeMidRight_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 1);
+ painter_.drawPixmap(0, 1, temp, 2, 1);
painter_.end();
}
@@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground()
_drawBorder(temp, 70, titleHeight_ - 3);
painter_.begin(&aTitleTextMid_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 0);
+ painter_.drawPixmap(0, 1, temp, 2, 0);
if (hicolour_)
painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, aTexture_);
painter_.end();
@@ -442,7 +442,7 @@ void Static::_drawTitleTextAreaBackground()
_drawBorder(temp, 70, titleHeight_ - 3);
painter_.begin(&iTitleTextMid_);
- painter_.tqdrawPixmap(0, 1, temp, 2, 0);
+ painter_.drawPixmap(0, 1, temp, 2, 0);
if (hicolour_)
painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_);
painter_.end();
@@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground()
_drawBorder(temp, 70, resizeHeight_ - 3);
painter_.begin(&aResizeMid_);
- painter_.tqdrawPixmap(0, 0, temp, 2, 0);
+ painter_.drawPixmap(0, 0, temp, 2, 0);
if (hicolour_)
painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, aTexture_);
painter_.end();
@@ -468,7 +468,7 @@ void Static::_drawResizeCentralAreaBackground()
_drawBorder(temp, 70, 7);
painter_.begin(&iResizeMid_);
- painter_.tqdrawPixmap(0, 0, temp, 2, 0);
+ painter_.drawPixmap(0, 0, temp, 2, 0);
if (hicolour_)
painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_);
painter_.end();
diff --git a/twin-styles/smooth-blend/client/config/configdialog.ui b/twin-styles/smooth-blend/client/config/configdialog.ui
index 09af45f6..89347781 100644
--- a/twin-styles/smooth-blend/client/config/configdialog.ui
+++ b/twin-styles/smooth-blend/client/config/configdialog.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>20</height>
@@ -172,7 +172,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>180</width>
<height>140</height>
@@ -348,7 +348,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>231</width>
<height>71</height>
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc
index e012fbc2..8f0cf6a9 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cc
+++ b/twin-styles/smooth-blend/client/smoothblend.cc
@@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() {
}
//////////////////////////////////////////////////////////////////////////////
-// tqsizeHint()
+// sizeHint()
// ----------
// Return size hint
-TQSize smoothblendButton::tqsizeHint() const {
+TQSize smoothblendButton::sizeHint() const {
return TQSize(::factory->buttonSize(), ::factory->buttonSize());
}
@@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) {
TQColor redColor(red);
bool active = client_->isActive();
TQPixmap backgroundTile = client_->getTitleBarTile(active);
- group = KDecoration::options()->tqcolorGroup(KDecoration::ColorTitleBar, active);
+ group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active);
//draw the titlebar behind the buttons and app icons
if ((client_->maximizeMode()==client_->MaximizeFull) && !KDecoration::options()->moveResizeMaximizedWindows())
@@ -508,8 +508,8 @@ void smoothblendClient::create_pixmaps() {
TQColorGroup group,widgetGroup;
int FRAMESIZE = ::factory->frameSize();
// Get the color groups we need for the gradients
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
- widgetGroup = widget()->tqcolorGroup();
+ group = options()->colorGroup(KDecoration::ColorTitleBar, true);
+ widgetGroup = widget()->colorGroup();
// active top title bar tile
tempPixmap.resize(1, TOPMARGIN);
@@ -525,7 +525,7 @@ void smoothblendClient::create_pixmaps() {
painter.end();
// inactive top title bar tile
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
+ group = options()->colorGroup(KDecoration::ColorTitleBar, false);
tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
group.background(),
widgetGroup.background(),
@@ -539,7 +539,7 @@ void smoothblendClient::create_pixmaps() {
// active title bar tile
tempPixmap.resize(1, s_titleHeight+FRAMESIZE);
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true);
+ group = options()->colorGroup(KDecoration::ColorTitleBar, true);
tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
group.background(),
widgetGroup.background(),
@@ -552,7 +552,7 @@ void smoothblendClient::create_pixmaps() {
painter.end();
// inactive title bar tile
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false);
+ group = options()->colorGroup(KDecoration::ColorTitleBar, false);
tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap,
group.background(),
widgetGroup.background(),
@@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) {
}
//////////////////////////////////////////////////////////////////////////////
-// tqminimumSize()
+// minimumSize()
// -------------
// Return the minimum allowable size for this window
-TQSize smoothblendClient::tqminimumSize() const {
- return widget()->tqminimumSize();
+TQSize smoothblendClient::minimumSize() const {
+ return widget()->minimumSize();
}
//////////////////////////////////////////////////////////////////////////////
@@ -1117,8 +1117,8 @@ void smoothblendClient::paintEvent(TQPaintEvent*) {
TQPainter painter(widget());
bool active = isActive();
//get group information first
- group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive());
- widgetGroup = widget()->tqcolorGroup();
+ group = options()->colorGroup(KDecoration::ColorTitleBar, isActive());
+ widgetGroup = widget()->colorGroup();
TQRect topRect( topSpacer_->tqgeometry() );
TQRect titleRect( titleLayout_->tqgeometry() );
diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h
index 4abd32cb..bf789440 100644
--- a/twin-styles/smooth-blend/client/smoothblend.h
+++ b/twin-styles/smooth-blend/client/smoothblend.h
@@ -135,7 +135,7 @@ public:
~smoothblendButton();
void setBitmap(const unsigned char *bitmap);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
ButtonState lastMousePress() const;
void reset();
TQImage getButtonImage(ButtonType type);
@@ -195,7 +195,7 @@ public:
virtual void borders(int &l, int &r, int &t, int &b) const;
virtual void resize(const TQSize &size);
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
virtual Position mousePosition(const TQPoint &point) const;
TQPixmap getTitleBarTile(bool active) const
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index a676a02a..895d60d0 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -124,12 +124,12 @@ static void create_pixmaps()
btnPix = new KPixmap;
btnPix->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
- drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true));
+ drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true));
iBtnPix = new KPixmap;
iBtnPix->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
- drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false));
+ drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false));
// pressed buttons
@@ -158,13 +158,13 @@ static void create_pixmaps()
btnPixDown = new KPixmap;
btnPixDown->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
- drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+ drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
true));
iBtnPixDown = new KPixmap;
iBtnPixDown->resize(14, 14);
bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
- drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+ drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
false));
}
if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128)
@@ -211,7 +211,7 @@ void SystemButton::setTipText(const TQString &tip)
}
-TQSize SystemButton::tqsizeHint() const
+TQSize SystemButton::sizeHint() const
{
return(TQSize(14, 14));
}
@@ -237,7 +237,7 @@ void SystemButton::drawButton(TQPainter *p)
p->drawPixmap(0, 0, isDown() ? *iBtnPixDown : *iBtnPix);
}
else{
- TQColorGroup g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame,
+ TQColorGroup g = KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
client->isActive());
int x2 = width()-1;
int y2 = height()-1;
@@ -251,7 +251,7 @@ void SystemButton::drawButton(TQPainter *p)
p->setPen(g.dark());
p->drawRect(1, 1, width()-2, height()-2);
// inner frame
- g = KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, client->isActive());
+ g = KDecoration::options()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive());
p->fillRect(3, 3, width()-6, height()-6, g.background());
p->setPen(isDown() ? g.mid() : g.light());
p->drawLine(2, 2, x2-2, 2);
@@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s )
}
-TQSize SystemClient::tqminimumSize() const
+TQSize SystemClient::minimumSize() const
{
- return widget()->tqminimumSize();
+ return widget()->minimumSize();
}
@@ -499,7 +499,7 @@ void SystemClient::recalcTitleBuffer()
p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient);
else
p.fillRect(0, 0, width(), 18,
- options()->tqcolorGroup(KDecorationOptions::ColorFrame, true).
+ options()->colorGroup(KDecorationOptions::ColorFrame, true).
brush(TQColorGroup::Button));
TQRect t = titlebar->tqgeometry();
@@ -538,7 +538,7 @@ void SystemClient::captionChange()
void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
{
kDrawRoundButton(&p, x, y, w, h,
- options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false);
+ options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false);
}
@@ -547,9 +547,9 @@ void SystemClient::paintEvent( TQPaintEvent* )
TQPainter p(widget());
TQRect t = titlebar->tqgeometry();
- TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ?
- widget()->tqcolorGroup().brush(TQColorGroup::Background) :
- options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).
+ TQBrush fillBrush(TQBrush(widget()->colorGroup().brush(TQColorGroup::Background)).pixmap() ?
+ widget()->colorGroup().brush(TQColorGroup::Background) :
+ options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).
brush(TQColorGroup::Button));
p.fillRect(1, 18, width()-2, height()-19, fillBrush);
@@ -570,10 +570,10 @@ void SystemClient::paintEvent( TQPaintEvent* )
p.drawText(t, AlignCenter, caption() );
}
- p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).light());
+ p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light());
p.drawLine(width()-20, height()-7, width()-10, height()-7);
p.drawLine(width()-20, height()-5, width()-10, height()-5);
- p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark());
+ p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark());
p.drawLine(width()-20, height()-6, width()-10, height()-6);
p.drawLine(width()-20, height()-4, width()-10, height()-4);
diff --git a/twin-styles/system/systemclient.h b/twin-styles/system/systemclient.h
index ecaf25ee..bb409642 100644
--- a/twin-styles/system/systemclient.h
+++ b/twin-styles/system/systemclient.h
@@ -45,7 +45,7 @@ class SystemClient : public KDecoration
virtual void iconChange();
virtual void desktopChange();
virtual void activeChange();
- virtual TQSize tqminimumSize() const;
+ virtual TQSize minimumSize() const;
virtual void borders(int&, int&, int&, int&) const;
virtual void reset( unsigned long changed );
void drawRoundFrame(TQPainter &p, int x, int y, int w, int h);
@@ -75,7 +75,7 @@ class SystemButton : public TQButton
const unsigned char *bitmap=NULL, const TQString& tip=NULL);
void setBitmap(const unsigned char *bitmap);
void reset();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void setTipText(const TQString &tip);
ButtonState last_button;
protected:
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 06:40:02 +0000