Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

7 files changed, 11 insertions, 11 deletions

diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 50063362..66f0b57c 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -351,10 +351,10 @@ KoDocument* KWDocumentChild::hitTest( const TQPoint& p, const TQWMatrix& _matrix
     }
 
 #if KDE_IS_VERSION( 3, 4, 0 )
-    int keyState = kapp->keyboardMouseState();
+    int keyState = tdeApp->keyboardMouseState();
 #else
     int keyState = 0;
-    if ( kapp->keyboardModifiers() & TDEApplication::ControlModifier )
+    if ( tdeApp->keyboardModifiers() & TDEApplication::ControlModifier )
         keyState = TQt::ControlButton;
 #endif
 
diff --git a/kword/KWordDocIface.cpp b/kword/KWordDocIface.cpp
index 845297ba..4616a6d6 100644
--- a/kword/KWordDocIface.cpp
+++ b/kword/KWordDocIface.cpp
@@ -38,7 +38,7 @@ DCOPRef KWordDocIface::textFrameSet( int num )
 {
     if( num>= (int)doc->frameSetCount())
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             doc->textFrameSet( num)->dcopObject()->objId() );
 }
 
@@ -46,7 +46,7 @@ DCOPRef KWordDocIface::frameSet( int num )
 {
     if( num>= (int)doc->frameSetCount())
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             doc->frameSet( num)->dcopObject()->objId() );
 }
 
diff --git a/kword/KWordFormulaFrameSetIface.cpp b/kword/KWordFormulaFrameSetIface.cpp
index e19c69dd..496117f7 100644
--- a/kword/KWordFormulaFrameSetIface.cpp
+++ b/kword/KWordFormulaFrameSetIface.cpp
@@ -42,7 +42,7 @@ DCOPRef KWordFormulaFrameSetIface::startEditing()
     TQValueList<KWView *> views = doc->getAllViews();
     KWCanvas* canvas = views.first()->getGUI()->canvasWidget();
     canvas->editFrameSet( m_formulaFrame );
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             ( static_cast<KWFormulaFrameSetEdit *>( canvas->currentFrameSetEdit() ) )
              ->dcopObject()->objId() );
 }
diff --git a/kword/KWordPartFrameSetIface.cpp b/kword/KWordPartFrameSetIface.cpp
index 88e58636..c40d14af 100644
--- a/kword/KWordPartFrameSetIface.cpp
+++ b/kword/KWordPartFrameSetIface.cpp
@@ -44,6 +44,6 @@ void KWordPartFrameSetIface::startEditing()
         return;
     view->partManager()->addPart( part, false );
     view->partManager()->setActivePart( part, view );
-    /* return DCOPRef( kapp->dcopClient()->appId(),
+    /* return DCOPRef( tdeApp->dcopClient()->appId(),
        (static_cast<KWPartFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() ); */
 }
diff --git a/kword/KWordTableFrameSetIface.cpp b/kword/KWordTableFrameSetIface.cpp
index 930f30ae..0a89402c 100644
--- a/kword/KWordTableFrameSetIface.cpp
+++ b/kword/KWordTableFrameSetIface.cpp
@@ -58,7 +58,7 @@ DCOPRef KWordTableFrameSetIface::cell( int pos )
     if( ! i.current() )
         return DCOPRef();
 
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             i->dcopObject()->objId() );
 }
 
@@ -66,7 +66,7 @@ DCOPRef KWordTableFrameSetIface::cell( uint row, uint col )
 {
   if( row>=m_table->getRows() || col>= m_table->getColumns())
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             m_table->cell(row,col)->dcopObject()->objId() );
 }
 
@@ -82,6 +82,6 @@ DCOPRef KWordTableFrameSetIface::startEditingCell(uint row, uint col )
     if( !m_frametext || m_frametext->isDeleted())
         return DCOPRef();
     canvas->checkCurrentEdit(m_frametext, true);
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             (static_cast<KWTextFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() );
 }
diff --git a/kword/KWordTextFrameSetIface.cpp b/kword/KWordTextFrameSetIface.cpp
index 4dcb836c..75d973c4 100644
--- a/kword/KWordTextFrameSetIface.cpp
+++ b/kword/KWordTextFrameSetIface.cpp
@@ -45,7 +45,7 @@ DCOPRef KWordTextFrameSetIface::startEditing()
     TQValueList<KWView *> views = doc->getAllViews();
     KWCanvas* canvas = views.first()->getGUI()->canvasWidget();
     canvas->editFrameSet(m_frametext, true);
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
             (static_cast<KWTextFrameSetEdit *>( canvas->currentFrameSetEdit()))->dcopObject()->objId() );
 }
 
diff --git a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
index bb183a74..65814497 100644
--- a/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
+++ b/kword/mailmerge/tdeabc/KWMailMergeTDEABCConfig.cpp
@@ -285,7 +285,7 @@ void KWMailMergeTDEABCConfig::initSlotSignalConnections()
 
 void KWMailMergeTDEABCConfig::launchAddressbook() const
 {
-    kapp->startServiceByDesktopName( "kaddressbook", TQString() );
+    tdeApp->startServiceByDesktopName( "kaddressbook", TQString() );
 }