Use tdeApp

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

122 files changed, 285 insertions, 285 deletions

diff --git a/chalk/core/kis_image_iface.cpp b/chalk/core/kis_image_iface.cpp
index 2cc16e27e..f75220341 100644
--- a/chalk/core/kis_image_iface.cpp
+++ b/chalk/core/kis_image_iface.cpp
@@ -79,7 +79,7 @@ DCOPRef KisImageIface::activeDevice()
     if( !dev )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         dev->dcopObject()->objId(),
                         "KisPaintDeviceIface");
 
@@ -91,7 +91,7 @@ DCOPRef KisImageIface::colorSpace() const
     if ( !cs )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         cs->dcopObject()->objId(),
                         "KisColorSpaceIface" );
 }
diff --git a/chalk/core/kis_paint_device_iface.cpp b/chalk/core/kis_paint_device_iface.cpp
index c8afa80a3..6ac3ad1c7 100644
--- a/chalk/core/kis_paint_device_iface.cpp
+++ b/chalk/core/kis_paint_device_iface.cpp
@@ -62,7 +62,7 @@ DCOPRef KisPaintDeviceIface::colorSpace() const
     if ( !cs )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         cs->dcopObject()->objId(),
                         "KisColorSpaceIface" );
 }
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index bd5b4a729..1233fc1be 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
@@ -129,9 +129,9 @@ void KisToolZoom::deactivate()
 void KisToolZoom::slotTimer()
 {
 #if KDE_IS_VERSION(3,4,0)
-    int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
+    int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
             |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index 62f014d98..b1a232450 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
@@ -166,9 +166,9 @@ void KisToolSelectSimilar::buttonPress(KisButtonPressEvent *e)
 void KisToolSelectSimilar::slotTimer()
 {
 #if KDE_IS_VERSION(3,4,0)
-    int state = kapp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
+    int state = tdeApp->keyboardMouseState() & (TQt::ShiftButton|TQt::ControlButton|TQt::AltButton);
 #else
-    int state = kapp->keyboardModifiers() & (TDEApplication::ShiftModifier
+    int state = tdeApp->keyboardModifiers() & (TDEApplication::ShiftModifier
             |TDEApplication::ControlModifier|TDEApplication::Modifier1);
 #endif
     enumSelectionMode action;
diff --git a/chalk/ui/kis_doc.cpp b/chalk/ui/kis_doc.cpp
index 5db84839f..9478749c3 100644
--- a/chalk/ui/kis_doc.cpp
+++ b/chalk/ui/kis_doc.cpp
@@ -1120,7 +1120,7 @@ void KisDoc::IODone()
 
 void KisDoc::slotIOProgress(TQ_INT8 percentage)
 {
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
 
     Q_ASSERT(app);
 
diff --git a/chalk/ui/kis_doc_iface.cpp b/chalk/ui/kis_doc_iface.cpp
index ae5a4a581..d93013caa 100644
--- a/chalk/ui/kis_doc_iface.cpp
+++ b/chalk/ui/kis_doc_iface.cpp
@@ -36,7 +36,7 @@ DCOPRef  KisDocIface::currentImage()
     if( !img )
         return DCOPRef();
     else
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         img->dcopObject()->objId(),
                         "KisImageIface");
 }
diff --git a/chalk/ui/kis_label_progress.cpp b/chalk/ui/kis_label_progress.cpp
index 383b8254d..7cf79ab10 100644
--- a/chalk/ui/kis_label_progress.cpp
+++ b/chalk/ui/kis_label_progress.cpp
@@ -169,7 +169,7 @@ void KisLabelProgress::update(int percent)
 {
     m_bar->setValue(percent);
 
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
 
     app->processEvents();
     // The following is safer, but makes cancel impossible:
@@ -181,7 +181,7 @@ void KisLabelProgress::updateStage(const TQString&, int percent)
 {
     m_bar->setValue(percent);
 
-    TDEApplication *app = TDEApplication::kApplication();
+    TDEApplication *app = tdeApp;
     Q_ASSERT(app);
 
     app->processEvents();
diff --git a/doc/chalk/installation.docbook b/doc/chalk/installation.docbook
index eb2eef395..c11b01da1 100644
--- a/doc/chalk/installation.docbook
+++ b/doc/chalk/installation.docbook
@@ -1,7 +1,7 @@
 <appendix id="installation">
 <title>Installation</title>
 
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
 <title>How to obtain &chalk;</title>
 
 <!-- This first entity contains boiler plate for applications that are
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cpp b/filters/chalk/gmagick/kis_image_magick_converter.cpp
index f25449ec4..01e1ee141 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cpp
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp
@@ -309,7 +309,7 @@ namespace {
         static bool init = false;
 
         if (!init) {
-            TDEApplication *app = TDEApplication::kApplication();
+            TDEApplication *app = tdeApp;
 
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
@@ -330,7 +330,7 @@ namespace {
 #if 0
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
@@ -343,7 +343,7 @@ namespace {
 #else
     unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cpp b/filters/chalk/jpeg/kis_jpeg_export.cpp
index 042a3c8ef..e876fe1ad 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cpp
+++ b/filters/chalk/jpeg/kis_jpeg_export.cpp
@@ -97,7 +97,7 @@ KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const T
  
     KisWdgOptionsJPEG* wdg = new KisWdgOptionsJPEG(kdb);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         return KoFilter::OK; // FIXME Cancel doesn't exist :(
diff --git a/filters/chalk/magick/kis_image_magick_converter.cpp b/filters/chalk/magick/kis_image_magick_converter.cpp
index 5f8bafa3a..5ea939e44 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cpp
+++ b/filters/chalk/magick/kis_image_magick_converter.cpp
@@ -257,7 +257,7 @@ namespace {
         static bool init = false;
 
         if (!init) {
-            TDEApplication *app = TDEApplication::kApplication();
+            TDEApplication *app = tdeApp;
 
             InitializeMagick(*app -> argv());
             atexit(DestroyMagick);
@@ -278,7 +278,7 @@ namespace {
 #ifdef HAVE_MAGICK6
     MagickBooleanType monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
@@ -291,7 +291,7 @@ namespace {
 #else
     unsigned int monitor(const char *text, const ExtendedSignedIntegralType, const ExtendedUnsignedIntegralType, ExceptionInfo *)
     {
-        TDEApplication *app = TDEApplication::kApplication();
+        TDEApplication *app = tdeApp;
 
         Q_ASSERT(app);
 
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index efcc4ad6c..c1822ebbc 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -112,7 +112,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
     
     KisPDFImportWidget* wdg = new KisPDFImportWidget(pdoc, kdb);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         delete pdoc;
diff --git a/filters/chalk/png/kis_png_export.cpp b/filters/chalk/png/kis_png_export.cpp
index bb071ff2e..f2fb548c6 100644
--- a/filters/chalk/png/kis_png_export.cpp
+++ b/filters/chalk/png/kis_png_export.cpp
@@ -89,7 +89,7 @@ KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQ
     wdg->alpha->setChecked(isThereAlpha);
     wdg->alpha->setEnabled(isThereAlpha);
     kdb->setMainWidget(wdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     if(kdb->exec() == TQDialog::Rejected)
     {
         return KoFilter::OK; // FIXME Cancel doesn't exist :(
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 43857e9b4..e0f5ba915 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -38,7 +38,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name)
     connect(optionswdg->kComboBoxCompressionType, TQ_SIGNAL(activated ( int )), this, TQ_SLOT(activated ( int ) ));
     connect(optionswdg->flatten, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(flattenToggled( bool) ) );
     setMainWidget(optionswdg);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
 }
 
diff --git a/filters/kformula/latex/latexexport.cpp b/filters/kformula/latex/latexexport.cpp
index d47e36bd3..6c0c34286 100644
--- a/filters/kformula/latex/latexexport.cpp
+++ b/filters/kformula/latex/latexexport.cpp
@@ -72,7 +72,7 @@ KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQ
         return KoFilter::FileNotFound;
     }
 
-    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
     KFormula::Document* doc = new KFormula::Document;
     wrapper->document( doc );
     KFormula::Container* formula = doc->createFormula();
diff --git a/filters/kformula/mathml/mathmlexport.cpp b/filters/kformula/mathml/mathmlexport.cpp
index 37951d2de..cf0f307ad 100644
--- a/filters/kformula/mathml/mathmlexport.cpp
+++ b/filters/kformula/mathml/mathmlexport.cpp
@@ -72,7 +72,7 @@ KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const T
         return KoFilter::FileNotFound;
     }
 
-    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
     KFormula::Document* doc = new KFormula::Document;
     wrapper->document( doc );
     KFormula::Container* formula = doc->createFormula();
diff --git a/filters/kformula/mathml/mathmlimport.cpp b/filters/kformula/mathml/mathmlimport.cpp
index b8fa07ed4..a204e0a4f 100644
--- a/filters/kformula/mathml/mathmlimport.cpp
+++ b/filters/kformula/mathml/mathmlimport.cpp
@@ -59,7 +59,7 @@ KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const T
         return KoFilter::FileNotFound;
     }
 
-    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
     KFormula::Document* doc = new KFormula::Document;
     wrapper->document( doc );
     KFormula::Container* formula = doc->createFormula();
diff --git a/filters/kformula/png/pngexport.cpp b/filters/kformula/png/pngexport.cpp
index 47b0d316f..820f81058 100644
--- a/filters/kformula/png/pngexport.cpp
+++ b/filters/kformula/png/pngexport.cpp
@@ -53,14 +53,14 @@ KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCS
 
     KoStoreDevice* in = m_chain->storageFile( "root", KoStore::Read );
     if(!in) {
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
         KMessageBox::error( 0, i18n( "Failed to read data." ), i18n( "PNG Export Error" ) );
         return KoFilter::FileNotFound;
     }
 
     TQDomDocument dom( "KFORMULA" );
     if ( !dom.setContent( in, false ) ) {
-        kapp->restoreOverrideCursor();
+        tdeApp->restoreOverrideCursor();
         KMessageBox::error( 0, i18n( "Malformed XML data." ), i18n( "PNG Export Error" ) );
         return KoFilter::WrongFormat;
     }
diff --git a/filters/kformula/png/pngexportdia.cpp b/filters/kformula/png/pngexportdia.cpp
index c63d276d0..18d76221b 100644
--- a/filters/kformula/png/pngexportdia.cpp
+++ b/filters/kformula/png/pngexportdia.cpp
@@ -43,8 +43,8 @@ PNGExportDia::PNGExportDia( const TQDomDocument &dom, const TQString &outFile, T
     : KDialogBase( parent, name, true, i18n("PNG Export Filter Parameters" ), Ok|Cancel ),
       _fileOut( outFile )
 {
-    kapp->restoreOverrideCursor();
-    wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+    tdeApp->restoreOverrideCursor();
+    wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
     KFormula::Document* doc = new KFormula::Document;
     wrapper->document( doc );
     formula = doc->createFormula();
diff --git a/filters/kformula/svg/svgexport.cpp b/filters/kformula/svg/svgexport.cpp
index 35896ac1b..62e20620a 100644
--- a/filters/kformula/svg/svgexport.cpp
+++ b/filters/kformula/svg/svgexport.cpp
@@ -69,7 +69,7 @@ SvgExport::convert(const TQCString& from, const TQCString& to)
     TQDomElement   docNode = domIn.documentElement();
 
     // Read the document from the XML tree.
-    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+    KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
     KFormula::Document* kformulaDoc = new KFormula::Document;
     wrapper->document( kformulaDoc );
     KFormula::Container* formula = kformulaDoc->createFormula();
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
index 1ed8fc0d2..84001c813 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
@@ -34,7 +34,7 @@ namespace Kivio
 ImageExportDialog::ImageExportDialog(TQWidget* parent, const char* name)
   : KDialogBase(parent, name, false, i18n("Export to Image"), Ok|Cancel)
 {
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
   m_mainWidget = new ImageExportWidget(this);
   setMainWidget(m_mainWidget);
 }
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index ed65970d4..914f75b4c 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -57,7 +57,7 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
       m_codec( TQTextCodec::codecForName( "UTF-8" ) )
 {
     setCaption( i18n( "Import" ) );
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     
     TQStringList encodings;
     encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -113,12 +113,12 @@ CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*
 CSVDialog::~CSVDialog()
 {
     saveSettings();
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 void CSVDialog::loadSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("CSVDialog Settings");
     m_textquote = config->readEntry("textquote", "\"")[0];
     m_delimiter = config->readEntry("delimiter", ",");
@@ -145,7 +145,7 @@ void CSVDialog::loadSettings()
 
 void CSVDialog::saveSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("CSVDialog Settings");
     TQString q = m_textquote;
     config->writeEntry("textquote", q);
@@ -165,7 +165,7 @@ void CSVDialog::fillTable( )
     TQChar x;
     TQString field;
 
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 
     for (row = 0; row < m_dialog->m_sheet->numRows(); ++row)
         for (column = 0; column < m_dialog->m_sheet->numCols(); ++column)
@@ -358,7 +358,7 @@ void CSVDialog::fillTable( )
     }
     fillComboBox();
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void CSVDialog::fillComboBox()
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index 10a692c9a..2b40f438b 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -54,7 +54,7 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
     m_delimiter( "," ),
     m_textquote('"')
 {
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 
   TQStringList encodings;
   encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -96,13 +96,13 @@ CSVExportDialog::CSVExportDialog( TQWidget * parent )
 CSVExportDialog::~CSVExportDialog()
 {
   saveSettings();
-  kapp->setOverrideCursor(TQt::waitCursor);
+  tdeApp->setOverrideCursor(TQt::waitCursor);
   delete m_delimiterValidator;
 }
 
 void CSVExportDialog::loadSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("CSVDialog Settings");
     m_textquote = config->readEntry("textquote", "\"")[0];
     m_delimiter = config->readEntry("delimiter", ",");
@@ -136,7 +136,7 @@ void CSVExportDialog::loadSettings()
 
 void CSVExportDialog::saveSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("CSVDialog Settings");
     TQString q = m_textquote;
     config->writeEntry("textquote", q);
diff --git a/filters/kspread/html/exportdialog.cpp b/filters/kspread/html/exportdialog.cpp
index f0dd28d25..b79263ca9 100644
--- a/filters/kspread/html/exportdialog.cpp
+++ b/filters/kspread/html/exportdialog.cpp
@@ -35,7 +35,7 @@
 ExportDialog::ExportDialog( TQWidget *parent, const char *name )
   : KDialogBase( parent, name, true, i18n("Export Sheet to HTML"), Ok|Cancel, No, true ), m_mainwidget( new ExportWidget( this ) )
 {
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
 
   connect( m_mainwidget->mCustomButton, TQ_SIGNAL( toggled( bool ) ),
            m_mainwidget->mCustomURL, TQ_SLOT( setEnabled( bool ) ) );
@@ -58,7 +58,7 @@ void ExportDialog::selectAll()
 
 ExportDialog::~ExportDialog()
 {
-  kapp->setOverrideCursor(TQt::waitCursor);
+  tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 TQTextCodec *ExportDialog::encoding() const
diff --git a/filters/kspread/latex/export/formula.cpp b/filters/kspread/latex/export/formula.cpp
index 1d805a2a3..43e39ffe7 100644
--- a/filters/kspread/latex/export/formula.cpp
+++ b/filters/kspread/latex/export/formula.cpp
@@ -155,7 +155,7 @@ void Formula::generate(TQTextStream &out)
 
    	// a new KFormula::Document for every formula is not the best idea.
 	// better to have only one such beast for the whole document.
-	KFormula::Document formulaDoc( kapp->sessionConfig() );
+	KFormula::Document formulaDoc( tdeApp->sessionConfig() );
 
 	KFormula::Container* formula = new KFormula::Container( &formulaDoc );
 	if ( !formula->load( doc ) ) {
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
index b088afe14..2b383b7e2 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
@@ -61,7 +61,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 {
 	int i = 0;
 
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 
 	/* Recent files */
 	_config = new TDEConfig("kspreadlatexexportdialog");
@@ -82,10 +82,10 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 	}
 
 	_iface = new LatexExportIface(this);
-	if(!kapp->dcopClient()->isRegistered() )
+	if(!tdeApp->dcopClient()->isRegistered() )
 	{
-		kapp->dcopClient()->registerAs("FilterConfigDia");
-		kapp->dcopClient()->setDefaultObject(_iface->objId());
+		tdeApp->dcopClient()->registerAs("FilterConfigDia");
+		tdeApp->dcopClient()->setDefaultObject(_iface->objId());
 	}
 	
 	/* All these items inserted must not be translated so they are inserted here 
diff --git a/filters/kword/ascii/ExportDialog.cpp b/filters/kword/ascii/ExportDialog.cpp
index 577fb72b9..011995a04 100644
--- a/filters/kword/ascii/ExportDialog.cpp
+++ b/filters/kword/ascii/ExportDialog.cpp
@@ -38,7 +38,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
       m_dialog(new ExportDialogUI(this))
 {
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     TQStringList encodings;
     encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -58,7 +58,7 @@ AsciiExportDialog :: AsciiExportDialog(TQWidget* parent)
 
 AsciiExportDialog :: ~AsciiExportDialog(void)
 {
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 TQTextCodec* AsciiExportDialog::getCodec(void) const
diff --git a/filters/kword/ascii/ImportDialog.cpp b/filters/kword/ascii/ImportDialog.cpp
index 09c81a090..269a4b991 100644
--- a/filters/kword/ascii/ImportDialog.cpp
+++ b/filters/kword/ascii/ImportDialog.cpp
@@ -38,7 +38,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
       m_dialog(new ImportDialogUI(this))
 {
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     TQStringList encodings;
     encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -57,7 +57,7 @@ AsciiImportDialog :: AsciiImportDialog(TQWidget* parent)
 
 AsciiImportDialog :: ~AsciiImportDialog(void)
 {
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 TQTextCodec* AsciiImportDialog::getCodec(void) const
diff --git a/filters/kword/html/export/ExportDialog.cpp b/filters/kword/html/export/ExportDialog.cpp
index 2da909347..9b0715712 100644
--- a/filters/kword/html/export/ExportDialog.cpp
+++ b/filters/kword/html/export/ExportDialog.cpp
@@ -42,7 +42,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
       m_dialog(new ExportDialogUI(this))
 {
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     TQStringList encodingList;
 
@@ -64,7 +64,7 @@ HtmlExportDialog :: HtmlExportDialog(TQWidget* parent)
 
 HtmlExportDialog :: ~HtmlExportDialog(void)
 {
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 void HtmlExportDialog::setCSSEnabled( bool b )
diff --git a/filters/kword/latex/export/formula.cpp b/filters/kword/latex/export/formula.cpp
index 98f173797..324301b1f 100644
--- a/filters/kword/latex/export/formula.cpp
+++ b/filters/kword/latex/export/formula.cpp
@@ -165,7 +165,7 @@ void Formula::generate(TQTextStream &out)
 
    	// a new KFormula::Document for every formula is not the best idea.
 	// better to have only one such beast for the whole document.
-        KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( kapp->config(), 0 );
+        KFormula::DocumentWrapper* wrapper = new KFormula::DocumentWrapper( tdeApp->config(), 0 );
         KFormula::Document* formulaDoc = new KFormula::Document;
         wrapper->document( formulaDoc );
 
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cpp b/filters/kword/latex/export/kwordlatexexportdia.cpp
index 3498bcdb9..69f596bd7 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cpp
+++ b/filters/kword/latex/export/kwordlatexexportdia.cpp
@@ -62,7 +62,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
 {
 	int i = 0;
 
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 	pathPictures->setMode(KFile::Directory);
 
 	/* Recent files */
@@ -84,10 +84,10 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
 	}
 
 	_iface = new LatexExportIface(this);
-	if(!kapp->dcopClient()->isRegistered() )
+	if(!tdeApp->dcopClient()->isRegistered() )
 	{
-		kapp->dcopClient()->registerAs("FilterConfigDia");
-		kapp->dcopClient()->setDefaultObject(_iface->objId());
+		tdeApp->dcopClient()->registerAs("FilterConfigDia");
+		tdeApp->dcopClient()->setDefaultObject(_iface->objId());
 	}
 
 	/* All these items inserted must not be translated so they are inserted here 
diff --git a/filters/kword/latex/import/lateximportdia.cpp b/filters/kword/latex/import/lateximportdia.cpp
index f0dd908bd..24dd0aa99 100644
--- a/filters/kword/latex/import/lateximportdia.cpp
+++ b/filters/kword/latex/import/lateximportdia.cpp
@@ -50,12 +50,12 @@ LATEXImportDia::LATEXImportDia(KoStore* out, TQWidget *parent, const char *name)
 						DCOPObject("FilterConfigDia"), _out(out)
 {
 	_out = out;
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 	createDialog();
-	if(!kapp->dcopClient()->isRegistered() )
+	if(!tdeApp->dcopClient()->isRegistered() )
 	{
-		kapp->dcopClient()->registerAs("FilterConfigDia");
-		kapp->dcopClient()->setDefaultObject(objId());
+		tdeApp->dcopClient()->registerAs("FilterConfigDia");
+		tdeApp->dcopClient()->setDefaultObject(objId());
 	}
 }
 
diff --git a/filters/kword/mswrite/ImportDialog.cpp b/filters/kword/mswrite/ImportDialog.cpp
index f5ca040f7..65eea56ac 100644
--- a/filters/kword/mswrite/ImportDialog.cpp
+++ b/filters/kword/mswrite/ImportDialog.cpp
@@ -39,7 +39,7 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent)
     : KDialogBase(parent, 0, true,  i18n("KWord's MS Write Import Filter"), Ok|Cancel, No, true),
       m_dialog(new ImportDialogUI(this))
 {
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
    m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->availableEncodingNames());
     //m_dialog->comboBoxEncoding->insertStringList(TDEGlobal::charsets()->descriptiveEncodingNames());
@@ -54,7 +54,7 @@ MSWriteImportDialog :: MSWriteImportDialog(TQWidget* parent)
 
 MSWriteImportDialog :: ~MSWriteImportDialog(void)
 {
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 TQTextCodec* MSWriteImportDialog::getCodec(void) const
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index 6c455e04b..ffb621cdb 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -41,7 +41,7 @@ ExportSizeDia::ExportSizeDia( int width, int height,
     : KDialogBase( parent, name, true,
 		   i18n("Export Filter Parameters" ), Ok|Cancel )
 {
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     setupGUI();
 
diff --git a/filters/xsltfilter/export/xsltexportdia.cpp b/filters/xsltfilter/export/xsltexportdia.cpp
index bf141f903..054a4517d 100644
--- a/filters/xsltfilter/export/xsltexportdia.cpp
+++ b/filters/xsltfilter/export/xsltexportdia.cpp
@@ -56,7 +56,7 @@ XSLTExportDia::XSLTExportDia(KoStoreDevice* in, const TQCString &format, TQWidge
 	_format = format;
 	setCaption(i18n("Export XSLT Configuration"));
 
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 
 	/* Recent files */
 	_config = new TDEConfig("xsltdialog");
diff --git a/filters/xsltfilter/import/xsltimportdia.cpp b/filters/xsltfilter/import/xsltimportdia.cpp
index 9052e4ecc..7877bb58c 100644
--- a/filters/xsltfilter/import/xsltimportdia.cpp
+++ b/filters/xsltfilter/import/xsltimportdia.cpp
@@ -102,7 +102,7 @@ XSLTImportDia::XSLTImportDia(KoStore* out, const TQCString &format, TQWidget* pa
 	}
 	
 	xsltList->insertStringList(_namesList);
-	kapp->restoreOverrideCursor();
+	tdeApp->restoreOverrideCursor();
 }
 
 /*
@@ -200,7 +200,7 @@ void XSLTImportDia::chooseCommonSlot()
  */
 void XSLTImportDia::okSlot()
 {
-  	kapp->setOverrideCursor(TQCursor(TQt::WaitCursor));
+  	tdeApp->setOverrideCursor(TQCursor(TQt::WaitCursor));
 	hide();
 	if(_currentFile.url().isEmpty())
 		return;
diff --git a/karbon/core/vgroup_iface.cpp b/karbon/core/vgroup_iface.cpp
index 8a22343a8..162c22894 100644
--- a/karbon/core/vgroup_iface.cpp
+++ b/karbon/core/vgroup_iface.cpp
@@ -40,7 +40,7 @@ VGroupIface::objects()
 	TQValueList<DCOPRef> lst;
 	VObjectListIterator itr = m_group->objects();
 	for( ; itr.current(); ++itr )
-		lst.append( DCOPRef( kapp->dcopClient()->appId(), itr.current()->dcopObject()->objId() ) );
+		lst.append( DCOPRef( tdeApp->dcopClient()->appId(), itr.current()->dcopObject()->objId() ) );
 	return lst;
 }
 
diff --git a/karbon/core/vobject_iface.cpp b/karbon/core/vobject_iface.cpp
index 25f9959f7..c687c8691 100644
--- a/karbon/core/vobject_iface.cpp
+++ b/karbon/core/vobject_iface.cpp
@@ -46,6 +46,6 @@ VObjectIface::parent() const
 	if( !m_object->parent() )
 		return DCOPRef();
 
-	return DCOPRef( kapp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
+	return DCOPRef( tdeApp->dcopClient()->appId(), m_object->parent()->dcopObject()->objId() );
 }
 
diff --git a/karbon/karbon_part_iface.cpp b/karbon/karbon_part_iface.cpp
index a87b454b3..2c207c8c2 100644
--- a/karbon/karbon_part_iface.cpp
+++ b/karbon/karbon_part_iface.cpp
@@ -113,7 +113,7 @@ DCOPRef KarbonPartIface::activeLayer()
 	if( !m_part->document().activeLayer() )
 		return DCOPRef();
 
-	return DCOPRef( kapp->dcopClient()->appId(),
+	return DCOPRef( tdeApp->dcopClient()->appId(),
 					m_part->document().activeLayer()->dcopObject()->objId() );
 }
 
diff --git a/kchart/csvimportdialog.cpp b/kchart/csvimportdialog.cpp
index a728a318f..98536f84e 100644
--- a/kchart/csvimportdialog.cpp
+++ b/kchart/csvimportdialog.cpp
@@ -57,7 +57,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
       m_codec( TQTextCodec::codecForName( "UTF-8" ) )
 {
     setCaption( i18n( "Import Data" ) );
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 
     TQStringList encodings;
     encodings << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" );
@@ -111,7 +111,7 @@ CSVImportDialog::CSVImportDialog(TQWidget* parent, TQByteArray& fileArray)
 
 CSVImportDialog::~CSVImportDialog()
 {
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 }
 
 
@@ -176,7 +176,7 @@ void CSVImportDialog::fillTable( )
     TQChar x;
     TQString field;
 
-    kapp->setOverrideCursor(TQt::waitCursor);
+    tdeApp->setOverrideCursor(TQt::waitCursor);
 
     for (row = 0; row < m_dialog->m_sheet->numRows(); ++row)
         for (column = 0; column < m_dialog->m_sheet->numCols(); ++column)
@@ -385,7 +385,7 @@ void CSVImportDialog::fillTable( )
     }
     fillComboBox();
 
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 void CSVImportDialog::fillComboBox()
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 9016add8e..31e335ac4 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -41,7 +41,7 @@ Manager::Manager(TQObject *parent)
 	m_lookupDone = false;
 	m_partlist.setAutoDelete(true);
 	m_partsByMime.setAutoDelete(false);
-	m_parts.setAutoDelete(false);//KApp will remove parts
+	m_parts.setAutoDelete(false);//TDEApp will remove parts
 	m_nextTempProjectPartID = -1;
 }
 
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index c68bd124d..6319684d8 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -33,9 +33,9 @@
 KexiTemplateInfo::List KexiTemplateLoader::loadListInfo()
 {
 	KexiTemplateInfo::List list;
-	const TQString subdir = TQString(kapp->instanceName()) + "/templates";
+	const TQString subdir = TQString(tdeApp->instanceName()) + "/templates";
 	TQString lang( TDEGlobal::locale()->language() );
-	TQStringList dirs( kapp->dirs()->findDirs("data", subdir) );
+	TQStringList dirs( tdeApp->dirs()->findDirs("data", subdir) );
 	while (true) {
 		foreach( TQStringList::ConstIterator, it, dirs) {
 			TQDir dir((*it)+lang);
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 102acda38..235ab2d20 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -121,7 +121,7 @@ FormManager::FormManager(TQObject *parent, int options, const char *name)
 	TDEGlobal::locale()->insertCatalogue("kformdesigner");
 #endif
 
-	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+	connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 //moved to createWidgetLibrary()	m_lib = new WidgetLibrary(this, supportedFactoryGroups);
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, TDEActionCollection* collection,
 	m_style->setEditable(false);
 
 	TDEGlobal::config()->setGroup("General");
-	TQString currentStyle = TQString::fromLatin1(kapp->style().name()).lower();
+	TQString currentStyle = TQString::fromLatin1(tdeApp->style().name()).lower();
 	const TQStringList styles = TQStyleFactory::keys();
 	m_style->setItems(styles);
 	m_style->setCurrentItem(0);
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index e8adc2ac2..b75b74d69 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -51,7 +51,7 @@ KFDMainWindow::KFDMainWindow()
 	else
 	{
 		KMessageBox::error(this, i18n("Could not find the KFormDesigner part. Please check your installation."));
-		kapp->quit();
+		tdeApp->quit();
 		return;
 	}
 
@@ -73,7 +73,7 @@ KFDMainWindow::loadUIFile(const KURL &url)
 void
 KFDMainWindow::setupActions()
 {
-	KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection());
+	KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection());
 }
 
 bool
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index fc126152a..eeddfdf2f 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -63,11 +63,11 @@ void DelayedCursorHandler::show() {
 DelayedCursorHandler _delayedCursorHandler;
 
 void KexiUtils::setWaitCursor(bool noDelay) {
-	if (kapp->guiEnabled())
+	if (tdeApp->guiEnabled())
 		_delayedCursorHandler.start(noDelay);
 }
 void KexiUtils::removeWaitCursor() {
-	if (kapp->guiEnabled())
+	if (tdeApp->guiEnabled())
 		_delayedCursorHandler.stop();
 }
 
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index c6f64d129..349d390aa 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -239,7 +239,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 	if(userMode())
 		kdDebug() << "KexiMainWindowImpl::KexiMainWindowImpl(): starting up in the User Mode" << endl;
 
-	d->config = kapp->config();
+	d->config = tdeApp->config();
 
 	if ( !initialGeometrySet() ) {
 		int scnum = TQApplication::desktop()->screenNumber(parentWidget());
@@ -2174,7 +2174,7 @@ KexiMainWindowImpl::restoreWindowConfiguration(TDEConfig *config)
 
 	TQString dockGrp;
 
-	if (kapp->isRestored())
+	if (tdeApp->isRestored())
 		dockGrp=config->group()+"-Docking";
 	else
 		dockGrp="MainWindow0-Docking";
@@ -2191,7 +2191,7 @@ KexiMainWindowImpl::storeWindowConfiguration(TDEConfig *config)
 	TQString dockGrp;
 
 #if KDE_IS_VERSION(3,1,9) && !defined(TQ_WS_WIN)
-	if (kapp->sessionSaving())
+	if (tdeApp->sessionSaving())
 		dockGrp=config->group()+"-Docking";
 	else
 #endif
@@ -3957,13 +3957,13 @@ void KexiMainWindowImpl::slotStartFeedbackAgent()
 {
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
-	const TDEAboutData* about = TDEApplication::kApplication()->aboutData();
+	const TDEAboutData* about = tdeApp->aboutData();
 	FEEDBACK_CLASS* wizard = new FEEDBACK_CLASS( about->programName(),
 		about->version(), 0, 0, 0, FEEDBACK_CLASS::AllPages );
 
 	if ( wizard->exec() )
 	{
-		TDEApplication::kApplication()->invokeMailer( "kexi-reports-dummy@kexi.org",
+		tdeApp->invokeMailer( "kexi-reports-dummy@kexi.org",
 			TQString(), TQString(),
 			about->appName() + TQCString( " [feedback]" ),
 			wizard->feedbackDocument().toString( 2 ).local8Bit() );
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index c6e75b549..c3238164b 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -50,7 +50,7 @@ KexiSimplePrintingSettings::KexiSimplePrintingSettings()
 	addPageNumbers = true;
 	addDateAndTime = true;
 	addTableBorders = false;
-	pageTitleFont = kapp->font();
+	pageTitleFont = tdeApp->font();
 	pageTitleFont.setPointSizeFloat( (double)TQFontInfo(pageTitleFont).pointSize()*1.5 );
 	pageTitleFont.setBold(true);
 }
@@ -63,7 +63,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
 {
 	KexiSimplePrintingSettings settings; //this will set defaults
 
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("Simple Printing");
 	if (config->hasKey("pageTitleFont"))
 		settings.pageTitleFont = config->readFontEntry("pageTitleFont");
@@ -95,7 +95,7 @@ KexiSimplePrintingSettings KexiSimplePrintingSettings::load()
 
 void KexiSimplePrintingSettings::save()
 {
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("Simple Printing");
 	config->writeEntry( "pageTitleFont", pageTitleFont );
 	config->writeEntry( "pageFormat", KoPageFormat::formatString( pageLayout.format ) );
@@ -270,7 +270,7 @@ void KexiSimplePrintingEngine::paintPage(int pageNumber, TQPainter& painter, boo
 		}
 
 //! @todo add setting
-		m_mainFont = kapp->font(); 
+		m_mainFont = tdeApp->font(); 
 		if(!printing) {
 			int pixelSize = int( POINT_TO_INCH(m_mainFont.pointSizeFloat())*m_dpiX )
 				* m_SCALE;
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index eb4152623..11d9e9390 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -120,7 +120,7 @@ void KexiSimplePrintPreviewScrollView::setFullWidth()
 //	int constantWidth = m_window->width()- KexiSimplePrintPreviewScrollView_MARGIN*6;
 	double constantWidth = width()- KexiSimplePrintPreviewScrollView_MARGIN*6;
 	double heightForWidth = constantWidth * heightMM / widthMM;
-//	heightForWidth = TQMIN(kapp->desktop()->height()*4/5, heightForWidth);
+//	heightForWidth = TQMIN(tdeApp->desktop()->height()*4/5, heightForWidth);
 	kdDebug() << "1: " << heightForWidth << endl;
 #if 0 //todo we can use this if we want to fix the height to width of the page
 	heightForWidth = TQMIN(height(), heightForWidth);
@@ -232,7 +232,7 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_navToolbar->addConnection(m_idLast, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLastClicked()));
 	m_navToolbar->insertSeparator();
 
-	resize(width(), kapp->desktop()->height()*4/5);
+	resize(width(), tdeApp->desktop()->height()*4/5);
 
 //! @todo progress bar...
 
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 9f8bbce39..1737dd6ca 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -76,8 +76,8 @@ OptionsDialog::OptionsDialog( const TQString& databaseFile, const TQString& sele
 	lyr->addItem( new TQSpacerItem( 121, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ), 1, 2 );
 
 	//read config
-	kapp->config()->setGroup("ImportExport");
-	TQString defaultEncodingForMSAccessFiles = kapp->config()->readEntry("DefaultEncodingForMSAccessFiles");
+	tdeApp->config()->setGroup("ImportExport");
+	TQString defaultEncodingForMSAccessFiles = tdeApp->config()->readEntry("DefaultEncodingForMSAccessFiles");
 	if (!defaultEncodingForMSAccessFiles.isEmpty()) {
 		m_encodingComboBox->setSelectedEncoding(defaultEncodingForMSAccessFiles);
 		m_chkAlwaysUseThisEncoding->setChecked(true);
@@ -98,12 +98,12 @@ KexiCharacterEncodingComboBox* OptionsDialog::encodingComboBox() const
 
 void OptionsDialog::accept()
 {
-	kapp->config()->setGroup("ImportExport");
+	tdeApp->config()->setGroup("ImportExport");
 	if (m_chkAlwaysUseThisEncoding->isChecked())
-		kapp->config()->writeEntry("defaultEncodingForMSAccessFiles", 
+		tdeApp->config()->writeEntry("defaultEncodingForMSAccessFiles", 
 			m_encodingComboBox->selectedEncoding());
 	else
-		kapp->config()->deleteEntry("defaultEncodingForMSAccessFiles");
+		tdeApp->config()->deleteEntry("defaultEncodingForMSAccessFiles");
 
 	KDialogBase::accept();
 }
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index d040f06bf..757d1fc87 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -600,7 +600,7 @@ bool ImportWizard::fileBasedDstSelected() const
 
 void ImportWizard::progressUpdated(int percent) {
 	m_progressBar->setProgress(percent);
-	TDEApplication::kApplication()->processEvents();
+	tdeApp->processEvents();
 }
 
 //===========================================================
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 4ba0442ac..2ba7a65cf 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -159,8 +159,8 @@ void KexiFormPart::initPartActions()
 void KexiFormPart::initInstanceActions()
 {
 #ifdef KEXI_DEBUG_GUI
-	kapp->config()->setGroup("General");
-	if (kapp->config()->readBoolEntry("showInternalDebugger", false)) {
+	tdeApp->config()->setGroup("General");
+	if (tdeApp->config()->readBoolEntry("showInternalDebugger", false)) {
 		new TDEAction(i18n("Show Form UI Code"), "compfile", 
 			CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()),
 			actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui");
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 960602200..5bf0030d3 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -97,7 +97,7 @@ void KexiDBTextEdit::setReadOnly( bool readOnly )
 {
 	KTextEdit::setReadOnly( readOnly );
 	TQPalette p = palette();
-	TQColor c(readOnly ? lighterGrayBackgroundColor(kapp->palette()) : p.color(TQPalette::Active, TQColorGroup::Base));
+	TQColor c(readOnly ? lighterGrayBackgroundColor(tdeApp->palette()) : p.color(TQPalette::Active, TQColorGroup::Base));
 	setPaper( c );
 	p.setColor(TQColorGroup::Base, c);
 	p.setColor(TQColorGroup::Background, c);
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index ee606300a..246e6b297 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -252,7 +252,7 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery,
 	}
 
 	if (copyToClipboard)
-		kapp->clipboard()->setText(buffer, TQClipboard::Clipboard);
+		tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard);
 
 	delete [] isText;
 	delete [] isDateTime;
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 5719f9f03..170b8ad00 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -105,7 +105,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 			":CSVImportExport", //startDir
 			KexiStartupFileDialog::Custom | KexiStartupFileDialog::SavingFileBasedDB,
 			this, "m_fileSavePage");
-		m_fileSavePage->setMinimumHeight(kapp->desktop()->height()/2);
+		m_fileSavePage->setMinimumHeight(tdeApp->desktop()->height()/2);
 		m_fileSavePage->setAdditionalFilters( csvMimeTypes() );
 		m_fileSavePage->setDefaultExtension("csv");
 		m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) );
@@ -199,7 +199,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options,
 	setFinishEnabled(m_exportOptionsPage, true);
 
 	// load settings
-	kapp->config()->setGroup("ImportExport");
+	tdeApp->config()->setGroup("ImportExport");
 	if (m_options.mode!=KexiCSVExport::Clipboard && readBoolEntry("ShowOptionsInCSVExportDialog", false)) {
 		show();
 		slotShowOptionsButtonClicked();
@@ -301,7 +301,7 @@ void KexiCSVExportWizard::done(int result)
 	}
 
 	//store options
-	kapp->config()->setGroup("ImportExport");
+	tdeApp->config()->setGroup("ImportExport");
 	if (m_options.mode!=KexiCSVExport::Clipboard)
 		writeEntry("ShowOptionsInCSVExportDialog", m_exportOptionsSection->isVisible());
 	const bool store = m_alwaysUseCheckBox->isChecked();
@@ -387,27 +387,27 @@ static TQString convertKey(const char *key, KexiCSVExport::Mode mode)
 
 bool KexiCSVExportWizard::readBoolEntry(const char *key, bool defaultValue)
 {
-	return kapp->config()->readBoolEntry(convertKey(key, m_options.mode), defaultValue);
+	return tdeApp->config()->readBoolEntry(convertKey(key, m_options.mode), defaultValue);
 }
 
 TQString KexiCSVExportWizard::readEntry(const char *key, const TQString& defaultValue)
 {
-	return kapp->config()->readEntry(convertKey(key, m_options.mode), defaultValue);
+	return tdeApp->config()->readEntry(convertKey(key, m_options.mode), defaultValue);
 }
 
 void KexiCSVExportWizard::writeEntry(const char *key, const TQString& value)
 {
-	kapp->config()->writeEntry(convertKey(key, m_options.mode), value);
+	tdeApp->config()->writeEntry(convertKey(key, m_options.mode), value);
 }
 
 void KexiCSVExportWizard::writeEntry(const char *key, bool value)
 {
-	kapp->config()->writeEntry(convertKey(key, m_options.mode), value);
+	tdeApp->config()->writeEntry(convertKey(key, m_options.mode), value);
 }
 
 void KexiCSVExportWizard::deleteEntry(const char *key)
 {
-	kapp->config()->deleteEntry(convertKey(key, m_options.mode));
+	tdeApp->config()->deleteEntry(convertKey(key, m_options.mode));
 }
 
 TQString KexiCSVExportWizard::defaultDelimiter() const
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.h b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
index 41289cb69..4097da765 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.h
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.h
@@ -70,7 +70,7 @@ class KexiCSVExportWizard : public KWizard
 		//! \return default text quote depending on mode.
 		TQString defaultTextQuote() const;
 
-		//! Helper, works like kapp->config()->readBoolEntry(const char*, bool) but if mode is Clipboard,
+		//! Helper, works like tdeApp->config()->readBoolEntry(const char*, bool) but if mode is Clipboard,
 		//! "Exporting" is replaced with "Copying" and "Export" is replaced with "Copy" 
 		//! and "CSVFiles" is replaced with "CSVToClipboard"
 		//! in \a key, to keep the setting separate.
@@ -79,7 +79,7 @@ class KexiCSVExportWizard : public KWizard
 		//! Helper like \ref readBoolEntry(const char *, bool), but for TQString values.
 		TQString readEntry(const char *key, const TQString& defaultValue = TQString());
 
-		//! Helper, works like kapp->config()->writeEntry(const char*,bool) but if mode is Clipboard,
+		//! Helper, works like tdeApp->config()->writeEntry(const char*,bool) but if mode is Clipboard,
 		//! "Exporting" is replaced with "Copying" and "Export" is replaced with "Copy" 
 		//! and "CSVFiles" is replaced with "CSVToClipboard"
 		//! in \a key, to keep the setting separate.
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 26efa6029..f0016235e 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -181,9 +181,9 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin,
 	m_typeNames[3] = i18n("time");
 	m_typeNames[4] = i18n("date/time");
 
-	kapp->config()->setGroup("ImportExport");
-	m_maximumRowsForPreview = kapp->config()->readNumEntry("MaximumRowsForPreviewInImportDialog", MAX_ROWS_TO_PREVIEW);
-	m_maximumBytesForPreview = kapp->config()->readNumEntry("MaximumBytesForPreviewInImportDialog", MAX_BYTES_TO_PREVIEW);
+	tdeApp->config()->setGroup("ImportExport");
+	m_maximumRowsForPreview = tdeApp->config()->readNumEntry("MaximumRowsForPreviewInImportDialog", MAX_ROWS_TO_PREVIEW);
+	m_maximumBytesForPreview = tdeApp->config()->readNumEntry("MaximumBytesForPreviewInImportDialog", MAX_BYTES_TO_PREVIEW);
 
 	m_pkIcon = SmallIcon("key");
 
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index dce13f384..f07102eb8 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -34,8 +34,8 @@
 
 KexiCSVImportOptions::KexiCSVImportOptions()
 {
-	kapp->config()->setGroup("ImportExport");
-	encoding = kapp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
+	tdeApp->config()->setGroup("ImportExport");
+	encoding = tdeApp->config()->readEntry("DefaultEncodingForImportingCSVFiles");
 	if (encoding.isEmpty()) {
 		encoding = TQString::fromLatin1(TDEGlobal::locale()->encoding());
 		defaultEncodingExplicitySet = false;
@@ -44,7 +44,7 @@ KexiCSVImportOptions::KexiCSVImportOptions()
 		defaultEncodingExplicitySet = true;
 
 	stripWhiteSpaceInTextValuesChecked 
-		= kapp->config()->readBoolEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", true);
+		= tdeApp->config()->readBoolEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", true);
 }
 
 KexiCSVImportOptions::~KexiCSVImportOptions()
@@ -124,14 +124,14 @@ KexiCSVImportOptions KexiCSVImportOptionsDialog::options() const
 
 void KexiCSVImportOptionsDialog::accept()
 {
-	kapp->config()->setGroup("ImportExport");
+	tdeApp->config()->setGroup("ImportExport");
 	if (m_chkAlwaysUseThisEncoding->isChecked())
-		kapp->config()->writeEntry("DefaultEncodingForImportingCSVFiles", 
+		tdeApp->config()->writeEntry("DefaultEncodingForImportingCSVFiles", 
 			m_encodingComboBox->selectedEncoding());
 	else
-		kapp->config()->deleteEntry("DefaultEncodingForImportingCSVFiles");
+		tdeApp->config()->deleteEntry("DefaultEncodingForImportingCSVFiles");
 
-	kapp->config()->writeEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", 
+	tdeApp->config()->writeEntry("StripBlanksOffOfTextValuesWhenImportingCSVFiles", 
 		m_chkStripWhiteSpaceInTextValues->isChecked());
 
 	KDialogBase::accept();
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 44b957af9..25e5cc367 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -91,7 +91,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	lyr->addWidget(m_list);
 	m_list->installEventFilter(this);
 	m_list->renameLineEdit()->installEventFilter(this);
-	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+	connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(0);
 
 	m_list->header()->hide();
@@ -108,7 +108,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
 	connect(m_list, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this,
 		TQ_SLOT(slotSelectionChanged(TQListViewItem*)));
 	
-	TDEConfig *config = kapp->config();
+	TDEConfig *config = tdeApp->config();
 	config->setGroup("MainWindow");
 	if ((m_features & SingleClickOpensItemOptionEnabled) 
 		&& config->readBoolEntry("SingleClickOpensItem", false))
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index d28759e97..747ea11ea 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -99,7 +99,7 @@ PixmapCollection::getPixmap(const TQString &name)
 
 	if(m_pixmaps[name].second != 0)
 	{
-		return kapp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
+		return tdeApp->iconLoader()->loadIcon(m_pixmaps[name].first, TDEIcon::NoGroup, m_pixmaps[name].second);
 	}
 	else
 		return TQPixmap(m_pixmaps[name].first);
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 61655424e..ae834d29b 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 
 	d = new KexiTableViewPrivate(this);
 
-	connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
+	connect( tdeApp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
 	slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
 
 	m_data = new KexiTableViewData(); //to prevent crash because m_data==0
@@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 #if 0 //moved to mainwindow's actions
 	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
 	d->menu_id_removeRecord = m_popupMenu->insertItem(
-		kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
+		tdeApp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
 		i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
 #endif
 
diff --git a/kformula/formulastring.cpp b/kformula/formulastring.cpp
index 0d07634e3..ab4a5fa41 100644
--- a/kformula/formulastring.cpp
+++ b/kformula/formulastring.cpp
@@ -107,7 +107,7 @@ void FormulaString::accept()
 
 void FormulaString::helpButtonClicked()
 {
-  kapp->invokeHelp( "formula-strings", "kformula" );
+  tdeApp->invokeHelp( "formula-strings", "kformula" );
 }
 
 void FormulaString::cursorPositionChanged( int para, int pos )
diff --git a/kformula/kformula_doc.cpp b/kformula/kformula_doc.cpp
index 2ce07d1f5..23ec49777 100644
--- a/kformula/kformula_doc.cpp
+++ b/kformula/kformula_doc.cpp
@@ -62,7 +62,7 @@ KFormulaDoc::KFormulaDoc(TQWidget *parentWidget, const char *widgetName, TQObjec
     //kdDebug(39001) << "General Settings" << endl;
 
     history = new KoCommandHistory( actionCollection() );
-    wrapper = new KFormula::DocumentWrapper( kapp->config(),
+    wrapper = new KFormula::DocumentWrapper( tdeApp->config(),
                                              actionCollection(),
                                              history );
     document = new KFormula::Document;
diff --git a/kivio/kiviopart/KIvioDocIface.cpp b/kivio/kiviopart/KIvioDocIface.cpp
index e9ab089f1..f1f4a1f7e 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 99397692e..6e199f8fd 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 26ba9a2e4..fc5a95f72 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 2c72e77d4..5b070e821 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 9ace753d5..7c6118486 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 2ef54d4f8..ba48b32e8 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 d2718f0a7..4dddc35da 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());
diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp
index e7fb17fef..0043f8716 100644
--- a/koshell/koshell_shell.cpp
+++ b/koshell/koshell_shell.cpp
@@ -415,12 +415,12 @@ void KoShellWindow::updateCaption()
 void KoShellWindow::slotSidebar_Part(int _item)
 {
   //kdDebug() << "Component part choosed:" << _item << endl;
-  kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
+  tdeApp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
   m_documentEntry = m_mapComponents[ _item ];
   kdDebug() << m_documentEntry.service() << endl;
   kdDebug() << m_documentEntry.name() << endl;
   KoDocument *doc = m_documentEntry.createDoc();
-  kapp->restoreOverrideCursor();
+  tdeApp->restoreOverrideCursor();
   if (doc)
   {
     if ( doc->showEmbedInitDialog( this ) )
@@ -721,7 +721,7 @@ void KoShellWindow::showPartSpecificHelp()
   if((m_activePage == m_lstPages.end()) || ((*m_activePage).m_pDoc == 0))
     return;
 
-  kapp->invokeHelp("", (*m_activePage).m_pDoc->instance()->aboutData()->appName(), "");
+  tdeApp->invokeHelp("", (*m_activePage).m_pDoc->instance()->aboutData()->appName(), "");
 }
 
 
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index a3fdbedcb..91f01c7a1 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -524,7 +524,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
         double w = _origSize.width();
         w *= ext.width();
 #if KDE_IS_VERSION(3,1,90)
-        TQRect desk = TDEGlobalSettings::desktopGeometry(kapp->activeWindow());
+        TQRect desk = TDEGlobalSettings::desktopGeometry(tdeApp->activeWindow());
 #else
         TQRect desk = TQApplication::desktop()->screenGeometry();
 #endif
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index ab8e15434..8afa94d18 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -3045,7 +3045,7 @@ bool KPrCanvas::pNext( bool gotoNextPage )
                 TQPainter p;
                 p.begin( this );
                 drawBackground( &p,
-                                TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() ),
+                                TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() ),
                                 doc->pageList().at( m_step.m_pageNumber ) );
                 p.end();
             }
@@ -3397,7 +3397,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
         m_effectHandler = 0;
     }
 
-    TQPixmap screen_orig( kapp->desktop()->width(), kapp->desktop()->height() );
+    TQPixmap screen_orig( tdeApp->desktop()->width(), tdeApp->desktop()->height() );
 
     KPrPage *page = m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber );
     // YABADABADOOOOOOO.... That's a hack :-)
@@ -3406,7 +3406,7 @@ void KPrCanvas::doObjEffects( bool isAllreadyPainted )
         //kdDebug(33001) << "Page::doObjEffects - in the strange hack" << endl;
         TQPainter p;
         p.begin( &screen_orig );
-        TQRect desktopRect = TQRect( 0, 0, kapp->desktop()->width(), kapp->desktop()->height() );
+        TQRect desktopRect = TQRect( 0, 0, tdeApp->desktop()->width(), tdeApp->desktop()->height() );
         drawBackground( &p, desktopRect, page );
         PresStep step( m_step.m_pageNumber, m_step.m_step, m_step.m_subStep, true, true );
         drawPresPage( &p, desktopRect ,step );
@@ -3545,7 +3545,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
     int i = 0;
 
     repaint( false );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     editMode = false;
     fillBlack = false;
@@ -3582,7 +3582,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
     {
         i=(*it);
         progress.setProgress( ++j );
-        kapp->processEvents();
+        tdeApp->processEvents();
 
         if ( progress.wasCancelled() )
             break;
@@ -3599,10 +3599,10 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
         painter->fillRect( m_view->kPresenterDoc()->pageList().at( m_step.m_pageNumber )->getZoomPageRect(), white );
 
         printPage( painter, step, printer, rows, cols );
-        kapp->processEvents();
+        tdeApp->processEvents();
 
         painter->resetXForm();
-        kapp->processEvents();
+        tdeApp->processEvents();
 
         current_slide += slides_per_page;
 
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index c2c34b5d0..b62f43e70 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -44,13 +44,13 @@ DCOPRef KPrDocumentIface::page( int num )
 {
     if( num>= (int )doc->getPageNums())
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     doc->pageList().at( num )->dcopObject()->objId() );
 }
 
 DCOPRef KPrDocumentIface::masterPage()
 {
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     doc->masterPage()->dcopObject()->objId() );
 }
 
@@ -204,7 +204,7 @@ bool KPrDocumentIface::isSlideSelected( int pgNum)
 DCOPRef KPrDocumentIface::header()
 {
     if(doc->header())
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         doc->header()->dcopObject()->objId() );
     else
         return DCOPRef();
@@ -214,7 +214,7 @@ DCOPRef KPrDocumentIface::header()
 DCOPRef KPrDocumentIface::footer()
 {
     if(doc->footer())
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         doc->footer()->dcopObject()->objId() );
     else
         return DCOPRef();
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 0436a7f3e..c5aa7f9f0 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -87,7 +87,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     for (int dirNum = 101; dirNum < 999; dirNum++) {
         slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
@@ -97,13 +97,13 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     str = (  path + slidePath );
     TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // now do the SPP file directory
     str = (  path + "/MSSONY" );
@@ -111,14 +111,14 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
     str = (  path + "/MSSONY/PJ" );
     TDEIO::NetAccess::mkdir( str,( TQWidget* )0L  );
 
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // create the title slides
     TQPixmap titleSlide( 1024, 768 );
@@ -133,7 +133,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // and put the specified title string on the first slide
     TQFont textFont( "SansSerif", 96 );
@@ -148,7 +148,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
 }
 
@@ -171,7 +171,7 @@ void KPrMSPresentation::createSlidesPictures( KProgress *progressBar )
 
         p = progressBar->progress();
         progressBar->setProgress( ++p );
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -186,7 +186,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
     sppStream.setByteOrder(TQDataStream::LittleEndian);
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // We are doing little endian
     sppStream << (TQ_UINT32)0x00505053; // SPP magic header
@@ -210,7 +210,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
     sppStream << (TQ_UINT32)0x00000000; // more nulls
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // title 1, 16 bytes null padded
     strncpy( buff, "SPJT0001.JPG", 15 );
@@ -239,7 +239,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
     }
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Add in the slide filenames
     TQString filename;
@@ -250,7 +250,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
         sppStream.writeRawBytes( buff, 64 );
         p = progressBar->progress();
         progressBar->setProgress( ++p );
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     // OK, now we need to fill to 16384 bytes
@@ -262,7 +262,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     sppFile.close();
     TDEIO::NetAccess::file_move( sppFile.name(), filenameStore, -1, true /*overwrite*/);
@@ -420,7 +420,7 @@ void KPrMSPresentationSetup::showColourGroup(bool on)
 
 void KPrMSPresentationSetup::helpMe()
 {
-    kapp->invokeHelp("ms-export");
+    tdeApp->invokeHelp("ms-export");
 }
 
 void KPrMSPresentationSetup::finish()
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index f310552dc..210506e76 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -1408,7 +1408,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
     _painter->save();
     _painter->translate( _zoomHandler->zoomItX(orig.x()), _zoomHandler->zoomItY(orig.y()) );
     _painter->setPen( TQPen( TQt::black, 1, TQPen::SolidLine ) );
-    _painter->setBrush( kapp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
+    _painter->setBrush( tdeApp->palette().color( TQPalette::Active, TQColorGroup::Highlight ) );
 
     KoRect r = getRealRect();
 
@@ -1444,7 +1444,7 @@ void KPrObject::paintSelection( TQPainter *_painter, KoTextZoomHandler *_zoomHan
         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/kpresenter/KPrPageIface.cpp b/kpresenter/KPrPageIface.cpp
index b0ef3b286..ced48f279 100644
--- a/kpresenter/KPrPageIface.cpp
+++ b/kpresenter/KPrPageIface.cpp
@@ -45,7 +45,7 @@ DCOPRef KPrPageIface::textObject( int num )
 {
     KPrTextObject * textObj=m_page->textFrameSet(num);
     if(textObj)
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         textObj->dcopObject()->objId() );
     return DCOPRef();
 }
@@ -55,7 +55,7 @@ DCOPRef KPrPageIface::selectedObject( )
 {
     KPrObject * obj=m_page->getSelectedObj();
     if(obj)
-        return DCOPRef( kapp->dcopClient()->appId(),
+        return DCOPRef( tdeApp->dcopClient()->appId(),
                         obj->dcopObject()->objId() );
     return DCOPRef();
 }
@@ -70,7 +70,7 @@ DCOPRef KPrPageIface::object( int num )
 {
     if( num >= (int)m_page->objNums())
         return DCOPRef();
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     m_page->getObject(num)->dcopObject()->objId() );
 }
 
diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index e737aec9e..41b96307f 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -40,7 +40,7 @@ DCOPRef KPrTextObjectIface::startEditing()
     KPrDocument *doc=m_textobject->kPresenterDocument();
     KPrView *view=doc->firstView();
     view->getCanvas()->createEditing( m_textobject);
-    return DCOPRef( kapp->dcopClient()->appId(),
+    return DCOPRef( tdeApp->dcopClient()->appId(),
                     view->getCanvas()->currentTextObjectView()->dcopObject()->objId() );
 }
 
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 585248532..f9e255d91 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -1518,7 +1518,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
             TQCString replyType;
             m_screenSaverWasEnabled = false;
             // is screensaver enabled?
-            if (kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
+            if (tdeApp->dcopClient()->call("kdesktop", "KScreensaverIface", "isEnabled()", data, replyType, replyData)
                 && replyType=="bool")
             {
                 TQDataStream replyArg(replyData, IO_ReadOnly);
@@ -1529,7 +1529,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
                     // disable screensaver
                     TQDataStream arg(data, IO_WriteOnly);
                     arg << false;
-                    if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
+                    if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
                         kdWarning(33001) << "Couldn't disable screensaver (using dcop to kdesktop)!" << endl;
                     else
                         kdDebug(33001) << "Screensaver successfully disabled" << endl;
@@ -1643,7 +1643,7 @@ void KPrView::screenStop()
                 TQByteArray data;
                 TQDataStream arg(data, IO_WriteOnly);
                 arg << true;
-                if (!kapp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
+                if (!tdeApp->dcopClient()->send("kdesktop", "KScreensaverIface", "enable(bool)", data))
                     kdWarning(33001) << "Couldn't re-enabled screensaver (using dcop to kdesktop)" << endl;
             }
             if ( m_dpmsWasEnabled )
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 5578b6b2d..54dd10da2 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -272,14 +272,14 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     str = path + "/pics";
     TDEIO::NetAccess::mkdir( str,( TQWidget* )0L );
 
     p = progressBar->progress();
     progressBar->setProgress( ++p );
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     const char *pics[] = { "home", "first", "next", "prev", "last", 0 };
 
@@ -295,7 +295,7 @@ void KPrWebPresentation::initCreation( KProgress *progressBar )
         TDEIO::NetAccess::file_copy( srcurl, desturl, -1, true /*overwrite*/);
         p = progressBar->progress();
         progressBar->setProgress( ++p );
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -318,7 +318,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
 
         p = progressBar->progress();
         progressBar->setProgress( ++p );
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -523,7 +523,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
 
         int p = progressBar->progress();
         progressBar->setProgress( ++p );
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 }
 
@@ -570,7 +570,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 
 
     progressBar->setProgress( progressBar->totalSteps() );
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 void KPrWebPresentation::init()
diff --git a/kpresenter/TODO b/kpresenter/TODO
index c69f36a1e..fa4cea478 100644
--- a/kpresenter/TODO
+++ b/kpresenter/TODO
@@ -29,7 +29,7 @@ KOffice in general:
 =======================
 - koTemplateChooseDia:
   - Restart with last presentation (suggesting it in initial "open" dialog)
-    (using kapp->getConfig)
+    (using tdeApp->getConfig)
 
 
 KPresenter after koffice 1.3
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
 
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 98352e139..9b5d62c55 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -174,7 +174,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
         else
         {
             TQString former_localtpl = localtpl;
-            localtpl = kapp -> dirs() -> findResource( "data", "kugar/templates/" + tpl );
+            localtpl = tdeApp -> dirs() -> findResource( "data", "kugar/templates/" + tpl );
             if ( localtpl.isEmpty() )
             {
                 KURL tmpURL( m_docURL );
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 50063362d..66f0b57ce 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 845297ba9..4616a6d60 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 e19c69ddd..496117f7a 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 88e58636b..c40d14af4 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 930f30aee..0a89402c8 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 4dcb836cc..75d973c47 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 bb183a74a..65814497e 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() );
 }
 
 
diff --git a/lib/kformula/main.cpp b/lib/kformula/main.cpp
index bf0f058fe..40e0f3eb2 100644
--- a/lib/kformula/main.cpp
+++ b/lib/kformula/main.cpp
@@ -183,7 +183,7 @@ void TestWidget::keyPressEvent(TQKeyEvent* event)
             case TQt::Key_L: document->document()->wrapper()->addGenericLowerIndex(); return;
             case TQt::Key_M: loadMathML( document, "test.mml" ); return;
             case TQt::Key_O: load( document->document(), "test.xml" ); return;
-            case TQt::Key_Q: kapp->quit(); return;
+            case TQt::Key_Q: tdeApp->quit(); return;
             case TQt::Key_S: save( "test.xml", document->document()->saveXML() ); return;
             case TQt::Key_T: std::cout << document->texString().latin1() << std::endl; return;
             case TQt::Key_U: document->document()->wrapper()->addGenericUpperIndex(); return;
@@ -248,7 +248,7 @@ int main(int argc, char** argv)
 
     app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
 
-    DocumentWrapper* wrapper = new DocumentWrapper( kapp->config(), 0 );
+    DocumentWrapper* wrapper = new DocumentWrapper( tdeApp->config(), 0 );
     Document* document = new Document;
     wrapper->document( document );
     Container* container1 = document->createFormula();
diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp
index 71e60ceef..1563ef613 100644
--- a/lib/kformula/symbolaction.cpp
+++ b/lib/kformula/symbolaction.cpp
@@ -117,7 +117,7 @@ SymbolAction::SymbolAction( const TQString& text, const TDEShortcut& cut,
 
 int SymbolAction::plug( TQWidget* w, int index )
 {
-    if (kapp && !kapp->authorizeTDEAction(name()))
+    if (tdeApp && !tdeApp->authorizeTDEAction(name()))
         return -1;
     if ( w->inherits( "TDEToolBar" ) )
     {
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index 6429d6eb5..436bf127f 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -91,7 +91,7 @@ bool KoApplication::start()
     ResetStarting resetStarting; // reset m_starting to false when we're done
     Q_UNUSED( resetStarting );
 
-    // Find the *.desktop file corresponding to the kapp instance name
+    // Find the *.desktop file corresponding to the tdeApp instance name
     KoDocumentEntry entry = KoDocumentEntry( KoDocument::readNativeService() );
     if ( entry.isEmpty() )
     {
diff --git a/lib/kofficecore/KoApplicationIface.cpp b/lib/kofficecore/KoApplicationIface.cpp
index e8995ad66..62e1f8481 100644
--- a/lib/kofficecore/KoApplicationIface.cpp
+++ b/lib/kofficecore/KoApplicationIface.cpp
@@ -49,7 +49,7 @@ DCOPRef KoApplicationIface::createDocument( const TQString &nativeFormat )
         return DCOPRef();
     }
     KoDocument* doc = entry.createDoc( 0 );
-    return DCOPRef( kapp->dcopClient()->appId(), doc->dcopObject()->objId() );
+    return DCOPRef( tdeApp->dcopClient()->appId(), doc->dcopObject()->objId() );
 }
 
 TQValueList<DCOPRef> KoApplicationIface::getDocuments()
@@ -60,7 +60,7 @@ TQValueList<DCOPRef> KoApplicationIface::getDocuments()
     {
       TQPtrListIterator<KoDocument> it( *documents );
       for (; it.current(); ++it )
-        lst.append( DCOPRef( kapp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
+        lst.append( DCOPRef( tdeApp->dcopClient()->appId(), it.current()->dcopObject()->objId() ) );
     }
     return lst;
 }
@@ -76,7 +76,7 @@ TQValueList<DCOPRef> KoApplicationIface::getViews()
       {
           TQPtrListIterator<KoView> itview( it.current()->views() );
           for ( ; itview.current(); ++itview )
-              lst.append( DCOPRef( kapp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) );
+              lst.append( DCOPRef( tdeApp->dcopClient()->appId(), itview.current()->dcopObject()->objId() ) );
       }
     }
     return lst;
@@ -90,7 +90,7 @@ TQValueList<DCOPRef> KoApplicationIface::getWindows()
     {
       TQPtrListIterator<TDEMainWindow> it( *mainWindows );
       for (; it.current(); ++it )
-        lst.append( DCOPRef( kapp->dcopClient()->appId(),
+        lst.append( DCOPRef( tdeApp->dcopClient()->appId(),
                              static_cast<KoMainWindow *>(it.current())->dcopObject()->objId() ) );
     }
     return lst;
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index acdc63618..1b1f6e566 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -103,8 +103,8 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance,
   connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked()));
   changePalette();
 
-  if(kapp) {
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
+  if(tdeApp) {
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
   }
 
   TDEListViewItem* selectItem = 0;
@@ -183,7 +183,7 @@ void KoTemplatesPane::openTemplate(TQListViewItem* item)
 
 void KoTemplatesPane::changePalette()
 {
-  TQPalette p = kapp ? kapp->palette() : palette();
+  TQPalette p = tdeApp ? tdeApp->palette() : palette();
   p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
   p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
   m_detailsLabel->setPalette(p);
@@ -283,8 +283,8 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst
   m_documentList->setSorting(-1); // Disable sorting
   changePalette();
 
-  if(kapp) {
-    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
+  if(tdeApp) {
+    connect(tdeApp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette()));
   }
 
   TQString oldGroup = instance->config()->group();
@@ -436,7 +436,7 @@ void KoRecentDocumentsPane::updatePreview(const KFileItem* fileItem, const TQPix
 
 void KoRecentDocumentsPane::changePalette()
 {
-  TQPalette p = kapp ? kapp->palette() : palette();
+  TQPalette p = tdeApp ? tdeApp->palette() : palette();
   p.setBrush(TQColorGroup::Base, p.brush(TQPalette::Active, TQColorGroup::Background));
   p.setColor(TQColorGroup::Text, p.color(TQPalette::Active, TQColorGroup::Foreground));
   m_detailsLabel->setPalette(p);
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 147b2ed1c..dca3063e4 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -2223,7 +2223,7 @@ TQCString KoDocument::nativeOasisMimeType() const
 //static
 KService::Ptr KoDocument::readNativeService( TDEInstance *instance )
 {
-    TQString instname = instance ? instance->instanceName() : kapp->instanceName();
+    TQString instname = instance ? instance->instanceName() : tdeApp->instanceName();
 
     // The new way is: we look for a foopart.desktop in the kde_services dir.
     TQString servicepartname = instname + "part.desktop";
@@ -2257,7 +2257,7 @@ TQCString KoDocument::readNativeFormatMimeType( TDEInstance *instance ) //static
         if ( KServiceType::serviceType( "KOfficePart" ) == 0L )
             kdError(30003) << "The serviceType KOfficePart is missing. Check that you have a kofficepart.desktop file in the share/servicetypes directory." << endl;
         else {
-            TQString instname = instance ? instance->instanceName() : kapp->instanceName();
+            TQString instname = instance ? instance->instanceName() : tdeApp->instanceName();
             if ( instname != "koshell" ) // hack for koshell
                 kdWarning(30003) << service->desktopEntryPath() << ": no X-TDE-NativeMimeType entry!" << endl;
         }
diff --git a/lib/kofficecore/KoDocumentIface.cpp b/lib/kofficecore/KoDocumentIface.cpp
index e0196fdf3..e63b1b1c8 100644
--- a/lib/kofficecore/KoDocumentIface.cpp
+++ b/lib/kofficecore/KoDocumentIface.cpp
@@ -86,12 +86,12 @@ DCOPRef KoDocumentIface::view( int idx )
   if ( !obj )
     return DCOPRef();
 
-  return DCOPRef( kapp->dcopClient()->appId(), obj->objId() );
+  return DCOPRef( tdeApp->dcopClient()->appId(), obj->objId() );
 }
 
 DCOPRef KoDocumentIface::action( const TQCString &name )
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
 }
 
 QCStringList KoDocumentIface::actions()
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index cce7fff28..daaeaba53 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -1466,7 +1466,7 @@ void KoMainWindow::slotProgress(int value) {
         d->m_firstTime=false;
     }
     d->m_progress->setProgress(value);
-    kapp->processEvents();
+    tdeApp->processEvents();
 }
 
 
@@ -1635,7 +1635,7 @@ void KoMainWindow::slotEmailFile()
 
     if (!fileURL.isEmpty())
     {
-        kapp->invokeMailer(TQString(), TQString(), TQString(), theSubject,
+        tdeApp->invokeMailer(TQString(), TQString(), TQString(), theSubject,
                             TQString(), //body
                             TQString(),
                             urls); // attachments
diff --git a/lib/kofficecore/KoMainWindowIface.cpp b/lib/kofficecore/KoMainWindowIface.cpp
index fda04670b..8b52fc4c6 100644
--- a/lib/kofficecore/KoMainWindowIface.cpp
+++ b/lib/kofficecore/KoMainWindowIface.cpp
@@ -40,7 +40,7 @@ KoMainWindowIface::~KoMainWindowIface()
 
 DCOPRef KoMainWindowIface::action( const TQCString &name )
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
 }
 
 QCStringList KoMainWindowIface::actions()
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index c708dd564..3637b90b8 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -136,7 +136,7 @@ void KoSpeaker::probe()
     TQPoint pos;
     bool spoke = false;
     if ( d->m_speakFlags & SpeakFocusWidget ) {
-        w = kapp->focusWidget();
+        w = tdeApp->focusWidget();
         if (w) {
             spoke = maybeSayWidget(w);
             if (!spoke)
@@ -145,7 +145,7 @@ void KoSpeaker::probe()
     }
     if ( !spoke && d->m_speakFlags & SpeakPointerWidget ) {
         pos = TQCursor::pos();
-        w = kapp->widgetAt(pos, true);
+        w = tdeApp->widgetAt(pos, true);
         if (w) {
             if (!maybeSayWidget(w, pos))
                 emit customSpeakWidget(w, pos, d->m_speakFlags);
@@ -481,12 +481,12 @@ bool KoSpeaker::sayWidget(const TQString& msg)
 
 bool KoSpeaker::startKttsd()
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     // If KTTSD not running, start it.
     if (!client->isApplicationRegistered("kttsd"))
     {
         TQString error;
-        if (kapp->startServiceByDesktopName("kttsd", TQStringList(), &error)) {
+        if (tdeApp->startServiceByDesktopName("kttsd", TQStringList(), &error)) {
             kdDebug() << "KoSpeaker::startKttsd: error starting KTTSD service: " << error << endl;
             d->m_enabled = false;
         } else
@@ -502,7 +502,7 @@ TQString KoSpeaker::getKttsdVersion()
     // did not support version() method, so we must manually marshall this call ourselves.
     if (d->m_enabled) {
         if (!d->m_versionChecked) {
-            DCOPClient *client = kapp->dcopClient();
+            DCOPClient *client = tdeApp->dcopClient();
             TQByteArray  data;
             TQCString    replyType;
             TQByteArray  replyData;
@@ -520,7 +520,7 @@ TQString KoSpeaker::getKttsdVersion()
 void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talker)
 {
     if (msg.isEmpty()) return;
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray  data;
     TQCString    replyType;
     TQByteArray  replyData;
@@ -535,7 +535,7 @@ void KoSpeaker::sayScreenReaderOutput(const TQString &msg, const TQString &talke
 uint KoSpeaker::setText(const TQString &text, const TQString &talker)
 {
     if (text.isEmpty()) return 0;
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray  data;
     TQCString    replyType;
     TQByteArray  replyData;
@@ -555,7 +555,7 @@ uint KoSpeaker::setText(const TQString &text, const TQString &talker)
 int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/)
 {
     if (text.isEmpty()) return 0;
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray  data;
     TQCString    replyType;
     TQByteArray  replyData;
@@ -574,7 +574,7 @@ int KoSpeaker::appendText(const TQString &text, uint jobNum /*=0*/)
 
 void KoSpeaker::startText(uint jobNum /*=0*/)
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray  data;
     TQCString    replyType;
     TQByteArray  replyData;
@@ -588,7 +588,7 @@ void KoSpeaker::startText(uint jobNum /*=0*/)
 
 void KoSpeaker::removeText(uint jobNum /*=0*/)
 {
-    DCOPClient *client = kapp->dcopClient();
+    DCOPClient *client = tdeApp->dcopClient();
     TQByteArray  data;
     TQCString    replyType;
     TQByteArray  replyData;
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index cca65063d..ddff05f49 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -613,7 +613,7 @@ void KoView::slotAutoScroll(  )
     {
         int state=0;
 #if KDE_IS_VERSION(3,4,0)
-        state = kapp->keyboardMouseState();
+        state = tdeApp->keyboardMouseState();
 #endif
 
         pos = canvas()->mapFrom(this, pos);
diff --git a/lib/kofficecore/KoViewIface.cpp b/lib/kofficecore/KoViewIface.cpp
index 18c5dae57..bb6159f60 100644
--- a/lib/kofficecore/KoViewIface.cpp
+++ b/lib/kofficecore/KoViewIface.cpp
@@ -55,7 +55,7 @@ KoViewIface::~KoViewIface()
 
 DCOPRef KoViewIface::action( const TQCString &name )
 {
-    return DCOPRef( kapp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
+    return DCOPRef( tdeApp->dcopClient()->appId(), m_actionProxy->actionObjectId( name ) );
 }
 
 QCStringList KoViewIface::actions()
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index 3ef20eb52..a5d35b422 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -59,7 +59,7 @@ class KPanelKbdSizerIcon : public TQCursor
         void show(const TQPoint p) {
             if (!isActive) {
                 originalPos = TQCursor::pos();
-                kapp->setOverrideCursor(*this);
+                tdeApp->setOverrideCursor(*this);
                 isActive = true;
             }
             if (p != pos())
@@ -69,7 +69,7 @@ class KPanelKbdSizerIcon : public TQCursor
 
         void hide() {
             if (isActive) {
-                kapp->restoreOverrideCursor();
+                tdeApp->restoreOverrideCursor();
                 TQCursor::setPos(originalPos);
             }
             isActive = false;
@@ -79,9 +79,9 @@ class KPanelKbdSizerIcon : public TQCursor
         {
             if (shayp != shape()) {
                 // Must restore and override to get the icon to refresh.
-                if (isActive) kapp->restoreOverrideCursor();
+                if (isActive) tdeApp->restoreOverrideCursor();
                 TQCursor::setShape((TQt::CursorShape)shayp);
-                if (isActive) kapp->setOverrideCursor(*this);
+                if (isActive) tdeApp->setOverrideCursor(*this);
             }
         }
 
@@ -174,12 +174,12 @@ KKbdAccessExtensions::KKbdAccessExtensions(TDEMainWindow* parent, const char* na
     d->revAction->setEnabled(false);
     d->accessKeysAction->setEnabled(false);
     d->icon = new KPanelKbdSizerIcon();
-    kapp->installEventFilter(this);
+    tdeApp->installEventFilter(this);
 }
 
 KKbdAccessExtensions::~KKbdAccessExtensions()
 {
-    kapp->removeEventFilter(this);
+    tdeApp->removeEventFilter(this);
     if (d->panel) exitSizing();
     delete d;
 }
@@ -274,7 +274,7 @@ bool KKbdAccessExtensions::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidgetList* KKbdAccessExtensions::getAllPanels()
 {
-    TQWidgetList* allWidgets = kapp->allWidgets();
+    TQWidgetList* allWidgets = tdeApp->allWidgets();
     TQWidgetList* allPanels = new TQWidgetList;
     TQWidget* widget = allWidgets->first();
     while (widget) {
@@ -571,7 +571,7 @@ void KKbdAccessExtensions::displayAccessKeys()
     }
     // Find all visible, focusable widgets and create a TQLabel for each.  Don't exceed
     // available list of access keys.
-    TQWidgetList* allWidgets = kapp->allWidgets();
+    TQWidgetList* allWidgets = tdeApp->allWidgets();
     TQWidget* widget = allWidgets->first();
     int accessCount = 0;
     int maxAccessCount = availableAccessKeys.length();
diff --git a/lib/kofficecore/kkbdaccessextensions.h b/lib/kofficecore/kkbdaccessextensions.h
index 2aa64c748..7b9becd7c 100644
--- a/lib/kofficecore/kkbdaccessextensions.h
+++ b/lib/kofficecore/kkbdaccessextensions.h
@@ -83,7 +83,7 @@ class TDEMainWindow;
 *   When entering sizing mode, the position of the mouse cursor is saved and restored when
 *   exiting sizing mode.
 *
-*   For a TQSplitter or TQDockWindow to be found, it must be in the kapp::allWidgets() list.
+*   For a TQSplitter or TQDockWindow to be found, it must be in the tdeApp::allWidgets() list.
 *
 *   @section focus_setting Focus Setting
 *
@@ -128,7 +128,7 @@ class KOFFICECORE_EXPORT KKbdAccessExtensions : public TQObject
         void setStepSize(int s);
 
     protected:
-        /** Event filter installed on kapp object. */
+        /** Event filter installed on tdeApp object. */
         bool eventFilter( TQObject *o, TQEvent *e );
 
         /** Retrieves a list of all Splitter and DockArea widgets in the application. */
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index 8d200c080..f78e466a1 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -219,7 +219,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e )
 		e->accept();
 		if (currentAnchor.startsWith("help://#")) {
 			//that's not really useful, since koffice documents can be embedded
-			kapp->invokeHelp(currentAnchor.right(currentAnchor.length()-8));
+			tdeApp->invokeHelp(currentAnchor.right(currentAnchor.length()-8));
 		}
 		else
 		if (currentAnchor.startsWith("help://")) {
@@ -231,7 +231,7 @@ void KoHelpView::mouseReleaseEvent( TQMouseEvent* e )
 				helpanchor=helpapp.right(helpapp.length()-pos-1);
 				helpapp=helpapp.left(pos);
 			}
-			kapp->invokeHelp(helpanchor,helpapp);
+			tdeApp->invokeHelp(helpanchor,helpapp);
 		}
 		else
 		emit linkClicked( currentAnchor );
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index f0ff9ff1c..94a2ffb75 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -463,7 +463,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name  )
   tmpTQLabel->setText(i18n("Recent file:"));
 
   TQComboBox * recentFile = new TQComboBox( this );
-  recentFile->setMaximumWidth( kapp->desktop()->width()*3/4 );
+  recentFile->setMaximumWidth( tdeApp->desktop()->width()*3/4 );
   lay2->addWidget(recentFile);
 
   TQStringList fileList = TDERecentDocument::recentDocuments();
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index e8840c0ba..d8542ec5c 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -87,7 +87,7 @@ void KoSelectAction::popup(const TQPoint& global)
 int KoSelectAction::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") )
@@ -98,7 +98,7 @@ int KoSelectAction::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/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index fa9b52cd6..e03ce56c2 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -224,7 +224,7 @@ KoTemplateChooseDia::~KoTemplateChooseDia()
 static bool cancelQuits() {
     bool onlyDoc = !KoDocument::documentList() || KoDocument::documentList()->count() <= 1;
     bool onlyMainWindow = !TDEMainWindow::memberList || TDEMainWindow::memberList->count() <= 1;
-    return onlyDoc && onlyMainWindow && kapp->instanceName() != "koshell"; // hack for koshell
+    return onlyDoc && onlyMainWindow && tdeApp->instanceName() != "koshell"; // hack for koshell
 }
 
 KoTemplateChooseDia::ReturnType KoTemplateChooseDia::choose(TDEInstance* instance, TQString &file,
diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp
index a27d7f236..50ac1136c 100644
--- a/lib/kofficeui/kcoloractions.cpp
+++ b/lib/kofficeui/kcoloractions.cpp
@@ -234,7 +234,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index )
 	kdWarning() << "TDESelectColorAction::plug called with 0 argument\n";
  	return -1;
     }
-    if (kapp && !kapp->authorizeTDEAction(name()))
+    if (tdeApp && !tdeApp->authorizeTDEAction(name()))
         return -1;
 
     if ( w->inherits("TQPopupMenu") )
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 295f24f80..1e63f54fc 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -390,7 +390,7 @@ void
 Editor::changeSetLater()
 {
 	tqApp->eventLoop()->processEvents(TQEventLoop::AllEvents);
-	if (kapp->hasPendingEvents()) {
+	if (tdeApp->hasPendingEvents()) {
 		d->changeSetLaterTimer.start(10, true); //try again...
 		return;
 	}
@@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it)
 	if (d->currentWidget) {
 		if (d->currentWidget->visibleFlag()) {
 			d->currentWidget->show();
-			if (hasParent( this, kapp->focusWidget() ))
+			if (hasParent( this, tdeApp->focusWidget() ))
 				d->currentWidget->setFocus();
 		}
 	}
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 1d186c4ce..250e8c28a 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -133,7 +133,7 @@ class GroupWidgetBase : public TQWidget
 			TQRect r(rect());
 			TQPainter p(this);
 			TQStyle::StyleFlags flags = m_mouseDown ? TQStyle::Style_Down : TQStyle::Style_Default;
-			kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
+			tdeApp->style().drawPrimitive(TQStyle::PE_HeaderSection, &p, r, palette().active(), flags);
 
 			paintListViewExpander(&p, this, r.height()+2, palette().active(), isOpen());
 			if (!m_miniicon.isNull()) {
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index 7c9518ead..336d5bbda 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -2281,7 +2281,7 @@ bool KoTextObject::statistics( TQProgressDialog *progress, ulong & charsWithSpac
         {
             progress->setProgress(progress->progress()+1);
             // MA: resizing if KWStatisticsDialog does not work correct with this enabled, don't know why
-            kapp->processEvents();
+            tdeApp->processEvents();
             if ( progress->wasCancelled() )
                 return false;
         }
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index ddc09dc21..f8dcba33e 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -49,7 +49,7 @@ KoHyphenator::KoHyphenator()
 {
 /*  Reading config for dictionary encodings from file...*/
 
-    TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml");
+    TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/dicts.xml");
 #ifdef DEBUG_HYPHENATOR
     kdDebug() << path << endl;
 #endif
@@ -187,7 +187,7 @@ HyphenDict *KoHyphenator::dict(const TQString &_lang) const
 #ifdef DEBUG_HYPHENATOR
         kdDebug() << "Searching dictionary for '" << lang << "' language..." << endl;
 #endif
-        TQString path = kapp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic");
+        TQString path = tdeApp->dirs()->findResource("data", "koffice/hyphdicts/hyph_" + lang + ".dic");
         if (!path.isNull())
         {
 #ifdef DEBUG_HYPHENATOR
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index d04f8d9dc..0af1be7dd 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -320,7 +320,7 @@ void WdgScriptsManager::slotUnloadScript()
 void WdgScriptsManager::slotGetNewScript()
 {
 #ifdef KROSS_SUPPORT_NEWSTUFF
-    const TQString appname = TDEApplication::kApplication()->name();
+    const TQString appname = tdeApp->name();
     const TQString type = TQString("%1 1.x script").arg(appname);
 
     if(! d->newstuff) {
diff --git a/tools/thumbnail/kofficecreator.cpp b/tools/thumbnail/kofficecreator.cpp
index 3e298186e..9d5f947c2 100644
--- a/tools/thumbnail/kofficecreator.cpp
+++ b/tools/thumbnail/kofficecreator.cpp
@@ -86,7 +86,7 @@ bool KOfficeCreator::create(const TQString &path, int width, int height, TQImage
     m_completed = false;
     startTimer(5000);
     while (!m_completed)
-        kapp->processOneEvent();
+        tdeApp->processOneEvent();
     killTimers();
 
     // render the page on a bigger pixmap and use smoothScale,