diff options
Diffstat (limited to 'kwin-styles')
57 files changed, 682 insertions, 655 deletions
diff --git a/kwin-styles/cde/Makefile.am b/kwin-styles/cde/Makefile.am index 46d74191..f5ecdfed 100644 --- a/kwin-styles/cde/Makefile.am +++ b/kwin-styles/cde/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config kde_module_LTLIBRARIES = kwin3_cde.la kwin3_cde_la_SOURCES = cdeclient.cpp -kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_cde_la_LIBADD = -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/cde/cdeclient.cpp b/kwin-styles/cde/cdeclient.cpp index 722f3a6f..d21f4770 100644 --- a/kwin-styles/cde/cdeclient.cpp +++ b/kwin-styles/cde/cdeclient.cpp @@ -7,7 +7,7 @@ * Copyright (c) 2000-2001, 2002 * Chris Lee <lee@azsites.com> * Lennart Kudling <kudling@kde.org> - * Fredrik Höglund <fredrik@kde.org> + * Fredrik H�glund <fredrik@kde.org> * * Copyright (c) 2003,2004 * Luciano Montanaro <mikelima@cirulla.net> @@ -41,7 +41,7 @@ static int s_frameWidth = 5; static int s_buttonSize = 19; static bool titlebarButtonMode = true; static bool coloredFrame = true; -static Qt::AlignmentFlags textAlignment = Qt::AlignHCenter; +static TQt::AlignmentFlags textAlignment = TQt::AlignHCenter; // Precomputed border sizes for accessibility // The sizes are applied for tiny -> normal -> large -> very large -> huge -> @@ -57,54 +57,54 @@ static int s_w2 = 5; // These are the line segments for the X on the close button static const int NUM_CLOSEL_COORDS = 2 * 14; -static const QCOORD closeLLinesTemplate[NUM_CLOSEL_COORDS] = +static const TQCOORD closeLLinesTemplate[NUM_CLOSEL_COORDS] = { 14,3, 12,3, 12,3, 9,6, 5,3, 3,3, 3,3, 3,5, 3,5, 6,8, 6,9, 3,12, 3,12, 3,14 }; static const int NUM_CLOSED_COORDS = 2 * 18; -static const QCOORD closeDLinesTemplate[NUM_CLOSED_COORDS] = +static const TQCOORD closeDLinesTemplate[NUM_CLOSED_COORDS] = { 5,3, 8,6, 14,4, 14,5, 14,5, 11,8, 11,9, 14,12, 14,12, 14,14, 14,14, 12,14, 12,14, 9,11, 8,11, 5,14, 5,14, 4,14 }; -static QCOORD closeLLines[NUM_CLOSEL_COORDS]; +static TQCOORD closeLLines[NUM_CLOSEL_COORDS]; -static QCOORD closeDLines[NUM_CLOSED_COORDS]; +static TQCOORD closeDLines[NUM_CLOSED_COORDS]; // These are the line segments for the ? on the help button static const int NUM_HELPL_COORDS = 2 * 16; -static const QCOORD helpLLinesTemplate[NUM_HELPL_COORDS] = +static const TQCOORD helpLLinesTemplate[NUM_HELPL_COORDS] = { 4,6, 4,5, 4,5, 6,3, 6,3, 9,3, 10,3, 11,4, 9,7, 7,9, 7,9, 7,10, 7,14, 7,13, 8,12, 9,12 }; static const int NUM_HELPD_COORDS = 2 * 14; -static const QCOORD helpDLinesTemplate[NUM_HELPD_COORDS] = +static const TQCOORD helpDLinesTemplate[NUM_HELPD_COORDS] = { 5,7, 8,6, 12,5, 12,8, 12,8, 10,10, 10,10, 10,11, 10,11, 8,11, 10,14, 10,13, 9,15, 8,15 }; -static QCOORD helpLLines[NUM_HELPL_COORDS]; +static TQCOORD helpLLines[NUM_HELPL_COORDS]; -static QCOORD helpDLines[NUM_HELPD_COORDS]; +static TQCOORD helpDLines[NUM_HELPD_COORDS]; // This question mark is taller than the one above and // is positioned one pixel higher on the button /* -static const QCOORD helpLLines[] = +static const TQCOORD helpLLines[] = { 4,5, 4,4, 4,4, 6,2, 6,2, 9,2, 10,2, 11,3, 9,6, 7,8, 7,9, 7,10, 7,13, 8,12, 8,12, 9,12 }; -static const QCOORD helpDLines[] = +static const TQCOORD helpDLines[] = { 5,6, 8,5, 12,4, 12,7, 12,7, 10,9, 10,10, 10,11, 10,11, 8,11, 10,13, 9,14, 9,14, 8,14 }; */ // Same as the one above but with a larger dot under // the question mark /* -static const QCOORD helpLLines[] = +static const TQCOORD helpLLines[] = { 4,5, 4,4, 4,4, 6,2, 6,2, 9,2, 10,2, 11,3, 9,6, 7,8, 7,9, 7,10, 7,14, 7,13, 8,12, 9,12 }; -static const QCOORD helpDLines[] = +static const TQCOORD helpDLines[] = { 5,6, 8,5, 12,4, 12,7, 12,7, 10,9, 10,10, 10,11, 10,11, 8,11, 10,13, 10,14, 9,15, 8,15 }; */ @@ -114,9 +114,9 @@ static inline const KDecorationOptions* options() return KDecoration::options(); } -static void fixColorGroup(TQColorGroup & colorGroup) +static void fixColorGroup(TQColorGroup & tqcolorGroup) { - TQColor light = colorGroup.light(); + TQColor light = tqcolorGroup.light(); int hue, saturation, value; @@ -125,17 +125,17 @@ static void fixColorGroup(TQColorGroup & colorGroup) if (value < 128) { light.setHsv(hue, saturation, 128); - colorGroup.setColor(TQColorGroup::Light, light); + tqcolorGroup.setColor(TQColorGroup::Light, light); } - TQColor dark = colorGroup.dark(); + TQColor dark = tqcolorGroup.dark(); dark.hsv(&hue, &saturation, &value); if (value < 84) { dark.setHsv(hue, saturation, 84); - colorGroup.setColor(TQColorGroup::Dark, dark); + tqcolorGroup.setColor(TQColorGroup::Dark, dark); } } @@ -158,11 +158,11 @@ static void readConfig(CdeClientFactory *f) TQString value = conf.readEntry( "TextAlignment", "AlignHCenter" ); if ( value == "AlignLeft" ) - textAlignment = Qt::AlignLeft; + textAlignment = TQt::AlignLeft; else if ( value == "AlignHCenter" ) - textAlignment = Qt::AlignHCenter; + textAlignment = TQt::AlignHCenter; else if ( value == "AlignRight" ) - textAlignment = Qt::AlignRight; + textAlignment = TQt::AlignRight; // find preferred border size @@ -325,7 +325,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'M': if ( ! button[BtnMenu] ) { - button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), LeftButton|RightButton ); + button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); connect( button[BtnMenu], TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()) ); connect( button[BtnMenu], TQT_SIGNAL(released()), TQT_SLOT(menuButtonReleased()) ); titleLayout->addWidget( button[BtnMenu] ); @@ -358,7 +358,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'A': if ( (! button[BtnMax] ) && isMaximizable() ) { - button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), LeftButton|MidButton|RightButton); + button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); connect(button[BtnMax], TQT_SIGNAL(clicked()), TQT_SLOT(maximizeButtonClicked())); titleLayout->addWidget( button[BtnMax] ); @@ -381,7 +381,7 @@ void CdeClient::addClientButtons( const TQString& s ) void CdeClient::captionChange() { - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), 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()->repaint(false); + widget()->tqrepaint(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]->repaint(); + button[BtnMax]->tqrepaint(); } } @@ -412,7 +412,7 @@ void CdeClient::shadeChange() void CdeClient::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void CdeClient::desktopChange() @@ -420,7 +420,7 @@ void CdeClient::desktopChange() // Nothing to do yet } -TQSize CdeClient::minimumSize() const +TQSize CdeClient::tqminimumSize() const { return TQSize(2 * (s_buttonSize + s_frameWidth), 2 * s_frameWidth + s_buttonSize); @@ -477,10 +477,10 @@ void CdeClient::resizeEvent( TQResizeEvent* e) int dy = 0; if ( e->oldSize().width() != width() ) - dx = 32 + QABS( e->oldSize().width() - width() ); + dx = 32 + TQABS( e->oldSize().width() - width() ); if ( e->oldSize().height() != height() ) - dy = 8 + QABS( e->oldSize().height() - height() ); + dy = 8 + TQABS( e->oldSize().height() - height() ); if ( dy ) widget()->update( 0, height() - dy + 1, width(), dy ); @@ -489,12 +489,12 @@ void CdeClient::resizeEvent( TQResizeEvent* e) { widget()->update( width() - dx + 1, 0, dx, height() ); widget()->update( TQRect( TQPoint(4,4), - titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update(TQRect(titlebar->geometry().topRight(), - TQPoint(width() - 4, titlebar->geometry().bottom()))); + titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update(TQRect(titlebar->tqgeometry().topRight(), + TQPoint(width() - 4, titlebar->tqgeometry().bottom()))); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), false ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), false ) ); } } } @@ -503,27 +503,27 @@ void CdeClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup colorGroup; + TQColorGroup tqcolorGroup; if ( coloredFrame ) - colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); else - colorGroup = options()->colorGroup( KDecoration::ColorFrame, isActive() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorFrame, isActive() ); - fixColorGroup( colorGroup ); + fixColorGroup( tqcolorGroup ); - TQRect trect = titlebar->geometry(); + TQRect trect = titlebar->tqgeometry(); TQRect mrect = widget()->rect(); if ( s_frameWidth > 0 ) { // draw black frame: - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawRect( mrect ); } - p.setPen( Qt::NoPen ); - p.setBrush( colorGroup.background() ); + p.setPen( TQt::NoPen ); + p.setBrush( tqcolorGroup.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), - colorGroup ); + tqcolorGroup ); qDrawShadePanel( &p, mrect.width() - s_frameWidth - 1, longSide + 1, s_frameWidth, mrect.height() - 2 * (longSide + 1), - colorGroup ); + tqcolorGroup ); } // draw top and bottom frames: qDrawShadePanel( &p, longSide + 1, 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - colorGroup ); + tqcolorGroup ); qDrawShadePanel( &p, longSide + 1, mrect.height() - s_frameWidth - 1, mrect.width() - 2 * (longSide + 1), s_frameWidth, - colorGroup ); + tqcolorGroup ); // draw light corner parts: - p.setPen( colorGroup.light() ); + p.setPen( tqcolorGroup.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( colorGroup.dark() ); + p.setPen( tqcolorGroup.dark() ); // tl corner: if ( !shaded ) @@ -636,18 +636,18 @@ void CdeClient::paintEvent( TQPaintEvent* ) } - p.setPen( Qt::NoPen ); + p.setPen( TQt::NoPen ); if ( !coloredFrame ) { - colorGroup = options()->colorGroup( KDecoration::ColorTitleBar, isActive() ); - fixColorGroup( colorGroup ); - p.setBrush( colorGroup.background() ); + tqcolorGroup = options()->tqcolorGroup( KDecoration::ColorTitleBar, isActive() ); + fixColorGroup( tqcolorGroup ); + p.setBrush( tqcolorGroup.background() ); } // draw titlebar: p.drawRect( trect ); - qDrawShadePanel( &p, trect, colorGroup, titlebarPressed ); + qDrawShadePanel( &p, trect, tqcolorGroup, 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( colorGroup.dark() ); + p.setPen( tqcolorGroup.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() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void CdeClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || titleLayout->geometry().contains( e->pos() ) ) + if (isSetShade() || titleLayout->tqgeometry().contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void CdeClient::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) { if ( titlebarButtonMode ) { titlebarPressed = true; - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } } } @@ -742,35 +742,35 @@ void CdeClient::borders(int &left, int &right, int &top, int &bottom) const void CdeClient::mouseReleaseEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebarPressed ) + if ( e->button() == Qt::LeftButton && titlebarPressed ) { titlebarPressed = false; - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } } bool CdeClient::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; @@ -782,7 +782,7 @@ bool CdeClient::eventFilter(TQObject *o, TQEvent *e) CdeButton::CdeButton(CdeClient* parent, const char* name, int btnType, const TQString& tip, int realize_btns) - : TQButton(parent->widget(), name), m_btnType(btnType), last_button(NoButton) + : TQButton(parent->widget(), name), m_btnType(btnType), last_button(Qt::NoButton) { setBackgroundMode( TQWidget::NoBackground ); setFixedSize( s_buttonSize, s_buttonSize ); @@ -797,7 +797,7 @@ CdeButton::CdeButton(CdeClient* parent, void CdeButton::reset() { - repaint( false ); + tqrepaint( 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 colorGroup = - options()->colorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); + TQColorGroup tqcolorGroup = + options()->tqcolorGroup( KDecoration::ColorTitleBar, m_parent->isActive() ); - fixColorGroup(colorGroup); + fixColorGroup(tqcolorGroup); qDrawShadePanel( p, 0, 0, s_buttonSize, s_buttonSize, - colorGroup, isDown() ); + tqcolorGroup, isDown() ); switch ( m_btnType ) { case (BtnMenu): - qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, colorGroup ); + qDrawShadePanel( p, s_o1, s_o2, s_w1, s_w2, tqcolorGroup ); break; case (BtnHelp): - p->setPen( colorGroup.light() ); + p->setPen( tqcolorGroup.light() ); p->drawLineSegments( TQPointArray(16, helpLLines) ); - p->setPen( colorGroup.dark() ); + p->setPen( tqcolorGroup.dark() ); p->drawLineSegments( TQPointArray(14, helpDLines) ); break; case (BtnIconify): - qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, colorGroup ); + qDrawShadePanel( p, s_o2, s_o2, s_w2, s_w2, tqcolorGroup ); break; case (BtnMax): - qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, colorGroup, + qDrawShadePanel( p, s_o1, s_o1, s_w1, s_w1, tqcolorGroup, m_parent->maximizeMode() == KDecoration::MaximizeFull ); break; case (BtnClose): - p->setPen( colorGroup.dark() ); + p->setPen( tqcolorGroup.dark() ); p->drawLineSegments( TQPointArray(18, closeDLines) ); - p->setPen( colorGroup.light() ); + p->setPen( tqcolorGroup.light() ); p->drawLineSegments( TQPointArray(15, closeLLines) ); break; } @@ -844,7 +844,7 @@ void CdeButton::mousePressEvent(TQMouseEvent *e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?LeftButton:NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -852,7 +852,7 @@ void CdeButton::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?LeftButton:NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/kwin-styles/cde/cdeclient.h b/kwin-styles/cde/cdeclient.h index 265c6c64..e3a0e9ad 100644 --- a/kwin-styles/cde/cdeclient.h +++ b/kwin-styles/cde/cdeclient.h @@ -5,7 +5,7 @@ * Copyright (c) 2000-2001, 2002 * Chris Lee <lee@azsites.com> * Lennart Kudling <kudling@kde.org> - * Fredrik Höglund <fredrik@kde.org> + * Fredrik H�glund <fredrik@kde.org> * * Copyright (c) 2003 * Luciano Montanaro <mikelima@cirulla.net> @@ -35,11 +35,11 @@ class CdeClient; enum Buttons { BtnMenu=0, BtnHelp, BtnIconify, BtnMax, BtnClose, BtnCount }; -class CdeButton : public QButton +class CdeButton : public TQButton { public: CdeButton( CdeClient* parent=0, const char* name=0, int btnType=0, - const TQString& tip=NULL, int realize_btns = LeftButton ); + const TQString& tip=NULL, int realize_btns = Qt::LeftButton ); void reset(); ButtonState lastButton() { return last_button; } @@ -58,6 +58,7 @@ private: class CdeClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: CdeClient(KDecorationBridge *b, KDecorationFactory *f); ~CdeClient() {}; @@ -77,7 +78,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void mousePressEvent( TQMouseEvent* ); diff --git a/kwin-styles/cde/config/Makefile.am b/kwin-styles/cde/config/Makefile.am index c12933e4..a1aa27ce 100644 --- a/kwin-styles/cde/config/Makefile.am +++ b/kwin-styles/cde/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_cde_config.la kwin_cde_config_la_SOURCES = config.cpp -kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_cde_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_cde_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/cde/config/config.cpp b/kwin-styles/cde/config/config.cpp index e9e49df0..cf58377d 100644 --- a/kwin-styles/cde/config/config.cpp +++ b/kwin-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 alignment of the titlebar caption text.") ); + TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the tqalignment 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/kwin-styles/cde/config/config.h b/kwin-styles/cde/config/config.h index 366cec54..fc7fa136 100644 --- a/kwin-styles/cde/config/config.h +++ b/kwin-styles/cde/config/config.h @@ -15,9 +15,10 @@ class TQVBox; class TQLabel; class TQRadioButton; -class CdeConfig: public QObject +class CdeConfig: public TQObject { Q_OBJECT + TQ_OBJECT public: CdeConfig( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/glow/Makefile.am b/kwin-styles/glow/Makefile.am index 92d5a63a..e63c4ef8 100644 --- a/kwin-styles/glow/Makefile.am +++ b/kwin-styles/glow/Makefile.am @@ -6,7 +6,7 @@ SUBDIRS = . config themes kde_module_LTLIBRARIES = kwin3_glow.la kwin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp -kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_glow_la_LIBADD = $(LIB_KDECORE) -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/glow/config/Makefile.am b/kwin-styles/glow/config/Makefile.am index e677ff91..c1721d1e 100644 --- a/kwin-styles/glow/config/Makefile.am +++ b/kwin-styles/glow/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_glow_config.la kwin_glow_config_la_SOURCES = glowconfigdialog.cpp -kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_glow_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_glow_config_la_LIBADD = $(LIB_KDEUI) METASOURCES = AUTO diff --git a/kwin-styles/glow/config/glowconfigdialog.cpp b/kwin-styles/glow/config/glowconfigdialog.cpp index ab0cd40d..5d3b4487 100644 --- a/kwin-styles/glow/config/glowconfigdialog.cpp +++ b/kwin-styles/glow/config/glowconfigdialog.cpp @@ -59,7 +59,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _main_group_box = new TQWidget(parent); TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box); - main_group_boxLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft); + main_group_boxLayout->tqsetAlignment(TQt::AlignTop | TQt::AlignLeft); main_group_boxLayout->setSpacing(6); //------------------------------------------------------------------------- @@ -79,12 +79,12 @@ 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->layout()); + new TQHBoxLayout(_button_glow_color_group_box->tqlayout()); // create buttons TQSize buttonSize(BITMAP_SIZE, BITMAP_SIZE); TQPixmap pm(buttonSize); - pm.fill(Qt::black); + pm.fill(TQt::black); _stickyButton = new TQPushButton(_button_glow_color_group_box); pm.setMask(TQBitmap(buttonSize, stickyoff_bits, true)); @@ -119,7 +119,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) // create signal mapper _titleButtonMapper = new TQSignalMapper(this); for( uint i=0; i<_titleButtonList.size(); i++ ) { - _titleButtonMapper->setMapping(_titleButtonList[i], i); + _titleButtonMapper->setMapping(TQT_TQOBJECT(_titleButtonList[i]), i); connect(_titleButtonList[i], TQT_SIGNAL(clicked()),_titleButtonMapper, TQT_SLOT(map())); } connect(_titleButtonMapper, TQT_SIGNAL(mapped(int)),this, TQT_SLOT(slotTitleButtonClicked(int))); @@ -139,7 +139,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) _titlebarGradientTypeComboBox = new TQComboBox(_main_group_box); KConfig *c = KGlobal::config(); - KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); + KConfigGroupSaver cgs( c, TQString::tqfromLatin1("WM") ); TQColor activeBackground = c->readColorEntry("activeBackground"); TQColor activeBlend = c->readColorEntry("activeBlend"); @@ -159,7 +159,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) this, TQT_SLOT(slotTitlebarGradientTypeChanged(int))); titlebarGradientTypeLayout->addWidget( new TQLabel(i18n("Titlebar gradient:"), _main_group_box)); - titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, Qt::AlignLeft); + titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, TQt::AlignLeft); titlebarGradientTypeLayout->addStretch(10); main_group_boxLayout->addLayout(titlebarGradientTypeLayout); @@ -194,7 +194,7 @@ void GlowConfigDialog::load( KConfig* /* conf */ ) _glowConfig->setGroup("General"); - _buttonConfigMap = new QColor[NUMBER_OF_BUTTONS]; + _buttonConfigMap = new TQColor[NUMBER_OF_BUTTONS]; color = _glowConfig->readColorEntry("stickyButtonGlowColor", &defaultStickyButtonColor); _buttonConfigMap[stickyButton] = color; @@ -286,7 +286,7 @@ void GlowConfigDialog::slotLoadThemeList () TQDir::Dirs | TQDir::Readable); if (dir.exists()) { - QFileInfoListIterator it2(*dir.entryInfoList()); + TQFileInfoListIterator it2(*dir.entryInfoList()); TQFileInfo * finfo; while ((finfo=it2.current())) diff --git a/kwin-styles/glow/config/glowconfigdialog.h b/kwin-styles/glow/config/glowconfigdialog.h index e8a1be31..81747a4c 100644 --- a/kwin-styles/glow/config/glowconfigdialog.h +++ b/kwin-styles/glow/config/glowconfigdialog.h @@ -29,9 +29,10 @@ class TQComboBox; class KConfig; class KColorButton; -class GlowConfigDialog : public QObject +class GlowConfigDialog : public TQObject { Q_OBJECT + TQ_OBJECT public: GlowConfigDialog( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/glow/glowbutton.cpp b/kwin-styles/glow/glowbutton.cpp index 25bae19c..87079c2e 100644 --- a/kwin-styles/glow/glowbutton.cpp +++ b/kwin-styles/glow/glowbutton.cpp @@ -87,12 +87,12 @@ GlowButton::GlowButton(TQWidget *parent, const char *name, _steps = 0; m_updateTime = 50; - m_pixmapName = TQString::null; + m_pixmapName = TQString(); m_timer = new TQTimer(this); connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); m_pos = 0; - m_timerStatus = Stop; + m_timertqStatus = Stop; setTipText (tip); setCursor(arrowCursor); @@ -116,7 +116,7 @@ TQString GlowButton::getPixmapName() const return m_pixmapName; } -Qt::ButtonState GlowButton::lastButton() const +TQt::ButtonState GlowButton::lastButton() const { return _last_button; } @@ -132,7 +132,7 @@ void GlowButton::setPixmapName(const TQString& pixmapName) // set steps _steps = pixmap->height()/pixmap->width() - 1; - repaint(false); + tqrepaint(false); } void GlowButton::paintEvent( TQPaintEvent *e ) @@ -160,7 +160,7 @@ void GlowButton::enterEvent( TQEvent *e ) { if( m_pos<0 ) m_pos=-m_pos; - m_timerStatus = Run; + m_timertqStatus = 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_timerStatus = Stop; + m_timertqStatus = Stop; if( ! m_timer->isActive() ) m_timer->start(m_updateTime); TQButton::leaveEvent(e); @@ -180,11 +180,11 @@ void GlowButton::mousePressEvent( TQMouseEvent *e ) if( m_timer->isActive() ) m_timer->stop(); m_pos = _steps; - repaint(false); + tqrepaint(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(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -195,22 +195,22 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) if( ! m_timer->isActive() ) { m_timer->start(m_updateTime); } - if( ! geometry().contains(p) ) { - m_timerStatus = Stop; + if( ! tqgeometry().contains(p) ) { + m_timertqStatus = Stop; } TQMouseEvent me (e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state()); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } void GlowButton::slotTimeout() { - repaint(false); + tqrepaint(false); if( m_pos>=_steps-1 ) { m_pos = -m_pos; } - if( m_timerStatus==Stop ) { + if( m_timertqStatus==Stop ) { if( m_pos==0 ) { m_timer->stop(); return; @@ -268,29 +268,29 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * src2_line = (uint*) fg_image.scanLine (y); uint * dst_line = (uint*) image.scanLine (i*h+y); for (int x=0; x<w; ++x) { - int r = qRed (*(src1_line+x)); - int g = qGreen (*(src1_line+x)); - int b = qBlue (*(src1_line+x)); - int a = QMAX (qAlpha(*(src1_line+x)),qGray(*(src2_line+x))); - *(dst_line+x) = qRgba (r, g, b, a); + int r = tqRed (*(src1_line+x)); + int g = tqGreen (*(src1_line+x)); + int b = tqBlue (*(src1_line+x)); + int a = TQMAX (tqAlpha(*(src1_line+x)),tqGray(*(src2_line+x))); + *(dst_line+x) = tqRgba (r, g, b, a); } } } TQPixmap * pixmap = new TQPixmap (image); TQPainter painter (pixmap); - bool dark = (qGray(color.rgb()) <= 127); + bool dark = (tqGray(color.rgb()) <= 127); TQImage fg_img (w, h, 32); fg_img.setAlphaBuffer (true); for (int y=0; y<h; ++y) { uint * src_line = (uint*) fg_image.scanLine (y); uint * dst_line = (uint*) fg_img.scanLine (y); for (int x=0; x<w; ++x) { - int alpha = qGray (*(src_line+x)); + int alpha = tqGray (*(src_line+x)); if (dark) - *(dst_line+x) = qRgba (255, 255, 255, alpha); + *(dst_line+x) = tqRgba (255, 255, 255, alpha); else - *(dst_line+x) = qRgba (0, 0, 0, alpha); + *(dst_line+x) = tqRgba (0, 0, 0, alpha); } } @@ -306,8 +306,8 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * dst_line = (uint*) glow_img.scanLine(y); for (int x=0; x<w; ++x) { int alpha = - (int) (qGray (*(src_line+x)) * ((double) i/_steps)); - *(dst_line+x) = qRgba (r, g, b, alpha); + (int) (tqGray (*(src_line+x)) * ((double) i/_steps)); + *(dst_line+x) = tqRgba (r, g, b, alpha); } } painter.drawImage (0, i*h, glow_img); @@ -317,8 +317,8 @@ TQPixmap * GlowButtonFactory::createGlowButtonPixmap( uint * src_line = (uint*) glow_image.scanLine (y); uint * dst_line = (uint*) glow_img.scanLine (y); for (int x=0; x<w; ++x) { - int alpha = qGray (*(src_line+x)); - *(dst_line+x) = qRgba (r, g, b, alpha); + int alpha = tqGray (*(src_line+x)); + *(dst_line+x) = tqRgba (r, g, b, alpha); } } painter.drawImage (0, _steps*h, glow_img); diff --git a/kwin-styles/glow/glowbutton.h b/kwin-styles/glow/glowbutton.h index f263f0ac..d2e83beb 100644 --- a/kwin-styles/glow/glowbutton.h +++ b/kwin-styles/glow/glowbutton.h @@ -44,9 +44,10 @@ private: //----------------------------------------------------------------------------- -class GlowButton : public QButton +class GlowButton : public TQButton { Q_OBJECT + TQ_OBJECT public: GlowButton(TQWidget *parent, const char* name, const TQString& tip, const int realizeBtns); @@ -58,7 +59,7 @@ public: ButtonState lastButton() const; /** Sets the name of the pixmap in the pixmap cache. - * If no background pixmap is wanted use TQString::null as name. */ + * If no background pixmap is wanted use TQString() as name. */ void setPixmapName(const TQString& pixmapName); protected: @@ -72,7 +73,7 @@ protected slots: void slotTimeout(); private: - enum TimerStatus { Run, Stop }; + enum TimertqStatus { Run, Stop }; int m_updateTime; int _steps; @@ -80,7 +81,7 @@ private: TQTimer *m_timer; int m_pos; - TimerStatus m_timerStatus; + TimertqStatus m_timertqStatus; int m_realizeButtons; ButtonState _last_button; diff --git a/kwin-styles/glow/glowclient.cpp b/kwin-styles/glow/glowclient.cpp index 53d52b79..51c6e0d8 100644 --- a/kwin-styles/glow/glowclient.cpp +++ b/kwin-styles/glow/glowclient.cpp @@ -284,7 +284,7 @@ const TQString GlowClientGlobals::getPixmapTypeName(PixmapType type) case(Close): return "Close"; default: - return TQString::null; + return TQString(); } } @@ -404,20 +404,20 @@ GlowClient::~GlowClient() void GlowClient::resizeEvent( TQResizeEvent * ) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::paintEvent( TQPaintEvent * ) { GlowClientConfig *conf = GlowClientGlobals::instance()->config(); TQRect r_this = widget()->rect(); - TQRect r_title = _title_spacer->geometry(); - TQColorGroup titleCg = options()->colorGroup(ColorTitleBar, isActive()); - TQColorGroup titleBlendCg=options()->colorGroup(ColorTitleBlend, isActive()); - TQColorGroup cg = widget()->colorGroup(); + TQRect r_title = _title_spacer->tqgeometry(); + TQColorGroup titleCg = options()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup titleBlendCg=options()->tqcolorGroup(ColorTitleBlend, isActive()); + TQColorGroup cg = widget()->tqcolorGroup(); TQColor titleColor = options()->color(ColorTitleBar, isActive()); TQColor titleBlendColor = options()->color(ColorTitleBlend, isActive()); - TQColor bgColor = widget()->colorGroup().background(); + TQColor bgColor = widget()->tqcolorGroup().background(); TQPainter p; TQPointArray pArray, pArray2, pArray3, pArray4; @@ -443,7 +443,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) p.setPen(options()->color(ColorFont, isActive())); p.drawText(r_title.x(), 0, r_title.width(), r_title.height(), - Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, caption()); + TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, caption()); // draw split color beneath buttons top right pArray4 = TQPointArray(4); @@ -452,7 +452,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) tBSize.height()/2-1); pArray4.setPoint(2, r_title.x()+r_title.width()-1, tBSize.height()); pArray4.setPoint(3, tBSize.width()-1, tBSize.height()); - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); p.setBrush(bgColor); p.drawPolygon(pArray4); @@ -479,7 +479,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) pArray3.setPoint(1, 0, 0); pArray3.setPoint(2, tBSize.width()-1, 0); pArray3.setPoint(3, tBSize.width()-1, tBSize.height()-1); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawPolyline(pArray3); p.end(); @@ -489,10 +489,10 @@ void GlowClient::paintEvent( TQPaintEvent * ) bitBlt(widget(), 0, 0, title_buffer); for (unsigned int i=0; i<m_buttonList.size(); ++i) - m_buttonList[i]->repaint(false); + m_buttonList[i]->tqrepaint(false); p.begin(widget()); - p.setPen(Qt::black); + p.setPen(TQt::black); //----- // draw borders p.drawLine(0,tBSize.height(),0,r_this.height()-1); @@ -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()->colorGroup(ColorFrame, isActive()).background()); + options()->tqcolorGroup(ColorFrame, isActive()).background()); p.end(); // paint resize handle if necessary @@ -511,7 +511,7 @@ void GlowClient::paintEvent( TQPaintEvent * ) && width()>=2 && height() >= RESIZE_HANDLE_HEIGHT) { p.begin(widget()); - p.setPen (Qt::black); + p.setPen (TQt::black); p.drawLine (1, height() - RESIZE_HANDLE_HEIGHT, width()-2, height() - RESIZE_HANDLE_HEIGHT); p.end(); @@ -521,12 +521,12 @@ void GlowClient::paintEvent( TQPaintEvent * ) void GlowClient::showEvent( TQShowEvent * ) { doShape(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if(e->button() == LeftButton && _title_spacer->geometry().contains(e->pos())) + if(e->button() == Qt::LeftButton && _title_spacer->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -539,7 +539,7 @@ void GlowClient::wheelEvent( TQWheelEvent *e ) void GlowClient::activeChange() { updateButtonPixmaps(); - widget()->repaint(false); + widget()->tqrepaint(false); } void GlowClient::iconChange() @@ -553,12 +553,12 @@ void GlowClient::shadeChange() void GlowClient::captionChange() { - widget()->update(_title_spacer->geometry()); + widget()->update(_title_spacer->tqgeometry()); } -TQSize GlowClient::minimumSize() const +TQSize GlowClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } void GlowClient::resize( const TQSize& s ) @@ -649,7 +649,7 @@ void GlowClient::createButtons() TQSize size = globals->theme()->buttonSize; m_stickyButton = factory->createGlowButton(widget(), - "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), LeftButton|RightButton); + "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), Qt::LeftButton|Qt::RightButton); m_stickyButton->setFixedSize(size); connect(m_stickyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); m_buttonList.insert(m_buttonList.end(), m_stickyButton); @@ -667,7 +667,7 @@ void GlowClient::createButtons() m_buttonList.insert(m_buttonList.end(), m_minimizeButton); m_maximizeButton=factory->createGlowButton(widget(), - "MaximizeButton", i18n("Maximize"), LeftButton|MidButton|RightButton); + "MaximizeButton", i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); m_maximizeButton->setFixedSize(size); connect(m_maximizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); m_buttonList.insert(m_buttonList.end(), m_maximizeButton); @@ -746,7 +746,7 @@ void GlowClient::updateButtonPositions() m_leftButtonList.clear(); m_rightButtonList.clear(); - // reset left and right button layout + // reset left and right button tqlayout if(m_leftButtonLayout) delete m_leftButtonLayout; m_leftButtonLayout = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); @@ -857,27 +857,27 @@ void GlowClient::slotMaximize() bool GlowClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e )); + resizeEvent( TQT_TQRESIZEEVENT( e )); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e )); + paintEvent( TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e )); + processMousePressEvent( TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Show: - showEvent( static_cast< TQShowEvent* >( e )); + showEvent( TQT_TQSHOWEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; diff --git a/kwin-styles/glow/glowclient.h b/kwin-styles/glow/glowclient.h index 41305bc6..9129dce0 100644 --- a/kwin-styles/glow/glowclient.h +++ b/kwin-styles/glow/glowclient.h @@ -144,6 +144,7 @@ private: class GlowClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: GlowClient( KDecorationBridge* b, KDecorationFactory* f ); ~GlowClient(); @@ -151,7 +152,7 @@ public: virtual void init(); virtual void borders( int&, int&, int&, int& ) const; virtual void resize( const TQSize& ); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; protected: virtual void resizeEvent( TQResizeEvent * ); diff --git a/kwin-styles/glow/resources.h b/kwin-styles/glow/resources.h index fa575aed..a304b822 100644 --- a/kwin-styles/glow/resources.h +++ b/kwin-styles/glow/resources.h @@ -1,11 +1,11 @@ #ifndef RESOURCES_H #define RESOURCES_H -#define DEFAULT_CLOSE_BUTTON_COLOR Qt::red -#define DEFAULT_MAXIMIZE_BUTTON_COLOR Qt::yellow -#define DEFAULT_ICONIFY_BUTTON_COLOR Qt::green -#define DEFAULT_HELP_BUTTON_COLOR Qt::white -#define DEFAULT_STICKY_BUTTON_COLOR Qt::white +#define DEFAULT_CLOSE_BUTTON_COLOR TQt::red +#define DEFAULT_MAXIMIZE_BUTTON_COLOR TQt::yellow +#define DEFAULT_ICONIFY_BUTTON_COLOR TQt::green +#define DEFAULT_HELP_BUTTON_COLOR TQt::white +#define DEFAULT_STICKY_BUTTON_COLOR TQt::white #endif diff --git a/kwin-styles/icewm/Makefile.am b/kwin-styles/icewm/Makefile.am index 1bdcda43..f5e240f1 100644 --- a/kwin-styles/icewm/Makefile.am +++ b/kwin-styles/icewm/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = . config icewm-themes kde_module_LTLIBRARIES = kwin3_icewm.la kwin3_icewm_la_SOURCES = icewm.cpp -kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_icewm_la_LIBADD = $(LIB_KDEUI) -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/icewm/config/Makefile.am b/kwin-styles/icewm/config/Makefile.am index 7c2b82e5..9189f18f 100644 --- a/kwin-styles/icewm/config/Makefile.am +++ b/kwin-styles/icewm/config/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin_icewm_config.la kwin_icewm_config_la_SOURCES = config.cpp -kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_icewm_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_icewm_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) METASOURCES = AUTO diff --git a/kwin-styles/icewm/config/config.cpp b/kwin-styles/icewm/config/config.cpp index 980e949a..8b679d54 100644 --- a/kwin-styles/icewm/config/config.cpp +++ b/kwin-styles/icewm/config/config.cpp @@ -172,7 +172,7 @@ void IceWMConfig::findIceWMThemes() TQDir d(*it, TQString("*"), TQDir::Unsorted, TQDir::Dirs | TQDir::Readable ); if (d.exists()) { - QFileInfoListIterator it2( *d.entryInfoList() ); + TQFileInfoListIterator it2( *d.entryInfoList() ); TQFileInfo* finfo; // Step through all directories within the kwin/icewm-themes directory diff --git a/kwin-styles/icewm/config/config.h b/kwin-styles/icewm/config/config.h index 9bcb76bf..c9c5b2d0 100644 --- a/kwin-styles/icewm/config/config.h +++ b/kwin-styles/icewm/config/config.h @@ -37,9 +37,10 @@ class TQVBox; -class IceWMConfig: public QObject +class IceWMConfig: public TQObject { Q_OBJECT + TQ_OBJECT public: IceWMConfig( KConfig* conf, TQWidget* parent ); diff --git a/kwin-styles/icewm/icewm.cpp b/kwin-styles/icewm/icewm.cpp index 9b60219d..47386962 100644 --- a/kwin-styles/icewm/icewm.cpp +++ b/kwin-styles/icewm/icewm.cpp @@ -218,7 +218,7 @@ void ThemeHandler::convertButtons( TQString& s ) } -// Reverses all characters in a QString +// Reverses all characters in a TQString TQString ThemeHandler::reverseString( TQString s ) { if (s.length() <= 1) @@ -385,8 +385,8 @@ void ThemeHandler::initTheme() setPixmap( frameTR, "frame", "TR.xpm" ); // Sides - setPixmap( frameL, "frame", "L.xpm", true, Vertical ); - setPixmap( frameR, "frame", "R.xpm", true, Vertical ); + setPixmap( frameL, "frame", "L.xpm", true,Qt::Vertical ); + setPixmap( frameR, "frame", "R.xpm", true,Qt::Vertical ); // Bottom setPixmap( frameBL, "frame", "BL.xpm" ); @@ -500,7 +500,7 @@ void ThemeHandler::freePixmapGroup( TQPixmap* p[] ) } -// Converts icewm colors #C0C0C0 or rgb:C0/C0/C0 to QColors +// Converts icewm colors #C0C0C0 or rgb:C0/C0/C0 to TQColors TQColor ThemeHandler::decodeColor( TQString& s ) { // Make rgb:C0/C0/C0, or #C0/C0/C0 -> C0C0C0 @@ -517,7 +517,7 @@ TQColor ThemeHandler::decodeColor( TQString& s ) if (s.length() != 6) return TQColor( 0xC0, 0xC0, 0xC0 ); - // Qt makes this conversion very easy + // TQt makes this conversion very easy return TQColor( TQString("#") + s ); } @@ -772,7 +772,7 @@ IceWMButton::IceWMButton(IceWMClient *parent, const char *name, TQPixmap* (*p)[2 setBackgroundMode( TQWidget::NoBackground ); client = parent; usePixmap( p ); - setFixedSize( sizeHint() ); + setFixedSize( tqsizeHint() ); setToggleButton( isToggle ); } @@ -785,7 +785,7 @@ void IceWMButton::setTipText(const TQString &tip) { } -TQSize IceWMButton::sizeHint() const +TQSize IceWMButton::tqsizeHint() 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 ); - repaint( false ); + tqrepaint( false ); } else pix = NULL; } @@ -840,7 +840,7 @@ void IceWMButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -849,7 +849,7 @@ void IceWMButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -892,7 +892,7 @@ void IceWMClient::init() // No flicker thanks widget()->setBackgroundMode( NoBackground ); - // Pack the windowWrapper() window within a grid layout + // Pack the windowWrapper() window within a grid tqlayout 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 layout as per the buttons specified +// Adds the buttons to the hbox tqlayout as per the buttons specified // in the button string 's' void IceWMClient::addClientButtons( const TQString& s ) { @@ -973,7 +973,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if (showMenuButtonIcon) { renderMenuIcons(); button[BtnSysMenu] = new IceWMButton(this, "menu", - &menuButtonWithIconPix, false, i18n("Menu"), LeftButton|RightButton); + &menuButtonWithIconPix, false, i18n("Menu"), Qt::LeftButton|Qt::RightButton); } else button[BtnSysMenu] = new IceWMButton(this, "menu", @@ -1002,7 +1002,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if ( validPixmaps(maximizePix) && !button[BtnMaximize] && isMaximizable() ) { button[BtnMaximize] = new IceWMButton(this, "maximize", - &maximizePix, false, i18n("Maximize"), LeftButton|MidButton|RightButton); + &maximizePix, false, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); hb->addWidget( button[BtnMaximize] ); connect( button[BtnMaximize], TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); @@ -1057,7 +1057,7 @@ void IceWMClient::addClientButtons( const TQString& s ) } -// Adds a pixmap to the titlebar layout via the use of a nice QSpacerItem +// Adds a pixmap to the titlebar tqlayout 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::minimumSize() const +TQSize IceWMClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } @@ -1175,10 +1175,10 @@ void IceWMClient::resizeEvent( TQResizeEvent* e ) int dy = 0; if ( e->oldSize().width() != widget()->width() ) - dx = 32 + QABS( e->oldSize().width() - width() ); + dx = 32 + TQABS( e->oldSize().width() - width() ); if ( e->oldSize().height() != height() ) - dy = 8 + QABS( e->oldSize().height() - height() ); + dy = 8 + TQABS( e->oldSize().height() - height() ); if ( dy ) widget()->update( 0, height() - dy + 1, width(), dy ); @@ -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->geometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, titlebar->geometry().bottom() ) ) ); - widget()->repaint(titlebar->geometry(), false); + 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); } } } @@ -1297,7 +1297,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) p.drawLine(1, h-2, w-2, h-2); p.drawLine(w-2, 1, w-2, h-2); - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawLine(w-1, 0, w-1, h-1); p.drawLine(0, h-1, w-1, h-1); } @@ -1306,7 +1306,7 @@ void IceWMClient::paintEvent( TQPaintEvent* ) // Fill frame border if required if (borderSizeX > 2) { - // Fill Vertical sizes + // FillQt::Vertical sizes p.fillRect( x+2, y+2, borderSizeX-2, h-4, c1); p.fillRect( w-borderSizeX, y+2, borderSizeX-2, h-4, c1); } @@ -1377,46 +1377,46 @@ void IceWMClient::paintEvent( TQPaintEvent* ) TQPainter p2( titleBuffer, this ); titleBuffer->fill( act ? *colorActiveTitleBar : *colorInActiveTitleBar ); - r = titleSpacerJ->geometry(); + r = titleSpacerJ->tqgeometry(); if (!r.isEmpty() && titleJ[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleJ[ act ]); - r = titleSpacerL->geometry(); + r = titleSpacerL->tqgeometry(); if (!r.isEmpty() && titleL[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleL[ act ]); - r = titleSpacerS->geometry(); + r = titleSpacerS->tqgeometry(); if (!r.isEmpty() && titleS[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleS[ act ]); - r = titleSpacerP->geometry(); + r = titleSpacerP->tqgeometry(); if (!r.isEmpty() && titleP[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleP[ act ]); - r = titlebar->geometry(); + r = titlebar->tqgeometry(); if (!r.isEmpty() && titleT[ act ] ) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleT[ act ]); - r = titleSpacerM->geometry(); + r = titleSpacerM->tqgeometry(); if (!r.isEmpty() && titleM[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleM[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerB->geometry(); + r = titleSpacerB->tqgeometry(); if (!r.isEmpty() && titleB[ act ]) p2.drawTiledPixmap( r.x()-borderSizeX, 0, r.width(), titleBarHeight, *titleB[ act ]); - r = titleSpacerR->geometry(); + r = titleSpacerR->tqgeometry(); if (!r.isEmpty() && titleR[ act ]) p2.drawPixmap( r.x()-borderSizeX, 0, *titleR[ act ], 0, 0, r.width(), r.height()); - r = titleSpacerQ->geometry(); + r = titleSpacerQ->tqgeometry(); 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->geometry(); + r = titlebar->tqgeometry(); 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->geometry().y(), titleBuffer ); + bitBlt( widget(), borderSizeX, hb->tqgeometry().y(), titleBuffer ); delete titleBuffer; } @@ -1453,7 +1453,7 @@ void IceWMClient::showEvent(TQShowEvent *ev) void IceWMClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if( e->button() != LeftButton ) + if( e->button() != Qt::LeftButton ) return; TQRect r; @@ -1486,7 +1486,7 @@ void IceWMClient::iconChange() renderMenuIcons(); button[BtnSysMenu]->usePixmap( &menuButtonWithIconPix ); if (button[BtnSysMenu]->isVisible()) - button[BtnSysMenu]->repaint(false); + button[BtnSysMenu]->tqrepaint(false); } } } @@ -1497,13 +1497,13 @@ void IceWMClient::desktopChange() if (button[BtnDepth]) { button[BtnDepth]->turnOn( isOnAllDesktops() ); - button[BtnDepth]->repaint(false); + button[BtnDepth]->tqrepaint(false); button[BtnDepth]->setTipText(isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops")); } } -// Please don't modify the following unless you want layout problems +// Please don't modify the following unless you want tqlayout 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()->repaint( r, false ); + widget()->tqrepaint( r, false ); } @@ -1541,12 +1541,12 @@ void IceWMClient::shadeChange() void IceWMClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); // Reset the button pixmaps. for(int i= IceWMClient::BtnSysMenu; i < IceWMClient::BtnCount; i++) if(button[i]) - button[i]->repaint( false ); + button[i]->tqrepaint( false ); } @@ -1661,24 +1661,24 @@ void IceWMClient::menuButtonReleased() bool IceWMClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e ) ); + resizeEvent(TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e ) ); + paintEvent(TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; diff --git a/kwin-styles/icewm/icewm.h b/kwin-styles/icewm/icewm.h index f5c319b6..f343912c 100644 --- a/kwin-styles/icewm/icewm.h +++ b/kwin-styles/icewm/icewm.h @@ -96,15 +96,15 @@ class ThemeHandler: public KDecorationFactory }; -class IceWMButton : public QButton +class IceWMButton : public TQButton { public: IceWMButton( IceWMClient *parent=0, const char *name=0, TQPixmap* (*p)[2]=0L, bool isToggle=false, - const TQString& tip=NULL, const int realizeBtns = LeftButton ); + const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void turnOn( bool isOn ); ButtonState last_button; @@ -125,6 +125,7 @@ class IceWMButton : public QButton class IceWMClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: IceWMClient( KDecorationBridge* bridge, KDecorationFactory* factory ); ~IceWMClient(); @@ -149,7 +150,7 @@ class IceWMClient : public KDecoration void iconChange(); virtual void desktopChange( ); virtual void borders(int&, int&, int&, int&) const; - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; protected slots: void slotMaximize(); diff --git a/kwin-styles/kde1/Makefile.am b/kwin-styles/kde1/Makefile.am index 9c25f718..c47be9c8 100644 --- a/kwin-styles/kde1/Makefile.am +++ b/kwin-styles/kde1/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kde1.la kwin3_kde1_la_SOURCES = kde1client.cpp -kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_kde1_la_LIBADD = -lkdecorations METASOURCES = AUTO diff --git a/kwin-styles/kde1/kde1client.cpp b/kwin-styles/kde1/kde1client.cpp index 4da5e3a1..a5a5e892 100644 --- a/kwin-styles/kde1/kde1client.cpp +++ b/kwin-styles/kde1/kde1client.cpp @@ -19,7 +19,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org> #include "kde1client_bitmaps.h" -// Default button layout +// Default button tqlayout 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()->colorGroup(KDecorationOptions::ColorButtonBg, true); - TQColorGroup iGrp = options()->colorGroup(KDecorationOptions::ColorButtonBg, false); + TQColorGroup aGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, true); + TQColorGroup iGrp = options()->tqcolorGroup(KDecorationOptions::ColorButtonBg, false); TQPainter aPainter, iPainter; close_pix = new TQPixmap(16, 16); @@ -282,7 +282,7 @@ void StdClient::init() button[n]->setBackgroundMode( PaletteBackground ); button[n]->setMouseTracking( FALSE ); button[n]->setAutoRaise( TRUE ); - button[n]->setFocusPolicy( TQWidget::NoFocus ); + button[n]->setFocusPolicy( TQ_NoFocus ); button[n]->setFixedSize( 20, 20 ); } @@ -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()->repaint( titlebar->geometry(), false ); + widget()->tqrepaint( titlebar->tqgeometry(), false ); } @@ -413,7 +413,7 @@ StdClient::~StdClient() void StdClient::resizeEvent( TQResizeEvent* ) { TQRegion rr = widget()->rect(); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); // 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()->repaint( titlebar->geometry(), FALSE ); + widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); } @@ -461,11 +461,11 @@ void StdClient::desktopChange() void StdClient::paintEvent( TQPaintEvent* ) { TQPainter p( widget() ); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); TQRegion r = widget()->rect(); r = r.subtract( t ); p.setClipRegion( r ); - qDrawWinPanel( &p, widget()->rect(), widget()->colorGroup() ); + qDrawWinPanel( &p, widget()->rect(), widget()->tqcolorGroup() ); // 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()->colorGroup(), true, 1 ); + widget()->tqcolorGroup(), 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() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().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]->repaint( FALSE ); + button[ButtonMenu]->tqrepaint( FALSE ); } } @@ -543,28 +543,28 @@ void StdClient::maxButtonClicked( ButtonState button ) bool StdClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: @@ -572,9 +572,9 @@ bool StdClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdClient::minimumSize() const +TQSize StdClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().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->geometry(); +// TQRect t = titlebar->tqgeometry(); // 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->geometry(); + TQRect t = titlebar->tqgeometry(); TQRect r = widget()->rect(); - qDrawWinPanel( &p, r, widget()->colorGroup() ); + qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); r.setTop( t.bottom()+1 ); - qDrawWinPanel( &p, r, widget()->colorGroup() ); + qDrawWinPanel( &p, r, widget()->tqcolorGroup() ); 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() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void StdToolClient::wheelEvent( TQWheelEvent * e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } void StdToolClient::captionChange() { - widget()->repaint( titlebar->geometry(), FALSE ); + widget()->tqrepaint( titlebar->tqgeometry(), FALSE ); } void StdToolClient::reset( unsigned long ) @@ -692,28 +692,28 @@ void StdToolClient::reset( unsigned long ) bool StdToolClient::eventFilter( TQObject* o, TQEvent* e ) { - if ( o != widget() ) + if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget()) ) return false; switch ( e->type() ) { case TQEvent::Resize: - resizeEvent( static_cast< TQResizeEvent* >( e ) ); + resizeEvent( TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent( static_cast< TQPaintEvent* >( e ) ); + paintEvent( TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent( static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent( static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent( TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: @@ -721,9 +721,9 @@ bool StdToolClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize StdToolClient::minimumSize() const +TQSize StdToolClient::tqminimumSize() const { - return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); } void StdToolClient::borders( int& left, int& right, int& top, int& bottom ) const diff --git a/kwin-styles/kde1/kde1client.h b/kwin-styles/kde1/kde1client.h index 7dd13ab9..b97afc3e 100644 --- a/kwin-styles/kde1/kde1client.h +++ b/kwin-styles/kde1/kde1client.h @@ -28,11 +28,12 @@ enum ButtonType { class StdClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: StdClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdClient(); void init(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); @@ -66,11 +67,12 @@ private: class StdToolClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: StdToolClient( KDecorationBridge* b, KDecorationFactory* f ); ~StdToolClient(); void init(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; void reset( unsigned long mask ); void resize( const TQSize& s ); @@ -100,9 +102,10 @@ private: Like TQToolButton, but provides a clicked(ButtonState) signals that has the last pressed mouse button as argument */ -class ThreeButtonButton: public QToolButton +class ThreeButtonButton: public TQToolButton { Q_OBJECT + TQ_OBJECT public: ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 ) : TQToolButton( parent, name ) @@ -119,13 +122,13 @@ protected: void mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mousePressEvent( &me ); } void mouseReleaseEvent( TQMouseEvent* e ) { - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent( &me ); } diff --git a/kwin-styles/kstep/Makefile.am b/kwin-styles/kstep/Makefile.am index 89397fad..1294e533 100644 --- a/kwin-styles/kstep/Makefile.am +++ b/kwin-styles/kstep/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_kstep.la kwin3_kstep_la_SOURCES = nextclient.cpp -kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx #kwin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) kwin3_kstep_la_LIBADD = $(LIB_KDEUI) -lkdecorations diff --git a/kwin-styles/kstep/nextclient.cpp b/kwin-styles/kstep/nextclient.cpp index d4e57e86..08867a62 100644 --- a/kwin-styles/kstep/nextclient.cpp +++ b/kwin-styles/kstep/nextclient.cpp @@ -255,13 +255,13 @@ static void create_pixmaps(NextClientFactory *f) KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); - bitBlt(iBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(iBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::DiagonalGradient); - bitBlt(iBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(iBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); // active buttons c = options()->color(KDecoration::ColorButtonBg, true); @@ -269,36 +269,36 @@ static void create_pixmaps(NextClientFactory *f) KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); - bitBlt(aBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(aBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120), KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(internal, c.light(120), c.dark(120), KPixmapEffect::DiagonalGradient); - bitBlt(aBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(aBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true); TQPainter p; p.begin(aBtn); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(iBtn); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(aBtnDown); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); p.begin(iBtnDown); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, btnWidth, btnWidth); p.end(); - if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) - btnForeground = new TQColor(Qt::black); + if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } static void delete_pixmaps() @@ -324,7 +324,7 @@ NextButton::NextButton(NextClient *parent, const char *name, const unsigned char *bitmap, int bw, int bh, const TQString& tip, const int realizeBtns) : TQButton(parent->widget(), name), - deco(NULL), client(parent), last_button(NoButton) + deco(NULL), client(parent), last_button(Qt::NoButton) { realizeButtons = realizeBtns; @@ -340,14 +340,14 @@ NextButton::NextButton(NextClient *parent, const char *name, void NextButton::reset() { - repaint(false); + tqrepaint(false); } void NextButton::setBitmap(const unsigned char *bitmap, int w, int h) { deco = new TQBitmap(w, h, bitmap, true); deco->setMask(*deco); - repaint(); + tqrepaint(); } void NextButton::drawButton(TQPainter *p) @@ -376,7 +376,7 @@ void NextButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -384,7 +384,7 @@ void NextButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?LeftButton:NoButton, e->state() ); + (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -478,7 +478,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) if (isMaximizable()) { button[MAXIMIZE_IDX] = new NextButton(this, "maximize", maximize_bits, 10, 10, - i18n("Maximize"), LeftButton|MidButton|RightButton); + i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); titleLayout->addWidget( button[MAXIMIZE_IDX] ); connect( button[MAXIMIZE_IDX], TQT_SIGNAL(clicked()), this, TQT_SLOT(maximizeButtonClicked()) ); @@ -508,7 +508,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) case 'M': button[MENU_IDX] = - new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), LeftButton|RightButton); + new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), Qt::LeftButton|Qt::RightButton); titleLayout->addWidget( button[MENU_IDX] ); // NOTE DIFFERENCE: capture pressed(), not clicked() connect( button[MENU_IDX], TQT_SIGNAL(pressed()), @@ -602,7 +602,7 @@ bool NextClient::mustDrawHandle() const void NextClient::iconChange() { if (button[MENU_IDX] && button[MENU_IDX]->isVisible()) - button[MENU_IDX]->repaint(false); + button[MENU_IDX]->tqrepaint(false); } void NextClient::menuButtonPressed() @@ -658,9 +658,9 @@ void NextClient::resizeEvent(TQResizeEvent *) // TODO ? update border area only? widget()->update(); #if 0 - widget()->update(titlebar->geometry()); + widget()->update(titlebar->tqgeometry()); TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = widget()->rect(); r = r.subtract( t ); @@ -672,7 +672,7 @@ void NextClient::resizeEvent(TQResizeEvent *) void NextClient::captionChange() { - widget()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } @@ -682,16 +682,16 @@ void NextClient::paintEvent( TQPaintEvent* ) // Draw black frame TQRect fr = widget()->rect(); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(fr); // Draw title bar - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); 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()->colorGroup(KDecoration::ColorTitleBar, isActive())); + options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorFrame, isActive()), + options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorHandle, isActive()), + options()->tqcolorGroup(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() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -753,7 +753,7 @@ void NextClient::wheelEvent( TQWheelEvent * e ) void NextClient::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void NextClient::desktopChange() @@ -782,7 +782,7 @@ void NextClient::maximizeChange() void NextClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(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->repaint(false); + b->tqrepaint(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->repaint(false); + b->tqrepaint(false); } } -TQSize NextClient::minimumSize() const +TQSize NextClient::tqminimumSize() const { return TQSize(titleHeight * 6 + 2, titleHeight + handleSize + 2); } @@ -870,31 +870,31 @@ void NextClient::reset(unsigned long) if (button[i]) button[i]->reset(); } - widget()->repaint(); + widget()->tqrepaint(); } bool NextClient::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e )); + resizeEvent(TQT_TQRESIZEEVENT( e )); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e )); + paintEvent(TQT_TQPAINTEVENT( e )); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e )); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e )); + processMousePressEvent(TQT_TQMOUSEEVENT( e )); return true; case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >( e )); + showEvent(TQT_TQSHOWEVENT( e )); return true; default: break; @@ -905,15 +905,15 @@ bool NextClient::eventFilter(TQObject *o, TQEvent *e) bool NextClient::drawbound(const TQRect& geom, bool /* clear */) { TQPainter p(workspaceWidget()); - p.setPen(TQPen(Qt::white, 3)); - p.setRasterOp(Qt::XorROP); + p.setPen(TQPen(TQt::white, 3)); + p.setRasterOp(TQt::XorROP); p.drawRect(geom); int leftMargin = geom.left() + 2; p.fillRect(leftMargin, geom.top() + titleHeight - 1, - geom.width() - 4, 3, Qt::white); + geom.width() - 4, 3, TQt::white); if (mustDrawHandle()) { p.fillRect(leftMargin, geom.bottom() - handleSize - 1, - geom.width() - 4, 3, Qt::white); + geom.width() - 4, 3, TQt::white); } return true; } diff --git a/kwin-styles/kstep/nextclient.h b/kwin-styles/kstep/nextclient.h index 0a29d135..b24da66d 100644 --- a/kwin-styles/kstep/nextclient.h +++ b/kwin-styles/kstep/nextclient.h @@ -16,12 +16,12 @@ namespace KStep { class NextClient; -class NextButton : public QButton +class NextButton : public TQButton { public: NextButton(NextClient *parent=0, const char *name=0, const unsigned char *bitmap=NULL, int bw=0, int bh=0, - const TQString& tip=NULL, const int realizeBtns = LeftButton); + const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); void setBitmap(const unsigned char *bitmap, int bw, int bh); void reset(); ButtonState lastButton() { return last_button; } @@ -42,6 +42,7 @@ protected: class NextClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: NextClient(KDecorationBridge *b, KDecorationFactory *f); ~NextClient() {;} @@ -60,7 +61,7 @@ protected: void activeChange(); void shadeChange(); void iconChange(); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize(const TQSize &size); void borders(int &left, int &right, int &top, int &bottom) const; void reset(unsigned long changed); diff --git a/kwin-styles/openlook/Makefile.am b/kwin-styles/openlook/Makefile.am index 25ed43d0..abf08664 100644 --- a/kwin-styles/openlook/Makefile.am +++ b/kwin-styles/openlook/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_openlook.la kwin3_openlook_la_SOURCES = OpenLook.cpp -kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_openlook_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_openlook_la_LIBADD = -lkdecorations noinst_HEADERS = OpenLook.h diff --git a/kwin-styles/openlook/OpenLook.cpp b/kwin-styles/openlook/OpenLook.cpp index d3f2b190..8e61f187 100644 --- a/kwin-styles/openlook/OpenLook.cpp +++ b/kwin-styles/openlook/OpenLook.cpp @@ -162,33 +162,33 @@ OpenLook::~OpenLook() bool OpenLook::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) return false; + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonPress: - if (!isButtonPress(static_cast< TQMouseEvent* >(e))) { - processMousePressEvent(static_cast< TQMouseEvent* >(e)); + if (!isButtonPress(TQT_TQMOUSEEVENT(e))) { + processMousePressEvent(TQT_TQMOUSEEVENT(e)); } return true; case TQEvent::MouseButtonRelease: - if (isButtonRelease(static_cast< TQMouseEvent* >(e))) { + if (isButtonRelease(TQT_TQMOUSEEVENT(e))) { return true; } else { return false; } case TQEvent::Show: - showEvent(static_cast< TQShowEvent* >(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; default: break; @@ -215,7 +215,7 @@ OpenLook::shadeChange() { } -TQSize OpenLook::minimumSize() const +TQSize OpenLook::tqminimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -226,7 +226,7 @@ TQSize OpenLook::minimumSize() const OpenLook::resize(const TQSize& s) { widget()->resize(s); - widget()->repaint(); //there is some strange wrong repaint of the frame without + widget()->tqrepaint(); //there is some strange wrong tqrepaint 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()->colorGroup(), true, 1, &titleBackground); + qDrawShadePanel(&p, tr, widget()->tqcolorGroup(), true, 1, &titleBackground); else - p.fillRect(tr, widget()->colorGroup().brush(TQColorGroup::Background)); + p.fillRect(tr, widget()->tqcolorGroup().brush(TQColorGroup::Background)); p.setClipRegion(clipRegion); @@ -272,13 +272,13 @@ OpenLook::paintEvent(TQPaintEvent * pe) void OpenLook::showEvent(TQShowEvent *) { - widget()->repaint(); + widget()->tqrepaint(); } void OpenLook::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() == LeftButton && titleRect().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleRect().contains(e->pos())) { titlebarDblClickOperation(); } @@ -302,7 +302,7 @@ OpenLook::resizeEvent(TQResizeEvent* e) void OpenLook::activeChange() { - widget()->repaint(); + widget()->tqrepaint(); } KDecoration::Position @@ -333,16 +333,16 @@ OpenLook::desktopChange() void OpenLook::maximizeChange() { - widget()->repaint(false); + widget()->tqrepaint(false); } void OpenLook::doLayout() { - TQVBoxLayout * layout = new TQVBoxLayout(widget(), openLookMargin); + TQVBoxLayout * tqlayout = new TQVBoxLayout(widget(), openLookMargin); titleSpacer_ = - new QSpacerItem + new TQSpacerItem ( 0, titleHeight, @@ -350,12 +350,12 @@ OpenLook::doLayout() TQSizePolicy::Fixed ); - layout->addItem(titleSpacer_); + tqlayout->addItem(titleSpacer_); - layout->addSpacing(2); + tqlayout->addSpacing(2); TQBoxLayout * midLayout = - new TQBoxLayout(layout, TQBoxLayout::LeftToRight, 0, 0); + new TQBoxLayout(tqlayout, TQBoxLayout::LeftToRight, 0, 0); if (isPreview()) { midLayout->addWidget(new TQLabel( @@ -377,11 +377,11 @@ OpenLook::animateMinimize(bool /*iconify*/) if (!icongeom.isValid()) return false; - TQRect wingeom(geometry()); + TQRect wingeom(tqgeometry()); TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) @@ -422,10 +422,10 @@ OpenLook::animateMinimize(bool /*iconify*/) return true; } - QRect + TQRect OpenLook::topLeftRect() const { - return QRect + return TQRect ( 0, 0, @@ -434,10 +434,10 @@ OpenLook::topLeftRect() const ); } - QRect + TQRect OpenLook::topRightRect() const { - return QRect + return TQRect ( width() - openLookCornerSize, 0, @@ -446,10 +446,10 @@ OpenLook::topRightRect() const ); } - QRect + TQRect OpenLook::bottomLeftRect() const { - return QRect + return TQRect ( 0, height() - openLookCornerSize, @@ -458,10 +458,10 @@ OpenLook::bottomLeftRect() const ); } - QRect + TQRect OpenLook::bottomRightRect() const { - return QRect + return TQRect ( width() - openLookCornerSize, height() - openLookCornerSize, @@ -482,7 +482,7 @@ OpenLook::paintTopLeftRect(TQPainter & p) const int x2(r.right()); int y2(r.bottom()); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().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()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().light()); p.drawLine(x1, y2 - openLookMargin+1, x1, y2); p.drawLine(x1 + 1, y2 - openLookMargin+1, x2 - openLookMargin+1, y2 - openLookMargin+1); @@ -579,16 +579,16 @@ 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()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x1 + 1, y2, x2, y2); p.drawLine(x2, y1 + 1, x2, y2 - 1); } - QRect + TQRect OpenLook::buttonRect() const { - return QRect + return TQRect ( openLookCornerSize + 3, titleRect().top(), @@ -609,16 +609,16 @@ OpenLook::paintButton(TQPainter & p) const r.width() - 2, r.height() - 2, buttonDown_ - ? widget()->colorGroup().dark() + ? widget()->tqcolorGroup().dark() : options()->color(KDecoration::ColorButtonBg, isActive()) ); - p.setPen(buttonDown_ ? widget()->colorGroup().dark() : widget()->colorGroup().light()); + p.setPen(buttonDown_ ? widget()->tqcolorGroup().dark() : widget()->tqcolorGroup().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()->colorGroup().light() : widget()->colorGroup().dark()); + p.setPen(buttonDown_ ? widget()->tqcolorGroup().light() : widget()->tqcolorGroup().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()->colorGroup().mid()); + p.setBrush(widget()->tqcolorGroup().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()->colorGroup().dark()); + p.setPen(widget()->tqcolorGroup().dark()); p.drawLine(x, y, x + w - 1, y); p.drawLine(x, y, x + (w / 2), y + h - 1); - p.setPen(widget()->colorGroup().light()); + p.setPen(widget()->tqcolorGroup().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()->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()); + 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()); TQColor frameColour(options()->color(KDecoration::ColorFrame, isActive())); @@ -687,14 +687,14 @@ OpenLook::paintBorder(TQPainter & p) const titleRect().bottom() + 1, width() - 2 * openLookMargin, 2, - widget()->colorGroup().background() + widget()->tqcolorGroup().background() ); } - QRect + TQRect OpenLook::titleRect() const { - return titleSpacer_->geometry(); + return titleSpacer_->tqgeometry(); } bool @@ -704,7 +704,7 @@ OpenLook::isButtonPress(TQMouseEvent * e) buttonDown_ = buttonRect().contains(mousePressPoint_); - widget()->repaint(buttonRect()); + widget()->tqrepaint(buttonRect()); return buttonDown_; } @@ -717,7 +717,7 @@ OpenLook::isButtonRelease(TQMouseEvent * e) return true; } buttonDown_ = false; - widget()->repaint(buttonRect()); + widget()->tqrepaint(buttonRect()); return false; } diff --git a/kwin-styles/openlook/OpenLook.h b/kwin-styles/openlook/OpenLook.h index 94dacebd..882c2d36 100644 --- a/kwin-styles/openlook/OpenLook.h +++ b/kwin-styles/openlook/OpenLook.h @@ -40,6 +40,7 @@ namespace OpenLook class OpenLook : public KDecoration { Q_OBJECT + TQ_OBJECT public: OpenLook(KDecorationBridge *b, KDecorationFactory *f); @@ -59,7 +60,7 @@ namespace OpenLook void iconChange(); void maximizeChange(); void borders(int &left, int &right, int &top, int &bottom) const; - TQSize minimumSize() const; + TQSize tqminimumSize() const; void resize( const TQSize& ); virtual void mouseDoubleClickEvent(TQMouseEvent *); virtual void wheelEvent(TQWheelEvent *e); diff --git a/kwin-styles/riscos/AboveButton.h b/kwin-styles/riscos/AboveButton.h index 9ea0e005..86fbb0a7 100644 --- a/kwin-styles/riscos/AboveButton.h +++ b/kwin-styles/riscos/AboveButton.h @@ -31,6 +31,7 @@ namespace RiscOS class AboveButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Button.cpp b/kwin-styles/riscos/Button.cpp index d126ced1..7bf4f477 100644 --- a/kwin-styles/riscos/Button.cpp +++ b/kwin-styles/riscos/Button.cpp @@ -31,13 +31,13 @@ Button::Button(TQWidget *parent, const TQString& tip, const ButtonState realizeButtons) : TQWidget(parent, "Button", 0), realizeButtons_(realizeButtons), - lastButton_(NoButton), + lastButton_(Qt::NoButton), alignment_(Left), down_ (false), active_ (false) { TQToolTip::add(this, tip); - setBackgroundColor(Qt::black); + setBackgroundColor(TQt::black); setFixedSize(Static::instance()->titleHeight() - 1, Static::instance()->titleHeight()); @@ -48,19 +48,19 @@ Button::~Button() // Empty. } -void Button::setAlignment(Alignment a) +void Button::tqsetAlignment(Alignment a) { alignment_ = a; - repaint(); + tqrepaint(); } void Button::setActive(bool b) { active_ = b; - repaint(); + tqrepaint(); } -Button::Alignment Button::alignment() const +Button::Alignment Button::tqalignment() const { return alignment_; } @@ -69,10 +69,10 @@ void Button::mousePressEvent(TQMouseEvent *e) { down_ = true; lastButton_ = e->button(); - repaint(); + tqrepaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? LeftButton : NoButton, + (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); TQWidget::mousePressEvent(&me); } @@ -81,9 +81,9 @@ void Button::mouseReleaseEvent(TQMouseEvent *e) { down_ = false; lastButton_ = e->button(); - repaint(); + tqrepaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? LeftButton : NoButton, + (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, e->state()); TQWidget::mouseReleaseEvent(&me); } @@ -94,9 +94,9 @@ void Button::setPixmap(const TQPixmap &p) aPixmap_ = iPixmap_ = p; else { - QRgb light; - QRgb* data = NULL; - QRgb w = qRgb(255, 255, 255); + TQRgb light; + TQRgb* data = NULL; + TQRgb w = tqRgb(255, 255, 255); TQImage aTx(p.convertToImage()); TQImage iTx(aTx.copy()); @@ -104,10 +104,10 @@ void Button::setPixmap(const TQPixmap &p) const KDecorationOptions* options = KDecoration::options(); light = options->color(KDecoration::ColorButtonBg, true).light(150).rgb(); - if (light == qRgb(0, 0, 0)) - light = qRgb(228, 228, 228); + if (light == tqRgb(0, 0, 0)) + light = tqRgb(228, 228, 228); - data = (QRgb *)aTx.bits(); + data = (TQRgb *)aTx.bits(); for (int x = 0; x < 144; x++) if (data[x] == w) @@ -115,10 +115,10 @@ void Button::setPixmap(const TQPixmap &p) light = options->color(KDecoration::ColorButtonBg, false).light(150).rgb(); - if (light == qRgb(0, 0, 0)) - light = qRgb(228, 228, 228); + if (light == tqRgb(0, 0, 0)) + light = tqRgb(228, 228, 228); - data = (QRgb *)iTx.bits(); + data = (TQRgb *)iTx.bits(); for (int x = 0; x < 144; x++) if (data[x] == w) @@ -133,7 +133,7 @@ void Button::setPixmap(const TQPixmap &p) iPixmap_.setMask(*p.mask()); } } - repaint(); + tqrepaint(); } void Button::paintEvent(TQPaintEvent *) diff --git a/kwin-styles/riscos/Button.h b/kwin-styles/riscos/Button.h index fc29e205..0c7c66c5 100644 --- a/kwin-styles/riscos/Button.h +++ b/kwin-styles/riscos/Button.h @@ -31,9 +31,10 @@ namespace RiscOS { -class Button : public QWidget +class Button : public TQWidget { Q_OBJECT + TQ_OBJECT public: @@ -42,12 +43,12 @@ class Button : public QWidget enum Alignment { Left, Right }; Button(TQWidget *parent, const TQString &tip, - const ButtonState realizeButton = LeftButton); + const ButtonState realizeButton = Qt::LeftButton); virtual ~Button(); - void setAlignment(Alignment); + void tqsetAlignment(Alignment); - Alignment alignment() const; + Alignment tqalignment() const; protected slots: diff --git a/kwin-styles/riscos/CloseButton.h b/kwin-styles/riscos/CloseButton.h index b9173c14..615ea2ed 100644 --- a/kwin-styles/riscos/CloseButton.h +++ b/kwin-styles/riscos/CloseButton.h @@ -31,6 +31,7 @@ namespace RiscOS class CloseButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/HelpButton.h b/kwin-styles/riscos/HelpButton.h index f825a05b..d57b91ce 100644 --- a/kwin-styles/riscos/HelpButton.h +++ b/kwin-styles/riscos/HelpButton.h @@ -31,6 +31,7 @@ namespace RiscOS class HelpButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/IconifyButton.h b/kwin-styles/riscos/IconifyButton.h index 8f757cb4..54e44aba 100644 --- a/kwin-styles/riscos/IconifyButton.h +++ b/kwin-styles/riscos/IconifyButton.h @@ -31,6 +31,7 @@ namespace RiscOS class IconifyButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/LowerButton.h b/kwin-styles/riscos/LowerButton.h index f3fc4df1..8616d688 100644 --- a/kwin-styles/riscos/LowerButton.h +++ b/kwin-styles/riscos/LowerButton.h @@ -31,6 +31,7 @@ namespace RiscOS class LowerButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Makefile.am b/kwin-styles/riscos/Makefile.am index 2a7d9764..3f81820d 100644 --- a/kwin-styles/riscos/Makefile.am +++ b/kwin-styles/riscos/Makefile.am @@ -31,7 +31,7 @@ kwin3_riscos_la_SOURCES = AboveButton.cpp \ Static.cpp \ StickyButton.cpp -kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_riscos_la_LIBADD = $(LIB_KDEUI) -lkdecorations kwin3_riscos_la_METASOURCES = AUTO diff --git a/kwin-styles/riscos/Manager.cpp b/kwin-styles/riscos/Manager.cpp index c4b77f0a..837bec9c 100644 --- a/kwin-styles/riscos/Manager.cpp +++ b/kwin-styles/riscos/Manager.cpp @@ -82,23 +82,23 @@ void Manager::init() bool Manager::eventFilter(TQObject *o, TQEvent *e) { - if (o != widget()) return false; + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::Resize: - resizeEvent(static_cast<TQResizeEvent*>(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; case TQEvent::Paint: - paintEvent(static_cast<TQPaintEvent*>(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast<TQMouseEvent*>(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; case TQEvent::MouseButtonRelease: return false; @@ -134,22 +134,22 @@ void Manager::resize(const TQSize &s) widget()->resize(s); } -TQSize Manager::minimumSize() const +TQSize Manager::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } void Manager::activeChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); emit(activeChanged(isActive())); } void Manager::captionChange() { updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::iconChange() @@ -182,7 +182,7 @@ void Manager::paintEvent(TQPaintEvent *e) if (intersectsLeft || intersectsRight) { - p.setPen(Qt::black); + p.setPen(TQt::black); if (intersectsLeft) p.drawLine(0, r.top(), 0, r.bottom()); @@ -197,7 +197,7 @@ void Manager::paintEvent(TQPaintEvent *e) // Title bar. - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); bitBlt(widget(), tr.topLeft(), &titleBuf_); // Resize bar. @@ -224,7 +224,7 @@ void Manager::resizeEvent(TQResizeEvent*) { updateButtonVisibility(); updateTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); } void Manager::updateButtonVisibility() @@ -282,7 +282,7 @@ void Manager::updateButtonVisibility() break; } - layout()->activate(); + tqlayout()->activate(); #endif } @@ -292,7 +292,7 @@ void Manager::updateTitleBuffer() Static * s = Static::instance(); - TQRect tr = titleSpacer_->geometry(); + TQRect tr = titleSpacer_->tqgeometry(); 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() == LeftButton && titleSpacer_->geometry().contains(e->pos())) + if (e->button() == Qt::LeftButton && titleSpacer_->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } void Manager::wheelEvent(TQWheelEvent *e) { - if (isSetShade() || titleLayout_->geometry().contains(e->pos()) ) + if (isSetShade() || titleLayout_->tqgeometry().contains(e->pos()) ) titlebarMouseWheelOperation( e->delta()); } @@ -428,7 +428,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); TQRect r = iconGeometry(); @@ -463,7 +463,7 @@ bool Manager::animateMinimize(bool iconify) double delta = finalAngle / steps; TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (double angle = 0; ; angle += delta) { @@ -517,7 +517,7 @@ bool Manager::animateMinimize(bool iconify) // Go away quick. helperShowHide(false); - qApp->syncX(); + tqApp->syncX(); int stepCount = 12; @@ -527,7 +527,7 @@ bool Manager::animateMinimize(bool iconify) int dy = r.height() / (stepCount * 2); TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); for (int step = 0; step < stepCount; step++) { @@ -559,7 +559,7 @@ bool Manager::animateMinimize(bool iconify) TQPainter p(workspaceWidget()); - p.setRasterOp(Qt::NotROP); + p.setRasterOp(TQt::NotROP); #if 0 if (iconify) p.setClipRegion(TQRegion(workspaceWidget()->rect()) - wingeom); @@ -573,7 +573,7 @@ bool Manager::animateMinimize(bool iconify) p.flush(); - qApp->syncX(); + tqApp->syncX(); usleep(30000); @@ -678,7 +678,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(leftButtonList_); it.current(); ++it) { - it.current()->setAlignment(Button::Left); + it.current()->tqsetAlignment(Button::Left); titleLayout_->addWidget(it.current()); } @@ -689,7 +689,7 @@ void Manager::createTitle() for (TQPtrListIterator<Button> it(rightButtonList_); it.current(); ++it) { - it.current()->setAlignment(Button::Right); + it.current()->tqsetAlignment(Button::Right); titleLayout_->addWidget(it.current()); } } diff --git a/kwin-styles/riscos/Manager.h b/kwin-styles/riscos/Manager.h index be440454..5668a7fc 100644 --- a/kwin-styles/riscos/Manager.h +++ b/kwin-styles/riscos/Manager.h @@ -45,6 +45,7 @@ class Button; class Manager : public KDecoration { Q_OBJECT + TQ_OBJECT public: @@ -55,7 +56,7 @@ class Manager : public KDecoration void reset(unsigned long changed); void borders(int&, int&, int&, int&) const; void resize(const TQSize&); - TQSize minimumSize() const; + TQSize tqminimumSize() const; void activeChange(); void captionChange(); void iconChange(); @@ -107,6 +108,7 @@ class Manager : public KDecoration class Factory : public TQObject, public KDecorationFactory { Q_OBJECT + TQ_OBJECT public: Factory(); diff --git a/kwin-styles/riscos/MaximiseButton.cpp b/kwin-styles/riscos/MaximiseButton.cpp index ebfb6628..dcc1b52a 100644 --- a/kwin-styles/riscos/MaximiseButton.cpp +++ b/kwin-styles/riscos/MaximiseButton.cpp @@ -67,7 +67,7 @@ static const char * const unmaximise_xpm[] = { MaximiseButton::MaximiseButton(TQWidget * parent) : Button(parent, i18n("Maximize"), - (ButtonState)(LeftButton|MidButton|RightButton)), + (ButtonState)(Qt::LeftButton|Qt::MidButton|Qt::RightButton)), on_(false) { setPixmap(TQPixmap((const char **)maximise_xpm)); @@ -78,7 +78,7 @@ void MaximiseButton::setOn(bool on) on_ = on; setPixmap(on_ ? TQPixmap((const char **)unmaximise_xpm) : TQPixmap((const char **)maximise_xpm)); - repaint(); + tqrepaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Restore") : i18n("Maximize")); } diff --git a/kwin-styles/riscos/MaximiseButton.h b/kwin-styles/riscos/MaximiseButton.h index ff715ba1..770c9370 100644 --- a/kwin-styles/riscos/MaximiseButton.h +++ b/kwin-styles/riscos/MaximiseButton.h @@ -31,6 +31,7 @@ namespace RiscOS class MaximiseButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/riscos/Palette.h b/kwin-styles/riscos/Palette.h index 260175b9..3fb71ab0 100644 --- a/kwin-styles/riscos/Palette.h +++ b/kwin-styles/riscos/Palette.h @@ -47,19 +47,19 @@ class Palette data_[7] = 0xFF000000; } - QRgb& operator [] (int idx) + TQRgb& operator [] (int idx) { return data_[idx]; } - QRgb operator [] (int idx) const + TQRgb operator [] (int idx) const { return data_[idx]; } private: - TQMemArray<QRgb> data_; + TQMemArray<TQRgb> data_; }; } // End namespace diff --git a/kwin-styles/riscos/Static.cpp b/kwin-styles/riscos/Static.cpp index 5c6e427d..7aac6f5a 100644 --- a/kwin-styles/riscos/Static.cpp +++ b/kwin-styles/riscos/Static.cpp @@ -245,16 +245,16 @@ void Static::updatePixmaps() void Static::_createTexture(TQPixmap &px, int t, bool active) { const TQImage texture(TQPixmap((const char **)texture_xpm).convertToImage()); - const QRgb w(qRgb(255, 255, 255)); - const QRgb b(qRgb(0, 0, 0)); + const TQRgb w(tqRgb(255, 255, 255)); + const TQRgb b(tqRgb(0, 0, 0)); TQColor c(KDecoration::options()->color(KDecoration::ColorType(t), active)); - QRgb mid (c.rgb()); - QRgb light (c.light(110).rgb()); - QRgb dark (c.dark(110).rgb()); + TQRgb mid (c.rgb()); + TQRgb light (c.light(110).rgb()); + TQRgb dark (c.dark(110).rgb()); - QRgb* data(reinterpret_cast<QRgb *>(texture.bits())); + TQRgb* data(reinterpret_cast<TQRgb *>(const_cast<TQImage&>(texture).bits())); for (int x = 0; x < 64*12; x++) if (data[x] == w) @@ -318,24 +318,24 @@ void Static::_resizeAllPixmaps() void Static::_blankAllPixmaps() { - aResize_ .fill(Qt::black); - iResize_ .fill(Qt::black); - aTitleTextLeft_ .fill(Qt::black); - aTitleTextRight_.fill(Qt::black); - iTitleTextLeft_ .fill(Qt::black); - iTitleTextRight_.fill(Qt::black); - aTitleTextMid_ .fill(Qt::black); - iTitleTextMid_ .fill(Qt::black); - aResizeMidLeft_ .fill(Qt::black); - aResizeMidRight_.fill(Qt::black); - iResizeMidLeft_ .fill(Qt::black); - iResizeMidRight_.fill(Qt::black); - aResizeMid_ .fill(Qt::black); - iResizeMid_ .fill(Qt::black); - aButtonUp_ .fill(Qt::black); - iButtonUp_ .fill(Qt::black); - aButtonDown_ .fill(Qt::black); - iButtonDown_ .fill(Qt::black); + aResize_ .fill(TQt::black); + iResize_ .fill(TQt::black); + aTitleTextLeft_ .fill(TQt::black); + aTitleTextRight_.fill(TQt::black); + iTitleTextLeft_ .fill(TQt::black); + iTitleTextRight_.fill(TQt::black); + aTitleTextMid_ .fill(TQt::black); + iTitleTextMid_ .fill(TQt::black); + aResizeMidLeft_ .fill(TQt::black); + aResizeMidRight_.fill(TQt::black); + iResizeMidLeft_ .fill(TQt::black); + iResizeMidRight_.fill(TQt::black); + aResizeMid_ .fill(TQt::black); + iResizeMid_ .fill(TQt::black); + aButtonUp_ .fill(TQt::black); + iButtonUp_ .fill(TQt::black); + aButtonDown_ .fill(TQt::black); + iButtonDown_ .fill(TQt::black); } void Static::_initPalettes() @@ -362,7 +362,7 @@ void Static::_initTextures() void Static::_drawTitleTextAreaSides() { TQPixmap temp(4, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transx = transy = 0.0; @@ -372,29 +372,29 @@ void Static::_drawTitleTextAreaSides() _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&aTitleTextLeft_); - painter_.drawPixmap(1, 1, temp, 0, 1); + painter_.tqdrawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&aTitleTextRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iTitlePal_; _drawBorder(temp, 4, titleHeight_ - 2); painter_.begin(&iTitleTextLeft_); - painter_.drawPixmap(1, 1, temp, 0, 1); + painter_.tqdrawPixmap(1, 1, temp, 0, 1); painter_.end(); painter_.begin(&iTitleTextRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); } void Static::_drawResizeCentralAreaSides() { TQPixmap temp(4, resizeHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transy = 1.0; @@ -403,29 +403,29 @@ void Static::_drawResizeCentralAreaSides() _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&aResizeMidLeft_); - painter_.drawPixmap(0, 1, temp, 0, 1); + painter_.tqdrawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&aResizeMidRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); palette_ = iResizePal_; _drawBorder(temp, 4, resizeHeight_ - 3); painter_.begin(&iResizeMidLeft_); - painter_.drawPixmap(0, 1, temp, 0, 1); + painter_.tqdrawPixmap(0, 1, temp, 0, 1); painter_.end(); painter_.begin(&iResizeMidRight_); - painter_.drawPixmap(0, 1, temp, 2, 1); + painter_.tqdrawPixmap(0, 1, temp, 2, 1); painter_.end(); } void Static::_drawTitleTextAreaBackground() { TQPixmap temp(70, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transx = transy = 0.0; @@ -433,7 +433,7 @@ void Static::_drawTitleTextAreaBackground() _drawBorder(temp, 70, titleHeight_ - 3); painter_.begin(&aTitleTextMid_); - painter_.drawPixmap(0, 1, temp, 2, 0); + painter_.tqdrawPixmap(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_.drawPixmap(0, 1, temp, 2, 0); + painter_.tqdrawPixmap(0, 1, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, titleHeight_ - 8, iTexture_); painter_.end(); @@ -451,7 +451,7 @@ void Static::_drawTitleTextAreaBackground() void Static::_drawResizeCentralAreaBackground() { TQPixmap temp(70, titleHeight_); - temp.fill(Qt::black); + temp.fill(TQt::black); transy = 1.0; @@ -459,7 +459,7 @@ void Static::_drawResizeCentralAreaBackground() _drawBorder(temp, 70, resizeHeight_ - 3); painter_.begin(&aResizeMid_); - painter_.drawPixmap(0, 0, temp, 2, 0); + painter_.tqdrawPixmap(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_.drawPixmap(0, 0, temp, 2, 0); + painter_.tqdrawPixmap(0, 0, temp, 2, 0); if (hicolour_) painter_.drawTiledPixmap(0, 4, 64, resizeHeight_ - 8, iTexture_); painter_.end(); diff --git a/kwin-styles/riscos/Static.h b/kwin-styles/riscos/Static.h index e7b49d59..0a5b4cdb 100644 --- a/kwin-styles/riscos/Static.h +++ b/kwin-styles/riscos/Static.h @@ -99,7 +99,7 @@ class Static aButPal_, iButPal_; - QPixmap + TQPixmap aButtonUp_, iButtonUp_, aButtonDown_, iButtonDown_, aResize_, iResize_, diff --git a/kwin-styles/riscos/StickyButton.cpp b/kwin-styles/riscos/StickyButton.cpp index b40db535..2229f915 100644 --- a/kwin-styles/riscos/StickyButton.cpp +++ b/kwin-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)); - repaint(); + tqrepaint(); TQToolTip::remove(this); TQToolTip::add(this, on_ ? i18n("Not on all desktops") : i18n("On all desktops")); diff --git a/kwin-styles/riscos/StickyButton.h b/kwin-styles/riscos/StickyButton.h index 4c500b8b..26c0428e 100644 --- a/kwin-styles/riscos/StickyButton.h +++ b/kwin-styles/riscos/StickyButton.h @@ -31,6 +31,7 @@ namespace RiscOS class StickyButton : public Button { Q_OBJECT + TQ_OBJECT public: diff --git a/kwin-styles/smooth-blend/client/Makefile.am b/kwin-styles/smooth-blend/client/Makefile.am index bd64ee62..d9ace4d7 100644 --- a/kwin-styles/smooth-blend/client/Makefile.am +++ b/kwin-styles/smooth-blend/client/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = smoothblend.h buttons.h kde_module_LTLIBRARIES = kwin3_smoothblend.la kwin3_smoothblend_la_SOURCES = smoothblend.cc kwin3_smoothblend_la_LIBADD = -lkdecorations -kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module +kwin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin3_smoothblend_la_METASOURCES = AUTO DISTCLEANFILES = $(kwin3_smoothblend_la_METASOURCES) diff --git a/kwin-styles/smooth-blend/client/buttons.h b/kwin-styles/smooth-blend/client/buttons.h index ac0eaa8e..3d777144 100644 --- a/kwin-styles/smooth-blend/client/buttons.h +++ b/kwin-styles/smooth-blend/client/buttons.h @@ -1704,7 +1704,7 @@ static struct EmbedImage { const unsigned char *data; ulong compressed; int numColors; - const QRgb *colorTable; + const TQRgb *colorTable; bool alpha; const char *name; } embed_image_vec[] = { @@ -1731,13 +1731,13 @@ static TQImage uic_findImage( const TQString& name ) for ( int i=0; embed_image_vec[i].data; i++ ) { if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) { TQByteArray baunzip; - baunzip = qUncompress( embed_image_vec[i].data, + baunzip = tqUncompress( embed_image_vec[i].data, embed_image_vec[i].compressed ); TQImage img((uchar*)baunzip.data(), embed_image_vec[i].width, embed_image_vec[i].height, embed_image_vec[i].depth, - (QRgb*)embed_image_vec[i].colorTable, + (TQRgb*)embed_image_vec[i].colorTable, embed_image_vec[i].numColors, TQImage::BigEndian ); @@ -1750,7 +1750,7 @@ static TQImage uic_findImage( const TQString& name ) return TQImage(); } -class MimeSourceFactory_smoothblend : public QMimeSourceFactory +class MimeSourceFactory_smoothblend : public TQMimeSourceFactory { public: MimeSourceFactory_smoothblend() {} diff --git a/kwin-styles/smooth-blend/client/config/Makefile.am b/kwin-styles/smooth-blend/client/config/Makefile.am index 618dbca1..f50eb0fa 100644 --- a/kwin-styles/smooth-blend/client/config/Makefile.am +++ b/kwin-styles/smooth-blend/client/config/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = smoothblendconfig.h kde_module_LTLIBRARIES = kwin_smoothblend_config.la kwin_smoothblend_config_la_SOURCES = configdialog.ui smoothblendconfig.cc -kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin_smoothblend_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx kwin_smoothblend_config_la_LIBADD = $(LIB_KDEUI) kwin_smoothblend_config_la_METASOURCES = AUTO diff --git a/kwin-styles/smooth-blend/client/config/configdialog.ui b/kwin-styles/smooth-blend/client/config/configdialog.ui index f84973dc..09af45f6 100644 --- a/kwin-styles/smooth-blend/client/config/configdialog.ui +++ b/kwin-styles/smooth-blend/client/config/configdialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ConfigDialog</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ConfigDialog</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>buttongroup</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonsize</cstring> </property> @@ -72,7 +72,7 @@ <number>16</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>animatebuttons</cstring> </property> @@ -92,7 +92,7 @@ <string>Check this option if you want to use button animations when hovering with the mouse.</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -100,7 +100,7 @@ <string>Button size:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>menuClose</cstring> </property> @@ -124,14 +124,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="2" column="3"> + <widget class="TQComboBox" row="2" column="3"> <item> <property name="text"> <string>Intensify</string> @@ -154,7 +154,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>140</height> @@ -181,7 +181,7 @@ </spacer> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>titlegroup</cstring> </property> @@ -192,15 +192,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> <property name="text"> - <string>Text alignment:</string> + <string>Text tqalignment:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -208,7 +208,7 @@ <string>Frame width:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -216,7 +216,7 @@ <string>Title height:</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>titlesize</cstring> </property> @@ -230,7 +230,7 @@ <number>16</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>framesize</cstring> </property> @@ -250,7 +250,7 @@ <number>4</number> </property> </widget> - <widget class="QButtonGroup" row="0" column="1" rowspan="2" colspan="2"> + <widget class="TQButtonGroup" row="0" column="1" rowspan="2" colspan="2"> <property name="name"> <cstring>titlealign</cstring> </property> @@ -274,14 +274,14 @@ <property name="title"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> <property name="toolTip" stdset="0"> <string></string> </property> <property name="whatsThis" stdset="0"> - <string>Use these buttons to set the alignment of the window title</string> + <string>Use these buttons to set the tqalignment of the window title</string> </property> <hbox> <property name="name"> @@ -290,15 +290,15 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignLeft</cstring> </property> @@ -309,7 +309,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignHCenter</cstring> </property> @@ -323,7 +323,7 @@ <string></string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>AlignRight</cstring> </property> @@ -348,14 +348,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>231</width> <height>71</height> </size> </property> </spacer> - <widget class="QCheckBox" row="4" column="2" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>roundCorners</cstring> </property> @@ -369,7 +369,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>titleshadow</cstring> </property> diff --git a/kwin-styles/smooth-blend/client/config/smoothblendconfig.h b/kwin-styles/smooth-blend/client/config/smoothblendconfig.h index de861779..4f2add87 100644 --- a/kwin-styles/smooth-blend/client/config/smoothblendconfig.h +++ b/kwin-styles/smooth-blend/client/config/smoothblendconfig.h @@ -32,6 +32,7 @@ class ConfigDialog; class smoothblendConfig : public TQObject { Q_OBJECT + TQ_OBJECT public: smoothblendConfig(KConfig* config, TQWidget* parent); ~smoothblendConfig(); diff --git a/kwin-styles/smooth-blend/client/smoothblend.cc b/kwin-styles/smooth-blend/client/smoothblend.cc index 9146c6eb..6e416dce 100644 --- a/kwin-styles/smooth-blend/client/smoothblend.cc +++ b/kwin-styles/smooth-blend/client/smoothblend.cc @@ -36,7 +36,7 @@ using namespace smoothblend; smoothblendFactory* factory=NULL; bool smoothblendFactory::initialized_ = false; -Qt::AlignmentFlags smoothblendFactory::titlealign_ = Qt::AlignHCenter; +TQt::AlignmentFlags smoothblendFactory::titlealign_ = TQt::AlignHCenter; bool smoothblendFactory::cornerflags_ = true; int smoothblendFactory::titlesize_ = 30; int smoothblendFactory::buttonsize_ = 26; @@ -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 layout +// Default button tqlayout 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 repaint is necessary +// only a tqrepaint is necessary bool smoothblendFactory::reset(unsigned long changed) { // read in the configuration @@ -124,11 +124,11 @@ bool smoothblendFactory::readConfig() { // grab settings TQString value = config.readEntry("TitleAlignment", "AlignHCenter"); if (value == "AlignLeft") - titlealign_ = Qt::AlignLeft; + titlealign_ = TQt::AlignLeft; else if (value == "AlignHCenter") - titlealign_ = Qt::AlignHCenter; + titlealign_ = TQt::AlignHCenter; else if (value == "AlignRight") - titlealign_ = Qt::AlignRight; + titlealign_ = TQt::AlignRight; cornerflags_ = config.readBoolEntry("RoundCorners", true); titlesize_ = config.readNumEntry("TitleSize",30); @@ -161,7 +161,7 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name type_(type), size_(button_size), deco_(0), - lastmouse_(NoButton), + lastmouse_(Qt::NoButton), hover_(false) { setBackgroundMode(NoBackground); @@ -184,11 +184,11 @@ smoothblendButton::~smoothblendButton() { } ////////////////////////////////////////////////////////////////////////////// -// sizeHint() +// tqsizeHint() // ---------- // Return size hint -TQSize smoothblendButton::sizeHint() const { +TQSize smoothblendButton::tqsizeHint() const { return TQSize(::factory->buttonSize(), ::factory->buttonSize()); } @@ -232,7 +232,7 @@ void smoothblendButton::animate() { animTmr->start(TIMERINTERVAL, true); // single-shot } } - repaint(false); + tqrepaint(false); } ////////////////////////////////////////////////////////////////////////////// // enterEvent() @@ -275,9 +275,9 @@ void smoothblendButton::mousePressEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = LeftButton; - if ((type_ != ButtonMax) && (e->button() != LeftButton)) { - button = NoButton; // middle & right buttons inappropriate + int button = Qt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { + button = Qt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); @@ -293,9 +293,9 @@ void smoothblendButton::mouseReleaseEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = LeftButton; - if ((type_ != ButtonMax) && (e->button() != LeftButton)) { - button = NoButton; // middle & right buttons inappropriate + int button = Qt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { + button = Qt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); TQButton::mouseReleaseEvent(&me); @@ -407,7 +407,7 @@ void smoothblendButton::drawButton( TQPainter *painter ) { TQColor redColor(red); bool active = client_->isActive(); TQPixmap backgroundTile = client_->getTitleBarTile(active); - group = KDecoration::options()->colorGroup(KDecoration::ColorTitleBar, active); + group = KDecoration::options()->tqcolorGroup(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 repaint + //highlight on a mouse over tqrepaint 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()->colorGroup(KDecoration::ColorTitleBar, true); - widgetGroup = widget()->colorGroup(); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + widgetGroup = widget()->tqcolorGroup(); // 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()->colorGroup(KDecoration::ColorTitleBar, false); + group = options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorTitleBar, true); + group = options()->tqcolorGroup(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()->colorGroup(KDecoration::ColorTitleBar, false); + group = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); tempPixmap = KPixmapEffect::unbalancedGradient(tempPixmap, group.background(), widgetGroup.background(), @@ -600,7 +600,7 @@ void smoothblendClient::init() { } void smoothblendClient::_resetLayout() { - // basic layout: + // basic tqlayout: // _______________________________________________________________ // | topSpacer | // |_______________________________________________________________| @@ -697,9 +697,9 @@ void smoothblendClient::_resetLayout() ////////////////////////////////////////////////////////////////////////////// // addButtons() // ------------ -// Add buttons to title layout +// Add buttons to title tqlayout -void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int button_size) { +void smoothblendClient::addButtons(TQBoxLayout *tqlayout, 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 *layout, const TQString& s, int b 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())); - layout->addWidget(button[ButtonMenu]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMenu]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -726,8 +726,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true); connect(button[ButtonSticky], TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); - layout->addWidget(button[ButtonSticky]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonSticky]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -737,8 +737,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size); connect(button[ButtonHelp], TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp())); - layout->addWidget(button[ButtonHelp]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonHelp]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -748,8 +748,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size); connect(button[ButtonMin], TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); - layout->addWidget(button[ButtonMin]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMin]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -764,8 +764,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true); connect(button[ButtonMax], TQT_SIGNAL(clicked()), this, TQT_SLOT(maxButtonPressed())); - layout->addWidget(button[ButtonMax]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonMax]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -775,8 +775,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size); connect(button[ButtonClose], TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); - layout->addWidget(button[ButtonClose]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonClose]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -787,8 +787,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b i18n("Keep Above Others"), ButtonAbove, button_size, true); connect(button[ButtonAbove], TQT_SIGNAL(clicked()), this, TQT_SLOT(aboveButtonPressed())); - layout->addWidget(button[ButtonAbove]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonAbove]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -799,8 +799,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b i18n("Keep Below Others"), ButtonBelow, button_size, true); connect(button[ButtonBelow], TQT_SIGNAL(clicked()), this, TQT_SLOT(belowButtonPressed())); - layout->addWidget(button[ButtonBelow]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonBelow]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; @@ -815,13 +815,13 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true); connect(button[ButtonShade], TQT_SIGNAL(clicked()), this, TQT_SLOT(shadeButtonPressed())); - layout->addWidget(button[ButtonShade]); - if (n < s.length()-1) layout->addSpacing(1); + tqlayout->addWidget(button[ButtonShade]); + if (n < s.length()-1) tqlayout->addSpacing(1); } break; case '_': // Spacer item - layout->addSpacing(::factory->frameSize()); + tqlayout->addSpacing(::factory->frameSize()); } } } @@ -836,7 +836,7 @@ void smoothblendClient::activeChange() { for (int n=0; n<ButtonTypeCount; n++) if (button[n]) button[n]->reset(); - widget()->repaint(false); + widget()->tqrepaint(false); } ////////////////////////////////////////////////////////////////////////////// @@ -845,7 +845,7 @@ void smoothblendClient::activeChange() { // The title has changed void smoothblendClient::captionChange() { - widget()->repaint(titlebar_->geometry(), false); + widget()->tqrepaint(titlebar_->tqgeometry(), 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]->repaint(false); + button[ButtonSticky]->tqrepaint(false); } } @@ -869,7 +869,7 @@ void smoothblendClient::desktopChange() { void smoothblendClient::iconChange() { if (button[ButtonMenu]) { - button[ButtonMenu]->repaint(false); + button[ButtonMenu]->tqrepaint(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]->repaint(false); + button[ButtonMax]->tqrepaint(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]->repaint(false); + button[ButtonShade]->tqrepaint(false); } } @@ -909,7 +909,7 @@ void smoothblendClient::shadeChange() { void smoothblendClient::keepAboveChange(bool a) { if (button[ButtonAbove]) { button[ButtonAbove]->setOn(a); - button[ButtonAbove]->repaint(false); + button[ButtonAbove]->tqrepaint(false); } } @@ -921,7 +921,7 @@ void smoothblendClient::keepAboveChange(bool a) { void smoothblendClient::keepBelowChange(bool b) { if (button[ButtonBelow]) { button[ButtonBelow]->setOn(b); - button[ButtonBelow]->repaint(false); + button[ButtonBelow]->tqrepaint(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 layout etc. + // update tqlayout 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 layout etc. + // update tqlayout 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()->layout()->activate(); + widget()->tqlayout()->activate(); } ////////////////////////////////////////////////////////////////////////////// @@ -971,12 +971,12 @@ void smoothblendClient::resize(const TQSize &size) { } ////////////////////////////////////////////////////////////////////////////// -// minimumSize() +// tqminimumSize() // ------------- // Return the minimum allowable size for this window -TQSize smoothblendClient::minimumSize() const { - return widget()->minimumSize(); +TQSize smoothblendClient::tqminimumSize() const { + return widget()->tqminimumSize(); } ////////////////////////////////////////////////////////////////////////////// @@ -1035,32 +1035,32 @@ KDecoration::Position smoothblendClient::mousePosition(const TQPoint &point) con // Event filter bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { - if (obj != widget()) + if (TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(widget())) return false; switch (e->type()) { case TQEvent::MouseButtonDblClick: { - mouseDoubleClickEvent(static_cast<TQMouseEvent *>(e)); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); return true; } case TQEvent::MouseButtonPress: { - processMousePressEvent(static_cast<TQMouseEvent *>(e)); + processMousePressEvent(TQT_TQMOUSEEVENT(e)); return true; } case TQEvent::Paint: { - paintEvent(static_cast<TQPaintEvent *>(e)); + paintEvent(TQT_TQPAINTEVENT(e)); return true; } case TQEvent::Resize: { - resizeEvent(static_cast<TQResizeEvent *>(e)); + resizeEvent(TQT_TQRESIZEEVENT(e)); return true; } case TQEvent::Show: { - showEvent(static_cast<TQShowEvent *>(e)); + showEvent(TQT_TQSHOWEVENT(e)); return true; } case TQEvent::Wheel: { - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent(TQT_TQWHEELEVENT( e )); return true; } default: { @@ -1077,7 +1077,7 @@ bool smoothblendClient::eventFilter(TQObject *obj, TQEvent *e) { // Doubleclick on title void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { - if (titlebar_->geometry().contains(e->pos())) + if (titlebar_->tqgeometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -1088,7 +1088,7 @@ void smoothblendClient::mouseDoubleClickEvent(TQMouseEvent *e) { void smoothblendClient::wheelEvent(TQWheelEvent *e) { - if (titleLayout_->geometry().contains(e->pos()) ) + if (titleLayout_->tqgeometry().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()->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() ); + 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() ); TQRect tempRect; @@ -1167,14 +1167,14 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { painter.setFont(options()->font(isActive(), false)); painter.setPen(blackColor); painter.drawText(shadowRect, - ::factory->titleAlign() | AlignVCenter | Qt::SingleLine, + ::factory->titleAlign() | AlignVCenter | TQt::SingleLine, captionText); } // draw title text painter.setFont(options()->font(isActive(), false)); painter.setPen(options()->color(KDecoration::ColorFont, isActive())); painter.drawText(textRect, - ::factory->titleAlign() | AlignVCenter | Qt::SingleLine, + ::factory->titleAlign() | AlignVCenter | TQt::SingleLine, captionText); //left of buttons and title @@ -1183,7 +1183,7 @@ void smoothblendClient::paintEvent(TQPaintEvent*) { Rltitle.width(), Rltitle.height()+Rdeco.height(), active ? *aTitleBarTile:*iTitleBarTile); - // left mid layout + // left mid tqlayout 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 layout + // right mid tqlayout 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_->geometry()); + region = region.subtract(titlebar_->tqgeometry()); widget()->erase(region); updateMask(); } @@ -1293,7 +1293,7 @@ void smoothblendClient::resizeEvent(TQResizeEvent *) { void smoothblendClient::showEvent(TQShowEvent *) { updateMask(); - widget()->repaint(); + widget()->tqrepaint(); } ////////////////////////////////////////////////////////////////////////////// diff --git a/kwin-styles/smooth-blend/client/smoothblend.h b/kwin-styles/smooth-blend/client/smoothblend.h index a72fe743..4abd32cb 100644 --- a/kwin-styles/smooth-blend/client/smoothblend.h +++ b/kwin-styles/smooth-blend/client/smoothblend.h @@ -65,7 +65,7 @@ public: virtual KDecoration *createDecoration(KDecorationBridge *b); virtual bool reset(unsigned long changed); static bool initialized(); - static Qt::AlignmentFlags titleAlign(); + static TQt::AlignmentFlags titleAlign(); static bool roundedCorners(); static int titleSize(); static int buttonSize(); @@ -82,7 +82,7 @@ private: private: static bool initialized_; - static Qt::AlignmentFlags titlealign_; + static TQt::AlignmentFlags titlealign_; static bool cornerflags_; static int titlesize_; static int buttonsize_; @@ -98,7 +98,7 @@ private: inline bool smoothblendFactory::initialized() { return initialized_; } -inline Qt::AlignmentFlags smoothblendFactory::titleAlign() { +inline TQt::AlignmentFlags smoothblendFactory::titleAlign() { return titlealign_; } inline bool smoothblendFactory::roundedCorners() { @@ -124,6 +124,7 @@ inline bool smoothblendFactory::titleShadow() { class smoothblendButton : public TQButton { Q_OBJECT + TQ_OBJECT public: smoothblendButton(smoothblendClient *parent=0, const char *name=0, const TQString &tip=NULL, @@ -134,7 +135,7 @@ public: ~smoothblendButton(); void setBitmap(const unsigned char *bitmap); - TQSize sizeHint() const; + TQSize tqsizeHint() const; ButtonState lastMousePress() const; void reset(); TQImage getButtonImage(ButtonType type); @@ -166,17 +167,18 @@ private: uint animProgress; }; -inline Qt::ButtonState smoothblendButton::lastMousePress() const { +inline TQt::ButtonState smoothblendButton::lastMousePress() const { return lastmouse_; } inline void smoothblendButton::reset() { - repaint(false); + tqrepaint(false); } // smoothblendClient ////////////////////////////////////////////////////////// class smoothblendClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: smoothblendClient(KDecorationBridge *b, KDecorationFactory *f); virtual ~smoothblendClient(); @@ -193,7 +195,7 @@ public: virtual void borders(int &l, int &r, int &t, int &b) const; virtual void resize(const TQSize &size); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() const; virtual Position mousePosition(const TQPoint &point) const; TQPixmap getTitleBarTile(bool active) const @@ -202,7 +204,7 @@ public: } private: - void addButtons(TQBoxLayout* layout, const TQString& buttons, int buttonSize = 18); + void addButtons(TQBoxLayout* tqlayout, const TQString& buttons, int buttonSize = 18); bool eventFilter(TQObject *obj, TQEvent *e); void mouseDoubleClickEvent(TQMouseEvent *e); void wheelEvent(TQWheelEvent *e); diff --git a/kwin-styles/system/Makefile.am b/kwin-styles/system/Makefile.am index 21a2119a..d94361f6 100644 --- a/kwin-styles/system/Makefile.am +++ b/kwin-styles/system/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = kwin3_system.la kwin3_system_la_SOURCES = systemclient.cpp -kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +kwin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx #kwin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) kwin3_system_la_LIBADD = $(LIB_KDEUI) -lkdecorations diff --git a/kwin-styles/system/systemclient.cpp b/kwin-styles/system/systemclient.cpp index caab350a..a676a02a 100644 --- a/kwin-styles/system/systemclient.cpp +++ b/kwin-styles/system/systemclient.cpp @@ -13,7 +13,7 @@ #include <kapplication.h> #include <kdebug.h> -// Default button layout +// Default button tqlayout 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->palette().active().background(); + TQColor bgColor = kapp->tqpalette().active().background(); KPixmapEffect::gradient(*aUpperGradient, KDecoration::options()->color(KDecorationOptions::ColorFrame, true).light(130), bgColor, @@ -117,19 +117,19 @@ static void create_pixmaps() hColor.light(150), hColor.dark(150), KPixmapEffect::DiagonalGradient); - bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, Qt::CopyROP, true); - bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); // normal buttons btnPix = new KPixmap; btnPix->resize(14, 14); - bitBlt(btnPix, 2, 2, &aPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true)); + bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(btnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); iBtnPix = new KPixmap; iBtnPix->resize(14, 14); - bitBlt(iBtnPix, 2, 2, &iPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false)); + bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(iBtnPix, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); // pressed buttons @@ -152,25 +152,25 @@ static void create_pixmaps() hColor.light(150), hColor.dark(150), KPixmapEffect::DiagonalGradient); - bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, Qt::CopyROP, true); - bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, Qt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true); btnPixDown = new KPixmap; btnPixDown->resize(14, 14); - bitBlt(btnPixDown, 2, 2, &aPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(btnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, true)); iBtnPixDown = new KPixmap; iBtnPixDown->resize(14, 14); - bitBlt(iBtnPixDown, 2, 2, &iPix, 0, 0, 10, 10, Qt::CopyROP, true); - drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, + bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true); + drawButtonFrame(iBtnPixDown, KDecoration::options()->tqcolorGroup(KDecorationOptions::ColorFrame, false)); } - if(qGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) - btnForeground = new TQColor(Qt::black); + if(tqGray(KDecoration::options()->color(KDecorationOptions::ColorButtonBg, true).rgb()) > 128) + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } static void delete_pixmaps() @@ -211,21 +211,21 @@ void SystemButton::setTipText(const TQString &tip) } -TQSize SystemButton::sizeHint() const +TQSize SystemButton::tqsizeHint() const { return(TQSize(14, 14)); } void SystemButton::reset() { - repaint(false); + tqrepaint(false); } void SystemButton::setBitmap(const unsigned char *bitmap) { deco = TQBitmap(8, 8, bitmap, true); deco.setMask(deco); - repaint(); + tqrepaint(); } 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()->colorGroup(KDecorationOptions::ColorFrame, + TQColorGroup g = KDecoration::options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorButtonBg, client->isActive()); + g = KDecoration::options()->tqcolorGroup(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); @@ -271,14 +271,14 @@ void SystemButton::drawButton(TQPainter *p) void SystemButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQButton::mousePressEvent( &me ); } void SystemButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -411,24 +411,24 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s) bool SystemClient::eventFilter( TQObject* o, TQEvent* e ) { - if( o != widget()) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(widget())) return false; switch( e->type()) { case TQEvent::Resize: - resizeEvent(static_cast< TQResizeEvent* >( e ) ); + resizeEvent(TQT_TQRESIZEEVENT( e ) ); return true; case TQEvent::Paint: - paintEvent(static_cast< TQPaintEvent* >( e ) ); + paintEvent(TQT_TQPAINTEVENT( e ) ); return true; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(static_cast< TQMouseEvent* >( e ) ); + mouseDoubleClickEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::MouseButtonPress: - processMousePressEvent(static_cast< TQMouseEvent* >( e ) ); + processMousePressEvent(TQT_TQMOUSEEVENT( e ) ); return true; case TQEvent::Wheel: - wheelEvent( static_cast< TQWheelEvent* >( e )); + wheelEvent( TQT_TQWHEELEVENT( e )); return true; default: break; @@ -440,7 +440,7 @@ void SystemClient::reset(unsigned long) { titleBuffer.resize(0, 0); recalcTitleBuffer(); - widget()->repaint(); + widget()->tqrepaint(); 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->geometry(); + TQRect t = titlebar->tqgeometry(); t.setTop( 0 ); TQRegion r = rect(); r = r.subtract( t ); @@ -481,9 +481,9 @@ void SystemClient::resize( const TQSize& s ) } -TQSize SystemClient::minimumSize() const +TQSize SystemClient::tqminimumSize() const { - return widget()->minimumSize(); + return widget()->tqminimumSize(); } @@ -499,10 +499,10 @@ void SystemClient::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), 18, *aUpperGradient); else p.fillRect(0, 0, width(), 18, - options()->colorGroup(KDecorationOptions::ColorFrame, true). + options()->tqcolorGroup(KDecorationOptions::ColorFrame, true). brush(TQColorGroup::Button)); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); 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()->repaint(titlebar->geometry(), false); + widget()->tqrepaint(titlebar->tqgeometry(), false); } void SystemClient::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), false); + options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), false); } void SystemClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQRect t = titlebar->geometry(); + TQRect t = titlebar->tqgeometry(); - TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->colorGroup().brush(TQColorGroup::Background) : - options()->colorGroup(KDecorationOptions::ColorFrame, isActive()). + TQBrush fillBrush(TQBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background)).pixmap() ? + widget()->tqcolorGroup().brush(TQColorGroup::Background) : + options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, 18, width()-2, height()-19, fillBrush); @@ -570,17 +570,17 @@ void SystemClient::paintEvent( TQPaintEvent* ) p.drawText(t, AlignCenter, caption() ); } - p.setPen(options()->colorGroup(KDecorationOptions::ColorFrame, isActive()).light()); + p.setPen(options()->tqcolorGroup(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()->colorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); + p.setPen(options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()).dark()); p.drawLine(width()-20, height()-6, width()-10, height()-6); p.drawLine(width()-20, height()-4, width()-10, height()-4); drawRoundFrame(p, 0, 0, width(), height()); } -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) void SystemClient::doShape() { @@ -597,7 +597,7 @@ void SystemClient::showEvent(TQShowEvent *) // Client::showEvent(ev); doShape(); widget()->show(); -// widget()->repaint(); +// widget()->tqrepaint(); } /*void SystemClient::windowWrapperShowEvent( TQShowEvent* ) @@ -607,13 +607,13 @@ void SystemClient::showEvent(TQShowEvent *) void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == Qt::LeftButton && titlebar->tqgeometry().contains( e->pos() ) ) titlebarDblClickOperation(); } void SystemClient::wheelEvent( TQWheelEvent *e ) { - if (isSetShade() || TQRect( 0, 0, width(), titlebar->geometry().height() ).contains( e->pos() ) ) + if (isSetShade() || TQRect( 0, 0, width(), titlebar->tqgeometry().height() ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -633,7 +633,7 @@ void SystemClient::maximizeChange() void SystemClient::activeChange() { - widget()->repaint(false); + widget()->tqrepaint(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]->repaint(false); +// button[BtnMenu]->tqrepaint(false); } void SystemClient::desktopChange() diff --git a/kwin-styles/system/systemclient.h b/kwin-styles/system/systemclient.h index 09406f48..ecaf25ee 100644 --- a/kwin-styles/system/systemclient.h +++ b/kwin-styles/system/systemclient.h @@ -30,6 +30,7 @@ enum ButtonType { class SystemClient : public KDecoration { Q_OBJECT + TQ_OBJECT public: SystemClient(KDecorationBridge* bridge, KDecorationFactory* factory); ~SystemClient(); @@ -44,7 +45,7 @@ class SystemClient : public KDecoration virtual void iconChange(); virtual void desktopChange(); virtual void activeChange(); - virtual TQSize minimumSize() const; + virtual TQSize tqminimumSize() 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); @@ -67,14 +68,14 @@ class SystemClient : public KDecoration TQString oldTitle; }; -class SystemButton : public QButton +class SystemButton : public TQButton { public: SystemButton(SystemClient *parent=0, const char *name=0, const unsigned char *bitmap=NULL, const TQString& tip=NULL); void setBitmap(const unsigned char *bitmap); void reset(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setTipText(const TQString &tip); ButtonState last_button; protected: @@ -93,6 +94,7 @@ class SystemButton : public QButton class SystemDecoFactory : public TQObject, public KDecorationFactory { Q_OBJECT + TQ_OBJECT public: SystemDecoFactory(); virtual ~SystemDecoFactory(); |