TDE
/
rosegarden
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/rosegarden
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace various tqtinterface's TQ_* defines with actual types

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3d3dc041a5)
r14.1.x r14.1.1
Michele Calgaro 1 year ago
parent 6be0f33ee5
commit 7d34c9951c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
Unescape View File

@ -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);

10
src/gui/kdeext/klearlook.cpp
Unescape View File

@ -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 )

6
src/gui/kdeext/klearlook.h
Unescape View File

@ -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;

4
src/gui/rulers/ControlRuler.cpp
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save