TDE
/
koffice
7
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Rename tqgeometry* to geometry*

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1242307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent abbfa2ecec
commit f3d9133226
9 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File

6
filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
Unescape View File

@ -41,7 +41,7 @@ static void setValuesAlmost(Widget oldWidget, Widget newWidget,
static XtGeometryResult queryGeometry(Widget widget, static XtGeometryResult queryGeometry(Widget widget,
XtWidgetGeometry *request, XtWidgetGeometry *request,
XtWidgetGeometry *reply); XtWidgetGeometry *reply);
static XtGeometryResult tqgeometryManager(Widget widget, static XtGeometryResult geometryManager(Widget widget,
XtWidgetGeometry *request, XtWidgetGeometry *request,
XtWidgetGeometry *reply); XtWidgetGeometry *reply);
static void changeManaged(Widget widget); static void changeManaged(Widget widget);
@ -163,7 +163,7 @@ externaldef(xpdftreeclassrec) XPDFTreeClassRec xpdfTreeClassRec = {
NULL // extension NULL // extension
}, },
{ // Composite { // Composite
&tqgeometryManager, // tqgeometry_manager &geometryManager, // geometry_manager
&changeManaged, // change_managed &changeManaged, // change_managed
XtInheritInsertChild, // insert_child XtInheritInsertChild, // insert_child
XtInheritDeleteChild, // delete_child XtInheritDeleteChild, // delete_child
@ -440,7 +440,7 @@ static XtGeometryResult queryGeometry(Widget widget,
#endif #endif
} }
static XtGeometryResult tqgeometryManager(Widget widget, static XtGeometryResult geometryManager(Widget widget,
XtWidgetGeometry *request, XtWidgetGeometry *request,
XtWidgetGeometry *reply) { XtWidgetGeometry *reply) {
XPDFTreeWidget w = (XPDFTreeWidget)XtParent(widget); XPDFTreeWidget w = (XPDFTreeWidget)XtParent(widget);

2
karbon/core/vpath.cc
Unescape View File

@ -423,7 +423,7 @@ VSubpath::pointIsInside( const KoPoint& p ) const
// as lines). // as lines).
/* This algorithm is taken from "Fast Winding Number Inclusion of a Point /* This algorithm is taken from "Fast Winding Number Inclusion of a Point
* in a Polygon" by Dan Sunday, tqgeometryalgorithms.com. * in a Polygon" by Dan Sunday, geometryalgorithms.com.
*/ */
/* /*

6
kivio/kiviopart/kivio_view.cpp
Unescape View File

@ -274,7 +274,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
createGeometryDock(); createGeometryDock();
createProtectionDock(); createProtectionDock();
paletteManager()->showWidget("birdseyepanel"); paletteManager()->showWidget("birdseyepanel");
paletteManager()->showWidget("stenciltqgeometrypanel"); paletteManager()->showWidget("stencilgeometrypanel");
setupActions(); setupActions();
@ -339,7 +339,7 @@ void KivioView::createGeometryDock()
m_pStencilGeometryPanel = new KivioStencilGeometryPanel(this); m_pStencilGeometryPanel = new KivioStencilGeometryPanel(this);
m_pStencilGeometryPanel->setCaption(i18n("Geometry")); m_pStencilGeometryPanel->setCaption(i18n("Geometry"));
m_pStencilGeometryPanel->setUnit(m_pDoc->unit()); m_pStencilGeometryPanel->setUnit(m_pDoc->unit());
paletteManager()->addWidget(m_pStencilGeometryPanel, "stenciltqgeometrypanel", "tqgeometrydocker"); paletteManager()->addWidget(m_pStencilGeometryPanel, "stencilgeometrypanel", "geometrydocker");
connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilPosition(double, double)) ); connect( m_pStencilGeometryPanel, TQT_SIGNAL(positionChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilPosition(double, double)) );
connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilSize(double, double)) ); connect( m_pStencilGeometryPanel, TQT_SIGNAL(sizeChanged(double, double)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeStencilSize(double, double)) );
@ -366,7 +366,7 @@ void KivioView::createProtectionDock()
{ {
m_pProtectionPanel = new KivioProtectionPanel(this,this); m_pProtectionPanel = new KivioProtectionPanel(this,this);
m_pProtectionPanel->setCaption(i18n("Protection")); m_pProtectionPanel->setCaption(i18n("Protection"));
paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "tqgeometrydocker"); paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "geometrydocker");
} }
void KivioView::createObjectListPalette() void KivioView::createObjectListPalette()

58
kspread/kspread_handler.cc
Unescape View File

@ -34,8 +34,8 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
{ {
TQMouseEvent* e = (TQMouseEvent*)ev; TQMouseEvent* e = (TQMouseEvent*)ev;
m_tqgeometryStart = e->pos(); m_geometryStart = e->pos();
m_tqgeometryEnd = e->pos(); m_geometryEnd = e->pos();
m_started = false; m_started = false;
m_clicked = true; m_clicked = true;
@ -58,15 +58,15 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
if ( m_started ) if ( m_started )
{ {
int x = m_tqgeometryStart.x(); int x = m_geometryStart.x();
int y = m_tqgeometryStart.y(); int y = m_geometryStart.y();
if ( x > m_tqgeometryEnd.x() ) if ( x > m_geometryEnd.x() )
x = m_tqgeometryEnd.x(); x = m_geometryEnd.x();
if ( y > m_tqgeometryEnd.y() ) if ( y > m_geometryEnd.y() )
y = m_tqgeometryEnd.y(); y = m_geometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x(); int w = m_geometryEnd.x() - m_geometryStart.x();
if ( w < 0 ) w *= -1; if ( w < 0 ) w *= -1;
int h = m_tqgeometryEnd.y() - m_tqgeometryStart.y(); int h = m_geometryEnd.y() - m_geometryStart.y();
if ( h < 0 ) h *= -1; if ( h < 0 ) h *= -1;
if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE; if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;
@ -77,17 +77,17 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
else else
m_started = true; m_started = true;
m_tqgeometryEnd = e->pos(); m_geometryEnd = e->pos();
int x = m_tqgeometryStart.x(); int x = m_geometryStart.x();
int y = m_tqgeometryStart.y(); int y = m_geometryStart.y();
if ( x > m_tqgeometryEnd.x() ) if ( x > m_geometryEnd.x() )
x = m_tqgeometryEnd.x(); x = m_geometryEnd.x();
if ( y > m_tqgeometryEnd.y() ) if ( y > m_geometryEnd.y() )
y = m_tqgeometryEnd.y(); y = m_geometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x(); int w = m_geometryEnd.x() - m_geometryStart.x();
if ( w < 0 ) w *= -1; if ( w < 0 ) w *= -1;
int h = m_tqgeometryEnd.y() - m_tqgeometryStart.y(); int h = m_geometryEnd.y() - m_geometryStart.y();
if ( h < 0 ) h *= -1; if ( h < 0 ) h *= -1;
if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE; if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;
@ -108,17 +108,17 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
return true; return true;
} }
m_tqgeometryEnd = e->pos(); m_geometryEnd = e->pos();
int x = m_tqgeometryStart.x(); int x = m_geometryStart.x();
int y = m_tqgeometryStart.y(); int y = m_geometryStart.y();
if ( x > m_tqgeometryEnd.x() ) if ( x > m_geometryEnd.x() )
x = m_tqgeometryEnd.x(); x = m_geometryEnd.x();
if ( y > m_tqgeometryEnd.y() ) if ( y > m_geometryEnd.y() )
y = m_tqgeometryEnd.y(); y = m_geometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x(); int w = m_geometryEnd.x() - m_geometryStart.x();
if ( w < 0 ) w *= -1; if ( w < 0 ) w *= -1;
int h = m_tqgeometryEnd.y() - m_tqgeometryStart.y(); int h = m_geometryEnd.y() - m_geometryStart.y();
if ( h < 0 ) h *= -1; if ( h < 0 ) h *= -1;
if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE; if ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;

4
kspread/kspread_handler.h
Unescape View File

@ -40,8 +40,8 @@ protected:
virtual void insertObject( TQRect ) = 0; virtual void insertObject( TQRect ) = 0;
View* m_view; View* m_view;
TQPoint m_tqgeometryStart; TQPoint m_geometryStart;
TQPoint m_tqgeometryEnd; TQPoint m_geometryEnd;
bool m_started; bool m_started;
bool m_clicked; bool m_clicked;
}; };

70
lib/kofficecore/KoContainerHandler.cpp
Unescape View File

@ -47,7 +47,7 @@ public:
KoChild::Gadget gadget, const TQPoint& point ) : KoChild::Gadget gadget, const TQPoint& point ) :
m_gadget(gadget), m_view(view), m_child(child), m_parentMatrix(matrix) { 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_matrix = child->matrix() * matrix;
m_invertParentMatrix = matrix.invert(); m_invertParentMatrix = matrix.invert();
@ -60,7 +60,7 @@ public:
KoChild::Gadget m_gadget; KoChild::Gadget m_gadget;
TQPoint m_mouseStart; TQPoint m_mouseStart;
TQRect m_tqgeometryStart; TQRect m_geometryStart;
KoView* m_view; KoView* m_view;
KoChild* m_child; KoChild* m_child;
TQWMatrix m_invert; TQWMatrix m_invert;
@ -123,77 +123,77 @@ bool KoPartResizeHandler::eventFilter( TQObject*, TQEvent* ev )
{ {
case KoChild::TopLeft: case KoChild::TopLeft:
{ {
x = TQMIN( d->m_tqgeometryStart.width() - 1, x ); x = TQMIN( d->m_geometryStart.width() - 1, x );
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() + x, d->m_tqgeometryStart.y() + y, d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y() + y,
d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() - y ) ); d->m_geometryStart.width() - x, d->m_geometryStart.height() - y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::TopMid: 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_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
d->m_tqgeometryStart.width(), d->m_tqgeometryStart.height() - y ) ); d->m_geometryStart.width(), d->m_geometryStart.height() - y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::TopRight: case KoChild::TopRight:
{ {
x = TQMAX( -d->m_tqgeometryStart.width() + 1, x ); x = TQMAX( -d->m_geometryStart.width() + 1, x );
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_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y() + y,
d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() - y ) ); d->m_geometryStart.width() + x, d->m_geometryStart.height() - y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::MidLeft: 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_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() ) ); d->m_geometryStart.width() - x, d->m_geometryStart.height() ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::MidRight: 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_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() ) ); d->m_geometryStart.width() + x, d->m_geometryStart.height() ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::BottomLeft: case KoChild::BottomLeft:
{ {
x = TQMIN( d->m_tqgeometryStart.width() - 1, x ); x = TQMIN( d->m_geometryStart.width() - 1, x );
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() + x, d->m_tqgeometryStart.y(), d->m_child->setGeometry( TQRect( d->m_geometryStart.x() + x, d->m_geometryStart.y(),
d->m_tqgeometryStart.width() - x, d->m_tqgeometryStart.height() + y ) ); d->m_geometryStart.width() - x, d->m_geometryStart.height() + y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::BottomMid: 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_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
d->m_tqgeometryStart.width(), d->m_tqgeometryStart.height() + y ) ); d->m_geometryStart.width(), d->m_geometryStart.height() + y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
case KoChild::BottomRight: case KoChild::BottomRight:
{ {
x = TQMAX( -d->m_tqgeometryStart.width() + 1, x ); x = TQMAX( -d->m_geometryStart.width() + 1, x );
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_child->setGeometry( TQRect( d->m_geometryStart.x(), d->m_geometryStart.y(),
d->m_tqgeometryStart.width() + x, d->m_tqgeometryStart.height() + y ) ); d->m_geometryStart.width() + x, d->m_geometryStart.height() + y ) );
tqrepaint(rgn); tqrepaint(rgn);
} }
break; break;
@ -214,7 +214,7 @@ public:
m_parentMatrix(matrix) { m_parentMatrix(matrix) {
m_invertParentMatrix = matrix.invert(); m_invertParentMatrix = matrix.invert();
m_mouseDragStart = m_invertParentMatrix.map( point ); m_mouseDragStart = m_invertParentMatrix.map( point );
m_tqgeometryDragStart = m_dragChild->tqgeometry(); m_geometryDragStart = m_dragChild->tqgeometry();
m_rotationDragStart = m_dragChild->rotationPoint(); m_rotationDragStart = m_dragChild->rotationPoint();
} }
~KoPartMoveHandlerPrivate() {} ~KoPartMoveHandlerPrivate() {}
@ -222,7 +222,7 @@ public:
KoView* m_view; KoView* m_view;
KoChild* m_dragChild; KoChild* m_dragChild;
TQPoint m_mouseDragStart; TQPoint m_mouseDragStart;
TQRect m_tqgeometryDragStart; TQRect m_geometryDragStart;
TQPoint m_rotationDragStart; TQPoint m_rotationDragStart;
TQWMatrix m_invertParentMatrix; TQWMatrix m_invertParentMatrix;
TQWMatrix m_parentMatrix; TQWMatrix m_parentMatrix;
@ -256,9 +256,9 @@ bool KoPartMoveHandler::eventFilter( TQObject*, TQEvent* ev )
TQRegion bound = d->m_dragChild->frameRegion( d->m_parentMatrix, true ); 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()) */ ); 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_dragChild->setGeometry( TQRect( d->m_geometryDragStart.x() + pos.x() - d->m_mouseDragStart.x(),
d->m_tqgeometryDragStart.y() + pos.y() - d->m_mouseDragStart.y(), d->m_geometryDragStart.y() + pos.y() - d->m_mouseDragStart.y(),
d->m_tqgeometryDragStart.width(), d->m_tqgeometryDragStart.height() ) ); 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_dragChild->setRotationPoint( TQPoint( d->m_rotationDragStart.x() + pos.x() - d->m_mouseDragStart.x(),
d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) ); d->m_rotationDragStart.y() + pos.y() - d->m_mouseDragStart.y() ) );
bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) ); bound = bound.unite( d->m_dragChild->frameRegion( d->m_parentMatrix, false ) );

6
lib/kofficecore/KoFrame.cpp
Unescape View File

@ -255,8 +255,8 @@ void KoFrame::mouseMoveEvent( TQMouseEvent* ev )
move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(), move( TQPoint( p.x() + d->m_framePos.x() - d->m_mousePressPos.x(),
p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) ); p.y() + d->m_framePos.y() - d->m_mousePressPos.y() ) );
// The other modes change the tqgeometry so they call resizeEvent. // The other modes change the tqgeometry so they call resizeEvent.
// This one doesn't, so it has to emit tqgeometryChangedby itself. // This one doesn't, so it has to emit geometryChangedby itself.
emit tqgeometryChanged(); emit geometryChanged();
//kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl; //kdDebug() << "KoFrame::mouseMoveEvent koFrame position is " << x() << "," << y() << endl;
} }
else if ( d->m_mode == 1 ) else if ( d->m_mode == 1 )
@ -357,7 +357,7 @@ void KoFrame::resizeEvent( TQResizeEvent* )
else else
d->m_view->setGeometry( 0, 0, width(), height() ); d->m_view->setGeometry( 0, 0, width(), height() );
emit tqgeometryChanged(); emit geometryChanged();
} }
bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev ) bool KoFrame::eventFilter( TQObject* obj, TQEvent* ev )

2
lib/kofficecore/KoFrame.h
Unescape View File

@ -49,7 +49,7 @@ public:
virtual int border() const; virtual int border() const;
signals: signals:
void tqgeometryChanged(); void geometryChanged();
protected: protected:
virtual void paintEvent( TQPaintEvent* ); virtual void paintEvent( TQPaintEvent* );

2
lib/kofficecore/KoView.cpp
Unescape View File

@ -852,7 +852,7 @@ void KoViewChild::setInitialFrameGeometry()
kdDebug() << k_funcinfo << endl; kdDebug() << k_funcinfo << endl;
// Connect only now, so that the GUI building doesn't move us around. // 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() ) ); this, TQT_SLOT( slotFrameGeometryChanged() ) );
connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), connect( m_child, TQT_SIGNAL( changed( KoChild * ) ),
this, TQT_SLOT( slotDocGeometryChanged() ) ); this, TQT_SLOT( slotDocGeometryChanged() ) );

Write Preview
Loading…
Cancel
Save