summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/kofficecore/KoContainerHandler.cpp70
-rw-r--r--lib/kofficecore/KoFrame.cpp6
-rw-r--r--lib/kofficecore/KoFrame.h2
-rw-r--r--lib/kofficecore/KoView.cpp2
4 files changed, 40 insertions, 40 deletions
diff --git a/lib/kofficecore/KoContainerHandler.cpp b/lib/kofficecore/KoContainerHandler.cpp
index 1f21df24..bd4bb489 100644
--- a/lib/kofficecore/KoContainerHandler.cpp
+++ b/lib/kofficecore/KoContainerHandler.cpp
@@ -47,7 +47,7 @@ public:
KoChild::Gadget gadget, const TQPoint& point ) :
m_gadget(gadget), m_view(view), m_child(child), m_parentMatrix(matrix) {
- m_tqgeometryStart = child->tqgeometry();
+ m_geometryStart = child->tqgeometry();
m_matrix = child->matrix() * matrix;
m_invertParentMatrix = matrix.invert();
@@ -60,7 +60,7 @@ public:
KoChild::Gadget m_gadget;
TQPoint m_mouseStart;
- TQRect m_tqgeometryStart;
+ TQRect m_geometryStart;
KoView* m_view;
KoChild* m_child;
TQWMatrix m_invert;
@@ -123,77 +123,77 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
{
case KoChild::TopLeft:
{
- x = TQMIN( d->m_tqgeometryStart.width() - 1, x );
- y = TQMIN( d->m_tqgeometryStart.height() - 1, y );
+ x = TQMIN( d->m_geometryStart.width() - 1, x );
+ y = TQMIN( d->m_geometryStart.height() - 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x() + x, d->m_tqgeometryStart.y() + y,
- d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() - y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y() + y,
+ d->m_geometryStart.width() - x, d->m_geometryStart.height() - y ) );
tqrepaint(rgn);
}
break;
case KoChild::TopMid:
{
- y = TQMIN( d->m_tqgeometryStart.height() - 1, y );
+ y = TQMIN( d->m_geometryStart.height() - 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x(), d->m_tqgeometryStart.y() + y,
- d->m_tqgeometryStart.width(), d->m_tqgeometryStart.height() - y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
+ d->m_geometryStart.width(), d->m_geometryStart.height() - y ) );
tqrepaint(rgn);
}
break;
case KoChild::TopRight:
{
- x = TQMAX( -d->m_tqgeometryStart.width() + 1, x );
- y = TQMIN( d->m_tqgeometryStart.height() - 1, y );
+ x = TQMAX( -d->m_geometryStart.width() + 1, x );
+ y = TQMIN( d->m_geometryStart.height() - 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x(), d->m_tqgeometryStart.y() + y,
- d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() - y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
+ d->m_geometryStart.width() + x, d->m_geometryStart.height() - y ) );
tqrepaint(rgn);
}
break;
case KoChild::MidLeft:
{
- x = TQMIN( d->m_tqgeometryStart.width() - 1, x );
+ x = TQMIN( d->m_geometryStart.width() - 1, x );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x() + x, d->m_tqgeometryStart.y(),
- d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
+ d->m_geometryStart.width() - x, d->m_geometryStart.height() ) );
tqrepaint(rgn);
}
break;
case KoChild::MidRight:
{
- x = TQMAX( -d->m_tqgeometryStart.width() + 1, x );
+ x = TQMAX( -d->m_geometryStart.width() + 1, x );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x(), d->m_tqgeometryStart.y(),
- d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
+ d->m_geometryStart.width() + x, d->m_geometryStart.height() ) );
tqrepaint(rgn);
}
break;
case KoChild::BottomLeft:
{
- x = TQMIN( d->m_tqgeometryStart.width() - 1, x );
- y = TQMAX( -d->m_tqgeometryStart.height() + 1, y );
+ x = TQMIN( d->m_geometryStart.width() - 1, x );
+ y = TQMAX( -d->m_geometryStart.height() + 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x() + x, d->m_tqgeometryStart.y(),
- d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() + y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
+ d->m_geometryStart.width() - x, d->m_geometryStart.height() + y ) );
tqrepaint(rgn);
}
break;
case KoChild::BottomMid:
{
- y = TQMAX( -d->m_tqgeometryStart.height() + 1, y );
+ y = TQMAX( -d->m_geometryStart.height() + 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x(), d->m_tqgeometryStart.y(),
- d->m_tqgeometryStart.width(), d->m_tqgeometryStart.height() + y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
+ d->m_geometryStart.width(), d->m_geometryStart.height() + y ) );
tqrepaint(rgn);
}
break;
case KoChild::BottomRight:
{
- x = TQMAX( -d->m_tqgeometryStart.width() + 1, x );
- y = TQMAX( -d->m_tqgeometryStart.height() + 1, y );
+ x = TQMAX( -d->m_geometryStart.width() + 1, x );
+ y = TQMAX( -d->m_geometryStart.height() + 1, y );
- d->m_child->setGeometry( TQRect( d->m_tqgeometryStart.x(), d->m_tqgeometryStart.y(),
- d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() + y ) );
+ d->m_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
+ d->m_geometryStart.width() + x, d->m_geometryStart.height() + y ) );
tqrepaint(rgn);
}
break;
@@ -214,7 +214,7 @@ public:
m_parentMatrix(matrix) {
m_invertParentMatrix = matrix.invert();
m_mouseDragStart = m_invertParentMatrix.map( point );
- m_tqgeometryDragStart = m_dragChild->tqgeometry();
+ m_geometryDragStart = m_dragChild->tqgeometry();
m_rotationDragStart = m_dragChild->rotationPoint();
}
~KoPartMoveHandlerPrivate() {}
@@ -222,7 +222,7 @@ public:
KoView* m_view;
KoChild* m_dragChild;
TQPoint m_mouseDragStart;
- TQRect m_tqgeometryDragStart;
+ TQRect m_geometryDragStart;
TQPoint m_rotationDragStart;
TQWMatrix m_invertParentMatrix;
TQWMatrix m_parentMatrix;
@@ -256,9 +256,9 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev )
TQRegion bound = d->m_dragChild->frameRegion( d->m_parentMatrix, true );
TQPoint pos = d->m_invertParentMatrix.map( e->pos() /* + TQPoint(d->m_view->canvasXOffset(), d->m_view->canvasYOffset()) */ );
- d->m_dragChild->setGeometry( TQRect( d->m_tqgeometryDragStart.x() + pos.x() - d->m_mouseDragStart.x(),
- d->m_tqgeometryDragStart.y() + pos.y() - d->m_mouseDragStart.y(),
- d->m_tqgeometryDragStart.width(), d->m_tqgeometryDragStart.height() ) );
+ d->m_dragChild->setGeometry( TQRect( d->m_geometryDragStart.x() + pos.x() - d->m_mouseDragStart.x(),
+ d->m_geometryDragStart.y() + pos.y() - d->m_mouseDragStart.y(),
+ d->m_geometryDragStart.width(), d->m_geometryDragStart.height() ) );
d->m_dragChild->setRotationPoint( TQPoint( d->m_rotationDragStart.x() + pos.x() - d->m_mouseDragStart.x(),
d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) );
bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) );
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index e8722eaa..2662169e 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -255,8 +255,8 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
// The other modes change the tqgeometry so they call resizeEvent.
- // This one doesn't, so it has to emit tqgeometryChangedby itself.
- emit tqgeometryChanged();
+ // This one doesn't, so it has to emit geometryChangedby itself.
+ emit geometryChanged();
//kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl;
}
else if ( d->m_mode == 1 )
@@ -357,7 +357,7 @@ void KoFrame::resizeEvent( TQResizeEvent* )
else
d->m_view->setGeometry( 0, 0, width(), height() );
- emit tqgeometryChanged();
+ emit geometryChanged();
}
bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )
diff --git a/lib/kofficecore/KoFrame.h b/lib/kofficecore/KoFrame.h
index 7b372b98..fbb40bbb 100644
--- a/lib/kofficecore/KoFrame.h
+++ b/lib/kofficecore/KoFrame.h
@@ -49,7 +49,7 @@ public:
virtual int border() const;
signals:
- void tqgeometryChanged();
+ void geometryChanged();
protected:
virtual void paintEvent( TQPaintEvent* );
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index cebd61be..87751a34 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -852,7 +852,7 @@ void KoViewChild::setInitialFrameGeometry()
kdDebug() << k_funcinfo << endl;
// Connect only now, so that the GUI building doesn't move us around.
- connect( m_frame, TQT_SIGNAL( tqgeometryChanged() ),
+ connect( m_frame, TQT_SIGNAL( geometryChanged() ),
this, TQT_SLOT( slotFrameGeometryChanged() ) );
connect( m_child, TQT_SIGNAL( changed( KoChild * ) ),
this, TQT_SLOT( slotDocGeometryChanged() ) );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 17:17:59 +0000