Browse Source

Rename tqgeometry* to geometry*

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1242307 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 8 years ago
parent
commit
f3d9133226
9 changed files with 78 additions and 78 deletions
  1. +3
    -3
      filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
  2. +1
    -1
      karbon/core/vpath.cc
  3. +3
    -3
      kivio/kiviopart/kivio_view.cpp
  4. +29
    -29
      kspread/kspread_handler.cc
  5. +2
    -2
      kspread/kspread_handler.h
  6. +35
    -35
      lib/kofficecore/KoContainerHandler.cpp
  7. +3
    -3
      lib/kofficecore/KoFrame.cpp
  8. +1
    -1
      lib/kofficecore/KoFrame.h
  9. +1
    -1
      lib/kofficecore/KoView.cpp

+ 3
- 3
filters/kword/pdf/xpdf/xpdf/XPDFTree.cc View File

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

static XtGeometryResult tqgeometryManager(Widget widget,
static XtGeometryResult geometryManager(Widget widget,
XtWidgetGeometry *request,
XtWidgetGeometry *reply) {
XPDFTreeWidget w = (XPDFTreeWidget)XtParent(widget);


+ 1
- 1
karbon/core/vpath.cc View File

@@ -423,7 +423,7 @@ VSubpath::pointIsInside( const KoPoint& p ) const
// as lines).

/* 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.
*/

/*


+ 3
- 3
kivio/kiviopart/kivio_view.cpp View File

@@ -274,7 +274,7 @@ KivioView::KivioView( TQWidget *_parent, const char *_name, KivioDoc* doc )
createGeometryDock();
createProtectionDock();
paletteManager()->showWidget("birdseyepanel");
paletteManager()->showWidget("stenciltqgeometrypanel");
paletteManager()->showWidget("stencilgeometrypanel");

setupActions();

@@ -339,7 +339,7 @@ void KivioView::createGeometryDock()
m_pStencilGeometryPanel = new KivioStencilGeometryPanel(this);
m_pStencilGeometryPanel->setCaption(i18n("Geometry"));
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(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->setCaption(i18n("Protection"));
paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "tqgeometrydocker");
paletteManager()->addWidget(m_pProtectionPanel, "protectionpanel", "geometrydocker");
}

void KivioView::createObjectListPalette()


+ 29
- 29
kspread/kspread_handler.cc View File

@@ -34,8 +34,8 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
{
TQMouseEvent* e = (TQMouseEvent*)ev;
m_tqgeometryStart = e->pos();
m_tqgeometryEnd = e->pos();
m_geometryStart = e->pos();
m_geometryEnd = e->pos();
m_started = false;
m_clicked = true;
@@ -58,15 +58,15 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )

if ( m_started )
{
int x = m_tqgeometryStart.x();
int y = m_tqgeometryStart.y();
if ( x > m_tqgeometryEnd.x() )
x = m_tqgeometryEnd.x();
if ( y > m_tqgeometryEnd.y() )
y = m_tqgeometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x();
int x = m_geometryStart.x();
int y = m_geometryStart.y();
if ( x > m_geometryEnd.x() )
x = m_geometryEnd.x();
if ( y > m_geometryEnd.y() )
y = m_geometryEnd.y();
int w = m_geometryEnd.x() - m_geometryStart.x();
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 ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;
@@ -77,17 +77,17 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
else
m_started = true;

m_tqgeometryEnd = e->pos();
m_geometryEnd = e->pos();

int x = m_tqgeometryStart.x();
int y = m_tqgeometryStart.y();
if ( x > m_tqgeometryEnd.x() )
x = m_tqgeometryEnd.x();
if ( y > m_tqgeometryEnd.y() )
y = m_tqgeometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x();
int x = m_geometryStart.x();
int y = m_geometryStart.y();
if ( x > m_geometryEnd.x() )
x = m_geometryEnd.x();
if ( y > m_geometryEnd.y() )
y = m_geometryEnd.y();
int w = m_geometryEnd.x() - m_geometryStart.x();
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 ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;
@@ -108,17 +108,17 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev )
return true;
}
m_tqgeometryEnd = e->pos();
int x = m_tqgeometryStart.x();
int y = m_tqgeometryStart.y();
if ( x > m_tqgeometryEnd.x() )
x = m_tqgeometryEnd.x();
if ( y > m_tqgeometryEnd.y() )
y = m_tqgeometryEnd.y();
int w = m_tqgeometryEnd.x() - m_tqgeometryStart.x();
m_geometryEnd = e->pos();
int x = m_geometryStart.x();
int y = m_geometryStart.y();
if ( x > m_geometryEnd.x() )
x = m_geometryEnd.x();
if ( y > m_geometryEnd.y() )
y = m_geometryEnd.y();
int w = m_geometryEnd.x() - m_geometryStart.x();
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 ( w < KS_MIN_RECTSIZE ) w = KS_MIN_RECTSIZE;


+ 2
- 2
kspread/kspread_handler.h View File

@@ -40,8 +40,8 @@ protected:
virtual void insertObject( TQRect ) = 0;

View* m_view;
TQPoint m_tqgeometryStart;
TQPoint m_tqgeometryEnd;
TQPoint m_geometryStart;
TQPoint m_geometryEnd;
bool m_started;
bool m_clicked;
};


+ 35
- 35
lib/kofficecore/KoContainerHandler.cpp View File

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


+ 3
- 3
lib/kofficecore/KoFrame.cpp View File

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


+ 1
- 1
lib/kofficecore/KoFrame.h View File

@@ -49,7 +49,7 @@ public:
virtual int border() const;

signals:
void tqgeometryChanged();
void geometryChanged();

protected:
virtual void paintEvent( TQPaintEvent* );


+ 1
- 1
lib/kofficecore/KoView.cpp View File

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


Loading…
Cancel
Save