diff options
Diffstat (limited to 'twin-styles')
28 files changed, 346 insertions, 346 deletions
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 03eb14fa..34a4baae 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -19,7 +19,7 @@ #include "cdeclient.h" #include <tqdatetime.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbutton.h> #include <tqcursor.h> #include <tqlabel.h> @@ -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); } } @@ -381,7 +381,7 @@ void CdeClient::addClientButtons( const TQString& s ) void CdeClient::captionChange() { - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->repaint(titlebar->geometry(), false); } void CdeClient::activeChange() @@ -389,7 +389,7 @@ void CdeClient::activeChange() for ( int i=0; i < BtnCount; i++ ) if ( button[i] ) button[i]->reset(); - widget()->tqrepaint(false); + widget()->repaint(false); } void CdeClient::maximizeChange() @@ -398,7 +398,7 @@ void CdeClient::maximizeChange() bool m = maximizeMode() == MaximizeFull; TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); - button[BtnMax]->tqrepaint(); + button[BtnMax]->repaint(); } } @@ -412,7 +412,7 @@ void CdeClient::shadeChange() void CdeClient::showEvent(TQShowEvent *) { - widget()->tqrepaint(); + widget()->repaint(); } void CdeClient::desktopChange() @@ -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); @@ -489,12 +489,12 @@ void CdeClient::resizeEvent( TQResizeEvent* e) { widget()->update( width() - dx + 1, 0, dx, height() ); widget()->update( TQRect( TQPoint(4,4), - titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update(TQRect(titlebar->tqgeometry().topRight(), - TQPoint(width() - 4, titlebar->tqgeometry().bottom()))); + titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update(TQRect(titlebar->geometry().topRight(), + TQPoint(width() - 4, titlebar->geometry().bottom()))); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), false ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); } } } @@ -503,16 +503,16 @@ 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 trect = titlebar->geometry(); TQRect mrect = widget()->rect(); if ( s_frameWidth > 0 ) @@ -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); @@ -712,24 +712,24 @@ KDecoration::Position CdeClient::mousePosition( const TQPoint& p ) const void CdeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void CdeClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || titleLayout->tqgeometry().contains( e->pos() ) ) + if (isSetShade() || titleLayout->geometry().contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void CdeClient::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) { if ( titlebarButtonMode ) { titlebarPressed = true; - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->repaint(titlebar->geometry(), false); } } } @@ -745,7 +745,7 @@ void CdeClient::mouseReleaseEvent( TQMouseEvent * e ) if ( e->button() == Qt::LeftButton && titlebarPressed ) { titlebarPressed = false; - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->repaint(titlebar->geometry(), false); } } @@ -797,7 +797,7 @@ CdeButton::CdeButton(CdeClient* parent, void CdeButton::reset() { - tqrepaint( false ); + repaint( false ); } void CdeButton::drawButton( TQPainter* p ) @@ -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/cde/config/config.cpp b/twin-styles/cde/config/config.cpp index fcd2de42..41631d57 100644 --- a/twin-styles/cde/config/config.cpp +++ b/twin-styles/cde/config/config.cpp @@ -30,7 +30,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent ) bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox ); bgAlign->setExclusive( true ); - TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the tqalignment of the titlebar caption text.") ); + TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the alignment of the titlebar caption text.") ); new TQRadioButton( i18n("Left"), bgAlign, "AlignLeft" ); TQRadioButton *radio2 = new TQRadioButton( i18n("Centered"), bgAlign, "AlignHCenter" ); radio2->setChecked( true ); diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index f8ff62fd..633cc0bf 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -23,7 +23,7 @@ #include <tqfileinfo.h> #include <tqgroupbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlistview.h> #include <tqpushbutton.h> #include <tqsignalmapper.h> @@ -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); //------------------------------------------------------------------------- @@ -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); @@ -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..79a9f546 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); @@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName) // set steps _steps = pixmap->height()/pixmap->width() - 1; - tqrepaint(false); + repaint(false); } void GlowButton::paintEvent( TQPaintEvent *e ) @@ -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); @@ -180,7 +180,7 @@ void GlowButton::mousePressEvent( TQMouseEvent *e ) if( m_timer->isActive() ) m_timer->stop(); m_pos = _steps; - tqrepaint(false); + repaint(false); // without pretending LeftButton, clicking on the button with MidButton // or RightButton would cause unwanted titlebar action TQMouseEvent me (e->type(), e->pos(), e->globalPos(), @@ -195,8 +195,8 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) if( ! m_timer->isActive() ) { m_timer->start(m_updateTime); } - if( ! tqgeometry().contains(p) ) { - m_timertqStatus = Stop; + if( ! geometry().contains(p) ) { + m_timerStatus = Stop; } TQMouseEvent me (e->type(), e->pos(), e->globalPos(), (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); @@ -205,12 +205,12 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) void GlowButton::slotTimeout() { - tqrepaint(false); + repaint(false); 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..1140ae81 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -18,7 +18,7 @@ #include <tqapplication.h> #include <tqbitmap.h> #include <tqimage.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqpixmap.h> #include <kconfig.h> @@ -404,20 +404,20 @@ GlowClient::~GlowClient() void GlowClient::resizeEvent( TQResizeEvent * ) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } 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(); + TQRect r_title = _title_spacer->geometry(); + 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; @@ -489,7 +489,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) bitBlt(widget(), 0, 0, title_buffer); for (unsigned int i=0; i<m_buttonList.size(); ++i) - m_buttonList[i]->tqrepaint(false); + m_buttonList[i]->repaint(false); p.begin(widget()); p.setPen(TQt::black); @@ -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 @@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * ) void GlowClient::showEvent( TQShowEvent * ) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos())) + if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e ) void GlowClient::activeChange() { updateButtonPixmaps(); - widget()->tqrepaint(false); + widget()->repaint(false); } void GlowClient::iconChange() @@ -553,12 +553,12 @@ void GlowClient::shadeChange() void GlowClient::captionChange() { - widget()->update(_title_spacer->tqgeometry()); + widget()->update(_title_spacer->geometry()); } -TQSize GlowClient::tqminimumSize() const +TQSize GlowClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } void GlowClient::resize( const TQSize& s ) @@ -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/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..c41c7a58 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 @@ -802,7 +802,7 @@ void IceWMButton::usePixmap( TQPixmap* (*p)[2] ) if (validPixmaps( *p )) { pix = p; setFixedSize( (*pix)[Active]->width(), titleBarHeight ); - tqrepaint( false ); + repaint( false ); } else pix = NULL; } @@ -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; @@ -1157,9 +1157,9 @@ void IceWMClient::resize( const TQSize& s ) } -TQSize IceWMClient::tqminimumSize() const +TQSize IceWMClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } @@ -1186,9 +1186,9 @@ void IceWMClient::resizeEvent( TQResizeEvent* e ) if ( dx ) { widget()->update( width() - dx + 1, 0, dx, height() ); - widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, titlebar->tqgeometry().bottom() ) ) ); - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); + widget()->repaint(titlebar->geometry(), false); } } } @@ -1377,46 +1377,46 @@ void IceWMClient::paintEvent( TQPaintEvent* ) TQPainter p2( titleBuffer, this ); titleBuffer->fill( act ? *colorActiveTitleBar : *colorInActiveTitleBar ); - r = titleSpacerJ->tqgeometry(); + r = titleSpacerJ->geometry(); if (!r.isEmpty() && titleJ[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleJ[ act ]); - r = titleSpacerL->tqgeometry(); + r = titleSpacerL->geometry(); if (!r.isEmpty() && titleL[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleL[ act ]); - r = titleSpacerS->tqgeometry(); + r = titleSpacerS->geometry(); if (!r.isEmpty() && titleS[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleS[ act ]); - r = titleSpacerP->tqgeometry(); + r = titleSpacerP->geometry(); if (!r.isEmpty() && titleP[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleP[ act ]); - r = titlebar->tqgeometry(); + r = titlebar->geometry(); if (!r.isEmpty() && titleT[ act ] ) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleT[ act ]); - r = titleSpacerM->tqgeometry(); + r = titleSpacerM->geometry(); if (!r.isEmpty() && titleM[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleM[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerB->tqgeometry(); + r = titleSpacerB->geometry(); if (!r.isEmpty() && titleB[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleB[ act ]); - r = titleSpacerR->tqgeometry(); + r = titleSpacerR->geometry(); if (!r.isEmpty() && titleR[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleR[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerQ->tqgeometry(); + r = titleSpacerQ->geometry(); if (!r.isEmpty() && titleQ[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleQ[ act ], 0, 0, r.width(), r.height()); p2.setFont( options()->font(true) ); // Pre-compute as much as possible - r = titlebar->tqgeometry(); + r = titlebar->geometry(); rx = r.x() - borderSizeX; rw = width()-(2*borderSizeX)-r.x(); @@ -1432,7 +1432,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) p2.drawText(rx, 0, rw, titleBarHeight, AlignLeft|AlignVCenter, caption()); p2.end(); - bitBlt( widget(), borderSizeX, hb->tqgeometry().y(), titleBuffer ); + bitBlt( widget(), borderSizeX, hb->geometry().y(), titleBuffer ); delete titleBuffer; } @@ -1486,7 +1486,7 @@ void IceWMClient::iconChange() renderMenuIcons(); button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix ); if (button[BtnSysMenu]->isVisible()) - button[BtnSysMenu]->tqrepaint(false); + button[BtnSysMenu]->repaint(false); } } } @@ -1497,13 +1497,13 @@ void IceWMClient::desktopChange() if (button[BtnDepth]) { button[BtnDepth]->turnOn( isOnAllDesktops() ); - button[BtnDepth]->tqrepaint(false); + button[BtnDepth]->repaint(false); button[BtnDepth]->setTipText(isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops")); } } -// 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); @@ -1512,7 +1512,7 @@ void IceWMClient::captionChange() TQSizePolicy::Preferred, TQSizePolicy::Fixed ); titlebar->invalidate(); grid->activate(); - widget()->tqrepaint( r, false ); + widget()->repaint( r, false ); } @@ -1541,12 +1541,12 @@ void IceWMClient::shadeChange() void IceWMClient::activeChange() { - widget()->tqrepaint(false); + widget()->repaint(false); // Reset the button pixmaps. for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++) if(button[i]) - button[i]->tqrepaint( false ); + button[i]->repaint( false ); } diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h index f343912c..bab6e919 100644 --- a/twin-styles/icewm/icewm.h +++ b/twin-styles/icewm/icewm.h @@ -43,7 +43,7 @@ #define __KDEGALLIUM_ICEWM_H #include <tqbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <kpixmap.h> #include <kdecoration.h> #include <kdecorationfactory.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..2cadd4c2 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -5,7 +5,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <[email protected]> ******************************************************************/ #include "kde1client.h" #include <tqcursor.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtoolbutton.h> #include <tqlabel.h> #include <tqdrawutil.h> @@ -19,7 +19,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <[email protected]> #include "kde1client_bitmaps.h" -// Default button tqlayout +// Default button layout const char default_left[] = "MS"; const char default_right[] = "H_IAX"; @@ -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); @@ -398,7 +398,7 @@ void StdClient::activeChange() button[ButtonClose]->setIconSet(on ? *close_pix : *dis_close_pix); if (button[ButtonHelp]) button[ButtonHelp]->setIconSet(on ? *question_mark_pix : *dis_question_mark_pix); - widget()->tqrepaint( titlebar->tqgeometry(), false ); + widget()->repaint( titlebar->geometry(), false ); } @@ -413,7 +413,7 @@ StdClient::~StdClient() void StdClient::resizeEvent( TQResizeEvent* ) { TQRegion rr = widget()->rect(); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); // t.setTop( 0 ); // TQRegion r = rr.subtract( TQRect( t.x()+1, 0, t.width()-2, 1 ) ); // setMask( r ); @@ -429,7 +429,7 @@ void StdClient::resizeEvent( TQResizeEvent* ) */ void StdClient::captionChange() { - widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); + widget()->repaint( titlebar->geometry(), FALSE ); } @@ -461,11 +461,11 @@ void StdClient::desktopChange() void StdClient::paintEvent( TQPaintEvent* ) { TQPainter p( widget() ); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); 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())); @@ -494,14 +494,14 @@ void StdClient::paintEvent( TQPaintEvent* ) void StdClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -513,7 +513,7 @@ void StdClient::iconChange() button[ButtonMenu]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix); else button[ButtonMenu]->setIconSet( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ) ); - button[ButtonMenu]->tqrepaint( FALSE ); + button[ButtonMenu]->repaint( FALSE ); } } @@ -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 @@ -636,7 +636,7 @@ StdToolClient::~StdToolClient() void StdToolClient::resizeEvent( TQResizeEvent* ) { // TQRegion r = rect(); -// TQRect t = titlebar->tqgeometry(); +// TQRect t = titlebar->geometry(); // t.setTop( 0 ); // r = r.subtract( TQRect(0, 0, width(), 1) ); // r = r.subtract (TQRect( 0, 0, 1, t.height() ) ); @@ -647,11 +647,11 @@ void StdToolClient::resizeEvent( TQResizeEvent* ) void StdToolClient::paintEvent( TQPaintEvent* ) { TQPainter p( widget() ); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); 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() ); @@ -665,19 +665,19 @@ void StdToolClient::paintEvent( TQPaintEvent* ) void StdToolClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdToolClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void StdToolClient::captionChange() { - widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); + widget()->repaint( titlebar->geometry(), FALSE ); } void StdToolClient::reset( unsigned long ) @@ -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..eae00bde 100644 --- a/twin-styles/kde1/kde1client.h +++ b/twin-styles/kde1/kde1client.h @@ -5,7 +5,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <[email protected]> ******************************************************************/ #ifndef STDCLIENT_H #define STDCLIENT_H -#include <tqlayout.h> +#include <layout.h> #include <tqvariant.h> #include <kdecoration.h> #include <kdecorationfactory.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..0cafc44a 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -1,7 +1,7 @@ #include "nextclient.h" #include <tqdatetime.h> #include <tqdrawutil.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqbitmap.h> #include <tqlabel.h> @@ -340,14 +340,14 @@ NextButton::NextButton(NextClient *parent, const char *name, void NextButton::reset() { - tqrepaint(false); + repaint(false); } void NextButton::setBitmap(const unsigned char *bitmap, int w, int h) { deco = new TQBitmap(w, h, bitmap, true); deco->setMask(*deco); - tqrepaint(); + repaint(); } void NextButton::drawButton(TQPainter *p) @@ -602,7 +602,7 @@ bool NextClient::mustDrawHandle() const void NextClient::iconChange() { if (button[MENU_IDX] && button[MENU_IDX]->isVisible()) - button[MENU_IDX]->tqrepaint(false); + button[MENU_IDX]->repaint(false); } void NextClient::menuButtonPressed() @@ -658,9 +658,9 @@ void NextClient::resizeEvent(TQResizeEvent *) // TODO ? update border area only? widget()->update(); #if 0 - widget()->update(titlebar->tqgeometry()); + widget()->update(titlebar->geometry()); TQPainter p(widget()); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); t.setTop( 0 ); TQRegion r = widget()->rect(); r = r.subtract( t ); @@ -672,7 +672,7 @@ void NextClient::resizeEvent(TQResizeEvent *) void NextClient::captionChange() { - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->repaint(titlebar->geometry(), false); } @@ -686,12 +686,12 @@ void NextClient::paintEvent( TQPaintEvent* ) p.drawRect(fr); // Draw title bar - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); t.setTop(1); 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); @@ -741,7 +741,7 @@ void NextClient::paintEvent( TQPaintEvent* ) void NextClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if (e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -753,7 +753,7 @@ void NextClient::wheelEvent( TQWheelEvent * e ) void NextClient::showEvent(TQShowEvent *) { - widget()->tqrepaint(); + widget()->repaint(); } void NextClient::desktopChange() @@ -782,7 +782,7 @@ void NextClient::maximizeChange() void NextClient::activeChange() { - widget()->tqrepaint(false); + widget()->repaint(false); slotReset(); } @@ -839,7 +839,7 @@ void NextClient::keepAboveChange(bool above) TQToolTip::remove(b); TQToolTip::add(b, above ? i18n("Do not keep above others") : i18n("Keep above others")); - b->tqrepaint(false); + b->repaint(false); } } @@ -850,11 +850,11 @@ void NextClient::keepBelowChange(bool below) TQToolTip::remove(b); TQToolTip::add(b, below ? i18n("Do not keep below others") : i18n("Keep below others")); - b->tqrepaint(false); + b->repaint(false); } } -TQSize NextClient::tqminimumSize() const +TQSize NextClient::minimumSize() const { return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2); } @@ -870,7 +870,7 @@ void NextClient::reset(unsigned long) if (button[i]) button[i]->reset(); } - widget()->tqrepaint(); + widget()->repaint(); } bool NextClient::eventFilter(TQObject *o, TQEvent *e) diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index b24da66d..e2cbe19a 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -4,7 +4,7 @@ #include <tqvariant.h> #include <tqbitmap.h> #include <kpixmap.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbutton.h> #include <kdecoration.h> #include <kdecorationfactory.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..781220d8 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -26,7 +26,7 @@ #include <unistd.h> // for usleep #include <math.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqdrawutil.h> #include <tqtoolbutton.h> @@ -215,7 +215,7 @@ OpenLook::shadeChange() { } -TQSize OpenLook::tqminimumSize() const +TQSize OpenLook::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -226,7 +226,7 @@ TQSize OpenLook::tqminimumSize() const OpenLook::resize(const TQSize& s) { widget()->resize(s); - widget()->tqrepaint(); //there is some strange wrong tqrepaint of the frame without + widget()->repaint(); //there is some strange wrong repaint of the frame without } void @@ -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); @@ -272,7 +272,7 @@ OpenLook::paintEvent(TQPaintEvent * pe) void OpenLook::showEvent(TQShowEvent *) { - widget()->tqrepaint(); + widget()->repaint(); } void @@ -302,7 +302,7 @@ OpenLook::resizeEvent(TQResizeEvent* e) void OpenLook::activeChange() { - widget()->tqrepaint(); + widget()->repaint(); } KDecoration::Position @@ -333,13 +333,13 @@ OpenLook::desktopChange() void OpenLook::maximizeChange() { - widget()->tqrepaint(false); + widget()->repaint(false); } 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( @@ -377,7 +377,7 @@ OpenLook::animateMinimize(bool /*iconify*/) if (!icongeom.isValid()) return false; - TQRect wingeom(tqgeometry()); + TQRect wingeom(geometry()); TQPainter p(workspaceWidget()); @@ -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,14 +687,14 @@ OpenLook::paintBorder(TQPainter & p) const titleRect().bottom() + 1, width() - 2 * openLookMargin, 2, - widget()->tqcolorGroup().background() + widget()->colorGroup().background() ); } TQRect OpenLook::titleRect() const { - return titleSpacer_->tqgeometry(); + return titleSpacer_->geometry(); } bool @@ -704,7 +704,7 @@ OpenLook::isButtonPress(TQMouseEvent * e) buttonDown_ = buttonRect().contains(mousePressPoint_); - widget()->tqrepaint(buttonRect()); + widget()->repaint(buttonRect()); return buttonDown_; } @@ -717,7 +717,7 @@ OpenLook::isButtonRelease(TQMouseEvent * e) return true; } buttonDown_ = false; - widget()->tqrepaint(buttonRect()); + widget()->repaint(buttonRect()); return false; } 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..3588c1dd 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -48,19 +48,19 @@ Button::~Button() // Empty. } -void Button::tqsetAlignment(Alignment a) +void Button::setAlignment(Alignment a) { alignment_ = a; - tqrepaint(); + repaint(); } void Button::setActive(bool b) { active_ = b; - tqrepaint(); + repaint(); } -Button::Alignment Button::tqalignment() const +Button::Alignment Button::alignment() const { return alignment_; } @@ -69,7 +69,7 @@ void Button::mousePressEvent(TQMouseEvent *e) { down_ = true; lastButton_ = e->button(); - tqrepaint(); + repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, @@ -81,7 +81,7 @@ void Button::mouseReleaseEvent(TQMouseEvent *e) { down_ = false; lastButton_ = e->button(); - tqrepaint(); + repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); @@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p) iPixmap_.setMask(*p.mask()); } } - tqrepaint(); + repaint(); } void Button::paintEvent(TQPaintEvent *) diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h index 0c7c66c5..f2efb1aa 100644 --- a/twin-styles/riscos/Button.h +++ b/twin-styles/riscos/Button.h @@ -46,9 +46,9 @@ class Button : public TQWidget const ButtonState realizeButton = Qt::LeftButton); virtual ~Button(); - void tqsetAlignment(Alignment); + void setAlignment(Alignment); - Alignment tqalignment() const; + Alignment alignment() const; protected slots: diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 837bec9c..2ad3b6c9 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -27,7 +27,7 @@ #include <tqapplication.h> #include <tqimage.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <netwm.h> @@ -134,22 +134,22 @@ 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() { updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); emit(activeChanged(isActive())); } void Manager::captionChange() { updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); } void Manager::iconChange() @@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e) // Title bar. - TQRect tr = titleSpacer_->tqgeometry(); + TQRect tr = titleSpacer_->geometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); } void Manager::updateButtonVisibility() @@ -282,7 +282,7 @@ void Manager::updateButtonVisibility() break; } - tqlayout()->activate(); + layout()->activate(); #endif } @@ -292,7 +292,7 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - TQRect tr = titleSpacer_->tqgeometry(); + TQRect tr = titleSpacer_->geometry(); if (tr.width() == 0 || tr.height() == 0) titleBuf_.resize(8, 8); @@ -352,13 +352,13 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos())) titlebarDblClickOperation(); } void Manager::wheelEvent(TQWheelEvent *e) { - if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) ) + if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -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/MaximiseButton.cpp b/twin-styles/riscos/MaximiseButton.cpp index dcc1b52a..e7f55db7 100644 --- a/twin-styles/riscos/MaximiseButton.cpp +++ b/twin-styles/riscos/MaximiseButton.cpp @@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm) : TQPixmap((const char **)maximise_xpm)); - tqrepaint(); + repaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); } 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/riscos/StickyButton.cpp b/twin-styles/riscos/StickyButton.cpp index 2229f915..b40db535 100644 --- a/twin-styles/riscos/StickyButton.cpp +++ b/twin-styles/riscos/StickyButton.cpp @@ -77,7 +77,7 @@ void StickyButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unsticky_xpm) : TQPixmap((const char **)sticky_xpm)); - tqrepaint(); + repaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Not on all desktops") : i18n("On all desktops")); diff --git a/twin-styles/smooth-blend/client/config/configdialog.ui b/twin-styles/smooth-blend/client/config/configdialog.ui index 09af45f6..7c330098 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> @@ -197,7 +197,7 @@ <cstring>textLabel1_3</cstring> </property> <property name="text"> - <string>Text tqalignment:</string> + <string>Text alignment:</string> </property> </widget> <widget class="TQLabel" row="3" column="0"> @@ -274,14 +274,14 @@ <property name="title"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> <string></string> </property> <property name="whatsThis" stdset="0"> - <string>Use these buttons to set the tqalignment of the window title</string> + <string>Use these buttons to set the alignment of the window title</string> </property> <hbox> <property name="name"> @@ -292,7 +292,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -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..f2a23b03 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -19,7 +19,7 @@ #include <tqbitmap.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqtooltip.h> #include <tqtimer.h> @@ -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"; @@ -94,7 +94,7 @@ KDecoration* smoothblendFactory::createDecoration(KDecorationBridge* b) { // reset() // ------- // Reset the handler. Returns true if decorations need to be remade, false if -// only a tqrepaint is necessary +// only a repaint is necessary bool smoothblendFactory::reset(unsigned long changed) { // read in the configuration @@ -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()); } @@ -232,7 +232,7 @@ void smoothblendButton::animate() { animTmr->start(TIMERINTERVAL, true); // single-shot } } - tqrepaint(false); + repaint(false); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() @@ -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()) @@ -434,7 +434,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { //that may produce pixilation of the image painter->drawImage( dx, dy, menuButtonImage.smoothScale(newWidth, newHeight) ); } else { - //highlight on a mouse over tqrepaint + //highlight on a mouse over repaint double factor = animProgress * 0.13; if(!isDown()) @@ -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(), @@ -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()); } } } @@ -836,7 +836,7 @@ void smoothblendClient::activeChange() { for (int n=0; n<ButtonTypeCount; n++) if (button[n]) button[n]->reset(); - widget()->tqrepaint(false); + widget()->repaint(false); } ////////////////////////////////////////////////////////////////////////////// @@ -845,7 +845,7 @@ void smoothblendClient::activeChange() { // The title has changed void smoothblendClient::captionChange() { - widget()->tqrepaint(titlebar_->tqgeometry(), false); + widget()->repaint(titlebar_->geometry(), false); } ////////////////////////////////////////////////////////////////////////////// @@ -858,7 +858,7 @@ void smoothblendClient::desktopChange() { if (button[ButtonSticky]) { TQToolTip::remove(button[ButtonSticky]); TQToolTip::add(button[ButtonSticky], d ? i18n("Un-Sticky") : i18n("Sticky")); - button[ButtonSticky]->tqrepaint(false); + button[ButtonSticky]->repaint(false); } } @@ -869,7 +869,7 @@ void smoothblendClient::desktopChange() { void smoothblendClient::iconChange() { if (button[ButtonMenu]) { - button[ButtonMenu]->tqrepaint(false); + button[ButtonMenu]->repaint(false); } } @@ -883,7 +883,7 @@ void smoothblendClient::maximizeChange() { if (button[ButtonMax]) { TQToolTip::remove(button[ButtonMax]); TQToolTip::add(button[ButtonMax], m ? i18n("Restore") : i18n("Maximize")); - button[ButtonMax]->tqrepaint(false); + button[ButtonMax]->repaint(false); } } @@ -897,7 +897,7 @@ void smoothblendClient::shadeChange() { if (button[ButtonShade]) { TQToolTip::remove(button[ButtonShade]); TQToolTip::add(button[ButtonShade], s ? i18n("Unshade") : i18n("Shade")); - button[ButtonShade]->tqrepaint(false); + button[ButtonShade]->repaint(false); } } @@ -909,7 +909,7 @@ void smoothblendClient::shadeChange() { void smoothblendClient::keepAboveChange(bool a) { if (button[ButtonAbove]) { button[ButtonAbove]->setOn(a); - button[ButtonAbove]->tqrepaint(false); + button[ButtonAbove]->repaint(false); } } @@ -921,7 +921,7 @@ void smoothblendClient::keepAboveChange(bool a) { void smoothblendClient::keepBelowChange(bool b) { if (button[ButtonBelow]) { button[ButtonBelow]->setOn(b); - button[ButtonBelow]->tqrepaint(false); + button[ButtonBelow]->repaint(false); } } @@ -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(); } ////////////////////////////////////////////////////////////////////////////// @@ -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(); } ////////////////////////////////////////////////////////////////////////////// @@ -1077,7 +1077,7 @@ bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { // Doubleclick on title void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { - if (titlebar_->tqgeometry().contains(e->pos())) + if (titlebar_->geometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -1088,7 +1088,7 @@ void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { void smoothblendClient::wheelEvent(TQWheelEvent *e) { - if (titleLayout_->tqgeometry().contains(e->pos()) ) + if (titleLayout_->geometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -1117,18 +1117,18 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { TQPainter painter(widget()); bool active = isActive(); //get group information first - group = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()); - widgetGroup = widget()->tqcolorGroup(); - - TQRect topRect( topSpacer_->tqgeometry() ); - TQRect titleRect( titleLayout_->tqgeometry() ); - TQRect textRect( titlebar_->tqgeometry() ); - TQRect Rltitle( leftTitleSpacer_->tqgeometry() ); - TQRect Rrtitle( rightTitleSpacer_->tqgeometry() ); - TQRect Rdeco( decoSpacer_->tqgeometry() ); - TQRect Rleft( leftSpacer_->tqgeometry() ); - TQRect Rright( rightSpacer_->tqgeometry() ); - TQRect Rbottom( bottomSpacer_->tqgeometry() ); + group = options()->colorGroup(KDecoration::ColorTitleBar, isActive()); + widgetGroup = widget()->colorGroup(); + + TQRect topRect( topSpacer_->geometry() ); + TQRect titleRect( titleLayout_->geometry() ); + TQRect textRect( titlebar_->geometry() ); + TQRect Rltitle( leftTitleSpacer_->geometry() ); + TQRect Rrtitle( rightTitleSpacer_->geometry() ); + TQRect Rdeco( decoSpacer_->geometry() ); + TQRect Rleft( leftSpacer_->geometry() ); + TQRect Rright( rightSpacer_->geometry() ); + TQRect Rbottom( bottomSpacer_->geometry() ); TQRect tempRect; @@ -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 @@ -1280,7 +1280,7 @@ void smoothblendClient::updateMask() { void smoothblendClient::resizeEvent(TQResizeEvent *) { if (widget()->isShown()) { TQRegion region = widget()->rect(); - region = region.subtract(titlebar_->tqgeometry()); + region = region.subtract(titlebar_->geometry()); widget()->erase(region); updateMask(); } @@ -1293,7 +1293,7 @@ void smoothblendClient::resizeEvent(TQResizeEvent *) { void smoothblendClient::showEvent(TQShowEvent *) { updateMask(); - widget()->tqrepaint(); + widget()->repaint(); } ////////////////////////////////////////////////////////////////////////////// diff --git a/twin-styles/smooth-blend/client/smoothblend.h b/twin-styles/smooth-blend/client/smoothblend.h index 4abd32cb..eaca8373 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); @@ -171,7 +171,7 @@ inline TQt::ButtonState smoothblendButton::lastMousePress() const { return lastmouse_; } inline void smoothblendButton::reset() { - tqrepaint(false); + repaint(false); } // smoothblendClient ////////////////////////////////////////////////////////// @@ -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 @@ -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/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index a676a02a..1204c388 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -1,6 +1,6 @@ #include "systemclient.h" -#include <tqlayout.h> +#include <layout.h> #include <tqdrawutil.h> #include <tqbitmap.h> #include <tqtooltip.h> @@ -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, @@ -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,21 +211,21 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::tqsizeHint() const +TQSize SystemButton::sizeHint() const { return(TQSize(14, 14)); } void SystemButton::reset() { - tqrepaint(false); + repaint(false); } void SystemButton::setBitmap(const unsigned char *bitmap) { deco = TQBitmap(8, 8, bitmap, true); deco.setMask(deco); - tqrepaint(); + repaint(); } void SystemButton::drawButton(TQPainter *p) @@ -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); @@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long) { titleBuffer.resize(0, 0); recalcTitleBuffer(); - widget()->tqrepaint(); + widget()->repaint(); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -466,7 +466,7 @@ void SystemClient::resizeEvent( TQResizeEvent* ) /* if ( isVisibleToTLW() && !testWFlags( WStaticContents )) { TQPainter p( this ); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); t.setTop( 0 ); TQRegion r = rect(); r = r.subtract( t ); @@ -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,10 +499,10 @@ 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(); + TQRect t = titlebar->geometry(); t.setTop( 2 ); t.setLeft( t.left() + 4 ); t.setRight( t.right() - 2 ); @@ -532,24 +532,24 @@ void SystemClient::recalcTitleBuffer() void SystemClient::captionChange() { recalcTitleBuffer(); - widget()->tqrepaint(titlebar->tqgeometry(), false); + widget()->repaint(titlebar->geometry(), false); } 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); } void SystemClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); - 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); @@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *) // Client::showEvent(ev); doShape(); widget()->show(); -// widget()->tqrepaint(); +// widget()->repaint(); } /*void SystemClient::windowWrapperShowEvent( TQShowEvent* ) @@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *) void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void SystemClient::wheelEvent( TQWheelEvent *e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -633,7 +633,7 @@ void SystemClient::maximizeChange() void SystemClient::activeChange() { - widget()->tqrepaint(false); + widget()->repaint(false); if (button[ButtonClose]) button[ButtonClose]->reset(); if (button[ButtonSticky]) @@ -649,7 +649,7 @@ void SystemClient::activeChange() void SystemClient::iconChange() { // if (button[BtnMenu] && button[BtnMenu]->isVisible()) -// button[BtnMenu]->tqrepaint(false); +// button[BtnMenu]->repaint(false); } void SystemClient::desktopChange() 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: |