diff options
Diffstat (limited to 'twin/lib')
-rw-r--r-- | twin/lib/kcommondecoration.cpp | 14 | ||||
-rw-r--r-- | twin/lib/kdecoration.cpp | 8 | ||||
-rw-r--r-- | twin/lib/kdecoration.h | 2 | ||||
-rw-r--r-- | twin/lib/kdecoration_p.h | 2 |
4 files changed, 13 insertions, 13 deletions
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; }; |