From 7c193f33d78ab79d2811a60c5190abdc1fa95c03 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Sat, 5 Aug 2023 15:50:55 +0300 Subject: twin: update Qt:: -> TQt:: Signed-off-by: Mavridis Philippe (cherry picked from commit 83e74d1e550db6a814ec252968b601f6a9b14f9b) --- twin/bridge.h | 2 +- twin/clients/b2/b2client.cpp | 20 ++-- twin/clients/b2/b2client.h | 2 +- twin/clients/default/kdedefault.cpp | 14 +-- twin/clients/keramik/keramik.cpp | 44 ++++----- twin/clients/keramik/keramik.h | 4 +- twin/clients/kwmtheme/kwmthemeclient.cpp | 6 +- twin/clients/laptop/laptopclient.cpp | 12 +-- twin/clients/modernsystem/config/config.cpp | 2 +- twin/clients/modernsystem/modernsys.cpp | 10 +- twin/clients/plastik/plastik.cpp | 24 ++--- twin/clients/plastik/plastik.h | 2 +- twin/clients/plastik/plastikbutton.cpp | 22 ++--- twin/clients/plastik/plastikclient.cpp | 4 +- twin/clients/quartz/quartz.cpp | 2 +- twin/clients/redmond/redmond.cpp | 8 +- twin/clients/web/Web.cpp | 2 +- twin/clients/web/WebButton.cpp | 8 +- twin/events.cpp | 28 +++--- twin/geometry.cpp | 2 +- twin/kcmtwin/twindecoration/buttons.cpp | 2 +- twin/kcmtwin/twindecoration/preview.h | 2 +- twin/kcmtwin/twindecoration/twindecoration.cpp | 16 +-- twin/kcmtwin/twinoptions/mouse.cpp | 6 +- twin/kcmtwin/twinoptions/windows.cpp | 28 +++--- twin/kcmtwin/twinrules/detectwidget.cpp | 2 +- twin/lib/kcommondecoration.cpp | 14 +-- twin/lib/kdecoration.cpp | 8 +- twin/lib/kdecoration.h | 2 +- twin/lib/kdecoration_p.h | 2 +- twin/options.cpp | 2 +- twin/popupinfo.cpp | 4 +- twin/tabbox.cpp | 8 +- twin/tools/decobenchmark/preview.h | 2 +- twin/twinbindings.cpp | 132 ++++++++++++------------- twin/useractions.cpp | 2 +- twin/workspace.cpp | 16 +-- twin/workspace.h | 2 +- 38 files changed, 234 insertions(+), 234 deletions(-) (limited to 'twin') diff --git a/twin/bridge.h b/twin/bridge.h index 3208b3192..b7fb51c1a 100644 --- a/twin/bridge.h +++ b/twin/bridge.h @@ -65,7 +65,7 @@ class Bridge : public KDecorationBridge virtual void setKeepBelow( bool ); virtual int currentDesktop() const; virtual TQWidget* initialParentWidget() const; - virtual Qt::WFlags initialWFlags() const; + virtual TQt::WFlags initialWFlags() const; virtual void helperShowHide( bool show ); virtual void grabXServer( bool grab ); private: diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 934e250c1..6c81660ee 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -221,7 +221,7 @@ static void create_pixmaps() TQPainter mask; mask.begin(&normalizeMask); - TQBrush one(Qt::color1); + TQBrush one(TQt::color1); mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 12, 12, one); mask.fillRect(0, 0, 10, 10, one); @@ -461,7 +461,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (!isModalSystemNotification()) { if (!button[BtnMenu]) { button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], - Qt::LeftButton | Qt::RightButton); + TQt::LeftButton | TQt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); connect(button[BtnMenu], TQT_SIGNAL(pressed()), @@ -504,7 +504,7 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], case 'A': // Maximize button if (isMaximizable() && (!button[BtnMax])) { button[BtnMax] = new B2Button(this, tb, tips[BtnMax], - Qt::LeftButton | Qt::MidButton | Qt::RightButton); + TQt::LeftButton | TQt::MidButton | TQt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); connect(button[BtnMax], TQT_SIGNAL(clicked()), @@ -676,7 +676,7 @@ void B2Client::paintEvent(TQPaintEvent* e) // bottom handle rect if (mustDrawHandle()) { - p.setPen(Qt::black); + p.setPen(TQt::black); int hx = width() - 40; int hw = 40; @@ -981,7 +981,7 @@ static void redraw_pixmaps() KPixmap *pix = pixmap[P_SHADE * NumStates + i]; TQColor color = is_act ? aGrp.button() : iGrp.button(); drawB2Rect(&thinBox, color, is_down); - pix->fill(Qt::black); + pix->fill(TQt::black); bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); } @@ -1166,7 +1166,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) *visible_bound = geom; } TQPainter p(workspaceWidget()); - p.setPen(TQPen(Qt::white, 5)); + p.setPen(TQPen(TQt::white, 5)); p.setRasterOp(TQt::XorROP); p.drawPolygon(bound_shape); @@ -1280,7 +1280,7 @@ void B2Button::mousePressEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, + (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, e->state()); TQButton::mousePressEvent(&me); } @@ -1289,7 +1289,7 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) { last_button = e->button(); TQMouseEvent me(e->type(), e->pos(), e->globalPos(), - (e->button() & realizeButtons) ? Qt::LeftButton : Qt::NoButton, + (e->button() & realizeButtons) ? TQt::LeftButton : TQt::NoButton, e->state()); TQButton::mouseReleaseEvent(&me); } @@ -1356,7 +1356,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) TQRect t = rect(); // black titlebar frame - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(0, 0, 0, t.bottom()); p.drawLine(0, 0, t.right(), 0); p.drawLine(t.right(), 0, t.right(), t.bottom()); @@ -1405,7 +1405,7 @@ void B2Titlebar::paintEvent(TQPaintEvent *) void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton && e->y() < height()) { + if (e->button() == TQt::LeftButton && e->y() < height()) { client->titlebarDblClickOperation(); } } diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h index e200843a4..c9748ccd6 100644 --- a/twin/clients/b2/b2client.h +++ b/twin/clients/b2/b2client.h @@ -28,7 +28,7 @@ class B2Client; class B2Button : public TQButton { public: - B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = Qt::LeftButton); + B2Button(B2Client *_client=0, TQWidget *parent=0, const TQString& tip=NULL, const int realizeBtns = TQt::LeftButton); ~B2Button() {}; void setBg(const TQColor &c){bg = c;} diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index e6d742bd6..3513ca5df 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -267,11 +267,11 @@ void KDEDefaultHandler::createPixmaps() int i, x, y; titlePix = new TQPixmap(132, normalTitleHeight+2); TQBitmap mask(132, normalTitleHeight+2); - mask.fill(Qt::color0); + mask.fill(TQt::color0); p.begin(titlePix); maskPainter.begin(&mask); - maskPainter.setPen(Qt::color1); + maskPainter.setPen(TQt::color1); for(i=0, y=2; i < 9; ++i, y+=4) for(x=1; x <= 132; x+=3) { @@ -681,9 +681,9 @@ void KDEDefaultButton::drawButton(TQPainter *p) active).rgb() ) > 127; if (isMouseOver) - p->setPen( darkDeco ? Qt::darkGray : Qt::lightGray ); + p->setPen( darkDeco ? TQt::darkGray : TQt::lightGray ); else - p->setPen( darkDeco ? Qt::black : Qt::white ); + p->setPen( darkDeco ? TQt::black : TQt::white ); int xOff = (width()-10)/2; int yOff = (height()-10)/2; @@ -905,7 +905,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) titleBuffer->resize( rightOffset-3, titleHeight+1 ); // Draw an outer black frame - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color @@ -923,7 +923,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) options()->color(ColorTitleBar, isActive() )); // Finish drawing the titlebar extension - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawLine(x+1, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart-1); p.setPen(g.mid()); p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); @@ -939,7 +939,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(ColorFrame, isActive())); TQPointArray a; - TQBrush brush( options()->color(ColorFrame, isActive()), Qt::SolidPattern ); + TQBrush brush( options()->color(ColorFrame, isActive()), TQt::SolidPattern ); p.setBrush( brush ); // use solid, yellow brush a.setPoints( 4, x+2, leftFrameStart+borderWidth-4, x+borderWidth-2, leftFrameStart, diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 82a6aba83..ded50a9d2 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -411,18 +411,18 @@ void KeramikHandler::createPixmaps() } // Pretile the center & border tiles for optimal performance - pretile( activeTiles[ CaptionSmallCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ CaptionLargeCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ TitleCenter ], 64, Qt::Horizontal ); - pretile( activeTiles[ GrabBarCenter ], 128, Qt::Horizontal ); - pretile( activeTiles[ BorderLeft ], 128, Qt::Vertical ); - pretile( activeTiles[ BorderRight ], 128, Qt::Vertical ); - - pretile( inactiveTiles[ CaptionSmallCenter ], 64, Qt::Horizontal ); - pretile( inactiveTiles[ TitleCenter ], 64, Qt::Horizontal ); - pretile( inactiveTiles[ GrabBarCenter ], 128, Qt::Horizontal ); - pretile( inactiveTiles[ BorderLeft ], 128, Qt::Vertical ); - pretile( inactiveTiles[ BorderRight ], 128, Qt::Vertical ); + pretile( activeTiles[ CaptionSmallCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ CaptionLargeCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ TitleCenter ], 64, TQt::Horizontal ); + pretile( activeTiles[ GrabBarCenter ], 128, TQt::Horizontal ); + pretile( activeTiles[ BorderLeft ], 128, TQt::Vertical ); + pretile( activeTiles[ BorderRight ], 128, TQt::Vertical ); + + pretile( inactiveTiles[ CaptionSmallCenter ], 64, TQt::Horizontal ); + pretile( inactiveTiles[ TitleCenter ], 64, TQt::Horizontal ); + pretile( inactiveTiles[ GrabBarCenter ], 128, TQt::Horizontal ); + pretile( inactiveTiles[ BorderLeft ], 128, TQt::Vertical ); + pretile( inactiveTiles[ BorderRight ], 128, TQt::Vertical ); if (heightOffset > 0) { addHeight (heightOffset, activeTiles[TitleLeft]); @@ -541,12 +541,12 @@ void KeramikHandler::flip( TQPixmap *&pix1, TQPixmap *&pix2 ) } -void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) +void KeramikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) { TQPixmap *newpix; TQPainter p; - if ( dir == Qt::Horizontal ) + if ( dir == TQt::Horizontal ) newpix = new TQPixmap( size, pix->height() ); else newpix = new TQPixmap( pix->width(), size ); @@ -759,7 +759,7 @@ TQValueList< KeramikHandler::BorderSize > KeramikHandler::borderSizes() const KeramikButton::KeramikButton( KeramikClient* c, const char *name, Button btn, const TQString &tip, const int realizeBtns ) : TQButton( c->widget(), name ), - client( c ), button( btn ), hover( false ), lastbutton( Qt::NoButton ) + client( c ), button( btn ), hover( false ), lastbutton( TQt::NoButton ) { realizeButtons = realizeBtns; @@ -800,7 +800,7 @@ void KeramikButton::leaveEvent( TQEvent *e ) void KeramikButton::mousePressEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mousePressEvent( &me ); } @@ -808,7 +808,7 @@ void KeramikButton::mousePressEvent( TQMouseEvent *e ) void KeramikButton::mouseReleaseEvent( TQMouseEvent *e ) { lastbutton = e->button(); - TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?Qt::LeftButton:Qt::NoButton, e->state() ); + TQMouseEvent me( e->type(), e->pos(), e->globalPos(), (e->button()&realizeButtons)?TQt::LeftButton:TQt::NoButton, e->state() ); TQButton::mouseReleaseEvent( &me ); } @@ -889,7 +889,7 @@ void KeramikButton::drawButton( TQPainter *p ) deco = NULL; } - p->setPen( Qt::black ); // ### hardcoded color + p->setPen( TQt::black ); // ### hardcoded color p->drawPixmap( (size-17)/2, (size-17)/2, *deco ); } @@ -1050,7 +1050,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'M' : if (!isModalSystemNotification()) { if ( !button[MenuButton] ) { - button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), Qt::LeftButton|Qt::RightButton ); + button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton ); connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } @@ -1092,7 +1092,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) // Maximize button case 'A' : if ( !button[MaxButton] && isMaximizable() ) { - button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), Qt::LeftButton|Qt::MidButton|Qt::RightButton ); + button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton ); connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } @@ -1277,7 +1277,7 @@ void KeramikClient::updateCaptionBuffer() TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); - //p.setPen( Qt::red ); // debug + //p.setPen( TQt::red ); // debug //p.drawRect( tr ); // debug // Application icon @@ -1670,7 +1670,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton + if ( e->button() == TQt::LeftButton && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarDblClickOperation(); } diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h index 793531c87..7369b5346 100644 --- a/twin/clients/keramik/keramik.h +++ b/twin/clients/keramik/keramik.h @@ -92,7 +92,7 @@ namespace Keramik { void addWidth (int width, TQPixmap *&pix, bool left, TQPixmap *bottomPix); void addHeight (int height, TQPixmap *&pix); void flip( TQPixmap *&, TQPixmap *& ); - void pretile( TQPixmap *&, int, Qt::Orientation ); + void pretile( TQPixmap *&, int, TQt::Orientation ); TQPixmap *composite( TQImage *, TQImage * ); TQImage *loadImage( const TQString &, const TQColor & ); TQPixmap *loadPixmap( const TQString &, const TQColor & ); @@ -114,7 +114,7 @@ namespace Keramik { class KeramikButton : public TQButton { public: - KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = Qt::LeftButton ); + KeramikButton( KeramikClient *, const char *, Button, const TQString &, const int realizeBtns = TQt::LeftButton ); ~KeramikButton(); ButtonState lastButton() const { return lastbutton; } diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 73c8feaca..4daffae7c 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -141,11 +141,11 @@ static void create_pixmaps() tmpStr = config->readEntry("TitleAlignment"); if(tmpStr == "right") - titleAlign = Qt::AlignRight | Qt::AlignVCenter; + titleAlign = TQt::AlignRight | TQt::AlignVCenter; else if(tmpStr == "middle") - titleAlign = Qt::AlignCenter; + titleAlign = TQt::AlignCenter; else - titleAlign = Qt::AlignLeft | Qt::AlignVCenter; + titleAlign = TQt::AlignLeft | TQt::AlignVCenter; titleSunken = config->readBoolEntry("TitleFrameShaded", true); // titleSunken = true; // is this fixed? titleTransparent = config->readBoolEntry("PixmapUnderTitleText", true); diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp index 114b03f4d..30fb76b3a 100644 --- a/twin/clients/laptop/laptopclient.cpp +++ b/twin/clients/laptop/laptopclient.cpp @@ -121,11 +121,11 @@ static void create_pixmaps() int i, x, y; titlePix = new TQPixmap(33, 12); TQBitmap mask(33, 12); - mask.fill(Qt::color0); + mask.fill(TQt::color0); p.begin(titlePix); maskPainter.begin(&mask); - maskPainter.setPen(Qt::color1); + maskPainter.setPen(TQt::color1); for(i=0, y=2; i < 3; ++i, y+=4){ for(x=1; x <= 33; x+=3){ p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150)); @@ -221,9 +221,9 @@ static void create_pixmaps() drawButtonFrame(iBtnDownPix2, g, true); if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) - btnForeground = Qt::black; + btnForeground = TQt::black; else - btnForeground = Qt::white; + btnForeground = TQt::white; } static void delete_pixmaps() @@ -290,7 +290,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(8, 8, bitmap, true); else { deco = TQBitmap(8,8); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); repaint(); @@ -472,7 +472,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(r); // fill mid frame... diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 18d6870f7..4512203c4 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -47,7 +47,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); - handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox); + handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox); TQWhatsThis::add(handleSizeSlider, i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index f2d31ed11..94615b190 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -185,9 +185,9 @@ static void create_pixmaps() if(tqGray(btnColor.background().rgb()) < 150) - buttonFg = new TQColor(Qt::white); + buttonFg = new TQColor(TQt::white); else - buttonFg = new TQColor(Qt::black); + buttonFg = new TQColor(TQt::black); delete lcDark1; delete lcDark2; @@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(8, 8, bitmap, true); else { deco = TQBitmap(8,8); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); } @@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1); p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, w, h); // handle outline @@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(width()-hs, height()-2, width()-2, height()-2); p.drawLine(width()-hs, height()-hw, width()-hs, height()-2); } else { - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawRect(0, 0, w, h); } } diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index b5cdeb85b..b5a4808d7 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -185,9 +185,9 @@ void PlastikHandler::readConfig() m_titleHeightTool++; TQString value = config.readEntry("TitleAlignment", "AlignLeft"); - if (value == "AlignLeft") m_titleAlign = Qt::AlignLeft; - else if (value == "AlignHCenter") m_titleAlign = Qt::AlignHCenter; - else if (value == "AlignRight") m_titleAlign = Qt::AlignRight; + if (value == "AlignLeft") m_titleAlign = TQt::AlignLeft; + else if (value == "AlignHCenter") m_titleAlign = TQt::AlignHCenter; + else if (value == "AlignRight") m_titleAlign = TQt::AlignRight; m_coloredBorder = config.readBoolEntry("ColoredBorder", true); m_animateButtons = config.readBoolEntry("AnimateButtons", true); @@ -210,27 +210,27 @@ TQColor PlastikHandler::getColor(KWinPlastik::ColorType type, const bool active) break; case ShadeTitleLight: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::white, active?205:215); + TQt::white, active?205:215); break; case ShadeTitleDark: return alphaBlendColors(KDecoration::options()->color(ColorTitleBar, active), - Qt::black, active?205:215); + TQt::black, active?205:215); break; case Border: return KDecoration::options()->color(ColorFrame, active); case TitleFont: return KDecoration::options()->color(ColorFont, active); default: - return Qt::black; + return TQt::black; } } -void PlastikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) const +void PlastikHandler::pretile( TQPixmap *&pix, int size, TQt::Orientation dir ) const { TQPixmap *newpix; TQPainter p; - if ( dir == Qt::Horizontal ) + if ( dir == TQt::Horizontal ) newpix = new TQPixmap( size, pix->height() ); else newpix = new TQPixmap( pix->width(), size ); @@ -300,7 +300,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); } - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } @@ -399,7 +399,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -433,7 +433,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } painter.end(); - pretile(pm, 64, Qt::Vertical); + pretile(pm, 64, TQt::Vertical); break; } @@ -523,7 +523,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawPoint(0, h-1); painter.end(); - pretile(pm, 64, Qt::Horizontal); + pretile(pm, 64, TQt::Horizontal); break; } diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h index 85b9e5fa0..587d93f4e 100644 --- a/twin/clients/plastik/plastik.h +++ b/twin/clients/plastik/plastik.h @@ -101,7 +101,7 @@ public: private: void readConfig(); - void pretile(TQPixmap *&pix, int size, Qt::Orientation dir) const; + void pretile(TQPixmap *&pix, int size, TQt::Orientation dir) const; bool m_coloredBorder; bool m_titleShadow; diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 3a097be15..5fdadc8e1 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -170,17 +170,17 @@ void PlastikButton::drawButton(TQPainter *painter) if(type() == CloseButton) { highlightColor = TQColor(255,64,0); } else { - highlightColor = Qt::white; + highlightColor = TQt::white; } TQColor contourTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::black, 215); + TQt::black, 215); TQColor contourBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::black, 215); + TQt::black, 215); TQColor sourfaceTop = alphaBlendColors(Handler()->getColor(TitleGradient2, active), - Qt::white, 210); + TQt::white, 210); TQColor sourfaceBottom = alphaBlendColors(Handler()->getColor(TitleGradient3, active), - Qt::white, 210); + TQt::white, 210); int highlightAlpha = static_cast(255-((60/static_cast(ANIMATIONSTEPS))* static_cast(animProgress) ) ); @@ -190,10 +190,10 @@ void PlastikButton::drawButton(TQPainter *painter) sourfaceBottom = alphaBlendColors(sourfaceBottom, highlightColor, highlightAlpha); if (isDown() ) { - contourTop = alphaBlendColors(contourTop, Qt::black, 200); - contourBottom = alphaBlendColors(contourBottom, Qt::black, 200); - sourfaceTop = alphaBlendColors(sourfaceTop, Qt::black, 200); - sourfaceBottom = alphaBlendColors(sourfaceBottom, Qt::black, 200); + contourTop = alphaBlendColors(contourTop, TQt::black, 200); + contourBottom = alphaBlendColors(contourBottom, TQt::black, 200); + sourfaceTop = alphaBlendColors(sourfaceTop, TQt::black, 200); + sourfaceBottom = alphaBlendColors(sourfaceBottom, TQt::black, 200); } TQPixmap buffer; @@ -291,10 +291,10 @@ TQBitmap IconEngine::icon(ButtonIcon icon, int size) --size; TQBitmap bitmap(size,size); - bitmap.fill(Qt::color0); + bitmap.fill(TQt::color0); TQPainter p(&bitmap); - p.setPen(Qt::color1); + p.setPen(TQt::color1); TQRect r = bitmap.rect(); diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp index 31c9e2ad9..6fa993721 100644 --- a/twin/clients/plastik/plastikclient.cpp +++ b/twin/clients/plastik/plastikclient.cpp @@ -402,10 +402,10 @@ TQRect PlastikClient::captionRect() const } else { tW = caption.width(); } - if (a == Qt::AlignLeft || (caption.width() > titleWidth) ) { + if (a == TQt::AlignLeft || (caption.width() > titleWidth) ) { // Align left tX = titleLeft; - } else if (a == Qt::AlignHCenter) { + } else if (a == TQt::AlignHCenter) { // Align center tX = titleLeft+(titleWidth- caption.width() )/2; } else { diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index 10f0a0a96..dff79ff4b 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p) { int xOff = (width()-10)/2; int yOff = (height()-10)/2; - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco); p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) ); p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco); diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp index c59cd48d1..6deddeaee 100644 --- a/twin/clients/redmond/redmond.cpp +++ b/twin/clients/redmond/redmond.cpp @@ -210,9 +210,9 @@ static void create_pixmaps () // Make sure button pixmaps contrast with the current colour scheme. if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) - btnForeground = new TQColor(Qt::black); + btnForeground = new TQColor(TQt::black); else - btnForeground = new TQColor(Qt::white); + btnForeground = new TQColor(TQt::white); } void delete_pixmaps() @@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap) deco = TQBitmap(10, 10, bitmap, true); else { deco = TQBitmap(10,10); - deco.fill(Qt::color0); + deco.fill(TQt::color0); } deco.setMask(deco); } @@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2, KImageEffect::HorizontalGradient); - titleBuffer->convertFromImage(image, Qt::OrderedDither); + titleBuffer->convertFromImage(image, TQt::OrderedDither); } TQPainter p2( titleBuffer, this ); diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index b40432939..5c2457e1c 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); - p.setPen(Qt::black); + p.setPen(TQt::black); p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp index f8d1c4add..eb6d8d530 100644 --- a/twin/clients/web/WebButton.cpp +++ b/twin/clients/web/WebButton.cpp @@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); @@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); if (shape_) @@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p) { // Draw edge. - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawLine(0, 0, width(), 0); // Draw highlight. @@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p) int bhby2(bitmap_.height() / 2); // Bitmap Height BY 2 p->setBrush(NoBrush); - p->setPen(Qt::black); + p->setPen(TQt::black); p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_); } diff --git a/twin/events.cpp b/twin/events.cpp index d87b29e84..c24d81c6f 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -1046,11 +1046,11 @@ void Client::updateMouseGrab() int qtToX11Button( TQt::ButtonState button ) { - if( button == Qt::LeftButton ) + if( button == TQt::LeftButton ) return Button1; - else if( button == Qt::MidButton ) + else if( button == TQt::MidButton ) return Button2; - else if( button == Qt::RightButton ) + else if( button == TQt::RightButton ) return Button3; return AnyButton; } @@ -1058,11 +1058,11 @@ int qtToX11Button( TQt::ButtonState button ) int qtToX11State( TQt::ButtonState state ) { int ret = 0; - if( state & Qt::LeftButton ) + if( state & TQt::LeftButton ) ret |= Button1Mask; - if( state & Qt::MidButton ) + if( state & TQt::MidButton ) ret |= Button2Mask; - if( state & Qt::RightButton ) + if( state & TQt::RightButton ) ret |= Button3Mask; if( state & TQt::ShiftButton ) ret |= ShiftMask; @@ -1092,11 +1092,11 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) removeShadow(); switch (qe->button()) { - case Qt::MidButton: + case TQt::MidButton: buttonMask = Button2Mask; buttonPressed = Button2; break; - case Qt::RightButton: + case TQt::RightButton: buttonMask = Button3Mask; buttonPressed = Button3; break; @@ -1348,7 +1348,7 @@ bool Client::buttonPressEvent( Window w, int button, int state, int x, int y, in // FRAME something out of this would be processed before it gets decorations updateUserTime(); workspace()->setWasUserInteraction(); - uint keyModX = (options->keyCmdAllModKey() == Qt::Key_Meta) ? + uint keyModX = (options->keyCmdAllModKey() == TQt::Key_Meta) ? KKeyNative::modX(KKey::WIN) : KKeyNative::modX(KKey::ALT); bool bModKeyHeld = keyModX != 0 && ( state & KKeyNative::accelModMaskX()) == keyModX; @@ -1481,13 +1481,13 @@ void Client::processMousePressEvent( TQMouseEvent* e ) int button; switch( e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: button = Button1; break; - case Qt::MidButton: + case TQt::MidButton: button = Button2; break; - case Qt::RightButton: + case TQt::RightButton: button = Button3; break; default: @@ -1728,8 +1728,8 @@ void Client::keyPressEvent( uint key_code ) updateUserTime(); if ( !isMove() && !isResize() ) return; - bool is_control = key_code & Qt::CTRL; - bool is_alt = key_code & Qt::ALT; + bool is_control = key_code & TQt::CTRL; + bool is_alt = key_code & TQt::ALT; key_code = key_code & 0xffff; int delta = is_control?1:is_alt?32:8; TQPoint pos = TQCursor::pos(); diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 5761f334b..562e3cda0 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -2240,7 +2240,7 @@ void Client::doDrawbound( const TQRect& geom, bool clear ) if( decoration != NULL && decoration->drawbound( geom, clear )) return; // done by decoration TQPainter p ( workspace()->desktopWidget() ); - p.setPen( TQPen( Qt::white, 5 ) ); + p.setPen( TQPen( TQt::white, 5 ) ); p.setRasterOp( TQt::XorROP ); // the line is 5 pixel thick, so compensate for the extra two pixels // on outside (#88657) diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 17381247a..40f63d981 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -606,7 +606,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) TQColor c1( 0x0A, 0x5F, 0x89 ); // KDE 2 titlebar default colour p->fillRect( r, c1 ); - p->setPen( Qt::white ); + p->setPen( TQt::white ); p->setFont( TQFont( TDEGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("TDE") ); diff --git a/twin/kcmtwin/twindecoration/preview.h b/twin/kcmtwin/twindecoration/preview.h index 8a7827d96..9d9f09402 100644 --- a/twin/kcmtwin/twindecoration/preview.h +++ b/twin/kcmtwin/twindecoration/preview.h @@ -106,7 +106,7 @@ class KDecorationPreviewBridge virtual void setKeepBelow( bool ); virtual int currentDesktop() const; virtual TQWidget* initialParentWidget() const; - virtual Qt::WFlags initialWFlags() const; + virtual TQt::WFlags initialWFlags() const; virtual void helperShowHide( bool show ); virtual void grabXServer( bool grab ); private: diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 79a72aafd..518f3bde8 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -98,7 +98,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c pluginLayout->addWidget(decorationList); TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); - pluginSettingsGrp->setColumnLayout( 0, Qt::Vertical ); + pluginSettingsGrp->setColumnLayout( 0, TQt::Vertical ); pluginSettingsGrp->setFlat( true ); pluginSettingsGrp->layout()->setMargin( 0 ); pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); @@ -184,11 +184,11 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c i18n("Enabling this checkbox will allow you to choose a kind of " "drop shadow to draw under each window.")); - activeShadowSettings = new TQGroupBox(1, Qt::Horizontal, + activeShadowSettings = new TQGroupBox(1, TQt::Horizontal, i18n("Active Window Shadow"), shadowPage); - inactiveShadowSettings = new TQGroupBox(1, Qt::Horizontal, + inactiveShadowSettings = new TQGroupBox(1, TQt::Horizontal, i18n("Inactive Window Shadows"), shadowPage); - whichShadowSettings = new TQGroupBox(3, Qt::Horizontal, + whichShadowSettings = new TQGroupBox(3, TQt::Horizontal, i18n("Draw Shadow Under Normal Windows And..."), shadowPage); cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"), @@ -223,7 +223,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowOpacityHBox = new TQHBox(activeShadowSettings); shadowOpacityHBox->setSpacing(KDialog::spacingHint()); shadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"), shadowOpacityHBox); - shadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal, + shadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal, shadowOpacityHBox); shadowOpacitySlider->setTickmarks(TQSlider::Below); shadowOpacitySlider->setTickInterval(10); @@ -240,7 +240,7 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint()); inactiveShadowOpacityLabel = new TQLabel(i18n("Maximum opacity:"), inactiveShadowOpacityHBox); - inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, Qt::Horizontal, + inactiveShadowOpacitySlider = new TQSlider(1, 100, 10, 50, TQt::Horizontal, inactiveShadowOpacityHBox); inactiveShadowOpacitySlider->setTickmarks(TQSlider::Below); inactiveShadowOpacitySlider->setTickInterval(10); @@ -895,7 +895,7 @@ void KWinDecorationModule::defaults() border_size = BorderNormal; checkSupportedBorderSizes(); - shadowColourButton->setColor(Qt::black); + shadowColourButton->setColor(TQt::black); shadowOpacitySlider->setValue(70); shadowXOffsetSpinBox->setValue(0); shadowYOffsetSpinBox->setValue(10); @@ -904,7 +904,7 @@ void KWinDecorationModule::defaults() cbShadowOverrides->setChecked(false); cbShadowTopMenus->setChecked(false); cbInactiveShadow->setChecked(false); - inactiveShadowColourButton->setColor(Qt::black); + inactiveShadowColourButton->setColor(TQt::black); inactiveShadowOpacitySlider->setValue(70); inactiveShadowXOffsetSpinBox->setValue(0); inactiveShadowYOffsetSpinBox->setValue(5); diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 4fa3dd866..3314604e7 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -209,7 +209,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the" " titlebar or the frame of a window.") ); - grid = new TQGrid(4, Qt::Vertical, box); + grid = new TQGrid(4, TQt::Vertical, box); new TQLabel(grid); // dummy @@ -611,7 +611,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive" " inner window ('inner' means: not titlebar, not frame).") ); - grid = new TQGrid(3, Qt::Vertical, box); + grid = new TQGrid(3, TQt::Vertical, box); strMouseButton1 = i18n("Left button:"); txtButton1 = i18n("In this row you can customize left click behavior when clicking into" @@ -681,7 +681,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config TQWhatsThis::add( box, i18n("Here you can customize TDE's behavior when clicking somewhere into" " a window while pressing a modifier key.")); - grid = new TQGrid(6, Qt::Vertical, box); + grid = new TQGrid(6, TQt::Vertical, box); // Labels label = new TQLabel(i18n("Modifier key:"), grid); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 4731f43d9..1a2286878 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -130,7 +130,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par // focus policy fcsBox = new TQButtonGroup(i18n("Focus"),this); - fcsBox->setColumnLayout( 0, Qt::Horizontal ); + fcsBox->setColumnLayout( 0, TQt::Horizontal ); TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), KDialog::spacingHint()); @@ -143,7 +143,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par focusCombo->insertItem(i18n("Focus Follows Mouse"), FOCUS_FOLLOWS_MOUSE); focusCombo->insertItem(i18n("Focus Under Mouse"), FOCUS_UNDER_MOUSE); focusCombo->insertItem(i18n("Focus Strictly Under Mouse"), FOCUS_STRICTLY_UNDER_MOUSE); - cLay->addWidget(focusCombo,1 ,Qt::AlignLeft); + cLay->addWidget(focusCombo,1 ,TQt::AlignLeft); fLabel->setBuddy(focusCombo); // FIXME, when more policies have been added to TWin @@ -177,7 +177,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool))); autoRaise = new KIntNumInput(500, fcsBox); - autoRaise->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); + autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); autoRaise->setRange(0, 3000, 100, true); autoRaise->setSteps(100,100); autoRaise->setSuffix(i18n(" msec")); @@ -190,7 +190,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool))); delayFocus = new KIntNumInput(500, fcsBox); - delayFocus->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); + delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); delayFocus->setRange(0, 3000, 100, true); delayFocus->setSteps(100,100); delayFocus->setSuffix(i18n(" msec")); @@ -212,7 +212,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "High" )); focusStealing->insertItem( i18n( "Focus Stealing Prevention Level", "Extreme" )); focusStealingLabel->setBuddy( focusStealing ); - cLay->addWidget(focusStealing,2 ,Qt::AlignLeft); + cLay->addWidget(focusStealing,2 ,TQt::AlignLeft); wtstr = i18n( "

This option specifies how much TWin will try to prevent unwanted focus stealing " "caused by unexpected activation of new windows. (Note: This feature does not " "work with the Focus Under Mouse or Focus Strictly Under Mouse focus policies.)" @@ -275,7 +275,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par lay->addWidget(fcsBox); kbdBox = new TQButtonGroup(i18n("Navigation"), this); - kbdBox->setColumnLayout( 0, Qt::Horizontal ); + kbdBox->setColumnLayout( 0, TQt::Horizontal ); TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); @@ -863,7 +863,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool))); shadeHover = new KIntNumInput(500, shBox); - shadeHover->setLabel(i18n("Dela&y:"), Qt::AlignVCenter|Qt::AlignLeft); + shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); shadeHover->setRange(0, 3000, 100, true); shadeHover->setSteps(100, 100); shadeHover->setSuffix(i18n(" msec")); @@ -983,7 +983,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa TQBoxLayout *lay = new TQVBoxLayout (this, 0, KDialog::spacingHint()); windowsBox = new TQButtonGroup(i18n("Windows"), this); - windowsBox->setColumnLayout( 0, Qt::Horizontal ); + windowsBox->setColumnLayout( 0, TQt::Horizontal ); TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); @@ -1031,11 +1031,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->setAlignment(TQt::AlignTop|TQt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -1090,7 +1090,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa plcLabel->setBuddy(placementCombo); vLay->addWidget(plcLabel, 0); - vLay->addWidget(placementCombo, 1, Qt::AlignLeft); + vLay->addWidget(placementCombo, 1, TQt::AlignLeft); bLay->addSpacing(10); @@ -1602,7 +1602,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, TQLabel *label6 = new TQLabel(i18n("Shadow color:"),sGroup); gLay2->addWidget(label6,7,0); - shadowColor = new KColorButton(Qt::black,sGroup); + shadowColor = new KColorButton(TQt::black,sGroup); gLay2->addWidget(shadowColor,7,1); gLay2->setColStretch(1,1); vLay2->addSpacing(11); @@ -1804,7 +1804,7 @@ void KTranslucencyConfig::load( void ) r = g = b = 256; if (sscanf(hex.latin1(), "0x%02x%02x%02x", &r, &g, &b)!=3 || r > 255 || g > 255 || b > 255) - shadowColor->setColor(Qt::black); + shadowColor->setColor(TQt::black); else shadowColor->setColor(TQColor(r,g,b)); @@ -2012,7 +2012,7 @@ void KTranslucencyConfig::defaults() useShadowsOnDockWindows->setChecked(FALSE); removeShadowsOnMove->setChecked(FALSE); removeShadowsOnResize->setChecked(FALSE); - shadowColor->setColor(Qt::black); + shadowColor->setColor(TQt::black); fadeInWindows->setChecked(FALSE); fadeInMenuWindows->setChecked(TRUE); fadeInToolTipWindows->setChecked(TRUE); diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index f450938bc..a0f017f7d 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/twin/kcmtwin/twinrules/detectwidget.cpp @@ -176,7 +176,7 @@ bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) return false; delete grabber; grabber = NULL; - if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton ) + if( TQT_TQMOUSEEVENT( e )->button() != TQt::LeftButton ) { emit detectionDone( false ); return true; diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 3d97027a3..0ada039b0 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -349,7 +349,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(MenuButton); if (!btn) break; btn->setTipText(i18n("Menu") ); - btn->setRealizeButtons(Qt::LeftButton|Qt::RightButton); + btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton); connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed())); connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); @@ -396,7 +396,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if ((!m_button[MaxButton]) && isMaximizable()){ btn = createButton(MaxButton); if (!btn) break; - btn->setRealizeButtons(Qt::LeftButton|Qt::MidButton|Qt::RightButton); + btn->setRealizeButtons(TQt::LeftButton|TQt::MidButton|TQt::RightButton); const bool max = maximizeMode()==MaximizeFull; btn->setTipText(max?i18n("Restore"):i18n("Maximize") ); btn->setToggleButton(true); @@ -710,7 +710,7 @@ void KCommonDecoration::resizeWidget(int w, int h, TQWidget *widget) const void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); @@ -900,8 +900,8 @@ KCommonDecorationButton::KCommonDecorationButton(ButtonType type, KCommonDecorat : TQButton(parent->widget(), name), m_decoration(parent), m_type(type), - m_realizeButtons(Qt::LeftButton), - m_lastMouse(Qt::NoButton), + m_realizeButtons(TQt::LeftButton), + m_lastMouse(TQt::NoButton), m_isLeft(true) { setCursor(ArrowCursor); @@ -975,7 +975,7 @@ void KCommonDecorationButton::mousePressEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton 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); } @@ -985,7 +985,7 @@ void KCommonDecorationButton::mouseReleaseEvent(TQMouseEvent* e) m_lastMouse = e->button(); // pass on event after changing button to LeftButton 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/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp index b2332c514..622362e9e 100644 --- a/twin/lib/kdecoration.cpp +++ b/twin/lib/kdecoration.cpp @@ -393,9 +393,9 @@ const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) return(*d->cg[idx]); - d->cg[idx] = new TQColorGroup(Qt::black, d->colors[idx], d->colors[idx].light(150), + d->cg[idx] = new TQColorGroup(TQt::black, d->colors[idx], d->colors[idx].light(150), d->colors[idx].dark(), d->colors[idx].dark(120), - Qt::black, TQApplication::palette().active(). + TQt::black, TQApplication::palette().active(). base()); return(*d->cg[idx]); } @@ -436,8 +436,8 @@ bool KDecorationOptions::moveResizeMaximizedWindows() const KDecorationDefines::WindowOperation KDecorationOptions::operationMaxButtonClick( TQt::ButtonState button ) const { - return button == Qt::RightButton? d->OpMaxButtonRightClick : - button == Qt::MidButton? d->OpMaxButtonMiddleClick : + return button == TQt::RightButton? d->OpMaxButtonRightClick : + button == TQt::MidButton? d->OpMaxButtonMiddleClick : d->OpMaxButtonLeftClick; } diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index af226a016..03e1c863e 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -51,7 +51,7 @@ public: * These values represent positions inside an area */ enum Position - { // without prefix, they'd conflict with Qt::TopLeft etc. :( + { // without prefix, they'd conflict with TQt::TopLeft etc. :( PositionCenter = 0x00, PositionLeft = 0x01, PositionRight = 0x02, diff --git a/twin/lib/kdecoration_p.h b/twin/lib/kdecoration_p.h index 2634ea140..b396509b6 100644 --- a/twin/lib/kdecoration_p.h +++ b/twin/lib/kdecoration_p.h @@ -103,7 +103,7 @@ class KDecorationBridge : public KDecorationDefines // not part of public API virtual int currentDesktop() const = 0; virtual TQWidget* initialParentWidget() const = 0; - virtual Qt::WFlags initialWFlags() const = 0; + virtual TQt::WFlags initialWFlags() const = 0; virtual void helperShowHide( bool ) = 0; virtual void grabXServer( bool grab ) = 0; }; diff --git a/twin/options.cpp b/twin/options.cpp index 60d8cd145..46c557b4a 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -174,7 +174,7 @@ unsigned long Options::updateSettings() CmdWindow1 = mouseCommand(config->readEntry("CommandWindow1","Activate, raise and pass click"), false ); CmdWindow2 = mouseCommand(config->readEntry("CommandWindow2","Activate and pass click"), false ); CmdWindow3 = mouseCommand(config->readEntry("CommandWindow3","Activate and pass click"), false ); - CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? Qt::Key_Meta : Qt::Key_Alt; + CmdAllModKey = (config->readEntry("CommandAllKey","Alt") == "Meta") ? TQt::Key_Meta : TQt::Key_Alt; CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move"), false ); CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower"), false ); CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize"), false ); diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index 740de7cb6..79386a5a8 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -92,9 +92,9 @@ void PopupInfo::paintContents() p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); /* - p.setPen(Qt::white); + p.setPen(TQt::white); p.drawText( r, AlignCenter, m_infoString ); - p.setPen(Qt::black); + p.setPen(TQt::black); r.moveBy( -1, -1 ); p.drawText( r, AlignCenter, m_infoString ); r.moveBy( -1, 0 ); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index d88146f22..1cf0fb8c2 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -474,7 +474,7 @@ void TabBox::drawContents( TQPainter * ) p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); + TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, s); y += lineHeight; } @@ -521,7 +521,7 @@ void TabBox::drawContents( TQPainter * ) // draw desktop-number p.setFont(f); TQString num = TQString::number(iDesktop); - p.drawText(x+5, y+2, iconWidth, iconHeight, Qt::AlignCenter, num); + p.drawText(x+5, y+2, iconWidth, iconHeight, TQt::AlignCenter, num); p.restore(); @@ -532,7 +532,7 @@ void TabBox::drawContents( TQPainter * ) p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, - Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, + TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine, workspace()->desktopName(iDesktop)); // show mini icons from that desktop aligned to each other @@ -1180,7 +1180,7 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) if (control_grab || tab_grab) { uint keyQt = keyX.keyCodeQt(); - if ( ((keyQt & 0xffff) == Qt::Key_Escape) + if ( ((keyQt & 0xffff) == TQt::Key_Escape) && !(forward || backward) ) { // if Escape is part of the shortcut, don't cancel closeTabBox(); diff --git a/twin/tools/decobenchmark/preview.h b/twin/tools/decobenchmark/preview.h index 2138c51b7..d69a2f57f 100644 --- a/twin/tools/decobenchmark/preview.h +++ b/twin/tools/decobenchmark/preview.h @@ -101,7 +101,7 @@ class KDecorationPreviewBridge virtual void setKeepBelow( bool ); virtual int currentDesktop() const; virtual TQWidget* initialParentWidget() const; - virtual Qt::WFlags initialWFlags() const; + virtual TQt::WFlags initialWFlags() const; virtual void helperShowHide( bool show ); virtual void grabXServer( bool grab ); private: diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp index 5e468d34b..08d6bf0d1 100644 --- a/twin/twinbindings.cpp +++ b/twin/twinbindings.cpp @@ -18,29 +18,29 @@ keys->insert( "Program:twin", i18n("System") ); keys->insert( "Group:Navigation", i18n("Navigation") ); - DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() ); - DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+Qt::Key_Tab, ALT+SHIFT+Qt::Key_Tab, slotWalkBackThroughWindows() ); - DEF( I18N_NOOP("Walk Through Windows of Same Application"), ALT+Qt::Key_QuoteLeft, ALT+Qt::Key_QuoteLeft, slotWalkThroughApps() ); - DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"), ALT+Qt::Key_AsciiTilde, ALT+Qt::Key_AsciiTilde, slotWalkBackThroughApps() ); - DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+Qt::Key_Tab, slotWalkThroughDesktops() ); - DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+Qt::Key_Tab, slotWalkBackThroughDesktops() ); + DEF( I18N_NOOP("Walk Through Windows"), ALT+TQt::Key_Tab, ALT+TQt::Key_Tab, slotWalkThroughWindows() ); + DEF( I18N_NOOP("Walk Through Windows (Reverse)"), ALT+SHIFT+TQt::Key_Tab, ALT+SHIFT+TQt::Key_Tab, slotWalkBackThroughWindows() ); + DEF( I18N_NOOP("Walk Through Windows of Same Application"), ALT+TQt::Key_QuoteLeft, ALT+TQt::Key_QuoteLeft, slotWalkThroughApps() ); + DEF( I18N_NOOP("Walk Through Windows of Same Application (Reverse)"), ALT+TQt::Key_AsciiTilde, ALT+TQt::Key_AsciiTilde, slotWalkBackThroughApps() ); + DEF( I18N_NOOP("Walk Through Desktops"), 0, WIN+TQt::Key_Tab, slotWalkThroughDesktops() ); + DEF( I18N_NOOP("Walk Through Desktops (Reverse)"), 0, WIN+SHIFT+TQt::Key_Tab, slotWalkBackThroughDesktops() ); DEF( I18N_NOOP("Walk Through Desktop List"), 0, 0, slotWalkThroughDesktopList() ); DEF( I18N_NOOP("Walk Through Desktop List (Reverse)"), 0, 0, slotWalkBackThroughDesktopList() ); keys->insert( "Group:Windows", i18n("Windows") ); - DEF( I18N_NOOP("Window Operations Menu"), ALT+Qt::Key_F3, ALT+Qt::Key_Menu, slotWindowOperations() ); + DEF( I18N_NOOP("Window Operations Menu"), ALT+TQt::Key_F3, ALT+TQt::Key_Menu, slotWindowOperations() ); DEF2( "Window Close", I18N_NOOP("Close Window"), - ALT+Qt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() ); + ALT+TQt::Key_F4, "Alt+Escape;Alt+F4", slotWindowClose() ); DEF2( "Window Maximize", I18N_NOOP("Maximize Window"), - 0, WIN+Qt::Key_Plus, slotWindowMaximize() ); + 0, WIN+TQt::Key_Plus, slotWindowMaximize() ); DEF2( "Window Maximize Vertical", I18N_NOOP("Maximize Window Vertically"), - 0, WIN+Qt::Key_Bar, slotWindowMaximizeVertical() ); + 0, WIN+TQt::Key_Bar, slotWindowMaximizeVertical() ); DEF2( "Window Maximize Horizontal", I18N_NOOP("Maximize Window Horizontally"), - 0, WIN+Qt::Key_Equal, slotWindowMaximizeHorizontal() ); + 0, WIN+TQt::Key_Equal, slotWindowMaximizeHorizontal() ); DEF2( "Window Minimize", I18N_NOOP("Minimize Window"), - 0, WIN+Qt::Key_Minus, slotWindowMinimize() ); + 0, WIN+TQt::Key_Minus, slotWindowMinimize() ); DEF2( "Window Shade", I18N_NOOP("Shade Window"), - 0, WIN+Qt::Key_Underscore, slotWindowShade() ); + 0, WIN+TQt::Key_Underscore, slotWindowShade() ); DEF2( "Window Move", I18N_NOOP("Move Window"), 0, 0, slotWindowMove() ); DEF2( "Window Resize", I18N_NOOP("Resize Window"), @@ -58,7 +58,7 @@ 0, 0, slotWindowAbove() ); DEF2( "Window Below Other Windows", I18N_NOOP("Keep Window Below Others"), 0, 0, slotWindowBelow() ); - DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+Qt::Key_A, 0, slotActivateAttentionWindow()); + DEF( I18N_NOOP("Activate Window Demanding Attention"), CTRL+ALT+TQt::Key_A, 0, slotActivateAttentionWindow()); DEF( I18N_NOOP("Setup Window Shortcut"), 0, 0, slotSetupWindowShortcut()); DEF2( "Window Pack Right", I18N_NOOP("Pack Window to the Right"), 0, 0, slotWindowPackRight() ); @@ -80,16 +80,16 @@ keys->insert( "Group:Window Desktop", i18n("Window & Desktop") ); DEF2( "Window On All Desktops", I18N_NOOP("Keep Window on All Desktops"), 0, 0, slotWindowOnAllDesktops() ); - DEF( I18N_NOOP("Window to Desktop 1"), 0, WIN+ALT+Qt::Key_F1, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 2"), 0, WIN+ALT+Qt::Key_F2, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 3"), 0, WIN+ALT+Qt::Key_F3, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 4"), 0, WIN+ALT+Qt::Key_F4, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 5"), 0, WIN+ALT+Qt::Key_F5, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 6"), 0, WIN+ALT+Qt::Key_F6, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 7"), 0, WIN+ALT+Qt::Key_F7, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 8"), 0, WIN+ALT+Qt::Key_F8, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 9"), 0, WIN+ALT+Qt::Key_F9, slotWindowToDesktop(int) ); - DEF( I18N_NOOP("Window to Desktop 10"), 0, WIN+ALT+Qt::Key_F10, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 1"), 0, WIN+ALT+TQt::Key_F1, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 2"), 0, WIN+ALT+TQt::Key_F2, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 3"), 0, WIN+ALT+TQt::Key_F3, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 4"), 0, WIN+ALT+TQt::Key_F4, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 5"), 0, WIN+ALT+TQt::Key_F5, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 6"), 0, WIN+ALT+TQt::Key_F6, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 7"), 0, WIN+ALT+TQt::Key_F7, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 8"), 0, WIN+ALT+TQt::Key_F8, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 9"), 0, WIN+ALT+TQt::Key_F9, slotWindowToDesktop(int) ); + DEF( I18N_NOOP("Window to Desktop 10"), 0, WIN+ALT+TQt::Key_F10, slotWindowToDesktop(int) ); DEF( I18N_NOOP("Window to Desktop 11"), 0, 0, slotWindowToDesktop(int) ); DEF( I18N_NOOP("Window to Desktop 12"), 0, 0, slotWindowToDesktop(int) ); DEF( I18N_NOOP("Window to Desktop 13"), 0, 0, slotWindowToDesktop(int) ); @@ -117,26 +117,26 @@ DEF( I18N_NOOP("Window to Next Screen"), 0, 0, slotWindowToNextScreen() ); keys->insert( "Group:Desktop Switching", i18n("Desktop Switching") ); - DEF( I18N_NOOP("Switch to Desktop 1"), CTRL+Qt::Key_F1, WIN+Qt::Key_F1, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 2"), CTRL+Qt::Key_F2, WIN+Qt::Key_F2, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 3"), CTRL+Qt::Key_F3, WIN+Qt::Key_F3, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 4"), CTRL+Qt::Key_F4, WIN+Qt::Key_F4, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 5"), CTRL+Qt::Key_F5, WIN+Qt::Key_F5, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 6"), CTRL+Qt::Key_F6, WIN+Qt::Key_F6, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 7"), CTRL+Qt::Key_F7, WIN+Qt::Key_F7, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 8"), CTRL+Qt::Key_F8, WIN+Qt::Key_F8, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 9"), CTRL+Qt::Key_F9, WIN+Qt::Key_F9, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 10"), CTRL+Qt::Key_F10, WIN+Qt::Key_F10, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 11"), CTRL+Qt::Key_F11, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 12"), CTRL+Qt::Key_F12, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 13"), CTRL+SHIFT+Qt::Key_F1, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 14"), CTRL+SHIFT+Qt::Key_F2, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 15"), CTRL+SHIFT+Qt::Key_F3, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 16"), CTRL+SHIFT+Qt::Key_F4, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 17"), CTRL+SHIFT+Qt::Key_F5, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 18"), CTRL+SHIFT+Qt::Key_F6, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 19"), CTRL+SHIFT+Qt::Key_F7, 0, slotSwitchToDesktop(int) ); - DEF( I18N_NOOP("Switch to Desktop 20"), CTRL+SHIFT+Qt::Key_F8, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 1"), CTRL+TQt::Key_F1, WIN+TQt::Key_F1, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 2"), CTRL+TQt::Key_F2, WIN+TQt::Key_F2, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 3"), CTRL+TQt::Key_F3, WIN+TQt::Key_F3, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 4"), CTRL+TQt::Key_F4, WIN+TQt::Key_F4, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 5"), CTRL+TQt::Key_F5, WIN+TQt::Key_F5, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 6"), CTRL+TQt::Key_F6, WIN+TQt::Key_F6, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 7"), CTRL+TQt::Key_F7, WIN+TQt::Key_F7, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 8"), CTRL+TQt::Key_F8, WIN+TQt::Key_F8, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 9"), CTRL+TQt::Key_F9, WIN+TQt::Key_F9, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 10"), CTRL+TQt::Key_F10, WIN+TQt::Key_F10, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 11"), CTRL+TQt::Key_F11, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 12"), CTRL+TQt::Key_F12, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 13"), CTRL+SHIFT+TQt::Key_F1, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 14"), CTRL+SHIFT+TQt::Key_F2, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 15"), CTRL+SHIFT+TQt::Key_F3, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 16"), CTRL+SHIFT+TQt::Key_F4, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 17"), CTRL+SHIFT+TQt::Key_F5, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 18"), CTRL+SHIFT+TQt::Key_F6, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 19"), CTRL+SHIFT+TQt::Key_F7, 0, slotSwitchToDesktop(int) ); + DEF( I18N_NOOP("Switch to Desktop 20"), CTRL+SHIFT+TQt::Key_F8, 0, slotSwitchToDesktop(int) ); DEF( I18N_NOOP("Switch to Next Desktop"), 0, 0, slotSwitchDesktopNext() ); DEF( I18N_NOOP("Switch to Previous Desktop"), 0, 0, slotSwitchDesktopPrevious() ); DEF( I18N_NOOP("Switch One Desktop to the Right"), 0, 0, slotSwitchDesktopRight() ); @@ -154,10 +154,10 @@ DEF( I18N_NOOP("Switch to Next Screen"), 0, 0, slotSwitchToNextScreen() ); keys->insert( "Group:Miscellaneous", i18n("Miscellaneous") ); - DEF( I18N_NOOP("Mouse Emulation"), ALT+Qt::Key_F12, 0, slotMouseEmulation() ); - DEF( I18N_NOOP("Kill Window"), ALT+CTRL+Qt::Key_Escape, WIN+CTRL+Qt::Key_Delete, slotKillWindow() ); - DEF( I18N_NOOP("Window Screenshot"), ALT+Qt::Key_Print, ALT+Qt::Key_Print, slotGrabWindow() ); - DEF( I18N_NOOP("Desktop Screenshot"), CTRL+Qt::Key_Print, WIN+Qt::Key_Print, slotGrabDesktop() ); + DEF( I18N_NOOP("Mouse Emulation"), ALT+TQt::Key_F12, 0, slotMouseEmulation() ); + DEF( I18N_NOOP("Kill Window"), ALT+CTRL+TQt::Key_Escape, WIN+CTRL+TQt::Key_Delete, slotKillWindow() ); + DEF( I18N_NOOP("Window Screenshot"), ALT+TQt::Key_Print, ALT+TQt::Key_Print, slotGrabWindow() ); + DEF( I18N_NOOP("Desktop Screenshot"), CTRL+TQt::Key_Print, WIN+TQt::Key_Print, slotGrabDesktop() ); #ifdef IN_KWIN { TDEGlobalAccel* keys = disable_shortcuts_keys; @@ -169,28 +169,28 @@ /*This belongs in taskbar rather than here, so it'll have to wait until after 2.2 is done. -- ellis -DEF( I18N_NOOP("Switch to Window 1", WIN+Qt::Key_1")); -DEF( I18N_NOOP("Switch to Window 2", WIN+Qt::Key_2")); -DEF( I18N_NOOP("Switch to Window 3", WIN+Qt::Key_3")); -DEF( I18N_NOOP("Switch to Window 4", WIN+Qt::Key_4")); -DEF( I18N_NOOP("Switch to Window 5", WIN+Qt::Key_5")); -DEF( I18N_NOOP("Switch to Window 6", WIN+Qt::Key_6")); -DEF( I18N_NOOP("Switch to Window 7", WIN+Qt::Key_7")); -DEF( I18N_NOOP("Switch to Window 8", WIN+Qt::Key_8")); -DEF( I18N_NOOP("Switch to Window 9", WIN+Qt::Key_9")); +DEF( I18N_NOOP("Switch to Window 1", WIN+TQt::Key_1")); +DEF( I18N_NOOP("Switch to Window 2", WIN+TQt::Key_2")); +DEF( I18N_NOOP("Switch to Window 3", WIN+TQt::Key_3")); +DEF( I18N_NOOP("Switch to Window 4", WIN+TQt::Key_4")); +DEF( I18N_NOOP("Switch to Window 5", WIN+TQt::Key_5")); +DEF( I18N_NOOP("Switch to Window 6", WIN+TQt::Key_6")); +DEF( I18N_NOOP("Switch to Window 7", WIN+TQt::Key_7")); +DEF( I18N_NOOP("Switch to Window 8", WIN+TQt::Key_8")); +DEF( I18N_NOOP("Switch to Window 9", WIN+TQt::Key_9")); #ifdef WITH_LABELS DEF( I18N_NOOP("Window & Taskbar"Group:Window Desktop", 0); #endif -DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+Qt::Key_Alt+1")); -DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+Qt::Key_Alt+2")); -DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+Qt::Key_Alt+3")); -DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+Qt::Key_Alt+4")); -DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+Qt::Key_Alt+5")); -DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+Qt::Key_Alt+6")); -DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+Qt::Key_Alt+7")); -DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+Qt::Key_Alt+8")); -DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+Qt::Key_Alt+9")); +DEF( I18N_NOOP("Window to Taskbar Position 1", WIN+TQt::Key_Alt+1")); +DEF( I18N_NOOP("Window to Taskbar Position 2", WIN+TQt::Key_Alt+2")); +DEF( I18N_NOOP("Window to Taskbar Position 3", WIN+TQt::Key_Alt+3")); +DEF( I18N_NOOP("Window to Taskbar Position 4", WIN+TQt::Key_Alt+4")); +DEF( I18N_NOOP("Window to Taskbar Position 5", WIN+TQt::Key_Alt+5")); +DEF( I18N_NOOP("Window to Taskbar Position 6", WIN+TQt::Key_Alt+6")); +DEF( I18N_NOOP("Window to Taskbar Position 7", WIN+TQt::Key_Alt+7")); +DEF( I18N_NOOP("Window to Taskbar Position 8", WIN+TQt::Key_Alt+8")); +DEF( I18N_NOOP("Window to Taskbar Position 9", WIN+TQt::Key_Alt+9")); */ #undef DEF diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 85e76e4cd..205ecfbc4 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -83,7 +83,7 @@ TQPopupMenu* Workspace::clientPopup() TQVBox *transBox = new TQVBox(trans_popup); transButton = new TQPushButton(transBox, "transButton"); TQToolTip::add(transButton, i18n("Reset opacity to default value")); - transSlider = new TQSlider(0, 100, 1, 100, Qt::Horizontal, transBox, "transSlider"); + transSlider = new TQSlider(0, 100, 1, 100, TQt::Horizontal, transBox, "transSlider"); TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity")); connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity())); connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide())); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 70308af3e..a06c624a4 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -168,7 +168,7 @@ Workspace::Workspace( bool restore ) root (0), workspaceInit (true), startup(0), - layoutOrientation(Qt::Vertical), + layoutOrientation(TQt::Vertical), layoutX(-1), layoutY(2), workarea(NULL), @@ -1553,7 +1553,7 @@ int Workspace::desktopToRight( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (layoutOrientation == Qt::Vertical) + if (layoutOrientation == TQt::Vertical) { dt += y; if ( dt >= numberOfDesktops() ) @@ -1584,7 +1584,7 @@ int Workspace::desktopToLeft( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (layoutOrientation == Qt::Vertical) + if (layoutOrientation == TQt::Vertical) { dt -= y; if ( dt < 0 ) @@ -1615,7 +1615,7 @@ int Workspace::desktopUp( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (layoutOrientation == Qt::Horizontal) + if (layoutOrientation == TQt::Horizontal) { dt -= x; if ( dt < 0 ) @@ -1646,7 +1646,7 @@ int Workspace::desktopDown( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (layoutOrientation == Qt::Horizontal) + if (layoutOrientation == TQt::Horizontal) { dt += x; if ( dt >= numberOfDesktops() ) @@ -1846,7 +1846,7 @@ void Workspace::updateDesktopLayout() { // rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to layoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal - ? Qt::Horizontal : Qt::Vertical ); + ? TQt::Horizontal : TQt::Vertical ); layoutX = rootInfo->desktopLayoutColumnsRows().width(); layoutY = rootInfo->desktopLayoutColumnsRows().height(); if( layoutX == 0 && layoutY == 0 ) // not given, set default layout @@ -2120,9 +2120,9 @@ void Workspace::slotGrabWindow() //Construct a bitmap mask from the rectangles TQBitmap mask( snapshot.width(), snapshot.height()); TQPainter p(&mask); - p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1); + p.fillRect(0, 0, mask.width(), mask.height(), TQt::color1); for (uint pos = 0; pos < maskedAwayRects.count(); pos++) - p.fillRect(maskedAwayRects[pos], Qt::color0); + p.fillRect(maskedAwayRects[pos], TQt::color0); p.end(); snapshot.setMask(mask); } diff --git a/twin/workspace.h b/twin/workspace.h index 40646f072..47ba7bb15 100644 --- a/twin/workspace.h +++ b/twin/workspace.h @@ -631,7 +631,7 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin TQPoint active_push_point; int active_reserved[ ACTIVE_BORDER_COUNT ]; // corners/edges used by something - Qt::Orientation layoutOrientation; + TQt::Orientation layoutOrientation; int layoutX; int layoutY; -- cgit v1.2.1