From 5c194e6e7059ddcc96b0e0166ce6157c35fc183e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:12 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- twin-styles/kde1/kde1client.cpp | 48 ++++++++++++++++++++--------------------- twin-styles/kde1/kde1client.h | 6 +++--- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'twin-styles/kde1') 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 ******************************************************************/ #include "kde1client.h" #include -#include +#include #include #include #include @@ -19,7 +19,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich #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 ******************************************************************/ #ifndef STDCLIENT_H #define STDCLIENT_H -#include +#include #include #include #include @@ -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 ); -- cgit v1.2.3