Use tdeApp

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

81 files changed, 202 insertions, 202 deletions

diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index e5293cb..c41a8a3 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -140,7 +140,7 @@ AcquireImageDialog::~AcquireImageDialog()
 
 void AcquireImageDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
+    tdeApp->invokeHelp("acquireimages", "kipi-plugins");
 }    
 
 void AcquireImageDialog::readSettings(void)
diff --git a/kipi-plugins/acquireimages/plugin_acquireimages.cpp b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
index 269c4a6..cd09455 100644
--- a/kipi-plugins/acquireimages/plugin_acquireimages.cpp
+++ b/kipi-plugins/acquireimages/plugin_acquireimages.cpp
@@ -100,7 +100,7 @@ void Plugin_AcquireImages::slotActivate()
     
     if (from == "scan_images")
     {
-        m_scanDialog = KScanDialog::getScanDialog(kapp->activeWindow(), "KIPI Scan Images Plugin");
+        m_scanDialog = KScanDialog::getScanDialog(tdeApp->activeWindow(), "KIPI Scan Images Plugin");
     
         if ( m_scanDialog )
         {
@@ -111,7 +111,7 @@ void Plugin_AcquireImages::slotActivate()
         }
         else
         {
-            KMessageBox::sorry(kapp->activeWindow(), i18n("No TDE scan-service available; check your system."),
+            KMessageBox::sorry(tdeApp->activeWindow(), i18n("No TDE scan-service available; check your system."),
                                 i18n("KIPI's 'Scan Images' Plugin"));
             kdDebug ( 51000 ) << "No Scan-service available, aborting!" << endl;
             return;
@@ -123,7 +123,7 @@ void Plugin_AcquireImages::slotActivate()
     else if (from == "screenshot_images")
     {
         m_screenshotDialog = new KIPIAcquireImagesPlugin::ScreenGrabDialog(interface,
-            kapp->activeWindow(), "KIPI ScreenshotImagesDialog");
+            tdeApp->activeWindow(), "KIPI ScreenshotImagesDialog");
         m_screenshotDialog->show();
     }
     else
@@ -152,7 +152,7 @@ void Plugin_AcquireImages::slotAcquireImageDone(const TQImage &img)
         return;
     }
             
-    m_acquireImageDialog = new KIPIAcquireImagesPlugin::AcquireImageDialog( interface, kapp->activeWindow(), img);
+    m_acquireImageDialog = new KIPIAcquireImagesPlugin::AcquireImageDialog( interface, tdeApp->activeWindow(), img);
     m_acquireImageDialog->setMinimumWidth(400);
     m_acquireImageDialog->exec();
 }
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index bea1d7b..a3a99b7 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -174,7 +174,7 @@ ScreenGrabDialog::~ScreenGrabDialog()
 
 void ScreenGrabDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
+    tdeApp->invokeHelp("acquireimages", "kipi-plugins");
 }    
 
 void ScreenGrabDialog::slotClose( void )
@@ -216,7 +216,7 @@ void ScreenGrabDialog::slotGrab()
         delete list;
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     TQApplication::syncX();
 
     if ( m_delay->value() != 0 )
diff --git a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
index 0c82eaa..17edc02 100644
--- a/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/batchprocessimagesdialog.cpp
@@ -476,7 +476,7 @@ bool BatchProcessImagesDialog::startProcess(void)
     KURL desturl(targetAlbum + "/" + item->nameDest());
 
 #if TDE_VERSION >= 0x30200
-    if ( TDEIO::NetAccess::exists( desturl, false, kapp->activeWindow() ) == true )
+    if ( TDEIO::NetAccess::exists( desturl, false, tdeApp->activeWindow() ) == true )
 #else
     if ( TDEIO::NetAccess::exists( desturl ) == true )
 #endif
@@ -715,7 +715,7 @@ void BatchProcessImagesDialog::slotProcessDone(TDEProcess* proc)
                 KURL deleteImage(item->pathSrc());
     
 #if TDE_VERSION >= 0x30200
-                if ( TDEIO::NetAccess::del( deleteImage, kapp->activeWindow() ) == false )
+                if ( TDEIO::NetAccess::del( deleteImage, tdeApp->activeWindow() ) == false )
 #else
                 if ( TDEIO::NetAccess::del( deleteImage ) == false )
 #endif
@@ -868,7 +868,7 @@ void BatchProcessImagesDialog::slotPreviewProcessDone(TDEProcess* proc)
        KURL deletePreviewImage(m_tmpFolder + "/" + TQString::number(getpid()) + "preview.PNG");
 
 #if TDE_VERSION >= 0x30200
-       TDEIO::NetAccess::del( deletePreviewImage, kapp->activeWindow() );
+       TDEIO::NetAccess::del( deletePreviewImage, tdeApp->activeWindow() );
 #else
        TDEIO::NetAccess::del( deletePreviewImage );
 #endif
@@ -1029,8 +1029,8 @@ void BatchProcessImagesDialog::processAborted(bool removeFlag)
        deleteImage.addPath(item->nameDest());
 
 #if TDE_VERSION >= 0x30200
-       if ( TDEIO::NetAccess::exists( deleteImage, false, kapp->activeWindow() ) == true )
-          TDEIO::NetAccess::del( deleteImage, kapp->activeWindow() );
+       if ( TDEIO::NetAccess::exists( deleteImage, false, tdeApp->activeWindow() ) == true )
+          TDEIO::NetAccess::del( deleteImage, tdeApp->activeWindow() );
 #else
        if ( TDEIO::NetAccess::exists( deleteImage ) == true )
           TDEIO::NetAccess::del( deleteImage );
@@ -1067,7 +1067,7 @@ TQString BatchProcessImagesDialog::RenameTargetImageFile(TQFileInfo *fi)
     }
     while ( Enumerator < 100 &&
 #if TDE_VERSION >= 0x30200
-            TDEIO::NetAccess::exists( NewDestUrl, true, kapp->activeWindow() )
+            TDEIO::NetAccess::exists( NewDestUrl, true, tdeApp->activeWindow() )
 #else
             TDEIO::NetAccess::exists( NewDestUrl )
 #endif
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 52af896..f94aebd 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -116,7 +116,7 @@ BorderImagesDialog::~BorderImagesDialog()
 
 void BorderImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("borderimages", "kipi-plugins");
+    tdeApp->invokeHelp("borderimages", "kipi-plugins");
 }
 
 void BorderImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index ddd1ed4..8a9e6a6 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -137,7 +137,7 @@ ColorImagesDialog::~ColorImagesDialog()
 
 void ColorImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("colorimages",
+    tdeApp->invokeHelp("colorimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index abad9ed..999c42b 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -147,7 +147,7 @@ ConvertImagesDialog::~ConvertImagesDialog()
 
 void ConvertImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("convertimages", "kipi-plugins");
+    tdeApp->invokeHelp("convertimages", "kipi-plugins");
 }
 
 void ConvertImagesDialog::slotTypeChanged(int type)
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 521fe13..c591ec9 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -135,7 +135,7 @@ EffectImagesDialog::~EffectImagesDialog()
 
 void EffectImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("effectimages",
+    tdeApp->invokeHelp("effectimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index 48cd61b..812ebc8 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -123,7 +123,7 @@ FilterImagesDialog::~FilterImagesDialog()
 
 void FilterImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("filterimages", "kipi-plugins");
+    tdeApp->invokeHelp("filterimages", "kipi-plugins");
 }
 
 void FilterImagesDialog::slotTypeChanged(int type)
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 15cd80c..f91f314 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -173,7 +173,7 @@ ImagePreview::~ImagePreview()
 
 void ImagePreview::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("", "kipi-plugins");
+    tdeApp->invokeHelp("", "kipi-plugins");
 }
 
 void ImagePreview::slotWheelChanged( int delta )
@@ -309,7 +309,7 @@ void PixmapView::PreviewProcessDone(TDEProcess* proc)
           KURL deletePreviewImage( m_previewFileName );
 
 #if TDE_VERSION >= 0x30200
-          TDEIO::NetAccess::del( deletePreviewImage, kapp->activeWindow() );
+          TDEIO::NetAccess::del( deletePreviewImage, tdeApp->activeWindow() );
 #else
           TDEIO::NetAccess::del( deletePreviewImage );
 #endif
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index af8d7fb..84a1b4d 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -98,7 +98,7 @@ OutputDialog::~OutputDialog()
 
 void OutputDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("",
+    tdeApp->invokeHelp("",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
index 98b218b..b0d5c11 100644
--- a/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
+++ b/kipi-plugins/batchprocessimages/plugin_batchprocessimages.cpp
@@ -225,7 +225,7 @@ void Plugin_BatchProcessImages::slotActivate()
 
     if ( images.images().isEmpty() ) 
         {
-        KMessageBox::sorry(kapp->activeWindow(),
+        KMessageBox::sorry(tdeApp->activeWindow(),
                            i18n("Please select an album or a selection of images."));
         return;
         }
@@ -237,49 +237,49 @@ void Plugin_BatchProcessImages::slotActivate()
     if (from == "batch_convert_images")
         {
         m_ConvertImagesDialog = new KIPIBatchProcessImagesPlugin::ConvertImagesDialog( urlList,
-                                                                  interface, kapp->activeWindow());
+                                                                  interface, tdeApp->activeWindow());
         m_ConvertImagesDialog->show();
         }
     else if (from == "batch_rename_images")
         {
         KIPIBatchProcessImagesPlugin::RenameImagesDialog
-            dlg(urlList, interface, kapp->activeWindow());
+            dlg(urlList, interface, tdeApp->activeWindow());
         dlg.exec();
         }
     else if (from == "batch_border_images")
         {
         m_BorderImagesDialog = new KIPIBatchProcessImagesPlugin::BorderImagesDialog( urlList,
-                                                                 interface, kapp->activeWindow());
+                                                                 interface, tdeApp->activeWindow());
         m_BorderImagesDialog->show();
         }
     else if (from == "batch_color_images")
         {
         m_ColorImagesDialog = new KIPIBatchProcessImagesPlugin::ColorImagesDialog( urlList, 
-                                                                interface, kapp->activeWindow());
+                                                                interface, tdeApp->activeWindow());
         m_ColorImagesDialog->show();
         }
     else if (from == "batch_filter_images")
         {
         m_FilterImagesDialog = new KIPIBatchProcessImagesPlugin::FilterImagesDialog( urlList,
-                                                                 interface, kapp->activeWindow());
+                                                                 interface, tdeApp->activeWindow());
         m_FilterImagesDialog->show();
         }
     else if (from == "batch_effect_images")
         {
         m_EffectImagesDialog = new KIPIBatchProcessImagesPlugin::EffectImagesDialog( urlList, 
-                                                                 interface, kapp->activeWindow());
+                                                                 interface, tdeApp->activeWindow());
         m_EffectImagesDialog->show();
         }
     else if (from == "batch_recompress_images")
         {
         m_RecompressImagesDialog = new KIPIBatchProcessImagesPlugin::RecompressImagesDialog( urlList, 
-                                                                     interface, kapp->activeWindow());
+                                                                     interface, tdeApp->activeWindow());
         m_RecompressImagesDialog->show();
         }
     else if (from == "batch_resize_images")
         {
         m_ResizeImagesDialog = new KIPIBatchProcessImagesPlugin::ResizeImagesDialog( urlList,
-                                                                 interface, kapp->activeWindow());
+                                                                 interface, tdeApp->activeWindow());
         m_ResizeImagesDialog->show();
         }
     else
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index 7399e61..c4b18ed 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -100,7 +100,7 @@ RecompressImagesDialog::~RecompressImagesDialog()
 
 void RecompressImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("recompressimages", "kipi-plugins");
+    tdeApp->invokeHelp("recompressimages", "kipi-plugins");
 }
 
 void RecompressImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
index 9019e34..ba70226 100644
--- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
@@ -88,7 +88,7 @@ RenameImagesDialog::~RenameImagesDialog()
 
 void RenameImagesDialog::slotHelp(void)
 {
-   kapp->invokeHelp("renameimages", "kipi-plugins");
+   tdeApp->invokeHelp("renameimages", "kipi-plugins");
 }
 
 }  // namespace KIPIBatchProcessImagesPlugin
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 464690d..b8cbe29 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -124,7 +124,7 @@ ResizeImagesDialog::~ResizeImagesDialog()
 
 void ResizeImagesDialog::slotHelp( void )
 {
-    TDEApplication::kApplication()->invokeHelp("resizeimages", "kipi-plugins");
+    tdeApp->invokeHelp("resizeimages", "kipi-plugins");
 }
 
 void ResizeImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index d0d9487..d3c8db1 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -180,7 +180,7 @@ CalWizard::~CalWizard()
 
 void CalWizard::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("calendar", "kipi-plugins");
+    tdeApp->invokeHelp("calendar", "kipi-plugins");
 }
 
 void CalWizard::slotPageSelected(const TQString&)
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index 87a511e..e5a61f4 100644
--- a/kipi-plugins/calendar/monthwidget.cpp
+++ b/kipi-plugins/calendar/monthwidget.cpp
@@ -125,7 +125,7 @@ void MonthWidget::setImage( const KURL &url )
     imagePath_ = url;
     CalSettings::instance()->setImage(month_, imagePath_);
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     TQPixmap pix = iconLoader->loadIcon("image-x-generic", TDEIcon::NoGroup, 64 );
     if ( pixmap_ )
         delete pixmap_;
diff --git a/kipi-plugins/calendar/plugin_calendar.cpp b/kipi-plugins/calendar/plugin_calendar.cpp
index 76b68ee..fc58cfd 100644
--- a/kipi-plugins/calendar/plugin_calendar.cpp
+++ b/kipi-plugins/calendar/plugin_calendar.cpp
@@ -82,7 +82,7 @@ void Plugin_Calendar::slotActivate()
        return;
        }
 
-    KIPICalendarPlugin::CalWizard* w = new KIPICalendarPlugin::CalWizard( interface, kapp->activeWindow() );
+    KIPICalendarPlugin::CalWizard* w = new KIPICalendarPlugin::CalWizard( interface, tdeApp->activeWindow() );
     w->show();
 }
 
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 9801348..59f263f 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -73,7 +73,7 @@ CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, TDEActio
         : TQObject(parent)
 {
     KImageIO::registerFormats();
-    const TDEAboutData *data = TDEApplication::kApplication()->aboutData();
+    const TDEAboutData *data = tdeApp->aboutData();
     m_hostName = TQString( data->appName() );
 
     m_hostURL = data->homepage();
@@ -209,7 +209,7 @@ bool CDArchiving::showDialog()
     m_HTMLInterfaceAutoRunInf = "";
     m_HTMLInterfaceAutoRunFolder = "";
 
-    m_configDlg = new CDArchivingDialog( m_interface, kapp->activeWindow() );
+    m_configDlg = new CDArchivingDialog( m_interface, tdeApp->activeWindow() );
     readSettings();
 
     if ( m_configDlg->exec() == TQDialog::Accepted )
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index 23d9c25..4eb36b3 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -132,7 +132,7 @@ CDArchivingDialog::~CDArchivingDialog()
 
 void CDArchivingDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("cdarchiving", "kipi-plugins");
+    tdeApp->invokeHelp("cdarchiving", "kipi-plugins");
 }
 
 void CDArchivingDialog::setupSelection(void)
diff --git a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
index 4216f52..48a4c4b 100644
--- a/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/plugin_cdarchiving.cpp
@@ -123,7 +123,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
 
     if (!m_progressDlg)
     {
-        m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Archive to CD/DVD"));
+        m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), i18n("Archive to CD/DVD"));
 
         connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
                 this, TQ_SLOT(slotCancel()));
@@ -330,7 +330,7 @@ void Plugin_CDArchiving::customEvent(TQCustomEvent *event)
         }
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     delete d;
 }
 
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 5493da1..32f00b5 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -288,7 +288,7 @@ DisplayCompare::~DisplayCompare()
 
 void DisplayCompare::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("findduplicateimages",
+    tdeApp->invokeHelp("findduplicateimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index dd6925b..36692ea 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -213,7 +213,7 @@ void FindDuplicateDialog::setupPageMethod(void)
 
 void FindDuplicateDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("findduplicateimages",
+    tdeApp->invokeHelp("findduplicateimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/findimages/finddupplicateimages.cpp b/kipi-plugins/findimages/finddupplicateimages.cpp
index ff37f7a..527bb2d 100644
--- a/kipi-plugins/findimages/finddupplicateimages.cpp
+++ b/kipi-plugins/findimages/finddupplicateimages.cpp
@@ -135,7 +135,7 @@ void FindDuplicateImages::readSettings(void)
 bool FindDuplicateImages::execDialog()
 {
     tqApp->setOverrideCursor( TQCursor(TQt::WaitCursor) );
-    m_findDuplicateDialog = new FindDuplicateDialog( m_interface, kapp->activeWindow() );
+    m_findDuplicateDialog = new FindDuplicateDialog( m_interface, tdeApp->activeWindow() );
     tqApp->restoreOverrideCursor();
 
     readSettings();
@@ -167,9 +167,9 @@ bool FindDuplicateImages::execDialog()
 void FindDuplicateImages::showResult()
 {
     if( !m_res.isEmpty() )
-        DisplayCompare((TQWidget *)(kapp->activeWindow()), m_interface, m_res).exec();
+        DisplayCompare((TQWidget *)(tdeApp->activeWindow()), m_interface, m_res).exec();
     else
-        KMessageBox::information(kapp->activeWindow(), i18n("No identical files found"));
+        KMessageBox::information(tdeApp->activeWindow(), i18n("No identical files found"));
 }
 
 
@@ -198,7 +198,7 @@ void FindDuplicateImages::compareAlbums(void)
             }
         }
 
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     if ( m_findDuplicateDialog->getFindMethod() == FindDuplicateDialog::MethodAlmost )
@@ -310,7 +310,7 @@ void FindDuplicateImages::updateCache(TQString fromDir)
 
     while ( (fi = it.current()) != 0 )
     {
-        kapp->processEvents();
+        tdeApp->processEvents();
         TQString fCache=fi->absFilePath();
         TQString orgFile=fCache.right(fCache.length()-len);
 
@@ -418,7 +418,7 @@ bool FindDuplicateImages::deldir(TQString dirname)
                 if (dir->remove(fi->absFilePath() ) == false)
                     return false;
 
-        kapp->processEvents();
+        tdeApp->processEvents();
         ++it;
     }
 
diff --git a/kipi-plugins/findimages/plugin_findimages.cpp b/kipi-plugins/findimages/plugin_findimages.cpp
index 75776ed..b2bd3da 100644
--- a/kipi-plugins/findimages/plugin_findimages.cpp
+++ b/kipi-plugins/findimages/plugin_findimages.cpp
@@ -101,7 +101,7 @@ void Plugin_FindImages::slotFindDuplicateImages()
 
     if (m_findDuplicateOperation->execDialog())
     {
-        m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Find Duplicate Images"));
+        m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), i18n("Find Duplicate Images"));
 
         connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
                 this, TQ_SLOT(slotCancel()));
@@ -293,7 +293,7 @@ void Plugin_FindImages::customEvent(TQCustomEvent *event)
     }
 
     m_progressDlg->setProgress(d->count, m_total);
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     delete d;
 }
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 210dfaf..15e1291 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -198,8 +198,8 @@ void FlickrTalker::slotAuthenticate()
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Authenticate url: " << url << endl;
 
-    TDEApplication::kApplication()->invokeBrowser(url.url());
-    int valueOk = KMessageBox::questionYesNo(kapp->activeWindow(),
+    tdeApp->invokeBrowser(url.url());
+    int valueOk = KMessageBox::questionYesNo(tdeApp->activeWindow(),
                   i18n("Please Follow through the instructions in the browser window and "
                        "return back to press ok if you are authenticated or press No"),
                   i18n("Flickr Service Web Authorization"));
@@ -541,7 +541,7 @@ void FlickrTalker::slotError(const TQString& error)
             break;
     };
 
-    KMessageBox::error(kapp->activeWindow(),
+    KMessageBox::error(tdeApp->activeWindow(),
                  i18n("Error Occured: %1\n We can not proceed further").arg(transError));
 
 //  kdDebug() << "Not handling the error now will see it later" << endl;
@@ -716,7 +716,7 @@ void FlickrTalker::parseResponseCheckToken(const TQByteArray& data)
             kdDebug() << "Error code=" << errorString << endl;
             kdDebug() << "Msg=" << node.toElement().attribute("msg") << endl;
 
-            int valueOk = KMessageBox::questionYesNo(kapp->activeWindow(),
+            int valueOk = KMessageBox::questionYesNo(tdeApp->activeWindow(),
                                        i18n("Your token is invalid. Would you like to "
                                             "get a new token to proceed ?\n"));
             if(valueOk == KMessageBox::Yes)
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 985f77d..4e85595 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -273,7 +273,7 @@ void FlickrWindow::writeSettings()
 
 void FlickrWindow::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("flickrexport", "kipi-plugins");
+    tdeApp->invokeHelp("flickrexport", "kipi-plugins");
 }
 
 void FlickrWindow::slotDoLogin()
@@ -334,7 +334,7 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
     //m_photoView->write( "<html></html>" );
     //m_photoView->end();
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/flickrexport/plugin_flickrexport.cpp b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
index 0293df6..04378c6 100644
--- a/kipi-plugins/flickrexport/plugin_flickrexport.cpp
+++ b/kipi-plugins/flickrexport/plugin_flickrexport.cpp
@@ -100,7 +100,7 @@ void Plugin_FlickrExport::slotActivate()
     TQString Tmp = dir.saveLocation("tmp", "kipi-flickrexportplugin-" + TQString::number(getpid()) + "/");
 
     // We clean it up in the close button
-    m_dlg = new KIPIFlickrExportPlugin::FlickrWindow(interface, Tmp, kapp->activeWindow());
+    m_dlg = new KIPIFlickrExportPlugin::FlickrWindow(interface, Tmp, tdeApp->activeWindow());
     m_dlg->show();
 }
 
diff --git a/kipi-plugins/galleryexport/galleries.cpp b/kipi-plugins/galleryexport/galleries.cpp
index 462167d..9658ffa 100644
--- a/kipi-plugins/galleryexport/galleries.cpp
+++ b/kipi-plugins/galleryexport/galleries.cpp
@@ -119,7 +119,7 @@ void Galleries::Load()
   bool bln_use_wallet = false;
 #if KDE_IS_VERSION(3,2,0)
   mpWallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(),
-                                         kapp->activeWindow()->winId(),
+                                         tdeApp->activeWindow()->winId(),
                                          TDEWallet::Wallet::Synchronous);
   if (!mpWallet)
   {
diff --git a/kipi-plugins/galleryexport/gallerylist.cpp b/kipi-plugins/galleryexport/gallerylist.cpp
index c3f7275..4218cc4 100644
--- a/kipi-plugins/galleryexport/gallerylist.cpp
+++ b/kipi-plugins/galleryexport/gallerylist.cpp
@@ -159,7 +159,7 @@ void GalleryList::slotUser2(void)
   TQListViewItem* p_lvi = mpGalleryList->selectedItem();
   if (!p_lvi)
   {
-    KMessageBox::error(kapp->activeWindow(), i18n("No gallery selected!"));
+    KMessageBox::error(tdeApp->activeWindow(), i18n("No gallery selected!"));
   }
   else
   {
@@ -180,12 +180,12 @@ void GalleryList::slotUser1(void)
   TQListViewItem* p_lvi = mpGalleryList->selectedItem();
   if (!p_lvi)
   {
-    KMessageBox::error(kapp->activeWindow(), i18n("No gallery selected!"));
+    KMessageBox::error(tdeApp->activeWindow(), i18n("No gallery selected!"));
   }
   else
   {
     if (KMessageBox::Yes == 
-          KMessageBox::warningYesNo(kapp->activeWindow(),
+          KMessageBox::warningYesNo(tdeApp->activeWindow(),
             i18n("Are you sure you want to remove this gallery? "
                  "All synchronisaton settings will be lost. "
                  "You cannot undo this action."), 
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index cc6e320..cb9d124 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -192,7 +192,7 @@ GalleryWindow::~GalleryWindow()
 
 void GalleryWindow::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
+    tdeApp->invokeHelp("galleryexport", "kipi-plugins");
 }
 
 void GalleryWindow::slotDoLogin()
@@ -282,7 +282,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
     m_photoView->write( "<html></html>" );
     m_photoView->end();
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/galleryexport/plugin_galleryexport.cpp b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
index 5e7e444..4958a44 100644
--- a/kipi-plugins/galleryexport/plugin_galleryexport.cpp
+++ b/kipi-plugins/galleryexport/plugin_galleryexport.cpp
@@ -129,7 +129,7 @@ void Plugin_GalleryExport::slotSync()
         return;
     }
 
-    KIPIGalleryExportPlugin::GalleryWindow dlg(interface, kapp->activeWindow(), mpGalleries);
+    KIPIGalleryExportPlugin::GalleryWindow dlg(interface, tdeApp->activeWindow(), mpGalleries);
     dlg.exec();
 }
 
@@ -142,7 +142,7 @@ void Plugin_GalleryExport::slotConfigure()
         return;
     }
 
-    KIPIGalleryExportPlugin::GalleryList dlg(kapp->activeWindow(), mpGalleries, false);
+    KIPIGalleryExportPlugin::GalleryList dlg(tdeApp->activeWindow(), mpGalleries, false);
     dlg.exec();
 }
 
@@ -155,7 +155,7 @@ void Plugin_GalleryExport::slotCollectionSettings()
         return;
     }
 
-    KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!");
+    KMessageBox::error(tdeApp->activeWindow(), "Not Implemented Yet!");
 }
 
 void Plugin_GalleryExport::slotImageSettings()
@@ -167,7 +167,7 @@ void Plugin_GalleryExport::slotImageSettings()
         return;
     }
 
-    KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!");
+    KMessageBox::error(tdeApp->activeWindow(), "Not Implemented Yet!");
 }
 
 KIPI::Category Plugin_GalleryExport::category( TDEAction* action ) const
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index bc801e1..52233db 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -196,7 +196,7 @@ GPSEditDialog::~GPSEditDialog()
 
 void GPSEditDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
+    tdeApp->invokeHelp("gpssync", "kipi-plugins");
 }
 
 void GPSEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 2a3e8e7..6ca9f6f 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -282,7 +282,7 @@ GPSSyncDialog::~GPSSyncDialog()
 
 void GPSSyncDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
+    tdeApp->invokeHelp("gpssync", "kipi-plugins");
 }
 
 void GPSSyncDialog::setImages( const KURL::List& images )
@@ -521,7 +521,7 @@ void GPSSyncDialog::slotApply()
         selItem->writeGPSInfoToFile();
         images.append(selItem->url());
         ++it;
-        kapp->processEvents();
+        tdeApp->processEvents();
     }
 
     // We use kipi interface refreshImages() method to tell to host than
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index 56ac3b6..9fc0372 100644
--- a/kipi-plugins/gpssync/kmlexport.cpp
+++ b/kipi-plugins/gpssync/kmlexport.cpp
@@ -59,7 +59,7 @@ namespace KIPIGPSSyncPlugin
 kmlExport::kmlExport(KIPI::Interface* interface)
 {
     m_interface      = interface;
-    TQWidget* parent  = TDEApplication::kApplication()->mainWidget();
+    TQWidget* parent  = tdeApp->mainWidget();
     m_progressDialog = new KIPI::BatchProgressDialog(parent, i18n("Generating KML file..."));
 }
 
@@ -450,7 +450,7 @@ void kmlExport::generate()
     if (defectImage) 
     {
         /** @todo if defectImage==count there are no pictures exported, does it worst to continue? */
-        TQWidget* parent = TDEApplication::kApplication()->mainWidget();
+        TQWidget* parent = tdeApp->mainWidget();
         KMessageBox::information(parent, i18n("No position data for 1 picture",
                                               "No position data for %n pictures", defectImage));
     }
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index 23b08f0..29bbd70 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -328,7 +328,7 @@ void KMLExportConfig::slotOk()
 
 void KMLExportConfig::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("KMLExport", "kipi-plugins");
+    tdeApp->invokeHelp("KMLExport", "kipi-plugins");
 }
 
 void KMLExportConfig::GoogleMapTargetRadioButton__toggled(bool)
diff --git a/kipi-plugins/gpssync/plugin_gpssync.cpp b/kipi-plugins/gpssync/plugin_gpssync.cpp
index e4e9e95..d19f7e6 100644
--- a/kipi-plugins/gpssync/plugin_gpssync.cpp
+++ b/kipi-plugins/gpssync/plugin_gpssync.cpp
@@ -135,7 +135,7 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
     if (!gpsBabelBinary.isAvailable()) 
     {
         KMessageBox::information(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("<qt><p>Unable to find the gpsbabel executable:<br> "
                           "This program is required by this plugin to support GPS data file decoding. "
                           "Please install gpsbabel as a package from your distributor "
@@ -152,7 +152,7 @@ bool Plugin_GPSSync::checkBinaries(TQString &gpsBabelVersion)
     if (!gpsBabelBinary.versionIsRight()) 
     {
         KMessageBox::information(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("<qt><p>gpsbabel executable is not up to date:<br> "
                           "The version %1 of gpsbabel have been found on your computer. "
                           "This version is too old to run properly with this plugin. "
@@ -186,7 +186,7 @@ void Plugin_GPSSync::slotGPSSync()
     */
 
     KIPIGPSSyncPlugin::GPSSyncDialog *dialog = new KIPIGPSSyncPlugin::GPSSyncDialog(
-                                               m_interface, kapp->activeWindow());
+                                               m_interface, tdeApp->activeWindow());
 
     dialog->setImages( images.images() );
     dialog->show();
@@ -206,7 +206,7 @@ void Plugin_GPSSync::slotGPSEdit()
     bool hasGPSInfo = exiv2Iface.getGPSInfo(alt, lat, lng);
     KIPIGPSSyncPlugin::GPSDataContainer gpsData(alt, lat, lng, false);
 
-    KIPIGPSSyncPlugin::GPSEditDialog dlg(kapp->activeWindow(), 
+    KIPIGPSSyncPlugin::GPSEditDialog dlg(tdeApp->activeWindow(), 
                                          gpsData, img.fileName(), hasGPSInfo);
 
     if (dlg.exec() == KDialogBase::Accepted)
@@ -245,7 +245,7 @@ void Plugin_GPSSync::slotGPSEdit()
         if (!errorFiles.isEmpty())
         {
             KMessageBox::errorList(
-                        kapp->activeWindow(),
+                        tdeApp->activeWindow(),
                         i18n("Unable to save geographical coordinates into:"),
                         errorFiles,
                         i18n("Edit Geographical Coordinates"));  
@@ -261,7 +261,7 @@ void Plugin_GPSSync::slotGPSRemove()
         return;
 
     if (KMessageBox::warningYesNo(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("Geographical coordinates will be definitively removed from all selected images.\n"
                           "Do you want to continue ?"),
                      i18n("Remove Geographical Coordinates")) != KMessageBox::Yes)
@@ -296,7 +296,7 @@ void Plugin_GPSSync::slotGPSRemove()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::errorList(
-                    kapp->activeWindow(),
+                    tdeApp->activeWindow(),
                     i18n("Unable to remove geographical coordinates from:"),
                     errorFiles,
                     i18n("Remove Geographical Coordinates"));  
@@ -314,7 +314,7 @@ void Plugin_GPSSync::slotKMLExport()
     else 
     {
         KIPIGPSSyncPlugin::KMLExportConfig *kmlExportConfigGui = new KIPIGPSSyncPlugin::KMLExportConfig(
-                                                                 kapp->activeWindow(), i18n("KMLExport").ascii());
+                                                                 tdeApp->activeWindow(), i18n("KMLExport").ascii());
         connect(kmlExportConfigGui, TQ_SIGNAL(okButtonClicked()), 
                 this, TQ_SLOT(slotKMLGenerate()));
         kmlExportConfigGui->show();
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index f2edbcb..45400b5 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -76,7 +76,7 @@ void Plugin::slotActivate() {
 
 	GalleryInfo info;
 	info.readConfig();
-	TQWidget* parent=TDEApplication::kApplication()->mainWidget();
+	TQWidget* parent=tdeApp->mainWidget();
 	Wizard wizard(parent, interface, &info);
 	if (wizard.exec()==TQDialog::Rejected) return;
 	info.writeConfig();
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index cda397a..48e1d5a 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -224,7 +224,7 @@ Wizard::~Wizard() {
 }
 
 void Wizard::showHelp() {
-	TDEApplication::kApplication()->invokeHelp("htmlexport", "kipi-plugins");
+	tdeApp->invokeHelp("htmlexport", "kipi-plugins");
 }
 
 void Wizard::updateFinishButton() {
diff --git a/kipi-plugins/ipodexport/plugin_ipodexport.cpp b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
index d753128..7ba4476 100644
--- a/kipi-plugins/ipodexport/plugin_ipodexport.cpp
+++ b/kipi-plugins/ipodexport/plugin_ipodexport.cpp
@@ -67,7 +67,7 @@ KIPI::Category Plugin_iPodExport::category( TDEAction* action ) const
 void Plugin_iPodExport::slotImageUpload()
 {
     IpodExport::UploadDialog *dlg = new IpodExport::UploadDialog( m_interface, i18n("iPod Export"),
-                                                                  kapp->activeWindow() );
+                                                                  tdeApp->activeWindow() );
     dlg->setMinimumWidth( 460 );
     dlg->show();
 }
diff --git a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
index 8726a5a..fa3d9c0 100644
--- a/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
+++ b/kipi-plugins/jpeglossless/plugin_jpeglossless.cpp
@@ -212,7 +212,7 @@ void Plugin_JPEGLossless::slotFlip()
         m_progressDlg = 0;
     }
 
-    m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), 
+    m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), 
                         i18n("Flip images %1").arg(title));
 
     connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
@@ -268,7 +268,7 @@ void Plugin_JPEGLossless::slotRotate()
         m_progressDlg = 0;
     }
 
-    m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), 
+    m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), 
                         i18n("Rotate images %1").arg(title));
 
     connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
@@ -284,7 +284,7 @@ void Plugin_JPEGLossless::slotConvert2GrayScale()
 {
     KURL::List items = images();
     if (items.count() <= 0 ||
-        KMessageBox::No==KMessageBox::warningYesNo(kapp->activeWindow(),
+        KMessageBox::No==KMessageBox::warningYesNo(tdeApp->activeWindow(),
                      i18n("<p>Are you sure you wish to convert the selected image(s) to "
                          "black and white? This operation <b>cannot</b> be undone.</p>")))
         return;
@@ -301,7 +301,7 @@ void Plugin_JPEGLossless::slotConvert2GrayScale()
         m_progressDlg = 0;
     }
 
-    m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), 
+    m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), 
                         i18n("Convert images to black & white"));
 
     connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index f271d90..ce64443 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -154,7 +154,7 @@ CameraSelection::~CameraSelection() {
 
 void CameraSelection::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("kameraklient",
+    tdeApp->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 194a2be..c309165 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -231,7 +231,7 @@ CameraUI::~CameraUI() {
 
 void CameraUI::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("kameraklient",
+    tdeApp->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp
index dc04957..3c1f4cb 100644
--- a/kipi-plugins/kameraklient/dmessagebox.cpp
+++ b/kipi-plugins/kameraklient/dmessagebox.cpp
@@ -51,7 +51,7 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD
     // ----------------------------------------------------
     TQHBox *hbox = new TQHBox(this);
     hbox->setSpacing(5);
-    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error",
+    TQPixmap pix = tdeApp->iconLoader()->loadIcon("error",
                                                                        TDEIcon::NoGroup,
                                                                        TDEIcon::SizeMedium,
                                                                        TDEIcon::DefaultState,
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index f54ad16..119f384 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -146,7 +146,7 @@ SetupCamera::~SetupCamera() {
 
 void SetupCamera::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("kameraklient",
+    tdeApp->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }   
 
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 353bf5f..f2c9a29 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -105,7 +105,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent)
     TQLabel *title = new TQLabel(i18n("<p>Enter the image caption hosted by <b>%1</b>. "
                                     "This field is not limited (excepted with IPTC). UTF-8 encoding "
                                     "will be used to save text.")
-                                    .arg(TDEApplication::kApplication()->aboutData()->appName()),
+                                    .arg(tdeApp->aboutData()->appName()),
                                plainPage());
 
     d->userCommentEdit  = new KTextEdit(plainPage());
@@ -140,7 +140,7 @@ CommentEditDialog::~CommentEditDialog()
 
 void CommentEditDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    tdeApp->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void CommentEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index e43750b..63db7bd 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -101,7 +101,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent)
     TQVBoxLayout *vlay = new TQVBoxLayout(plainPage(), 0, KDialog::spacingHint());
 
     d->removeHOSTCommentCheck = new TQCheckBox(i18n("Remove caption created by %1")
-                                    .arg(TDEApplication::kApplication()->aboutData()->appName()), 
+                                    .arg(tdeApp->aboutData()->appName()), 
                                     plainPage());
     d->removeJFIFCommentCheck = new TQCheckBox(i18n("Remove JFIF Comment section"), plainPage());
     d->removeEXIFCommentCheck = new TQCheckBox(i18n("Remove EXIF Comment"), plainPage());
@@ -131,7 +131,7 @@ CommentRemoveDialog::~CommentRemoveDialog()
 
 void CommentRemoveDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    tdeApp->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void CommentRemoveDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp
index 7642fc4..db9237b 100644
--- a/kipi-plugins/metadataedit/exifcaption.cpp
+++ b/kipi-plugins/metadataedit/exifcaption.cpp
@@ -151,7 +151,7 @@ EXIFCaption::EXIFCaption(TQWidget* parent)
                                              "will be used to save the text."));
 
     d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync captions entered through %1")
-                                            .arg(TDEApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(tdeApp->aboutData()->appName()), 
                                             parent);
     d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
     d->syncIPTCCaptionCheck = new TQCheckBox(i18n("Sync IPTC caption (warning: limited to 2000 printable "
diff --git a/kipi-plugins/metadataedit/exifdatetime.cpp b/kipi-plugins/metadataedit/exifdatetime.cpp
index 59510d7..010ef1b 100644
--- a/kipi-plugins/metadataedit/exifdatetime.cpp
+++ b/kipi-plugins/metadataedit/exifdatetime.cpp
@@ -106,7 +106,7 @@ EXIFDateTime::EXIFDateTime(TQWidget* parent)
     d->dateCreatedSubSecEdit  = new KIntSpinBox(0, 999, 1, 0, 10, parent);
     d->dateCreatedSel->setDateTime(TQDateTime::currentDateTime());
     d->syncHOSTDateCheck      = new TQCheckBox(i18n("Sync creation date entered through %1")
-                                              .arg(TDEApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(tdeApp->aboutData()->appName()), 
                                               parent);
     d->syncIPTCDateCheck      = new TQCheckBox(i18n("Sync IPTC creation date"), parent);
     KSeparator *line          = new KSeparator(Horizontal, parent);
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index 9d17991..596f49c 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -211,7 +211,7 @@ EXIFEditDialog::~EXIFEditDialog()
 
 void EXIFEditDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    tdeApp->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void EXIFEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp
index dac5413..8f8d76a 100644
--- a/kipi-plugins/metadataedit/iptccaption.cpp
+++ b/kipi-plugins/metadataedit/iptccaption.cpp
@@ -103,7 +103,7 @@ IPTCCaption::IPTCCaption(TQWidget* parent)
     d->captionEdit          = new KTextEdit(parent);
     d->syncJFIFCommentCheck = new TQCheckBox(i18n("Sync JFIF Comment section"), parent);
     d->syncHOSTCommentCheck = new TQCheckBox(i18n("Sync caption entered through %1")
-                                            .arg(TDEApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(tdeApp->aboutData()->appName()), 
                                             parent);
     d->syncEXIFCommentCheck = new TQCheckBox(i18n("Sync EXIF Comment"), parent);
     KSeparator *line        = new KSeparator(Horizontal, parent);
diff --git a/kipi-plugins/metadataedit/iptcdatetime.cpp b/kipi-plugins/metadataedit/iptcdatetime.cpp
index 4aed44f..e63c74d 100644
--- a/kipi-plugins/metadataedit/iptcdatetime.cpp
+++ b/kipi-plugins/metadataedit/iptcdatetime.cpp
@@ -114,7 +114,7 @@ IPTCDateTime::IPTCDateTime(TQWidget* parent)
     d->dateCreatedSel    = new KDateWidget(parent);
     d->timeCreatedSel    = new KTimeWidget(parent);
     d->syncHOSTDateCheck = new TQCheckBox(i18n("Sync creation date entered through %1")
-                                              .arg(TDEApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(tdeApp->aboutData()->appName()), 
                                               parent);
     d->syncEXIFDateCheck = new TQCheckBox(i18n("Sync EXIF creation date"), parent);
     KSeparator *line     = new KSeparator(Horizontal, parent);
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index e562d12..4bee1dc 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -233,7 +233,7 @@ IPTCEditDialog::~IPTCEditDialog()
 
 void IPTCEditDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    tdeApp->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void IPTCEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/plugin_metadataedit.cpp b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
index 01618f8..1841b2d 100644
--- a/kipi-plugins/metadataedit/plugin_metadataedit.cpp
+++ b/kipi-plugins/metadataedit/plugin_metadataedit.cpp
@@ -162,7 +162,7 @@ void Plugin_MetadataEdit::slotEditExif()
     if ( !images.isValid() || images.images().isEmpty() )
         return;
 
-    KIPIMetadataEditPlugin::EXIFEditDialog dialog(kapp->activeWindow(), images.images(), m_interface);
+    KIPIMetadataEditPlugin::EXIFEditDialog dialog(tdeApp->activeWindow(), images.images(), m_interface);
     dialog.exec();
     m_interface->refreshImages(images.images());
 }
@@ -175,7 +175,7 @@ void Plugin_MetadataEdit::slotRemoveExif()
         return;
 
     if (KMessageBox::warningYesNo(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("EXIF metadata will be permanently removed from all current selected pictures.\n"
                           "Do you want to continue ?"),
                      i18n("Remove EXIF Metadata")) != KMessageBox::Yes)
@@ -214,7 +214,7 @@ void Plugin_MetadataEdit::slotRemoveExif()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::errorList(
-                    kapp->activeWindow(),
+                    tdeApp->activeWindow(),
                     i18n("Unable to remove EXIF metadata from:"),
                     errorFiles,
                     i18n("Remove EXIF Metadata"));  
@@ -229,7 +229,7 @@ void Plugin_MetadataEdit::slotImportExif()
         return;
 
     KURL importEXIFFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                                  TQString(), kapp->activeWindow(),
+                                                  TQString(), tdeApp->activeWindow(),
                                                   i18n("Select File to Import EXIF metadata") );
     if( importEXIFFile.isEmpty() )
        return;
@@ -237,7 +237,7 @@ void Plugin_MetadataEdit::slotImportExif()
     KExiv2Iface::KExiv2 exiv2Iface;
     if (!exiv2Iface.load(importEXIFFile.path()))
     {
-        KMessageBox::error(kapp->activeWindow(), 
+        KMessageBox::error(tdeApp->activeWindow(), 
                            i18n("Cannot load metadata from \"%1\"").arg(importEXIFFile.fileName()), 
                            i18n("Import EXIF Metadata"));    
         return;
@@ -246,14 +246,14 @@ void Plugin_MetadataEdit::slotImportExif()
     TQByteArray exifData = exiv2Iface.getExif();
     if (exifData.isEmpty())
     {
-        KMessageBox::error(kapp->activeWindow(), 
+        KMessageBox::error(tdeApp->activeWindow(), 
                            i18n("\"%1\" do not have EXIF metadata").arg(importEXIFFile.fileName()), 
                            i18n("Import EXIF Metadata"));    
         return;
     }        
 
     if (KMessageBox::warningYesNo(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("EXIF metadata from current selected pictures will be permanently "
                           "replaced by the EXIF content of \"%1\".\n"
                           "Do you want to continue ?").arg(importEXIFFile.fileName()),
@@ -294,7 +294,7 @@ void Plugin_MetadataEdit::slotImportExif()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::errorList(
-                    kapp->activeWindow(),
+                    tdeApp->activeWindow(),
                     i18n("Unable to set EXIF metadata from:"),
                     errorFiles,
                     i18n("Import EXIF Metadata"));  
@@ -308,7 +308,7 @@ void Plugin_MetadataEdit::slotEditIptc()
     if ( !images.isValid() || images.images().isEmpty() )
         return;
 
-    KIPIMetadataEditPlugin::IPTCEditDialog dialog(kapp->activeWindow(), images.images(), m_interface);
+    KIPIMetadataEditPlugin::IPTCEditDialog dialog(tdeApp->activeWindow(), images.images(), m_interface);
     dialog.exec();
     m_interface->refreshImages(images.images());
 }
@@ -321,7 +321,7 @@ void Plugin_MetadataEdit::slotRemoveIptc()
         return;
 
     if (KMessageBox::warningYesNo(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("IPTC metadata will be permanently removed from all current selected pictures.\n"
                           "Do you want to continue ?"),
                      i18n("Remove IPTC Metadata")) != KMessageBox::Yes)
@@ -360,7 +360,7 @@ void Plugin_MetadataEdit::slotRemoveIptc()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::errorList(
-                    kapp->activeWindow(),
+                    tdeApp->activeWindow(),
                     i18n("Unable to remove IPTC metadata from:"),
                     errorFiles,
                     i18n("Remove IPTC Metadata"));  
@@ -375,7 +375,7 @@ void Plugin_MetadataEdit::slotImportIptc()
         return;
 
     KURL importIPTCFile = KFileDialog::getOpenURL(TDEGlobalSettings::documentPath(),
-                                                  TQString(), kapp->activeWindow(),
+                                                  TQString(), tdeApp->activeWindow(),
                                                   i18n("Select File to Import IPTC metadata") );
     if( importIPTCFile.isEmpty() )
        return;
@@ -383,7 +383,7 @@ void Plugin_MetadataEdit::slotImportIptc()
     KExiv2Iface::KExiv2 exiv2Iface;
     if (!exiv2Iface.load(importIPTCFile.path()))
     {
-        KMessageBox::error(kapp->activeWindow(), 
+        KMessageBox::error(tdeApp->activeWindow(), 
                            i18n("Cannot load metadata from \"%1\"").arg(importIPTCFile.fileName()), 
                            i18n("Import IPTC Metadata"));    
         return;
@@ -392,14 +392,14 @@ void Plugin_MetadataEdit::slotImportIptc()
     TQByteArray iptcData = exiv2Iface.getIptc();
     if (iptcData.isEmpty())
     {
-        KMessageBox::error(kapp->activeWindow(), 
+        KMessageBox::error(tdeApp->activeWindow(), 
                            i18n("\"%1\" do not have IPTC metadata").arg(importIPTCFile.fileName()), 
                            i18n("Import IPTC Metadata"));    
         return;
     }        
 
     if (KMessageBox::warningYesNo(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("IPTC metadata from current selected pictures will be permanently "
                           "replaced by the IPTC content of \"%1\".\n"
                           "Do you want to continue ?").arg(importIPTCFile.fileName()),
@@ -440,7 +440,7 @@ void Plugin_MetadataEdit::slotImportIptc()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::errorList(
-                    kapp->activeWindow(),
+                    tdeApp->activeWindow(),
                     i18n("Unable to set IPTC metadata from:"),
                     errorFiles,
                     i18n("Import IPTC Metadata"));  
@@ -454,7 +454,7 @@ void Plugin_MetadataEdit::slotEditComments()
     if ( !images.isValid() || images.images().isEmpty() )
         return;
 
-    KIPIMetadataEditPlugin::CommentEditDialog dlg(kapp->activeWindow());
+    KIPIMetadataEditPlugin::CommentEditDialog dlg(tdeApp->activeWindow());
 
     if (dlg.exec() != KMessageBox::Ok)
         return;
@@ -504,7 +504,7 @@ void Plugin_MetadataEdit::slotEditComments()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::informationList(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("Unable to set captions as image metadata from:"),
                      errorFiles,
                      i18n("Edit Image Caption"));  
@@ -518,7 +518,7 @@ void Plugin_MetadataEdit::slotRemoveComments()
     if ( !images.isValid() || images.images().isEmpty() )
         return;
 
-    KIPIMetadataEditPlugin::CommentRemoveDialog dlg(kapp->activeWindow());
+    KIPIMetadataEditPlugin::CommentRemoveDialog dlg(tdeApp->activeWindow());
 
     if (dlg.exec() != KMessageBox::Ok)
         return;
@@ -571,7 +571,7 @@ void Plugin_MetadataEdit::slotRemoveComments()
     if (!errorFiles.isEmpty())
     {
         KMessageBox::informationList(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("Unable to remove caption as image metadata from:"),
                      errorFiles,
                      i18n("Remove Image Caption"));  
diff --git a/kipi-plugins/mpegencoder/checkbinprog.cpp b/kipi-plugins/mpegencoder/checkbinprog.cpp
index e2fffbb..70de7fc 100644
--- a/kipi-plugins/mpegencoder/checkbinprog.cpp
+++ b/kipi-plugins/mpegencoder/checkbinprog.cpp
@@ -68,13 +68,13 @@ int CheckBinProg::findExecutables( void )
 
   if (ImageMagickPath.isEmpty())
         {
-        KMessageBox::error(kapp->activeWindow(), i18n("Your 'ImageMagick' binary program path is empty.\nSetting to default value. Check option's setting."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Your 'ImageMagick' binary program path is empty.\nSetting to default value. Check option's setting."));
         return (ValRet);
         }
 
 if (MjpegToolsPath.isEmpty())
         {
-        KMessageBox::error(kapp->activeWindow(), i18n("Your 'MjpegTools' binary programs path is empty.\nSetting to default value. Check option's setting."));
+        KMessageBox::error(tdeApp->activeWindow(), i18n("Your 'MjpegTools' binary programs path is empty.\nSetting to default value. Check option's setting."));
         return (ValRet);
         }
 
@@ -121,7 +121,7 @@ if (MjpegToolsPath.isEmpty())
                  "\n\nVisit these URLs for more information:"
                  "\nImageMagick package: http://www.imagemagick.org/"
                  "\nMjpegTools package: http://mjpeg.sourceforge.net/");
-    KMessageBox::error(kapp->activeWindow(), str);
+    KMessageBox::error(tdeApp->activeWindow(), str);
     return (ValRet);
     }
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index f818cdb..83e0e8f 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -769,7 +769,7 @@ void KImg2mpgData::slotOptionDlgOkClicked( void )
 
 void KImg2mpgData::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("mpegencoder",
+    tdeApp->invokeHelp("mpegencoder",
                                              "kipi-plugins");
 }
 
@@ -1227,7 +1227,7 @@ while( (fi = it.current() ) )
                if (dir->remove(fi->absFilePath() ) == false)
                    return false;
 
-     kapp->processEvents();
+     tdeApp->processEvents();
      ++it;
      }
 
diff --git a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
index 78d7a2f..1f3a1c8 100644
--- a/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
+++ b/kipi-plugins/mpegencoder/plugin_mpegencoder.cpp
@@ -85,7 +85,7 @@ void Plugin_Mpegencoder::slotActivate()
     }
 
     KIPIMPEGEncoderPlugin::KImg2mpgData *MPEGconverterDialog =
-                           new KIPIMPEGEncoderPlugin::KImg2mpgData( interface, kapp->activeWindow() );
+                           new KIPIMPEGEncoderPlugin::KImg2mpgData( interface, tdeApp->activeWindow() );
 
     KIPIMPEGEncoderPlugin::CheckBinProg* CheckExternalPrograms =
                            new KIPIMPEGEncoderPlugin::CheckBinProg(this);
diff --git a/kipi-plugins/picasawebexport/picasawebtalker.cpp b/kipi-plugins/picasawebexport/picasawebtalker.cpp
index 9b99c04..8748a3b 100644
--- a/kipi-plugins/picasawebexport/picasawebtalker.cpp
+++ b/kipi-plugins/picasawebexport/picasawebtalker.cpp
@@ -128,7 +128,7 @@ void PicasawebTalker::getToken(const TQString& username, const TQString& passwor
 
     TQString url = "https://www.google.com/accounts/ClientLogin";
 
-    PicasawebLogin *loginDialog = new PicasawebLogin(kapp->activeWindow(), TQString("LoginWindow"), username, password);
+    PicasawebLogin *loginDialog = new PicasawebLogin(tdeApp->activeWindow(), TQString("LoginWindow"), username, password);
     /*if (username!=NULL && username.length() > 0){
         //  kdDebug()<<"Showing stored username"<< username << endl;
         loginDialog->setUsername(username);
@@ -593,7 +593,7 @@ void PicasawebTalker::slotError(const TQString & error)
             transError=i18n("Unknown error");
     };
 
-    KMessageBox::error(kapp->activeWindow(), i18n("Error Occured: %1\n We can not proceed further").arg(transError));
+    KMessageBox::error(tdeApp->activeWindow(), i18n("Error Occured: %1\n We can not proceed further").arg(transError));
     //kdDebug()<<"Not handling the error now will see it later"<<endl;
 }
 
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index f438d5d..1077bef 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -307,7 +307,7 @@ void PicasawebWindow::getToken(TQString& username, TQString& password)
 
 void PicasawebWindow::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("picasawebexport", "kipi-plugins");
+    tdeApp->invokeHelp("picasawebexport", "kipi-plugins");
 }
 
 void PicasawebWindow::slotGetAlbumsListSucceeded()
@@ -373,7 +373,7 @@ void PicasawebWindow::slotAuthCancel()
 
 void PicasawebWindow::slotCreateNewAlbum()
 {
-    NewAlbumDialog *dlg = new NewAlbumDialog(kapp->activeWindow());
+    NewAlbumDialog *dlg = new NewAlbumDialog(tdeApp->activeWindow());
     dlg->m_dateAndTimeEdit->setDateTime(TQDateTime::currentDateTime());
     TQString test;
     int t = dlg->exec();
diff --git a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
index 9091b72..0c06c73 100644
--- a/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
+++ b/kipi-plugins/picasawebexport/plugin_picasawebexport.cpp
@@ -100,7 +100,7 @@ void Plugin_PicasawebExport::slotActivate()
     TDEStandardDirs dir;
     TQString Tmp = dir.saveLocation("tmp", "kipi-picasawebexportplugin-" + TQString::number(getpid()) + "/");
 
-    m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,kapp->activeWindow());
+    m_dlg = new KIPIPicasawebExportPlugin::PicasawebWindow(interface,Tmp,tdeApp->activeWindow());
     m_dlg->show();
 }
 
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 208ee7c..48a7663 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -207,7 +207,7 @@ FrmPrintWizard::~FrmPrintWizard()
 
 void FrmPrintWizard::slotHelp()
 {
-  TDEApplication::kApplication()->invokeHelp("printwizard","kipi-plugins");
+  tdeApp->invokeHelp("printwizard","kipi-plugins");
 }
 
 void FrmPrintWizard::print( KURL::List fileList, TQString tempPath)
@@ -1178,7 +1178,7 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> lay
   PrgPrintProgress->setProgress(0);
   PrgPrintProgress->setTotalSteps(photos.count());
   this->finishButton()->setEnabled(false);
-  TDEApplication::kApplication()->processEvents();
+  tdeApp->processEvents();
 
   TQPainter p;
   p.begin(&printer);
@@ -1192,7 +1192,7 @@ void FrmPrintWizard::printPhotos(TQPtrList<TPhoto> photos, TQPtrList<TQRect> lay
     if (printing)
       printer.newPage();
     PrgPrintProgress->setProgress(current);
-    TDEApplication::kApplication()->processEvents();
+    tdeApp->processEvents();
     if (m_cancelPrinting)
     {
       printer.abort();
@@ -1217,7 +1217,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
   PrgPrintProgress->setProgress(0);
   PrgPrintProgress->setTotalSteps(photos.count());
   this->finishButton()->setEnabled(false);
-  TDEApplication::kApplication()->processEvents();
+  tdeApp->processEvents();
 
   unsigned int current = 0;
   int pageCount = 1;
@@ -1269,7 +1269,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
     pageCount++;
 
     PrgPrintProgress->setProgress(current);
-    TDEApplication::kApplication()->processEvents();
+    tdeApp->processEvents();
     if (m_cancelPrinting)
       break;
   }
diff --git a/kipi-plugins/printwizard/plugin_printwizard.cpp b/kipi-plugins/printwizard/plugin_printwizard.cpp
index 74f2d34..fd5f76c 100644
--- a/kipi-plugins/printwizard/plugin_printwizard.cpp
+++ b/kipi-plugins/printwizard/plugin_printwizard.cpp
@@ -105,12 +105,12 @@ void Plugin_PrintWizard::slotActivate()
 
     if (fileList.count() == 0)
     {
-        KMessageBox::sorry(kapp->activeWindow(), i18n("Please select one or more photos to print."),
+        KMessageBox::sorry(tdeApp->activeWindow(), i18n("Please select one or more photos to print."),
                            i18n("Print Wizard"));
         return;
     }
 
-    KIPIPrintWizardPlugin::FrmPrintWizard frm(kapp->activeWindow());
+    KIPIPrintWizardPlugin::FrmPrintWizard frm(tdeApp->activeWindow());
     TDEStandardDirs dir;
     TQString tempPath = dir.saveLocation("tmp", "kipi-printwizardplugin-" + TQString::number(getpid()) + "/");
     frm.print(fileList, tempPath);
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index c4932e7..3b0ab89 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -287,7 +287,7 @@ void BatchDialog::saveSettings()
 
 void BatchDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
+    tdeApp->invokeHelp("rawconverter", "kipi-plugins");
 }
 
 void BatchDialog::slotUser1()
diff --git a/kipi-plugins/rawconverter/plugin_rawconverter.cpp b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
index 15801c4..9ed3613 100644
--- a/kipi-plugins/rawconverter/plugin_rawconverter.cpp
+++ b/kipi-plugins/rawconverter/plugin_rawconverter.cpp
@@ -166,14 +166,14 @@ void Plugin_RawConverter::slotActivateSingle()
 
     if (!isRAWFile(images.images()[0].path()))
     {
-        KMessageBox::error(kapp->activeWindow(), 
+        KMessageBox::error(tdeApp->activeWindow(), 
                            i18n("\"%1\" is not a Raw file.").arg(images.images()[0].fileName()));
         return;
     }
 
     KIPIRawConverterPlugin::SingleDialog *converter = 
         new KIPIRawConverterPlugin::SingleDialog(images.images()[0].path(), 
-            kapp->activeWindow()); 
+            tdeApp->activeWindow()); 
 
     converter->show();
 }
@@ -198,7 +198,7 @@ void Plugin_RawConverter::slotActivateBatch()
         return;
 
     KIPIRawConverterPlugin::BatchDialog *converter =
-        new KIPIRawConverterPlugin::BatchDialog(kapp->activeWindow());
+        new KIPIRawConverterPlugin::BatchDialog(tdeApp->activeWindow());
 
     KURL::List urls = images.images();
     TQStringList files;
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index 656d8b8..38a1263 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -276,7 +276,7 @@ void SingleDialog::saveSettings()
 
 void SingleDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
+    tdeApp->invokeHelp("rawconverter", "kipi-plugins");
 }
 
 // 'Preview' dialog button.
diff --git a/kipi-plugins/sendimages/plugin_sendimages.cpp b/kipi-plugins/sendimages/plugin_sendimages.cpp
index 952163d..0ee4168 100644
--- a/kipi-plugins/sendimages/plugin_sendimages.cpp
+++ b/kipi-plugins/sendimages/plugin_sendimages.cpp
@@ -145,7 +145,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
 
     if (!m_progressDlg)
     {
-        m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Preparing images to send"));
+        m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), i18n("Preparing images to send"));
 
         connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
                 this, TQ_SLOT(slotCancel()));
@@ -278,7 +278,7 @@ void Plugin_SendImages::customEvent(TQCustomEvent *event)
         }
     }
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     delete d;
 }
 
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index ecd189e..27b22e4 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -105,7 +105,7 @@ SendImages::~SendImages()
 ///Invokes the User Dialog Window
 void SendImages::showDialog()
 {
-    m_sendImagesDialog = new KIPISendimagesPlugin::SendImagesDialog(kapp->activeWindow(),
+    m_sendImagesDialog = new KIPISendimagesPlugin::SendImagesDialog(tdeApp->activeWindow(),
                              m_interface, m_collection);
     m_sendImagesDialog->show();
 
@@ -372,7 +372,7 @@ bool SendImages::showErrors()
 {
     if ( m_imagesResizedWithError.isEmpty() == false )
     {
-        listImagesErrorDialog *ErrorImagesDialog = new listImagesErrorDialog(kapp->activeWindow(),
+        listImagesErrorDialog *ErrorImagesDialog = new listImagesErrorDialog(tdeApp->activeWindow(),
                                                        i18n("Error during resize images process."),
                                                        i18n("Cannot resize the following image files:"),
                                                        i18n("Do you want them to be added as attachments "
@@ -459,7 +459,7 @@ bool SendImages::invokeMailAgent(void)
         tqDebug("number of elements in m_filelist %d", (int)m_filesSendList.size());     
         if ( m_sendImagesDialog->m_mailAgentName->currentText() == "Default" )
         {
-            TDEApplication::kApplication()->invokeMailer(
+            tdeApp->invokeMailer(
                 TQString(),                     // Destination address.
                 TQString(),                     // Carbon Copy address.
                 TQString(),                     // Blind Carbon Copy address
@@ -484,7 +484,7 @@ bool SendImages::invokeMailAgent(void)
         }
     
         if ( m_mailAgentProc->start() == false )
-            KMessageBox::error(kapp->activeWindow(), 
+            KMessageBox::error(tdeApp->activeWindow(), 
                                i18n("Cannot start '%1' program;\nplease "
                                     "check your installation.")
                                     .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
@@ -513,7 +513,7 @@ bool SendImages::invokeMailAgent(void)
                 *m_mailAgentProc << TQFile::encodeName((*it).path()).data();
         
             if ( m_mailAgentProc->start() == false )
-                KMessageBox::error(kapp->activeWindow(), 
+                KMessageBox::error(tdeApp->activeWindow(), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
                                         .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
@@ -535,7 +535,7 @@ bool SendImages::invokeMailAgent(void)
             }
         
             if ( m_mailAgentProc->start() == false )
-                KMessageBox::error(kapp->activeWindow(), 
+                KMessageBox::error(tdeApp->activeWindow(), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
                                         .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
@@ -561,7 +561,7 @@ bool SendImages::invokeMailAgent(void)
             *m_mailAgentProc << Temp;
         
             if ( m_mailAgentProc->start() == false )
-                KMessageBox::error(kapp->activeWindow(), 
+                KMessageBox::error(tdeApp->activeWindow(), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
                                         .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
@@ -624,7 +624,7 @@ bool SendImages::invokeMailAgent(void)
             tqDebug ("%s", Temp.ascii());
         
             if ( m_mailAgentProc->start(TDEProcess::NotifyOnExit , TDEProcess::All) == false )
-                KMessageBox::error(kapp->activeWindow(), 
+                KMessageBox::error(tdeApp->activeWindow(), 
                                    i18n("Cannot start '%1' program;\nplease "
                                         "check your installation.")
                                         .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
@@ -642,7 +642,7 @@ bool SendImages::invokeMailAgent(void)
 void SendImages::removeTmpFiles(void)
 {
     if (DeleteDir(m_tmp) == false)
-       KMessageBox::error(kapp->activeWindow(), i18n("Cannot remove temporary folder %1.").arg(m_tmp));
+       KMessageBox::error(tdeApp->activeWindow(), i18n("Cannot remove temporary folder %1.").arg(m_tmp));
 }
 
 ///Checks if directory is empty and invokes its deletion
@@ -699,7 +699,7 @@ bool SendImages::deldir(TQString dirname)
                 if (dir->remove(fi->absFilePath() ) == false)
                     return false;
     
-        kapp->processEvents();
+        tdeApp->processEvents();
         ++it;
     }
 
@@ -881,7 +881,7 @@ void SendImages::slotMozillaExited(TDEProcess*)
 
         if ( m_mailAgentProc2->start() == false )
         {
-            KMessageBox::error(kapp->activeWindow(), 
+            KMessageBox::error(tdeApp->activeWindow(), 
                                i18n("Cannot start '%1' program;\nplease "
                                     "check your installation.")
                                     .arg(m_sendImagesDialog->m_mailAgentName->currentText()));
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index a387744..8780428 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -553,7 +553,7 @@ void SendImagesDialog::setupEmailOptions(void)
 
 void SendImagesDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("sendimages", "kipi-plugins");
+    tdeApp->invokeHelp("sendimages", "kipi-plugins");
 }
 
 void SendImagesDialog::slotMailAgentChanged(int)
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index 8450702..4d08487 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -139,12 +139,12 @@ FirstRunDlg::~FirstRunDlg()
 
 void FirstRunDlg::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
+    tdeApp->invokeHelp("simpleviewerexport", "kipi-plugins");
 }
 
 void FirstRunDlg::slotDownload(const TQString &url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void FirstRunDlg::slotURLSelected(const TQString &url)
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 0b5acfb..f1473a5 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -87,7 +87,7 @@ void SimpleViewerExport::run(KIPI::Interface* interface, TQObject *parent)
     {
         if(!plugin->installSimpleViewer())
         {
-            KMessageBox::error(kapp->activeWindow(), i18n("SimpleViewer installation failed"));
+            KMessageBox::error(tdeApp->activeWindow(), i18n("SimpleViewer installation failed"));
             return;
         }
     }
@@ -112,7 +112,7 @@ SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *par
     m_simpleViewerFiles.append(viewer);
     m_simpleViewerFiles.append("swfobject.js");
 
-    const TDEAboutData *data = TDEApplication::kApplication()->aboutData();
+    const TDEAboutData *data = tdeApp->aboutData();
     m_hostName             = TQString( data->appName() );
     m_hostURL              = data->homepage();
 
@@ -134,7 +134,7 @@ bool SimpleViewerExport::configure()
     m_canceled = false;
 
     if(!m_configDlg)
-        m_configDlg = new SVEDialog(m_interface, kapp->activeWindow());
+        m_configDlg = new SVEDialog(m_interface, tdeApp->activeWindow());
 
     bool configured = false;
     while(!configured)
@@ -144,9 +144,9 @@ bool SimpleViewerExport::configure()
 
         configured = true;
 
-        if(TDEIO::NetAccess::exists(m_configDlg->exportURL(), false, kapp->activeWindow()))
+        if(TDEIO::NetAccess::exists(m_configDlg->exportURL(), false, tdeApp->activeWindow()))
         {
-            int ret = KMessageBox::warningYesNoCancel(kapp->activeWindow(),
+            int ret = KMessageBox::warningYesNoCancel(tdeApp->activeWindow(),
                                                       i18n("Target folder %1 already exists.\n"
                                                            "Do you want to overwrite it (all data in this folder will be lost)")
                                                            .arg(m_configDlg->exportURL()));
@@ -154,9 +154,9 @@ bool SimpleViewerExport::configure()
             switch(ret)
             {
                 case KMessageBox::Yes:
-                    if(!TDEIO::NetAccess::del(m_configDlg->exportURL(), kapp->activeWindow()))
+                    if(!TDEIO::NetAccess::del(m_configDlg->exportURL(), tdeApp->activeWindow()))
                     {
-                        KMessageBox::error(kapp->activeWindow(), i18n("Could not delete %1\n"
+                        KMessageBox::error(tdeApp->activeWindow(), i18n("Could not delete %1\n"
                                 "Please choose another export folder").arg(m_configDlg->exportURL()));
                         configured = false;
                     }
@@ -181,13 +181,13 @@ void SimpleViewerExport::startExport()
     if(m_canceled)
         return;
 
-    m_progressDlg = new KIPI::BatchProgressDialog(kapp->activeWindow(), i18n("Flash Export"));
+    m_progressDlg = new KIPI::BatchProgressDialog(tdeApp->activeWindow(), i18n("Flash Export"));
 
     connect(m_progressDlg, TQ_SIGNAL(cancelClicked()),
             this, TQ_SLOT(slotCancel()));
 
     m_progressDlg->show();
-    kapp->processEvents();
+    tdeApp->processEvents();
 
     // Estimate the number of actions for the KIPI progress dialog.
     m_progressDlg->addedAction(i18n("Estimate the number of actions to do..."), KIPI::StartingMessage);
@@ -264,13 +264,13 @@ void SimpleViewerExport::slotProcess()
 
     if(m_canceled)
     {
-        int ret = KMessageBox::warningYesNo(kapp->activeWindow(),
+        int ret = KMessageBox::warningYesNo(tdeApp->activeWindow(),
                                             i18n("Export was canceled.\n"
                                             "Do you want to delete the yet created files in %1 ?")
                                             .arg(m_configDlg->exportURL()));
         if(ret == KMessageBox::Yes)
         {
-            TDEIO::NetAccess::del(m_configDlg->exportURL(), kapp->activeWindow());
+            TDEIO::NetAccess::del(m_configDlg->exportURL(), tdeApp->activeWindow());
         }
     }
 
@@ -286,7 +286,7 @@ bool SimpleViewerExport::createExportDirectories()
     m_progressDlg->addedAction(i18n("Creating directories..."), KIPI::StartingMessage);
 
     KURL root = m_configDlg->exportURL();
-    if(!TDEIO::NetAccess::mkdir(root, kapp->activeWindow()))
+    if(!TDEIO::NetAccess::mkdir(root, tdeApp->activeWindow()))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(root.url()),
                                    KIPI::ErrorMessage);
@@ -295,7 +295,7 @@ bool SimpleViewerExport::createExportDirectories()
 
     KURL thumbsDir = m_tempDir->name();
     thumbsDir.addPath("/thumbs");
-    if(!TDEIO::NetAccess::mkdir(thumbsDir, kapp->activeWindow()))
+    if(!TDEIO::NetAccess::mkdir(thumbsDir, tdeApp->activeWindow()))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(thumbsDir.url()),
                                    KIPI::ErrorMessage);
@@ -304,7 +304,7 @@ bool SimpleViewerExport::createExportDirectories()
 
     KURL imagesDir = m_tempDir->name();
     imagesDir.addPath("/images");
-    if(!TDEIO::NetAccess::mkdir(imagesDir, kapp->activeWindow()))
+    if(!TDEIO::NetAccess::mkdir(imagesDir, tdeApp->activeWindow()))
     {
         m_progressDlg->addedAction(i18n("Could not create folder '%1'").arg(imagesDir.url()),
                                    KIPI::ErrorMessage);
@@ -373,7 +373,7 @@ bool SimpleViewerExport::exportImages()
         for(KURL::List::Iterator it = images.begin();
             !m_canceled && (it != images.end()) ; ++it)
         {
-            kapp->processEvents();
+            tdeApp->processEvents();
             KURL url = *it;
             TQFileInfo fileInfo(url.path());
 
@@ -628,7 +628,7 @@ bool SimpleViewerExport::checkSimpleViewer() const
 
 bool SimpleViewerExport::installSimpleViewer()
 {
-    FirstRunDlg *firstRunDlg = new FirstRunDlg(kapp->activeWindow());
+    FirstRunDlg *firstRunDlg = new FirstRunDlg(tdeApp->activeWindow());
     if(firstRunDlg->exec() == TQDialog::Accepted)
     {
         TQString url = firstRunDlg->getURL();
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index 8216c66..7e737df 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -117,7 +117,7 @@ SVEDialog::~SVEDialog()
 
 void SVEDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
+    tdeApp->invokeHelp("simpleviewerexport", "kipi-plugins");
 }
 
 void SVEDialog::readConfig()
diff --git a/kipi-plugins/slideshow/plugin_slideshow.cpp b/kipi-plugins/slideshow/plugin_slideshow.cpp
index 48fe4ab..2068c7c 100644
--- a/kipi-plugins/slideshow/plugin_slideshow.cpp
+++ b/kipi-plugins/slideshow/plugin_slideshow.cpp
@@ -131,7 +131,7 @@ void Plugin_SlideShow::slotActivate()
     m_imagesHasComments = m_interface->hasFeature(KIPI::ImagesHasComments);
     
     KIPISlideShowPlugin::SlideShowConfig *slideShowConfig
-            = new KIPISlideShowPlugin::SlideShowConfig( allowSelectedOnly, m_interface,kapp->activeWindow(), 
+            = new KIPISlideShowPlugin::SlideShowConfig( allowSelectedOnly, m_interface,tdeApp->activeWindow(), 
                                                         i18n("Slide Show").ascii(), m_imagesHasComments,
                                                         m_urlList);
 
@@ -189,7 +189,7 @@ void Plugin_SlideShow::slotSlideShow()
     
     if ( m_urlList->isEmpty() )
     {
-        KMessageBox::sorry(kapp->activeWindow(), i18n("There are no images to show."));
+        KMessageBox::sorry(tdeApp->activeWindow(), i18n("There are no images to show."));
 	return;
     }
 
@@ -240,7 +240,7 @@ void Plugin_SlideShow::slotSlideShow()
     }
     else {
         if (!TQGLFormat::hasOpenGL())
-            KMessageBox::error(kapp->activeWindow(),
+            KMessageBox::error(tdeApp->activeWindow(),
                                i18n("Sorry. OpenGL support not available on your system"));
         else {
           if (wantKB) {
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index b1b3ab4..9d040b3 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -778,7 +778,7 @@ void SlideShowConfig::slotStartClicked()
 
 void SlideShowConfig::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("slideshow",
+    tdeApp->invokeHelp("slideshow",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/slideshow/toolbar.cpp b/kipi-plugins/slideshow/toolbar.cpp
index cee86d1..d8d40ed 100644
--- a/kipi-plugins/slideshow/toolbar.cpp
+++ b/kipi-plugins/slideshow/toolbar.cpp
@@ -51,7 +51,7 @@ ToolBar::ToolBar(TQWidget* parent)
     m_stopBtn = new TQToolButton(this);
     m_playBtn->setToggleButton(true);
 
-    TDEIconLoader* loader = kapp->iconLoader();
+    TDEIconLoader* loader = tdeApp->iconLoader();
     m_playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
     m_prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
     m_nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
@@ -129,14 +129,14 @@ void ToolBar::slotPlayBtnToggled()
     if (m_playBtn->isOn())
     {
         m_canHide = false;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         m_playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }
     else
     {
         m_canHide = true;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         m_playBtn->setIconSet(loader->loadIcon("media-playback-pause", TDEIcon::NoGroup, 22));
         emit signalPlay();
     }
@@ -148,7 +148,7 @@ void ToolBar::slotNexPrevClicked()
     {
         m_playBtn->setOn(true);
         m_canHide = false;
-        TDEIconLoader* loader = kapp->iconLoader();
+        TDEIconLoader* loader = tdeApp->iconLoader();
         m_playBtn->setIconSet(loader->loadIcon("media-playback-start", TDEIcon::NoGroup, 22));
         emit signalPause();
     }
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index e5370fa..243fb28 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -177,7 +177,7 @@ GalleryWindow::~GalleryWindow()
 
 void GalleryWindow::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
+    tdeApp->invokeHelp("galleryexport", "kipi-plugins");
 }
 
 void GalleryWindow::slotDoLogin()
@@ -267,7 +267,7 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
     m_photoView->write( "<html></html>" );
     m_photoView->end();
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/sync/plugin_sync.cpp b/kipi-plugins/sync/plugin_sync.cpp
index f75e1ab..3e12efd 100644
--- a/kipi-plugins/sync/plugin_sync.cpp
+++ b/kipi-plugins/sync/plugin_sync.cpp
@@ -129,7 +129,7 @@ void Plugin_Sync::slotSync()
     return;
   }
 /*
-  KIPISyncPlugin::GalleryWindow dlg(interface, kapp->activeWindow(), mpSinks);
+  KIPISyncPlugin::GalleryWindow dlg(interface, tdeApp->activeWindow(), mpSinks);
   dlg.exec();
 */
 }
@@ -144,7 +144,7 @@ void Plugin_Sync::slotConfigure()
     return;
   }
 /*
-  KIPISyncPlugin::SinkList dlg(kapp->activeWindow(), mpSinks, false);
+  KIPISyncPlugin::SinkList dlg(tdeApp->activeWindow(), mpSinks, false);
   dlg.exec();
 */
 }
@@ -159,7 +159,7 @@ void Plugin_Sync::slotSettingsCollection()
     return;
   }
 
-  KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!");
+  KMessageBox::error(tdeApp->activeWindow(), "Not Implemented Yet!");
 }
 
 
@@ -172,7 +172,7 @@ void Plugin_Sync::slotSettingsImage()
     return;
   }
 
-  KMessageBox::error(kapp->activeWindow(), "Not Implemented Yet!");
+  KMessageBox::error(tdeApp->activeWindow(), "Not Implemented Yet!");
 }
 
 
diff --git a/kipi-plugins/sync/sinklist.cpp b/kipi-plugins/sync/sinklist.cpp
index cbd823e..3a295f2 100644
--- a/kipi-plugins/sync/sinklist.cpp
+++ b/kipi-plugins/sync/sinklist.cpp
@@ -118,7 +118,7 @@ void SinkList::buttonConfigure_clicked(void)
   TQListViewItem* p_lvi = listSinks->selectedItem();
   if (!p_lvi)
   {
-    KMessageBox::error(kapp->activeWindow(), i18n("No sink selected!"));
+    KMessageBox::error(tdeApp->activeWindow(), i18n("No sink selected!"));
   }
   else
   {
@@ -141,12 +141,12 @@ void SinkList::buttonRemove_clicked(void)
   TQListViewItem* p_lvi = listSinks->selectedItem();
   if (!p_lvi)
   {
-    KMessageBox::error(kapp->activeWindow(), i18n("No sink selected!"));
+    KMessageBox::error(tdeApp->activeWindow(), i18n("No sink selected!"));
   }
   else
   {
     if (KMessageBox::Yes == 
-          KMessageBox::warningYesNo(kapp->activeWindow(),
+          KMessageBox::warningYesNo(tdeApp->activeWindow(),
             i18n("Are you sure you want to remove this sink? "
                  "All synchronisaton settings will be lost. "
                  "You cannot undo this action."), 
diff --git a/kipi-plugins/sync/sinks.cpp b/kipi-plugins/sync/sinks.cpp
index a9eaf71..93f3585 100644
--- a/kipi-plugins/sync/sinks.cpp
+++ b/kipi-plugins/sync/sinks.cpp
@@ -61,7 +61,7 @@ Sinks::Sinks()
   TDEWallet::Wallet* p_wallet = NULL;
 #if KDE_IS_VERSION(3,2,0)
   mpWallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(),
-                                         kapp->activeWindow()->winId(),
+                                         tdeApp->activeWindow()->winId(),
                                          TDEWallet::Wallet::Synchronous);
   if (!mpWallet)
   {
diff --git a/kipi-plugins/timeadjust/plugin_timeadjust.cpp b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
index 3ed18c2..7dc8b5c 100644
--- a/kipi-plugins/timeadjust/plugin_timeadjust.cpp
+++ b/kipi-plugins/timeadjust/plugin_timeadjust.cpp
@@ -91,7 +91,7 @@ void Plugin_TimeAdjust::slotActivate()
     if (!images.isValid() || images.images().isEmpty())
         return;
 
-    KIPITimeAdjustPlugin::TimeAdjustDialog dlg(m_interface, kapp->activeWindow());
+    KIPITimeAdjustPlugin::TimeAdjustDialog dlg(m_interface, tdeApp->activeWindow());
     dlg.setImages(images.images());
     dlg.exec();
 }
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index 0407ef6..8f1ae74 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -296,7 +296,7 @@ TimeAdjustDialog::~TimeAdjustDialog()
 
 void TimeAdjustDialog::slotHelp()
 {
-    TDEApplication::kApplication()->invokeHelp("timeadjust", "kipi-plugins");
+    tdeApp->invokeHelp("timeadjust", "kipi-plugins");
 }
 
 void TimeAdjustDialog::slotResetDateToCurrent()
@@ -503,7 +503,7 @@ void TimeAdjustDialog::slotOk()
     if (!errorFiles.isEmpty() && (d->syncEXIFDateCheck->isChecked() || d->syncIPTCDateCheck->isChecked()))
     {
         KMessageBox::informationList(
-                     kapp->activeWindow(),
+                     tdeApp->activeWindow(),
                      i18n("Unable to set date and time like picture metadata from:"),
                      errorFiles,
                      i18n("Adjust Time & Date"));  
diff --git a/kipi-plugins/wallpaper/plugin_wallpaper.cpp b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
index 803f33e..ce259f3 100644
--- a/kipi-plugins/wallpaper/plugin_wallpaper.cpp
+++ b/kipi-plugins/wallpaper/plugin_wallpaper.cpp
@@ -240,10 +240,10 @@ void Plugin_WallPaper::setWallpaper(int layout)
       // PENDING We need a way to get a parent widget
       // Sun, 06 Jun 2004 - Aur�ien
 
-      KMessageBox::information( kapp->activeWindow(), i18n(
+      KMessageBox::information( tdeApp->activeWindow(), i18n(
          "<qt><p>You selected a remote image. It needs to be saved to your local disk to be used as a wallpaper."
          "</p><p>You will now be asked where to save the image.</p></qt>"));
-      path = KFileDialog::getSaveFileName(url.fileName(), TQString(), kapp->activeWindow());
+      path = KFileDialog::getSaveFileName(url.fileName(), TQString(), tdeApp->activeWindow());
 
       if (path.isNull()) return;
 #if TDE_VERSION > 0x30200