Use tdeApp

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

9 files changed, 24 insertions, 24 deletions

diff --git a/kspread/KSpreadAppIface.cpp b/kspread/KSpreadAppIface.cpp
index 6f0c8362e..fb98b0345 100644
--- a/kspread/KSpreadAppIface.cpp
+++ b/kspread/KSpreadAppIface.cpp
@@ -43,7 +43,7 @@ DCOPRef AppIface::createDoc()
     Doc* doc = new Doc();
     doc->initDoc(KoDocument::InitDocFileNew);
 
-    return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
 }
 
 DCOPRef AppIface::createDoc( const TQString& name )
@@ -52,7 +52,7 @@ DCOPRef AppIface::createDoc( const TQString& name )
     Doc* doc = new Doc( 0, name.latin1() );
     doc->initDoc( KoDocument::InitDocEmpty, 0 );
 
-    return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
 }
 
 TQMap<TQString,DCOPRef> AppIface::documents()
@@ -64,7 +64,7 @@ TQMap<TQString,DCOPRef> AppIface::documents()
     for( ; it != lst.end(); ++it )
     {
 	map[ TQString( (*it)->name() ) ] =
-	 DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
+	 DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
     }
 
     return map;
@@ -76,7 +76,7 @@ DCOPRef AppIface::document( const TQString& name )
     TQValueListIterator<Doc*> it = lst.begin();
     for( ; it != lst.end(); ++it )
 	if ( name == (*it)->name() )
-	    return DCOPRef( kapp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
+	    return DCOPRef( tdeApp->dcopClient()->appId(), (*it)->dcopObject()->objId() );
 
     return DCOPRef();
 }
diff --git a/kspread/KSpreadDocIface.cpp b/kspread/KSpreadDocIface.cpp
index e8f1df462..73d53d966 100644
--- a/kspread/KSpreadDocIface.cpp
+++ b/kspread/KSpreadDocIface.cpp
@@ -46,7 +46,7 @@ DocIface::DocIface( Doc* _doc )
 
 DCOPRef DocIface::map()
 {
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     doc->map()->dcopObject()->objId() );
 }
 
diff --git a/kspread/KSpreadMapIface.cpp b/kspread/KSpreadMapIface.cpp
index ba8071f9c..5677ceb5e 100644
--- a/kspread/KSpreadMapIface.cpp
+++ b/kspread/KSpreadMapIface.cpp
@@ -46,7 +46,7 @@ DCOPRef MapIface::sheet( const TQString& name )
     if ( !t )
         return DCOPRef();
 
-    return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
 }
 
 DCOPRef MapIface::sheetByIndex( int index )
@@ -60,7 +60,7 @@ DCOPRef MapIface::sheetByIndex( int index )
 
     kdDebug(36001) << "+++++++ Returning table " << t->TQObject::name() << endl;
 
-    return DCOPRef( kapp->dcopClient()->appId(), t->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), t->dcopObject()->objId() );
 }
 
 int MapIface::sheetCount() const
@@ -87,7 +87,7 @@ TQValueList<DCOPRef> MapIface::sheets()
     TQPtrList<Sheet>& lst = m_map->sheetList();
     TQPtrListIterator<Sheet> 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;
 }
@@ -120,6 +120,6 @@ bool MapIface::processDynamic(const TQCString &fun, const TQByteArray &/*data*/,
 
     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/kspread/KSpreadTableIface.cpp b/kspread/KSpreadTableIface.cpp
index cbf37f202..d124c3c7b 100644
--- a/kspread/KSpreadTableIface.cpp
+++ b/kspread/KSpreadTableIface.cpp
@@ -65,7 +65,7 @@ private:
 };
 
 KSpread::CellProxy::CellProxy( Sheet* sheet, const TQCString& prefix )
-    : DCOPObjectProxy( kapp->dcopClient() ), m_prefix( prefix )
+    : DCOPObjectProxy( tdeApp->dcopClient() ), m_prefix( prefix )
 {
     m_cell = new CellIface;
     m_sheet = sheet;
@@ -168,7 +168,7 @@ DCOPRef SheetIface::cell( int x, int y )
 
     TQCString str = objId() + '/' + Cell::name( x, y ).latin1();
 
-    return DCOPRef( kapp->dcopClient()->appId(), str );
+    return DCOPRef( tdeApp->dcopClient()->appId(), str );
 }
 
 DCOPRef SheetIface::cell( const TQString& name )
@@ -177,7 +177,7 @@ DCOPRef SheetIface::cell( const TQString& name )
     str += "/";
     str += name.latin1();
 
-    return DCOPRef( kapp->dcopClient()->appId(), str );
+    return DCOPRef( tdeApp->dcopClient()->appId(), str );
 }
 
 DCOPRef SheetIface::column( int _col )
@@ -185,7 +185,7 @@ DCOPRef SheetIface::column( int _col )
     //First col number = 1
     if(_col <1)
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
 		    m_sheet->nonDefaultColumnFormat( _col )->dcopObject()->objId() );
 
 }
@@ -195,7 +195,7 @@ DCOPRef SheetIface::row( int _row )
     //First row number = 1
     if(_row <1)
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
 		    m_sheet->nonDefaultRowFormat( _row )->dcopObject()->objId() );
 }
 
@@ -249,7 +249,7 @@ bool SheetIface::processDynamic( const TQCString& fun, const TQByteArray&/*data*
 
     replyType = "DCOPRef";
     TQDataStream out( replyData, IO_WriteOnly );
-    out << DCOPRef( kapp->dcopClient()->appId(), str );
+    out << DCOPRef( tdeApp->dcopClient()->appId(), str );
     return true;
 }
 
diff --git a/kspread/KSpreadViewIface.cpp b/kspread/KSpreadViewIface.cpp
index 1fb76f460..143528de0 100644
--- a/kspread/KSpreadViewIface.cpp
+++ b/kspread/KSpreadViewIface.cpp
@@ -56,17 +56,17 @@ ViewIface::~ViewIface()
 
 DCOPRef ViewIface::doc() const
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_view->doc()->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_view->doc()->dcopObject()->objId() );
 }
 
 DCOPRef ViewIface::map() const
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_view->doc()->map()->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_view->doc()->map()->dcopObject()->objId() );
 }
 
 DCOPRef ViewIface::sheet() const
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_view->activeSheet()->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_view->activeSheet()->dcopObject()->objId() );
 }
 
 void ViewIface::changeNbOfRecentFiles(int _nb)
diff --git a/kspread/kspread_doc.cpp b/kspread/kspread_doc.cpp
index 17f02d487..229216d35 100644
--- a/kspread/kspread_doc.cpp
+++ b/kspread/kspread_doc.cpp
@@ -320,7 +320,7 @@ bool Doc::initDoc(InitDocFlags flags, TQWidget* parentWidget)
   bool ok=openURL(url);
 
   while (KoDocument::isLoading())
-    kapp->processEvents();
+    tdeApp->processEvents();
 
   return ok;
 
diff --git a/kspread/kspread_object.cpp b/kspread/kspread_object.cpp
index ca3732057..706eecf23 100644
--- a/kspread/kspread_object.cpp
+++ b/kspread/kspread_object.cpp
@@ -205,7 +205,7 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
 
   //_painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
   _painter->setPen( pen );
-  _painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
+  _painter->setBrush( tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
 
   //KoRect r = rotateRectObject(); // TODO: rotation
   KoRect r = /*KoRect::fromTQRect*/( bound );
@@ -241,7 +241,7 @@ void EmbeddedObject::paintSelection( TQPainter *_painter, SelectionMode mode )
     zX6=zX6-2;
     zY6=zY6-2;
 
-    TQBrush brush=kapp->palette().color( TQPalette::Active,TQColorGroup::Base );
+    TQBrush brush=tdeApp->palette().color( TQPalette::Active,TQColorGroup::Base );
     _painter->fillRect( x, y,  zX6, zY6, brush );
     _painter->fillRect( x, y + h / 2, zX6, zY6, brush);
     _painter->fillRect( x, y + h, zX6, zY6, brush );
diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp
index 66ded1ffb..8bdff42b8 100644
--- a/kspread/kspread_view.cpp
+++ b/kspread/kspread_view.cpp
@@ -3054,7 +3054,7 @@ void View::setSelectionBorderColor(const TQColor &bdColor)
 
 void View::helpUsing()
 {
-  kapp->invokeHelp( );
+  tdeApp->invokeHelp( );
 }
 
 void View::enableUndo( bool _b )
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index 92f665e71..8451224e9 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -63,8 +63,8 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char
 
     // Set the window caption/title
 
-    // connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
-    // setCaption( kapp->caption() );
+    // connect(tdeApp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors()));
+    // setCaption( tdeApp->caption() );
 
     // create help button