summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp2
-rw-r--r--src/gui/kdeext/klearlook.cpp10
-rw-r--r--src/gui/kdeext/klearlook.h6
-rw-r--r--src/gui/rulers/ControlRuler.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index fec7899..54d973c 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -173,7 +173,7 @@ SegmentSelector::handleMouseButtonPress(TQMouseEvent *e)
// Add on middle button or ctrl+left - bounding box on rest
//
if (e->button() == Qt::MidButton ||
- (e->button() == Qt::LeftButton && (e->state() & TQ_ControlButton))) {
+ (e->button() == Qt::LeftButton && (e->state() & ControlButton))) {
m_dispatchTool = getToolBox()->getTool(SegmentPencil::ToolName);
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 324c7f5..d4b5d1d 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -1206,7 +1206,7 @@ void KlearlookStyle::drawLightBevel(
}
void KlearlookStyle::drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags,
- TQStyle::TQ_PrimitiveElement pe, bool small, bool checkActive ) const {
+ TQStyle::PrimitiveElement pe, bool small, bool checkActive ) const {
TQPointArray a;
const TQColor &col = flags & Style_Enabled
? checkActive && flags & Style_Active
@@ -1296,7 +1296,7 @@ void KlearlookStyle::drawArrow( TQPainter *p, const TQRect &r, const TQColorGrou
p->restore();
}
-void KlearlookStyle::drawPrimitiveMenu( TQ_PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
+void KlearlookStyle::drawPrimitiveMenu( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
SFlags flags, const TQStyleOption &data ) const {
switch ( pe ) {
case PE_CheckMark:
@@ -1335,7 +1335,7 @@ void KlearlookStyle::drawPrimitiveMenu( TQ_PrimitiveElement pe, TQPainter *p, co
}
}
-void KlearlookStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
+void KlearlookStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
SFlags flags, const TQStyleOption &data ) const {
int x, y, w, h;
@@ -3259,7 +3259,7 @@ void KlearlookStyle::drawComplexControl(
);
if ( ( controls & SC_SpinWidgetUp ) && up.isValid() ) {
- TQ_PrimitiveElement pe = PE_SpinWidgetUp;
+ PrimitiveElement pe = PE_SpinWidgetUp;
SFlags upflags = flags;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
@@ -3273,7 +3273,7 @@ void KlearlookStyle::drawComplexControl(
}
if ( ( controls & SC_SpinWidgetDown ) && down.isValid() ) {
- TQ_PrimitiveElement pe = PE_SpinWidgetDown;
+ PrimitiveElement pe = PE_SpinWidgetDown;
SFlags downflags = flags;
if ( spinwidget->buttonSymbols() == TQSpinWidget::PlusMinus )
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 332f3d6..bfde64d 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -252,11 +252,11 @@ class KlearlookStyle : public TDEStyle {
const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
void drawLightBevelButton( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, bool useGrad, ERound round,
const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
- void drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, TQStyle::TQ_PrimitiveElement pe,
+ void drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, TQStyle::PrimitiveElement pe,
bool small = false, bool checkActive = false ) const;
- void drawPrimitive( TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+ void drawPrimitive( PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void drawPrimitiveMenu( TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+ void drawPrimitiveMenu( PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt, const TQWidget* widget = 0 ) const;
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index 06ffcb8..cf79f33 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -184,7 +184,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
// clear selection unless control was pressed, in which case
// add the event to the current selection
- if (!(e->state() && TQ_ControlButton)) {
+ if (!(e->state() && ControlButton)) {
clearSelectedItems();
}
@@ -214,7 +214,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
} else { // select it
- if (!(e->state() && TQ_ControlButton)) {
+ if (!(e->state() && ControlButton)) {
if (item->z() > topItem->z())
topItem = item;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 08:04:59 +0000