7 files changed, 13 insertions, 13 deletions
diff --git a/kivio/kiviopart/KIvioDocIface.cpp b/kivio/kiviopart/KIvioDocIface.cpp
index e9ab089f..f1f4a1f7 100644
--- a/kivio/kiviopart/KIvioDocIface.cpp
+++ b/kivio/kiviopart/KIvioDocIface.cpp
@@ -35,7 +35,7 @@ KIvioDocIface::KIvioDocIface( KivioDoc *doc_ )
 
 DCOPRef KIvioDocIface::map()
 {
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     doc->map()->dcopObject()->objId() );
 }
 
diff --git a/kivio/kiviopart/KIvioMapIface.cpp b/kivio/kiviopart/KIvioMapIface.cpp
index 99397692..6e199f8f 100644
--- a/kivio/kiviopart/KIvioMapIface.cpp
+++ b/kivio/kiviopart/KIvioMapIface.cpp
@@ -39,7 +39,7 @@ DCOPRef KIvioMapIface::page( const TQString& name )
     if ( !t )
         return DCOPRef();
 
-    return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
 }
 
 DCOPRef KIvioMapIface::pageByIndex( int index )
@@ -53,7 +53,7 @@ DCOPRef KIvioMapIface::pageByIndex( int index )
 
     kdDebug(43000) << "+++++++ Returning page " << t->TQObject::name() << endl;
 
-    return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
 }
 
 int KIvioMapIface::pageCount() const
@@ -80,7 +80,7 @@ TQValueList<DCOPRef> KIvioMapIface::pages()
     TQPtrList<KivioPage>& lst = m_map->pageList();
     TQPtrListIterator<KivioPage> it( lst );
     for( ; it.current(); ++it )
-        t.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
+        t.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
 
     return t;
 }
@@ -114,6 +114,6 @@ bool KIvioMapIface::processDynamic(const TQCString &fun, const TQByteArray &/*da
 
     replyType = "DCOPRef";
     TQDataStream out( replyData, IO_WriteOnly );
-    out << DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
+    out << DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
     return true;
 }
diff --git a/kivio/kiviopart/KIvioPageIface.cpp b/kivio/kiviopart/KIvioPageIface.cpp
index 26ba9a2e..fc5a95f7 100644
--- a/kivio/kiviopart/KIvioPageIface.cpp
+++ b/kivio/kiviopart/KIvioPageIface.cpp
@@ -90,7 +90,7 @@ int KIvioPageIface::nbLayer() const
 DCOPRef KIvioPageIface::firstLayer()
 {
     if ( m_page->firstLayer())
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         m_page->firstLayer()->dcopObject()->objId() );
     else
         return DCOPRef();
@@ -100,7 +100,7 @@ DCOPRef KIvioPageIface::layerAt( int pos)
 {
     if ( pos >= nbLayer() )
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     m_page->layerAt(pos)->dcopObject()->objId() );
 }
 
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 2c72e77d..5b070e82 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -1707,7 +1707,7 @@ void KivioView::addStencilFromSpawner( KivioStencilSpawner *pSpawner, double x,
 
     // Use default properties if we held ctrl down
 #if KDE_IS_VERSION(3, 4, 0)
-    if(kapp->keyboardMouseState() & TQt::ControlButton) {
+    if(tdeApp->keyboardMouseState() & TQt::ControlButton) {
 #else
     if(TDEApplication::keyboardModifiers() & TDEApplication::ControlModifier) {
 #endif
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 9ace753d..7c611848 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -82,7 +82,7 @@ void KivioArrowHeadAction::popup( const TQPoint& global )
 int KivioArrowHeadAction::plug( TQWidget* widget, int index)
 {
   // This function is copied from TDEActionMenu::plug
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( widget->inherits("TQPopupMenu") )
@@ -93,7 +93,7 @@ int KivioArrowHeadAction::plug( TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
+      id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 2ef54d4f..ba48b32e 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -95,7 +95,7 @@ void KivioStencilSetAction::popup( const TQPoint& global )
 int KivioStencilSetAction::plug( TQWidget* widget, int index)
 {
   // This function is copied from TDEActionMenu::plug
-  if (kapp && !kapp->authorizeTDEAction(name()))
+  if (tdeApp && !tdeApp->authorizeTDEAction(name()))
     return -1;
   kdDebug(129) << "TDEAction::plug( " << widget << ", " << index << " )" << endl; // remove -- ellis
   if ( widget->inherits("TQPopupMenu") )
@@ -106,7 +106,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
     if ( hasIconSet() )
       id = menu->insertItem( iconSet(), text(), popupMenu(), -1, index );
     else
-      id = menu->insertItem( kapp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
+      id = menu->insertItem( tdeApp->iconLoader()->loadIcon(icon(), TDEIcon::Small),
         text(), popupMenu(), -1, index );
 
     if ( !isEnabled() )
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index d2718f0a..4dddc35d 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -98,7 +98,7 @@ KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name)
 void KivioOptionsDialog::initPage()
 {
   TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"),
-    kapp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32));
+    tdeApp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
   KivioView* view = static_cast<KivioView*>(parent());