From 185ed081e216488c0e5dc3e64219cbaac6a5b471 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 6 Nov 2023 11:29:31 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit 96f53316c2d7b72477825b53206998efc9bfd315) --- styles/dotnet/dotnet.cpp | 10 +++++----- styles/phase/phasestyle.cpp | 12 ++++++------ tdescreensaver/kdesavers/banner.cpp | 4 ++-- tdescreensaver/kdesavers/kclock.cpp | 4 ++-- tdescreensaver/kdesavers/kvm.cpp | 4 ++-- tdescreensaver/kdesavers/lines.cpp | 4 ++-- tdescreensaver/kdesavers/lorenz.cpp | 12 ++++++------ tdescreensaver/kdesavers/polygon.cpp | 6 +++--- tdescreensaver/kdesavers/science.cpp | 10 +++++----- tdescreensaver/kxsconfig/kxscontrol.cpp | 8 ++++---- tdescreensaver/xsavers/space.cpp | 4 ++-- tdescreensaver/xsavers/swarm.cpp | 4 ++-- twin-styles/cde/cdeclient.cpp | 16 ++++++++-------- twin-styles/cde/cdeclient.h | 2 +- twin-styles/cde/config/config.cpp | 2 +- twin-styles/glow/config/glowconfigdialog.cpp | 2 +- twin-styles/glow/glowbutton.cpp | 4 ++-- twin-styles/glow/glowbutton.h | 2 +- twin-styles/glow/glowclient.cpp | 6 +++--- twin-styles/icewm/icewm.cpp | 14 +++++++------- twin-styles/icewm/icewm.h | 2 +- twin-styles/kde1/kde1client.cpp | 4 ++-- twin-styles/kde1/kde1client.h | 4 ++-- twin-styles/kstep/nextclient.cpp | 12 ++++++------ twin-styles/kstep/nextclient.h | 2 +- twin-styles/openlook/OpenLook.cpp | 2 +- twin-styles/riscos/Button.cpp | 6 +++--- twin-styles/riscos/Button.h | 2 +- twin-styles/riscos/Manager.cpp | 2 +- twin-styles/riscos/MaximiseButton.cpp | 2 +- twin-styles/smooth-blend/client/smoothblend.cpp | 14 +++++++------- twin-styles/system/systemclient.cpp | 6 +++--- 32 files changed, 94 insertions(+), 94 deletions(-) diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 0a6e8027..defe823d 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -765,21 +765,21 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe, if (flags & Style_Enabled) { a.translate((r.x() + r.width()/2), (r.y() + r.height()/2)); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.buttonText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); } else { a.translate((r.x() + r.width()/2)+1, (r.y() + r.height()/2)+1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.highlightedText()); } p->drawLineSegments(a, 0, 3); p->drawPoint(a[6]); a.translate(-1,-1); - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(cg.mid()); } p->drawLineSegments(a, 0, 3); @@ -1357,11 +1357,11 @@ void dotNETstyle::drawControl(TQ_ControlElement element, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 6e75e953..1185048d 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -633,7 +633,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element, widget =dynamic_cast(painter->device()); if (header) { - horiz = (header->orientation() ==Qt::Horizontal); + horiz = (header->orientation() ==TQt::Horizontal); } else { horiz = true; } @@ -1481,13 +1481,13 @@ void PhaseStyle::drawControl(TQ_ControlElement element, else if (mi->pixmap()) { // pixmap as label pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::OpaqueMode); + painter->setBackgroundMode(TQt::OpaqueMode); dx = ((w - pixmap.width()) / 2) + ((w - pixmap.width()) % 2); painter->drawPixmap(x+dx, y+ITEMFRAME, pixmap); if (pixmap.depth() == 1) - painter->setBackgroundMode(Qt::TransparentMode); + painter->setBackgroundMode(TQt::TransparentMode); } } @@ -1874,7 +1874,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, if ((extension = ::tqqt_cast(btn->parent()))) { toolbar = ::tqqt_cast(extension->parent()); if (toolbar) { - horiz = (toolbar->orientation() == Qt::Horizontal); + horiz = (toolbar->orientation() == TQt::Horizontal); if (normal) { // draw background drawPhaseGradient(painter, rect, group.background(), !horiz, 0, 0, toolbar->width()-3, @@ -2295,7 +2295,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co TQRect prect = parent->rect(); toolbar = ::tqqt_cast(parent); - horiz = (toolbar) ? (toolbar->orientation() == Qt::Horizontal) + horiz = (toolbar) ? (toolbar->orientation() == TQt::Horizontal) : (prect.height() < prect.width()); TQPainter painter(widget); if (flatToolbar(ceData, elementFlags, toolbar)) { @@ -2320,7 +2320,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co else if (object && object->isWidgetType() && object->parent() && (toolbar = ::tqqt_cast(object->parent()))) { if (0 == (widget = ::tqqt_cast(object))) return false; - horiz = (toolbar->orientation() == Qt::Horizontal); + horiz = (toolbar->orientation() == TQt::Horizontal); TQPainter painter(widget); ceData.rect.rect(&x, &y, &w, &h); // draw the extension diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp index 9004bdd5..a51579ba 100644 --- a/tdescreensaver/kdesavers/banner.cpp +++ b/tdescreensaver/kdesavers/banner.cpp @@ -74,7 +74,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() ); tl1->addLayout(tl11); - TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main ); + TQGroupBox *group = new TQGroupBox( 0,TQt::Vertical, i18n("Font"), main ); TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() ); label = new TQLabel( i18n("Family:"), group ); @@ -134,7 +134,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) tl11->addStretch(1); tl11->addWidget(label); - TQSlider *sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main ); + TQSlider *sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main ); sb->setMinimumWidth( 180); sb->setFixedHeight(20); sb->setTickmarks(TQSlider::Below); diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp index 7de25947..c3983bff 100644 --- a/tdescreensaver/kdesavers/kclock.cpp +++ b/tdescreensaver/kdesavers/kclock.cpp @@ -84,7 +84,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) top->addLayout( hbox ); TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main); - colgroup->setColumnLayout( 0,Qt::Horizontal ); + colgroup->setColumnLayout( 0,TQt::Horizontal ); TQGridLayout *grid = new TQGridLayout( colgroup->layout(), 5, 2, spacingHint() ); @@ -143,7 +143,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) label = new TQLabel( i18n( "Si&ze:" ), main ); top->addWidget( label ); - TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,Qt::Horizontal, main); + TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,TQt::Horizontal, main); label->setBuddy( qs ); qs->setTickInterval(1); qs->setTickmarks(TQSlider::Below); diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp index afc132ed..9464e2ef 100644 --- a/tdescreensaver/kdesavers/kvm.cpp +++ b/tdescreensaver/kdesavers/kvm.cpp @@ -289,7 +289,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Virtual machine speed:"), main ); tl1->addWidget(label); - TQSlider *slider = new TQSlider( Qt::Horizontal, main ); + TQSlider *slider = new TQSlider( TQt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, 100 ); slider->setSteps( 10, 20 ); @@ -303,7 +303,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Display update speed:"), main ); tl1->addWidget(label); - slider = new TQSlider( Qt::Horizontal, main ); + slider = new TQSlider( TQt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, MAX_REFRESH_TIMEOUT ); slider->setSteps( MAX_REFRESH_TIMEOUT/10, MAX_REFRESH_TIMEOUT/5 ); diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp index b7c5bdd9..e80d85c6 100644 --- a/tdescreensaver/kdesavers/lines.cpp +++ b/tdescreensaver/kdesavers/lines.cpp @@ -128,7 +128,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) TQLabel *label=new TQLabel(i18n("Length:"), main); tl1->addWidget(label); - TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, Qt::Horizontal, + TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, TQt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); @@ -139,7 +139,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) label=new TQLabel(i18n("Speed:"), main); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp index 2d521583..50ac9b5c 100644 --- a/tdescreensaver/kdesavers/lorenz.cpp +++ b/tdescreensaver/kdesavers/lorenz.cpp @@ -82,7 +82,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, main); + sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQt::Horizontal, main); sps->setMinimumSize( 120, 20 ); sps->setTickmarks(TQSlider::Below); sps->setTickInterval(150); @@ -92,7 +92,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Epoch:"), main ); tl1->addWidget(label); - eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, Qt::Horizontal, main); + eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, TQt::Horizontal, main); eps->setMinimumSize( 120, 20 ); eps->setTickmarks(TQSlider::Below); eps->setTickInterval(3000); @@ -102,7 +102,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Color rate:"), main ); tl1->addWidget(label); - crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, Qt::Horizontal, main); + crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, TQt::Horizontal, main); crs->setMinimumSize( 120, 20 ); crs->setTickmarks(TQSlider::Below); crs->setTickInterval(10); @@ -112,7 +112,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Z:"), main ); tl1->addWidget(label); - zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, Qt::Horizontal, main); + zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, TQt::Horizontal, main); zrs->setMinimumSize( 120, 20 ); zrs->setTickmarks(TQSlider::Below); zrs->setTickInterval(36); @@ -122,7 +122,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Y:"), main ); tl1->addWidget(label); - yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, Qt::Horizontal, main); + yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, TQt::Horizontal, main); yrs->setMinimumSize( 120, 20 ); yrs->setTickmarks(TQSlider::Below); yrs->setTickInterval(36); @@ -132,7 +132,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation X:"), main ); tl1->addWidget(label); - xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, Qt::Horizontal, main); + xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, TQt::Horizontal, main); xrs->setMinimumSize( 120, 20 ); xrs->setTickmarks(TQSlider::Below); xrs->setTickInterval(36); diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp index 1979dfe8..46c7c94a 100644 --- a/tdescreensaver/kdesavers/polygon.cpp +++ b/tdescreensaver/kdesavers/polygon.cpp @@ -66,7 +66,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Length:"), main ); tl1->addWidget(label); - TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, Qt::Horizontal, + TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, TQt::Horizontal, main ); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); @@ -77,7 +77,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Vertices:"), main ); tl1->addWidget(label); - sb = new TQSlider(3, MAXVERTICES, 2, vertices, Qt::Horizontal, main); + sb = new TQSlider(3, MAXVERTICES, 2, vertices, TQt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(2); @@ -87,7 +87,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, TQt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp index bd3ee4ad..2f1534bc 100644 --- a/tdescreensaver/kdesavers/science.cpp +++ b/tdescreensaver/kdesavers/science.cpp @@ -897,7 +897,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Size:"), main ); ltc->addWidget( label ); - slideSize = new TQSlider(9, 50, 5, size[mode], Qt::Horizontal, + slideSize = new TQSlider(9, 50, 5, size[mode], TQt::Horizontal, main ); slideSize->setMinimumSize( 90, 20 ); slideSize->setTickmarks(TQSlider::Below); @@ -916,7 +916,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideIntensity = new TQSlider(0, 10, 1, intensity[mode], - Qt::Horizontal, main ); + TQt::Horizontal, main ); slideIntensity->setMinimumSize( 90, 20 ); slideIntensity->setTickmarks(TQSlider::Below); slideIntensity->setTickInterval(1); @@ -933,7 +933,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideSpeed = new TQSlider(0, SCI_MAX_SPEED, 10, speed[mode], - Qt::Horizontal, main ); + TQt::Horizontal, main ); slideSpeed->setMinimumSize( 90, 20 ); slideSpeed->setTickmarks(TQSlider::Below); slideSpeed->setTickInterval(10); @@ -949,7 +949,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addLayout( ltcm ); slideMoveX = new TQSlider(0, SCI_MAX_MOVE, 5, moveX[mode], - Qt::Horizontal, main ); + TQt::Horizontal, main ); slideMoveX->setMinimumSize( 40, 20 ); slideMoveX->setTickmarks(TQSlider::Below); slideMoveX->setTickInterval(5); @@ -958,7 +958,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltcm->addWidget( slideMoveX ); slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode], - Qt::Horizontal, main ); + TQt::Horizontal, main ); slideMoveY->setMinimumSize( 40, 20 ); slideMoveY->setTickmarks(TQSlider::Below); slideMoveY->setTickInterval(5); diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp index c1e8ad46..26e7ad6f 100644 --- a/tdescreensaver/kxsconfig/kxscontrol.cpp +++ b/tdescreensaver/kxsconfig/kxscontrol.cpp @@ -39,7 +39,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, TQVBoxLayout *l = new TQVBoxLayout(this); TQLabel *label = new TQLabel(mLabel, this); l->add(label); - mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, Qt::Horizontal, this); + mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); l->add(mSlider); } @@ -71,7 +71,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name, TQLabel *l = new TQLabel(i18n(lowLabel.utf8()), this); hb->addWidget(l); } - mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, Qt::Horizontal, this); + mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); hb->add(mSlider); if (!highLabel.isEmpty()){ @@ -107,7 +107,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent, int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum)); - mSlider = new TQSlider(0, 100, 10, value, Qt::Horizontal, this); + mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); l->add(mSlider); } @@ -129,7 +129,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent, hb->addWidget(l); } int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum)); - mSlider = new TQSlider(0, 100, 10, value, Qt::Horizontal, this); + mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this); connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); hb->add(mSlider); if (!highLabel.isEmpty()){ diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp index cf3ebbc6..4660d79a 100644 --- a/tdescreensaver/xsavers/space.cpp +++ b/tdescreensaver/xsavers/space.cpp @@ -592,7 +592,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, + slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); @@ -602,7 +602,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Warp interval:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval,Qt::Horizontal, page ); + slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval,TQt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(3); diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp index c813d809..72c0d2d1 100644 --- a/tdescreensaver/xsavers/swarm.cpp +++ b/tdescreensaver/xsavers/swarm.cpp @@ -330,7 +330,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) left->addWidget(label); TQSlider *slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, - Qt::Horizontal, main ); + TQt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(10); @@ -342,7 +342,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) min_size(label); left->addWidget(label); - slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels,Qt::Horizontal, main ); + slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels,TQt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(20); diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp index 040b00ef..eaea2002 100644 --- a/twin-styles/cde/cdeclient.cpp +++ b/twin-styles/cde/cdeclient.cpp @@ -328,7 +328,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'M': if ( ! button[BtnMenu] ) { - button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); + button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), TQt::LeftButton|TQt::RightButton ); connect( button[BtnMenu], TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()) ); connect( button[BtnMenu], TQT_SIGNAL(released()), TQT_SLOT(menuButtonReleased()) ); titleLayout->addWidget( button[BtnMenu] ); @@ -361,7 +361,7 @@ void CdeClient::addClientButtons( const TQString& s ) case 'A': if ( (! button[BtnMax] ) && isMaximizable() ) { - button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); + button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton); connect(button[BtnMax], TQT_SIGNAL(clicked()), TQT_SLOT(maximizeButtonClicked())); titleLayout->addWidget( button[BtnMax] ); @@ -715,7 +715,7 @@ KDecoration::Position CdeClient::mousePosition( const TQPoint& p ) const void CdeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -727,7 +727,7 @@ void CdeClient::wheelEvent( TQWheelEvent * e ) void CdeClient::mousePressEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) { if ( titlebarButtonMode ) { @@ -745,7 +745,7 @@ void CdeClient::borders(int &left, int &right, int &top, int &bottom) const void CdeClient::mouseReleaseEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebarPressed ) + if ( e->button() == TQt::LeftButton && titlebarPressed ) { titlebarPressed = false; widget()->repaint(titlebar->geometry(), false); @@ -785,7 +785,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(Qt::NoButton) + : TQButton(parent->widget(), name), m_btnType(btnType), last_button(TQt::NoButton) { setBackgroundMode( TQWidget::NoBackground ); setFixedSize( s_buttonSize, s_buttonSize ); @@ -847,7 +847,7 @@ void CdeButton::mousePressEvent(TQMouseEvent *e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?TQt::LeftButton:TQt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -855,7 +855,7 @@ void CdeButton::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), - e->globalPos(), (e->button()&m_realize_buttons)?Qt::LeftButton:Qt::NoButton, e->state()); + e->globalPos(), (e->button()&m_realize_buttons)?TQt::LeftButton:TQt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/twin-styles/cde/cdeclient.h b/twin-styles/cde/cdeclient.h index 5b1deb73..be4a9752 100644 --- a/twin-styles/cde/cdeclient.h +++ b/twin-styles/cde/cdeclient.h @@ -39,7 +39,7 @@ class CdeButton : public TQButton { public: CdeButton( CdeClient* parent=0, const char* name=0, int btnType=0, - const TQString& tip=NULL, int realize_btns = Qt::LeftButton ); + const TQString& tip=NULL, int realize_btns = TQt::LeftButton ); void reset(); ButtonState lastButton() { return last_button; } diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp index 1776df24..48b5c791 100644 --- a/twin-styles/cde/config/config.cpp +++ b/twin-styles/cde/config/config.cpp @@ -29,7 +29,7 @@ CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent ) groupBox = new TQVBox( parent ); - bgAlign = new TQButtonGroup( 3, Qt::Horizontal, i18n("Text &Alignment"), groupBox ); + bgAlign = new TQButtonGroup( 3, TQt::Horizontal, i18n("Text &Alignment"), groupBox ); bgAlign->setExclusive( true ); TQWhatsThis::add( bgAlign, i18n("Use these buttons to set the alignment of the titlebar caption text.") ); new TQRadioButton( i18n("Left"), bgAlign, "AlignLeft" ); diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index 3aa1d63a..f28e31c1 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -78,7 +78,7 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent ) slotLoadThemeList(); _button_glow_color_group_box = new TQGroupBox( - 0, Qt::Horizontal, i18n("Button Glow Colors"), _main_group_box); + 0, TQt::Horizontal, i18n("Button Glow Colors"), _main_group_box); TQHBoxLayout *colorHBoxLayout = new TQHBoxLayout(_button_glow_color_group_box->layout()); diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp index 6dbe2df3..9baa98a3 100644 --- a/twin-styles/glow/glowbutton.cpp +++ b/twin-styles/glow/glowbutton.cpp @@ -184,7 +184,7 @@ void GlowButton::mousePressEvent( TQMouseEvent *e ) // 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)?Qt::LeftButton:Qt::NoButton, e->state()); + (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -199,7 +199,7 @@ void GlowButton::mouseReleaseEvent( TQMouseEvent *e ) m_timerStatus = Stop; } TQMouseEvent me (e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state()); + (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } diff --git a/twin-styles/glow/glowbutton.h b/twin-styles/glow/glowbutton.h index 9bd56de6..31e185c1 100644 --- a/twin-styles/glow/glowbutton.h +++ b/twin-styles/glow/glowbutton.h @@ -118,7 +118,7 @@ public: const TQColor & glow_color); GlowButton* createGlowButton( - TQWidget *parent, const char* name, const TQString& tip, const int realizeBtns = Qt::LeftButton); + TQWidget *parent, const char* name, const TQString& tip, const int realizeBtns = TQt::LeftButton); private: int _steps; diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 4c911194..f2df7b4b 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -529,7 +529,7 @@ void GlowClient::showEvent( TQShowEvent * ) void GlowClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if(e->button() == Qt::LeftButton && _title_spacer->geometry().contains(e->pos())) + if(e->button() == TQt::LeftButton && _title_spacer->geometry().contains(e->pos())) titlebarDblClickOperation(); } @@ -652,7 +652,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"), Qt::LeftButton|Qt::RightButton); + "StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), TQt::LeftButton|TQt::RightButton); m_stickyButton->setFixedSize(size); connect(m_stickyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops())); m_buttonList.insert(m_buttonList.end(), m_stickyButton); @@ -670,7 +670,7 @@ void GlowClient::createButtons() m_buttonList.insert(m_buttonList.end(), m_minimizeButton); m_maximizeButton=factory->createGlowButton(widget(), - "MaximizeButton", i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); + "MaximizeButton", i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton); m_maximizeButton->setFixedSize(size); connect(m_maximizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); m_buttonList.insert(m_buttonList.end(), m_maximizeButton); diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp index 324a736a..3c8441ee 100644 --- a/twin-styles/icewm/icewm.cpp +++ b/twin-styles/icewm/icewm.cpp @@ -388,8 +388,8 @@ void ThemeHandler::initTheme() setPixmap( frameTR, "frame", "TR.xpm" ); // Sides - setPixmap( frameL, "frame", "L.xpm", true,Qt::Vertical ); - setPixmap( frameR, "frame", "R.xpm", true,Qt::Vertical ); + setPixmap( frameL, "frame", "L.xpm", true,TQt::Vertical ); + setPixmap( frameR, "frame", "R.xpm", true,TQt::Vertical ); // Bottom setPixmap( frameBL, "frame", "BL.xpm" ); @@ -843,7 +843,7 @@ void IceWMButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -852,7 +852,7 @@ void IceWMButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), - (e->button()&m_realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + (e->button()&m_realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -976,7 +976,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if (showMenuButtonIcon) { renderMenuIcons(); button[BtnSysMenu] = new IceWMButton(this, "menu", - &menuButtonWithIconPix, false, i18n("Menu"), Qt::LeftButton|Qt::RightButton); + &menuButtonWithIconPix, false, i18n("Menu"), TQt::LeftButton|TQt::RightButton); } else button[BtnSysMenu] = new IceWMButton(this, "menu", @@ -1005,7 +1005,7 @@ void IceWMClient::addClientButtons( const TQString& s ) if ( validPixmaps(maximizePix) && !button[BtnMaximize] && isMaximizable() ) { button[BtnMaximize] = new IceWMButton(this, "maximize", - &maximizePix, false, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); + &maximizePix, false, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton); hb->addWidget( button[BtnMaximize] ); connect( button[BtnMaximize], TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize())); @@ -1456,7 +1456,7 @@ void IceWMClient::showEvent(TQShowEvent *ev) void IceWMClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; TQRect r; diff --git a/twin-styles/icewm/icewm.h b/twin-styles/icewm/icewm.h index debfbfb1..ef667f1e 100644 --- a/twin-styles/icewm/icewm.h +++ b/twin-styles/icewm/icewm.h @@ -101,7 +101,7 @@ 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 = Qt::LeftButton ); + const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton ); void setTipText(const TQString &tip); void usePixmap( TQPixmap* (*p)[2] ); TQSize sizeHint() const; diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp index 1eff9939..5e569d42 100644 --- a/twin-styles/kde1/kde1client.cpp +++ b/twin-styles/kde1/kde1client.cpp @@ -495,7 +495,7 @@ void StdClient::paintEvent( TQPaintEvent* ) void StdClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -666,7 +666,7 @@ void StdToolClient::paintEvent( TQPaintEvent* ) void StdToolClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h index 56eb2ac5..407c3993 100644 --- a/twin-styles/kde1/kde1client.h +++ b/twin-styles/kde1/kde1client.h @@ -122,13 +122,13 @@ protected: void mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mousePressEvent( &me ); } void mouseReleaseEvent( TQMouseEvent* e ) { - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQToolButton::mouseReleaseEvent( &me ); } diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp index b9953459..5bd5b0fd 100644 --- a/twin-styles/kstep/nextclient.cpp +++ b/twin-styles/kstep/nextclient.cpp @@ -325,7 +325,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(Qt::NoButton) + deco(NULL), client(parent), last_button(TQt::NoButton) { realizeButtons = realizeBtns; @@ -377,7 +377,7 @@ void NextButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -385,7 +385,7 @@ void NextButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); TQMouseEvent me( e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -479,7 +479,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) if (isMaximizable()) { button[MAXIMIZE_IDX] = new NextButton(this, "maximize", maximize_bits, 10, 10, - i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton); + i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton); titleLayout->addWidget( button[MAXIMIZE_IDX] ); connect( button[MAXIMIZE_IDX], TQT_SIGNAL(clicked()), this, TQT_SLOT(maximizeButtonClicked()) ); @@ -509,7 +509,7 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec) case 'M': button[MENU_IDX] = - new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), Qt::LeftButton|Qt::RightButton); + new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), TQt::LeftButton|TQt::RightButton); titleLayout->addWidget( button[MENU_IDX] ); // NOTE DIFFERENCE: capture pressed(), not clicked() connect( button[MENU_IDX], TQT_SIGNAL(pressed()), @@ -742,7 +742,7 @@ void NextClient::paintEvent( TQPaintEvent* ) void NextClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if (e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } diff --git a/twin-styles/kstep/nextclient.h b/twin-styles/kstep/nextclient.h index e7660cc9..34f74b4d 100644 --- a/twin-styles/kstep/nextclient.h +++ b/twin-styles/kstep/nextclient.h @@ -21,7 +21,7 @@ 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 = Qt::LeftButton); + const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton); void setBitmap(const unsigned char *bitmap, int bw, int bh); void reset(); ButtonState lastButton() { return last_button; } diff --git a/twin-styles/openlook/OpenLook.cpp b/twin-styles/openlook/OpenLook.cpp index fd07a70a..71489d91 100644 --- a/twin-styles/openlook/OpenLook.cpp +++ b/twin-styles/openlook/OpenLook.cpp @@ -281,7 +281,7 @@ OpenLook::showEvent(TQShowEvent *) void OpenLook::mouseDoubleClickEvent(TQMouseEvent * e) { - if (e->button() == Qt::LeftButton && titleRect().contains(e->pos())) + if (e->button() == TQt::LeftButton && titleRect().contains(e->pos())) { titlebarDblClickOperation(); } diff --git a/twin-styles/riscos/Button.cpp b/twin-styles/riscos/Button.cpp index f1f150d1..4d11e0c7 100644 --- a/twin-styles/riscos/Button.cpp +++ b/twin-styles/riscos/Button.cpp @@ -31,7 +31,7 @@ Button::Button(TQWidget *parent, const TQString& tip, const ButtonState realizeButtons) : TQWidget(parent, "Button", 0), realizeButtons_(realizeButtons), - lastButton_(Qt::NoButton), + lastButton_(TQt::NoButton), alignment_(Left), down_ (false), active_ (false) @@ -72,7 +72,7 @@ void Button::mousePressEvent(TQMouseEvent *e) repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, + (e->button()&realizeButtons_) ? TQt::LeftButton : TQt::NoButton, e->state()); TQWidget::mousePressEvent(&me); } @@ -83,7 +83,7 @@ void Button::mouseReleaseEvent(TQMouseEvent *e) lastButton_ = e->button(); repaint(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button()&realizeButtons_) ? Qt::LeftButton : Qt::NoButton, + (e->button()&realizeButtons_) ? TQt::LeftButton : TQt::NoButton, e->state()); TQWidget::mouseReleaseEvent(&me); } diff --git a/twin-styles/riscos/Button.h b/twin-styles/riscos/Button.h index 5d20e9a6..afff9925 100644 --- a/twin-styles/riscos/Button.h +++ b/twin-styles/riscos/Button.h @@ -43,7 +43,7 @@ class Button : public TQWidget enum Alignment { Left, Right }; Button(TQWidget *parent, const TQString &tip, - const ButtonState realizeButton = Qt::LeftButton); + const ButtonState realizeButton = TQt::LeftButton); virtual ~Button(); void setAlignment(Alignment); diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp index 14c81a84..ada3336f 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -352,7 +352,7 @@ KDecoration::Position Manager::mousePosition(const TQPoint& p) const void Manager::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && titleSpacer_->geometry().contains(e->pos())) + if (e->button() == TQt::LeftButton && titleSpacer_->geometry().contains(e->pos())) titlebarDblClickOperation(); } diff --git a/twin-styles/riscos/MaximiseButton.cpp b/twin-styles/riscos/MaximiseButton.cpp index aa54b52a..524c2a8a 100644 --- a/twin-styles/riscos/MaximiseButton.cpp +++ b/twin-styles/riscos/MaximiseButton.cpp @@ -67,7 +67,7 @@ static const char * const unmaximise_xpm[] = { MaximiseButton::MaximiseButton(TQWidget * parent) : Button(parent, i18n("Maximize"), - (ButtonState)(Qt::LeftButton|Qt::MidButton|Qt::RightButton)), + (ButtonState)(TQt::LeftButton|TQt::MidButton|TQt::RightButton)), on_(false) { setPixmap(TQPixmap((const char **)maximise_xpm)); diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp index 004a4264..b097a32b 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cpp +++ b/twin-styles/smooth-blend/client/smoothblend.cpp @@ -168,7 +168,7 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name type_(type), size_(button_size), deco_(0), - lastmouse_(Qt::NoButton), + lastmouse_(TQt::NoButton), hover_(false) { setBackgroundMode(NoBackground); @@ -282,9 +282,9 @@ void smoothblendButton::mousePressEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = Qt::LeftButton; - if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { - button = Qt::NoButton; // middle & right buttons inappropriate + int button = TQt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != TQt::LeftButton)) { + button = TQt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); @@ -300,9 +300,9 @@ void smoothblendButton::mouseReleaseEvent(TQMouseEvent* e) { lastmouse_ = e->button(); // translate and pass on mouse event - int button = Qt::LeftButton; - if ((type_ != ButtonMax) && (e->button() != Qt::LeftButton)) { - button = Qt::NoButton; // middle & right buttons inappropriate + int button = TQt::LeftButton; + if ((type_ != ButtonMax) && (e->button() != TQt::LeftButton)) { + button = TQt::NoButton; // middle & right buttons inappropriate } TQMouseEvent me(e->type(), e->pos(), e->globalPos(), button, e->state()); TQButton::mouseReleaseEvent(&me); diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp index 869b925e..822fb6df 100644 --- a/twin-styles/system/systemclient.cpp +++ b/twin-styles/system/systemclient.cpp @@ -272,14 +272,14 @@ void SystemButton::drawButton(TQPainter *p) void SystemButton::mousePressEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQButton::mousePressEvent( &me ); } void SystemButton::mouseReleaseEvent( TQMouseEvent* e ) { last_button = e->button(); - TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), Qt::LeftButton, e->state() ); + TQMouseEvent me ( e->type(), e->pos(), e->globalPos(), TQt::LeftButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -608,7 +608,7 @@ void SystemClient::showEvent(TQShowEvent *) void SystemClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton && titlebar->geometry().contains( e->pos() ) ) + if ( e->button() == TQt::LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } -- cgit v1.2.1