diff options
Diffstat (limited to 'lib/kofficecore/KoView.cpp')
-rw-r--r-- | lib/kofficecore/KoView.cpp | 248 |
1 files changed, 124 insertions, 124 deletions
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 9650192c..cfb508a4 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -33,7 +33,7 @@ #include <assert.h> #include <kstatusbar.h> #include <kapplication.h> -#include <qtimer.h> +#include <tqtimer.h> class KoViewPrivate { @@ -42,7 +42,7 @@ public: { m_inOperation = false; m_zoom = 1.0; - m_children.setAutoDelete( true ); + m_tqchildren.setAutoDelete( true ); m_manager = 0L; m_tempActiveWidget = 0L; m_dcopObject = 0; @@ -53,30 +53,30 @@ public: { } - QGuardedPtr<KoDocument> m_doc; // our KoDocument - QGuardedPtr<KParts::PartManager> m_manager; + TQGuardedPtr<KoDocument> m_doc; // our KoDocument + TQGuardedPtr<KParts::PartManager> m_manager; double m_zoom; - QPtrList<KoViewChild> m_children; - QWidget *m_tempActiveWidget; + TQPtrList<KoViewChild> m_tqchildren; + TQWidget *m_tempActiveWidget; KoViewIface *m_dcopObject; bool m_registered; // are we registered at the part manager? bool m_documentDeleted; // true when m_doc gets deleted [can't use m_doc==0 - // since this only happens in ~QObject, and views + // since this only happens in ~TQObject, and views // get deleted by ~KoDocument]. - QTimer *m_scrollTimer; + TQTimer *m_scrollTimer; // Hmm sorry for polluting the private class with such a big inner class. // At the beginning it was a little struct :) class StatusBarItem { public: - StatusBarItem() // for QValueList + StatusBarItem() // for TQValueList : m_widget(0), m_visible(false) {} - StatusBarItem( QWidget * widget, int stretch, bool permanent ) + StatusBarItem( TQWidget * widget, int stretch, bool permanent ) : m_widget(widget), m_stretch(stretch), m_permanent(permanent), m_visible(false) {} - QWidget * widget() const { return m_widget; } + TQWidget * widget() const { return m_widget; } void ensureItemShown( KStatusBar * sb ) { @@ -97,46 +97,46 @@ public: } } private: - QWidget * m_widget; + TQWidget * m_widget; int m_stretch; bool m_permanent; bool m_visible; // true when the item has been added to the statusbar }; - QValueList<StatusBarItem> m_statusBarItems; // Our statusbar items + TQValueList<StatusBarItem> m_statusBarItems; // Our statusbar items bool m_inOperation; //in the middle of an operation (no screen refreshing)? }; -KoView::KoView( KoDocument *document, QWidget *parent, const char *name ) - : QWidget( parent, name ) +KoView::KoView( KoDocument *document, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { Q_ASSERT( document ); //kdDebug(30003) << "KoView::KoView " << this << endl; d = new KoViewPrivate; d->m_doc = document; - KParts::PartBase::setPartObject( this ); + KParts::PartBase::setPartObject( TQT_TQOBJECT(this) ); - setFocusPolicy( StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); setMouseTracking( true ); - connect( d->m_doc, SIGNAL( childChanged( KoDocumentChild * ) ), - this, SLOT( slotChildChanged( KoDocumentChild * ) ) ); + connect( d->m_doc, TQT_SIGNAL( childChanged( KoDocumentChild * ) ), + this, TQT_SLOT( slotChildChanged( KoDocumentChild * ) ) ); - connect( d->m_doc, SIGNAL( sigBeginOperation() ), - this, SLOT( beginOperation() ) ); + connect( d->m_doc, TQT_SIGNAL( sigBeginOperation() ), + this, TQT_SLOT( beginOperation() ) ); - connect( d->m_doc, SIGNAL( sigEndOperation() ), - this, SLOT( endOperation() ) ); + connect( d->m_doc, TQT_SIGNAL( sigEndOperation() ), + this, TQT_SLOT( endOperation() ) ); actionCollection()->setWidget( this ); setupGlobalActions(); KActionCollection *coll = actionCollection(); /**** not needed anymore, according to David (Werner) - QValueList<KAction*> docActions = document->actionCollection()->actions(); - QValueList<KAction*>::ConstIterator it = docActions.begin(); - QValueList<KAction*>::ConstIterator end = docActions.end(); + TQValueList<KAction*> docActions = document->actionCollection()->actions(); + TQValueList<KAction*>::ConstIterator it = docActions.begin(); + TQValueList<KAction*>::ConstIterator end = docActions.end(); for (; it != end; ++it ) coll->insert( *it ); */ @@ -145,20 +145,20 @@ KoView::KoView( KoDocument *document, QWidget *parent, const char *name ) if ( sb ) // No statusbar in e.g. konqueror { coll->setHighlightingEnabled( true ); - connect( coll, SIGNAL( actionStatusText( const QString & ) ), - this, SLOT( slotActionStatusText( const QString & ) ) ); - connect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); - - connect( d->m_doc, SIGNAL( sigStatusBarMessage( const QString& ) ), - this, SLOT( slotActionStatusText( const QString& ) ) ); - connect( d->m_doc, SIGNAL( sigClearStatusBarMessage() ), - this, SLOT( slotClearStatusText() ) ); + connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); + + connect( d->m_doc, TQT_SIGNAL( sigStatusBarMessage( const TQString& ) ), + this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); + connect( d->m_doc, TQT_SIGNAL( sigClearStatusBarMessage() ), + this, TQT_SLOT( slotClearStatusText() ) ); } d->m_doc->setCurrent(); - d->m_scrollTimer = new QTimer( this ); - connect (d->m_scrollTimer, SIGNAL( timeout() ), this, SLOT( slotAutoScroll() ) ); + d->m_scrollTimer = new TQTimer( this ); + connect (d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); } KoView::~KoView() @@ -203,7 +203,7 @@ void KoView::setPartManager( KParts::PartManager *manager ) { d->m_manager = manager; if ( !koDocument()->isSingleViewMode() && - manager->parts()->containsRef( koDocument() ) == 0 ) // is there another view registered? + manager->parts()->tqcontainsRef( koDocument() ) == 0 ) // is there another view registered? { d->m_registered = true; // no, so we have to register now and ungregister again in the DTOR manager->addPart( koDocument(), false ); @@ -217,10 +217,10 @@ KParts::PartManager *KoView::partManager() const return d->m_manager; } -KAction *KoView::action( const QDomElement &element ) const +KAction *KoView::action( const TQDomElement &element ) const { - static const QString &attrName = KGlobal::staticQString( "name" ); - QString name = element.attribute( attrName ); + static const TQString &attrName = KGlobal::staticQString( "name" ); + TQString name = element.attribute( attrName ); KAction *act = KXMLGUIClient::action( name.utf8() ); @@ -230,22 +230,22 @@ KAction *KoView::action( const QDomElement &element ) const return act; } -KoDocument *KoView::hitTest( const QPoint &viewPos ) +KoDocument *KoView::hitTest( const TQPoint &viewPos ) { KoViewChild *viewChild; - QPoint pos = reverseViewTransformations( viewPos ); + TQPoint pos = reverseViewTransformations( viewPos ); KoDocumentChild *docChild = selectedChild(); if ( docChild ) { if ( ( viewChild = child( docChild->document() ) ) ) { - if ( viewChild->frameRegion().contains( pos ) ) + if ( viewChild->frameRegion().tqcontains( pos ) ) return 0; } else - if ( docChild->frameRegion().contains( pos ) ) + if ( docChild->frameRegion().tqcontains( pos ) ) return 0; } @@ -254,11 +254,11 @@ KoDocument *KoView::hitTest( const QPoint &viewPos ) { if ( ( viewChild = child( docChild->document() ) ) ) { - if ( viewChild->frameRegion().contains( pos ) ) + if ( viewChild->frameRegion().tqcontains( pos ) ) return 0; } else - if ( docChild->frameRegion().contains( pos ) ) + if ( docChild->frameRegion().tqcontains( pos ) ) return 0; } @@ -296,7 +296,7 @@ double KoView::zoom() const return d->m_zoom; } -QWidget *KoView::canvas() const +TQWidget *KoView::canvas() const { //dfaure: since the view plays two roles in this method (the const means "you can modify the canvas // but not the view", it's just coincidence that the view is the canvas by default ;) @@ -317,7 +317,7 @@ void KoView::canvasAddChild( KoViewChild * ) { } -void KoView::customEvent( QCustomEvent *ev ) +void KoView::customEvent( TQCustomEvent *ev ) { if ( KParts::PartActivateEvent::test( ev ) ) partActivateEvent( (KParts::PartActivateEvent *)ev ); @@ -339,12 +339,12 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event ) if ( child->isRectangle() && !child->isTransparent() ) { KoViewChild *viewChild = new KoViewChild( child, this ); - d->m_children.append( viewChild ); + d->m_tqchildren.append( viewChild ); - QApplication::setOverrideCursor(waitCursor); - // This is the long operation (due to toolbar layout stuff) + TQApplication::setOverrideCursor(waitCursor); + // This is the long operation (due to toolbar tqlayout stuff) d->m_manager->setActivePart( child->document(), viewChild->frame()->view() ); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); // Now we can move the frame to the right place viewChild->setInitialFrameGeometry(); @@ -361,7 +361,7 @@ void KoView::partActivateEvent( KParts::PartActivateEvent *event ) emit childDeactivated( child ); } else - emit invalidated(); + emit tqinvalidated(); } else emit activated( event->activated() ); @@ -377,20 +377,20 @@ void KoView::partSelectEvent( KParts::PartSelectEvent *event ) if ( child && event->selected() ) { - QRegion r = child->frameRegion( matrix() ); + TQRegion r = child->frameRegion( matrix() ); r.translate( - canvasXOffset(), - canvasYOffset() ); emit regionInvalidated( r, true ); emit childSelected( child ); } else if ( child ) { - QRegion r = child->frameRegion( matrix() ); + TQRegion r = child->frameRegion( matrix() ); r.translate( - canvasXOffset(), - canvasYOffset() ); emit regionInvalidated( r, true ); emit childUnselected( child ); } else - emit invalidated(); + emit tqinvalidated(); } else emit selected( event->selected() ); @@ -406,7 +406,7 @@ void KoView::showAllStatusBarItems( bool show ) KStatusBar * sb = statusBar(); if ( !sb ) return; - QValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.begin(); + TQValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.begin(); for ( ; it != d->m_statusBarItems.end() ; ++it ) if ( show ) (*it).ensureItemShown( sb ); @@ -414,21 +414,21 @@ void KoView::showAllStatusBarItems( bool show ) (*it).ensureItemHidden( sb ); } -void KoView::addStatusBarItem( QWidget * widget, int stretch, bool permanent ) +void KoView::addStatusBarItem( TQWidget * widget, int stretch, bool permanent ) { KoViewPrivate::StatusBarItem item( widget, stretch, permanent ); d->m_statusBarItems.append(item); - QValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.fromLast(); + TQValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.fromLast(); KStatusBar * sb = statusBar(); Q_ASSERT(sb); if (sb) (*it).ensureItemShown( sb ); } -void KoView::removeStatusBarItem( QWidget * widget ) +void KoView::removeStatusBarItem( TQWidget * widget ) { KStatusBar * sb = statusBar(); - QValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.begin(); + TQValueListIterator<KoViewPrivate::StatusBarItem> it = d->m_statusBarItems.begin(); for ( ; it != d->m_statusBarItems.end() ; ++it ) if ( (*it).widget() == widget ) { @@ -477,14 +477,14 @@ void KoView::disableAutoScroll( ) d->m_scrollTimer->stop(); } -void KoView::paintEverything( QPainter &painter, const QRect &rect, bool transparent ) +void KoView::paintEverything( TQPainter &painter, const TQRect &rect, bool transparent ) { koDocument()->paintEverything( painter, rect, transparent, this ); } KoViewChild *KoView::child( KoView *view ) { - QPtrListIterator<KoViewChild> it( d->m_children ); + TQPtrListIterator<KoViewChild> it( d->m_tqchildren ); for (; it.current(); ++it ) if ( it.current()->frame()->view() == view ) return it.current(); @@ -494,7 +494,7 @@ KoViewChild *KoView::child( KoView *view ) KoViewChild *KoView::child( KoDocument *doc ) { - QPtrListIterator<KoViewChild> it( d->m_children ); + TQPtrListIterator<KoViewChild> it( d->m_tqchildren ); for (; it.current(); ++it ) if ( it.current()->documentChild()->document() == doc ) return it.current(); @@ -502,9 +502,9 @@ KoViewChild *KoView::child( KoDocument *doc ) return 0L; } -QWMatrix KoView::matrix() const +TQWMatrix KoView::matrix() const { - QWMatrix m; + TQWMatrix m; m.scale( zoom(), zoom() ); //m.translate( canvasXOffset() , canvasYOffset() ); return m; @@ -522,7 +522,7 @@ void KoView::slotChildActivated( bool a ) KoView* view = ch->frame()->view(); - QWidget *activeWidget = view->d->m_tempActiveWidget; + TQWidget *activeWidget = view->d->m_tempActiveWidget; if ( d->m_manager->activeWidget() ) activeWidget = d->m_manager->activeWidget(); @@ -532,21 +532,21 @@ void KoView::slotChildActivated( bool a ) // Is the new active view a child of this one ? // In this case we may not delete! - // QObject *n = d->m_manager->activeWidget(); - QObject *n = activeWidget; + // TQObject *n = d->m_manager->activeWidget(); + TQObject *n = TQT_TQOBJECT(activeWidget); while( n ) - if ( n == (QObject *)view ) + if ( n == (TQObject *)view ) return; else - n = n->parent(); + n = n->tqparent(); d->m_tempActiveWidget = activeWidget; - QApplication::setOverrideCursor(waitCursor); + TQApplication::setOverrideCursor(waitCursor); d->m_manager->setActivePart( 0L ); - QGuardedPtr<KoDocumentChild> docChild = ch->documentChild(); - QGuardedPtr<KoFrame> chFrame = ch->frame(); + TQGuardedPtr<KoDocumentChild> docChild = ch->documentChild(); + TQGuardedPtr<KoFrame> chFrame = ch->frame(); if ( docChild && chFrame && chFrame->view() ) { docChild->setContentsPos( chFrame->view()->canvasXOffset(), @@ -554,11 +554,11 @@ void KoView::slotChildActivated( bool a ) docChild->document()->setViewBuildDocument( chFrame->view(), chFrame->view()->xmlguiBuildDocument() ); } - d->m_children.remove( ch ); + d->m_tqchildren.remove( ch ); d->m_manager->addPart( docChild->document(), false ); // the destruction of the view removed the part from the partmanager. re-add it :) - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); // #### HACK // We want to delete as many views as possible and this @@ -568,7 +568,7 @@ void KoView::slotChildActivated( bool a ) void KoView::slotChildChanged( KoDocumentChild *child ) { - QRegion region( child->oldPointArray( matrix() ) ); + TQRegion region( child->oldPointArray( matrix() ) ); emit regionInvalidated( child->frameRegion( matrix(), true ).unite( region ), true ); } @@ -582,9 +582,9 @@ int KoView::autoScrollAcceleration( int offset ) const void KoView::slotAutoScroll( ) { - QPoint scrollDistance; + TQPoint scrollDistance; bool actuallyDoScroll = false; - QPoint pos( mapFromGlobal( QCursor::pos() ) ); + TQPoint pos( mapFromGlobal( TQCursor::pos() ) ); //Provide progressive scrolling depending on the mouse position if ( pos.y() < topBorder() ) @@ -617,9 +617,9 @@ void KoView::slotAutoScroll( ) #endif pos = canvas()->mapFrom(this, pos); - QMouseEvent * event = new QMouseEvent(QEvent::MouseMove, pos, 0, state); + TQMouseEvent * event = new TQMouseEvent(TQEvent::MouseMove, pos, 0, state); - QApplication::postEvent( canvas(), event ); + TQApplication::postEvent( canvas(), event ); emit autoScroll( scrollDistance ); } } @@ -627,7 +627,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { actionNewView = new KAction( i18n( "&New View" ), "window_new", 0, - this, SLOT( newView() ), + TQT_TQOBJECT(this), TQT_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -671,12 +671,12 @@ void KoView::endOperation() KoMainWindow * KoView::shell() const { - return dynamic_cast<KoMainWindow *>( topLevelWidget() ); + return dynamic_cast<KoMainWindow *>( tqtopLevelWidget() ); } KMainWindow * KoView::mainWindow() const { - return dynamic_cast<KMainWindow *>( topLevelWidget() ); + return dynamic_cast<KMainWindow *>( tqtopLevelWidget() ); } KStatusBar * KoView::statusBar() const @@ -685,7 +685,7 @@ KStatusBar * KoView::statusBar() const return mw ? mw->statusBar() : 0L; } -void KoView::slotActionStatusText( const QString &text ) +void KoView::slotActionStatusText( const TQString &text ) { KStatusBar *sb = statusBar(); if ( sb ) @@ -723,29 +723,29 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) m_parentView = _parentView; m_child = child; - m_frame = new KoFrame( parentView()->canvas() ); + m_frame = new KoFrame( tqparentView()->canvas() ); KoView *view = child->document()->createView( m_frame ); view->setXMLGUIBuildDocument( child->document()->viewBuildDocument( view ) ); - view->setPartManager( parentView()->partManager() ); + view->setPartManager( tqparentView()->partManager() ); // hack? (Werner) - view->setZoom( parentView()->zoom() * QMAX(child->xScaling(), child->yScaling()) ); + view->setZoom( tqparentView()->zoom() * TQMAX(child->xScaling(), child->yScaling()) ); m_frame->setView( view ); m_frame->show(); m_frame->raise(); - parentView()->canvasAddChild( this ); + tqparentView()->canvasAddChild( this ); /* KoViewChild has basically three geometries to keep in sync. - - The KoDocumentChild geometry (i.e. the embedded object's geometry, unzoomed) - - Its own geometry (used for hit-test etc.) - - The KoFrame geometry (the graphical widget for moving the object when active) + - The KoDocumentChild tqgeometry (i.e. the embedded object's tqgeometry, unzoomed) + - Its own tqgeometry (used for hit-test etc.) + - The KoFrame tqgeometry (the graphical widget for moving the object when active) - So we need to subtract the scrollview's offset for the frame geometry, since it's a widget. + So we need to subtract the scrollview's offset for the frame tqgeometry, since it's a widget. The rules are (R1) frameGeometry = viewGeometry(childGeometry) "+" m_frame->{left|right|top|bottom}Border() - scrollview offset, @@ -763,8 +763,8 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) // Setting the frameGeometry is done in setInitialFrameGeometry, which is // also called right after activation. - connect( view, SIGNAL( activated( bool ) ), - parentView(), SLOT( slotChildActivated( bool ) ) ); + connect( view, TQT_SIGNAL( activated( bool ) ), + tqparentView(), TQT_SLOT( slotChildActivated( bool ) ) ); } KoViewChild::~KoViewChild() @@ -779,28 +779,28 @@ KoViewChild::~KoViewChild() void KoViewChild::slotFrameGeometryChanged() { - // Set our geometry from the frame geometry (R2 reversed) - QRect geom = m_frame->geometry(); + // Set our tqgeometry from the frame tqgeometry (R2 reversed) + TQRect geom = m_frame->tqgeometry(); int b = m_frame->border(); - QRect borderRect( geom.x() + b + parentView()->canvasXOffset(), - geom.y() + b + parentView()->canvasYOffset(), + TQRect borderRect( geom.x() + b + tqparentView()->canvasXOffset(), + geom.y() + b + tqparentView()->canvasYOffset(), geom.width() - b * 2, geom.height() - b * 2 ); setGeometry( borderRect ); if(m_child) { - // Set the child geometry from the frame geometry (R1 reversed) - QRect borderLessRect( geom.x() + m_frame->leftBorder() + parentView()->canvasXOffset(), - geom.y() + m_frame->topBorder() + parentView()->canvasYOffset(), + // Set the child tqgeometry from the frame tqgeometry (R1 reversed) + TQRect borderLessRect( geom.x() + m_frame->leftBorder() + tqparentView()->canvasXOffset(), + geom.y() + m_frame->topBorder() + tqparentView()->canvasYOffset(), geom.width() - m_frame->leftBorder() - m_frame->rightBorder(), geom.height() - m_frame->topBorder() - m_frame->bottomBorder() ); // We don't want to trigger slotDocGeometryChanged again lock(); - QRect childGeom = parentView()->reverseViewTransformations( borderLessRect ); - kdDebug() << "KoChild::slotFrameGeometryChanged child geometry " - << ( geometry() == childGeom ? "already " : "set to " ) + TQRect childGeom = tqparentView()->reverseViewTransformations( borderLessRect ); + kdDebug() << "KoChild::slotFrameGeometryChanged child tqgeometry " + << ( tqgeometry() == childGeom ? "already " : "set to " ) << childGeom << endl; m_child->setGeometry( childGeom ); unlock(); @@ -811,39 +811,39 @@ void KoViewChild::slotDocGeometryChanged() { if ( locked() ) return; - // Set frame geometry from child geometry (R1) + // Set frame tqgeometry from child tqgeometry (R1) // The frame's resizeEvent will call slotFrameGeometryChanged. - QRect geom = parentView()->applyViewTransformations( m_child->geometry() ); - QRect borderRect( geom.x() - m_frame->leftBorder() - parentView()->canvasXOffset(), - geom.y() - m_frame->topBorder() - parentView()->canvasYOffset(), + TQRect geom = tqparentView()->applyViewTransformations( m_child->tqgeometry() ); + TQRect borderRect( geom.x() - m_frame->leftBorder() - tqparentView()->canvasXOffset(), + geom.y() - m_frame->topBorder() - tqparentView()->canvasYOffset(), geom.width() + m_frame->leftBorder() + m_frame->rightBorder(), geom.height() + m_frame->topBorder() + m_frame->bottomBorder() ); - kdDebug() << "KoViewChild::slotDocGeometryChanged frame geometry " - << ( m_frame->geometry() == borderRect ? "already " : "set to " ) + kdDebug() << "KoViewChild::slotDocGeometryChanged frame tqgeometry " + << ( m_frame->tqgeometry() == borderRect ? "already " : "set to " ) << borderRect << endl; m_frame->setGeometry( borderRect ); } -QPoint KoView::applyViewTransformations( const QPoint& p ) const +TQPoint KoView::applyViewTransformations( const TQPoint& p ) const { - return QPoint( qRound( p.x() * zoom() ), qRound( p.y() * zoom() ) ); + return TQPoint( tqRound( p.x() * zoom() ), tqRound( p.y() * zoom() ) ); } -QPoint KoView::reverseViewTransformations( const QPoint& v ) const +TQPoint KoView::reverseViewTransformations( const TQPoint& v ) const { - return QPoint( qRound( v.x() / zoom() ), qRound( v.y() / zoom() ) ); + return TQPoint( tqRound( v.x() / zoom() ), tqRound( v.y() / zoom() ) ); } -QRect KoView::applyViewTransformations( const QRect& r ) const +TQRect KoView::applyViewTransformations( const TQRect& r ) const { - return QRect( applyViewTransformations( r.topLeft() ), + return TQRect( applyViewTransformations( r.topLeft() ), applyViewTransformations( r.bottomRight() ) ); } -QRect KoView::reverseViewTransformations( const QRect& r ) const +TQRect KoView::reverseViewTransformations( const TQRect& r ) const { - return QRect( reverseViewTransformations( r.topLeft() ), + return TQRect( reverseViewTransformations( r.topLeft() ), reverseViewTransformations( r.bottomRight() ) ); } @@ -852,10 +852,10 @@ void KoViewChild::setInitialFrameGeometry() kdDebug() << k_funcinfo << endl; // Connect only now, so that the GUI building doesn't move us around. - connect( m_frame, SIGNAL( geometryChanged() ), - this, SLOT( slotFrameGeometryChanged() ) ); - connect( m_child, SIGNAL( changed( KoChild * ) ), - this, SLOT( slotDocGeometryChanged() ) ); + connect( m_frame, TQT_SIGNAL( tqgeometryChanged() ), + this, TQT_SLOT( slotFrameGeometryChanged() ) ); + connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), + this, TQT_SLOT( slotDocGeometryChanged() ) ); // Set frameGeometry from childGeometry slotDocGeometryChanged(); |