diff options
Diffstat (limited to 'kword')
| -rw-r--r-- | kword/KWCanvas.cpp | 4 | ||||
| -rw-r--r-- | kword/KWView.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 11e23e27..044801ae 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -1699,9 +1699,9 @@ void KWCanvas::updateRulerOffsets( int cx, int cy ) bool KWCanvas::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + if ( o == this || o == viewport() ) { - if(m_currentFrameSetEdit && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if(m_currentFrameSetEdit && o == this ) { // Pass event to auto-hide-cursor code (see kcursor.h for details) KCursor::autoHideEventFilter( o, e ); diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 74a49cfa..7d5bbf7f 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -1512,7 +1512,7 @@ void KWView::insertExpression() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + TDEAction * act = (TDEAction *)(sender()); edit->insertExpression(act->text()); } } @@ -1611,7 +1611,7 @@ void KWView::insertCustomVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + TDEAction * act = (TDEAction *)(sender()); edit->insertCustomVariable(act->text()); } } @@ -2245,7 +2245,7 @@ void KWView::updateStyleList() // Called when selecting a style in the Format / Style menu void KWView::slotStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = PARAGSTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -3580,7 +3580,7 @@ void KWView::insertVariable() KWTextFrameSetEdit * edit = currentTextEdit(); if ( edit ) { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + TDEAction * act = (TDEAction *)(sender()); VariableDefMap::Iterator it = m_variableDefMap.find( act ); if ( it == m_variableDefMap.end() ) kdWarning() << "Action not found in m_variableDefMap." << endl; @@ -4532,7 +4532,7 @@ void KWView::textStyleSelected( int index ) // Slot is called when selecting a framestyle in the Frames / Framestyle menu void KWView::slotFrameStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = FRAMESTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -4601,7 +4601,7 @@ void KWView::frameStyleSelected( KWFrameStyle *sty ) // Called when selecting a tablestyle in the Table / Tablestyle menu void KWView::slotTableStyleSelected() { - TQString actionName = TQString::fromUtf8(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromUtf8(sender()->name()); const TQString prefix = TABLESTYLE_ACTION_PREFIX; if ( actionName.startsWith( prefix ) ) { actionName = actionName.mid( prefix.length() ); @@ -5021,7 +5021,7 @@ void KWView::textSpacingDouble() void KWView::slotCounterStyleSelected() { - TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + TQString actionName = TQString::fromLatin1(sender()->name()); TQString styleStr = actionName.mid(13); //kdDebug() << "KWView::slotCounterStyleSelected styleStr=" << styleStr << endl; KoParagCounter::Style style = (KoParagCounter::Style)(styleStr.toInt()); @@ -7460,7 +7460,7 @@ TQPtrList<TDEAction> KWView::listOfResultOfCheckWord( const TQString &word ) void KWView::slotCorrectWord() { - TDEAction * act = (TDEAction *)(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + TDEAction * act = (TDEAction *)(sender()); KWTextFrameSetEdit* edit = currentTextEdit(); if ( edit ) { @@ -7472,7 +7472,7 @@ void KWView::slotCorrectWord() void KWView::slotChildActivated( bool a ) { // Same hack as in KoView - KoViewChild* ch = child( (KoView*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) ); + KoViewChild* ch = child( (KoView*)sender() ); if ( !ch ) return; KWDocumentChild* kwchild = static_cast<KWDocumentChild *>( ch->documentChild() ); |