Rename KApplication to TDEApplication to avoid conflicts with KDE4

56 files changed, 84 insertions, 84 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index ea3168e..d6a7783 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF
 #include <kapp.h>
 
 int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
+    printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
+    printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
+    printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
+    printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
+    printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
+    printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
+    printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
+    printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
+    printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
+    printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
     printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+	TDEApplication::kde_wallpaperdir().data());
+    printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
+    printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index 0f68560..4b6e3b0 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -140,7 +140,7 @@ AcquireImageDialog::~AcquireImageDialog()
 
 void AcquireImageDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
 }    
 
 void AcquireImageDialog::readSettings(void)
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 5ade146..8de50bb 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -174,7 +174,7 @@ ScreenGrabDialog::~ScreenGrabDialog()
 
 void ScreenGrabDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("acquireimages", "kipi-plugins");
 }    
 
 void ScreenGrabDialog::slotClose( void )
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 0cc6625..5cf8d86 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -116,7 +116,7 @@ BorderImagesDialog::~BorderImagesDialog()
 
 void BorderImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("borderimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("borderimages", "kipi-plugins");
 }
 
 void BorderImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index 3b3ad6a..051adc0 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -137,7 +137,7 @@ ColorImagesDialog::~ColorImagesDialog()
 
 void ColorImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("colorimages",
+    TDEApplication::kApplication()->invokeHelp("colorimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index 4b953c6..ec3508d 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -147,7 +147,7 @@ ConvertImagesDialog::~ConvertImagesDialog()
 
 void ConvertImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("convertimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("convertimages", "kipi-plugins");
 }
 
 void ConvertImagesDialog::slotTypeChanged(int type)
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 15570ed..81f9466 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -135,7 +135,7 @@ EffectImagesDialog::~EffectImagesDialog()
 
 void EffectImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("effectimages",
+    TDEApplication::kApplication()->invokeHelp("effectimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index fa7100b..98b298d 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -123,7 +123,7 @@ FilterImagesDialog::~FilterImagesDialog()
 
 void FilterImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("filterimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("filterimages", "kipi-plugins");
 }
 
 void FilterImagesDialog::slotTypeChanged(int type)
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 783e20c..1713674 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -173,7 +173,7 @@ ImagePreview::~ImagePreview()
 
 void ImagePreview::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("", "kipi-plugins");
 }
 
 void ImagePreview::slotWheelChanged( int delta )
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index 2f12cbe..06b729a 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -98,7 +98,7 @@ OutputDialog::~OutputDialog()
 
 void OutputDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("",
+    TDEApplication::kApplication()->invokeHelp("",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index 93208ef..954fdf7 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -100,7 +100,7 @@ RecompressImagesDialog::~RecompressImagesDialog()
 
 void RecompressImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("recompressimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("recompressimages", "kipi-plugins");
 }
 
 void RecompressImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index c4703ca..3fe0c8d 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -124,7 +124,7 @@ ResizeImagesDialog::~ResizeImagesDialog()
 
 void ResizeImagesDialog::slotHelp( void )
 {
-    KApplication::kApplication()->invokeHelp("resizeimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("resizeimages", "kipi-plugins");
 }
 
 void ResizeImagesDialog::slotOptionsClicked(void)
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index edf2222..66a68c5 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -180,7 +180,7 @@ CalWizard::~CalWizard()
 
 void CalWizard::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("calendar", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("calendar", "kipi-plugins");
 }
 
 void CalWizard::slotPageSelected(const TQString&)
@@ -222,7 +222,7 @@ void CalWizard::slotPageSelected(const TQString&)
                         "calendar for<br>the current year or a year in the "
                         "past.")+"</b>";
 
-            KApplication::startServiceByName("KJobViewer");
+            TDEApplication::startServiceByName("KJobViewer");
             TQString extra2 = i18n("<br><br>You can see KJobViewer is already started. "
                     "After the plugin has prepared the calendar, it is passed to "
                     "the PDF printer. In the KJobViewer you can see the progress "
diff --git a/kipi-plugins/calendar/monthwidget.cpp b/kipi-plugins/calendar/monthwidget.cpp
index 2c8cdc4..ccf173f 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_);
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, 64 );
     if ( pixmap_ )
         delete pixmap_;
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 6f3c9f9..7c6f1dc 100644
--- a/kipi-plugins/cdarchiving/cdarchiving.cpp
+++ b/kipi-plugins/cdarchiving/cdarchiving.cpp
@@ -73,7 +73,7 @@ CDArchiving::CDArchiving( KIPI::Interface* interface, TQObject *parent, KAction
         : TQObject(parent)
 {
     KImageIO::registerFormats();
-    const KAboutData *data = KApplication::kApplication()->aboutData();
+    const KAboutData *data = TDEApplication::kApplication()->aboutData();
     m_hostName = TQString( data->appName() );
 
     m_hostURL = data->homepage();
diff --git a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
index fdcdaa8..a5b7bfc 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -132,7 +132,7 @@ CDArchivingDialog::~CDArchivingDialog()
 
 void CDArchivingDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("cdarchiving", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("cdarchiving", "kipi-plugins");
 }
 
 void CDArchivingDialog::setupSelection(void)
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 050a158..7ff09ef 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -288,7 +288,7 @@ DisplayCompare::~DisplayCompare()
 
 void DisplayCompare::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("findduplicateimages",
+    TDEApplication::kApplication()->invokeHelp("findduplicateimages",
                                              "kipi-plugins");
 }
 
@@ -341,7 +341,7 @@ void DisplayCompare::slotDelete( void )
 
 void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
 {
-    KApplication::setOverrideCursor( waitCursor );
+    TDEApplication::setOverrideCursor( waitCursor );
     listEq->clear();
     FindOriginalItem *pitem = static_cast<FindOriginalItem*>( item );
     TQPtrVector < TQFile > *list = (TQPtrVector < TQFile > *)m_cmp.find(pitem->fullpath());
@@ -404,7 +404,7 @@ void DisplayCompare::slotDisplayLeft(TQListViewItem * item)
 
     preview2->setPixmap(TQPixmap());
     listEq->setSelected(last, true);
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
 }
 
 
@@ -420,7 +420,7 @@ void DisplayCompare::slotGotPreview1(const KFileItem* /*url*/, const TQPixmap &p
 
 void DisplayCompare::slotDisplayRight(TQListViewItem * item)
 {
-    KApplication::setOverrideCursor( waitCursor );
+    TDEApplication::setOverrideCursor( waitCursor );
     FindDuplicateItem *pitem = static_cast<FindDuplicateItem*>( item );
     TQImage im(pitem->fullpath());
 
@@ -447,7 +447,7 @@ void DisplayCompare::slotDisplayRight(TQListViewItem * item)
     connect(thumbJob2, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
             TQT_SLOT(slotGotPreview2(const KFileItem*, const TQPixmap&)));
 
-    KApplication::restoreOverrideCursor();
+    TDEApplication::restoreOverrideCursor();
     }
 
 
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 0841b84..53d35af 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -213,7 +213,7 @@ void FindDuplicateDialog::setupPageMethod(void)
 
 void FindDuplicateDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("findduplicateimages",
+    TDEApplication::kApplication()->invokeHelp("findduplicateimages",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/flickrexport/flickrtalker.cpp b/kipi-plugins/flickrexport/flickrtalker.cpp
index 2194bc9..4ab0df9 100644
--- a/kipi-plugins/flickrexport/flickrtalker.cpp
+++ b/kipi-plugins/flickrexport/flickrtalker.cpp
@@ -198,7 +198,7 @@ void FlickrTalker::slotAuthenticate()
     url.addQueryItem("api_sig", md5);
     kdDebug() << "Authenticate url: " << url << endl;
 
-    KApplication::kApplication()->invokeBrowser(url.url());
+    TDEApplication::kApplication()->invokeBrowser(url.url());
     int valueOk = KMessageBox::questionYesNo(TQT_TQWIDGET(kapp->activeWindow()),
                   i18n("Please Follow through the instructions in the browser window and "
                        "return back to press ok if you are authenticated or press No"),
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 7b8864d..03adf6e 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -273,7 +273,7 @@ void FlickrWindow::writeSettings()
 
 void FlickrWindow::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("flickrexport", "kipi-plugins");
+    TDEApplication::kApplication()->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();
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/flickrexport/mpform.cpp b/kipi-plugins/flickrexport/mpform.cpp
index 35138f0..ab33c30 100644
--- a/kipi-plugins/flickrexport/mpform.cpp
+++ b/kipi-plugins/flickrexport/mpform.cpp
@@ -49,7 +49,7 @@ namespace KIPIFlickrExportPlugin
 MPForm::MPForm()
 {
     m_boundary  = "----------";
-    m_boundary += KApplication::randomString(42 + 13).ascii();
+    m_boundary += TDEApplication::randomString(42 + 13).ascii();
 }
 
 MPForm::~MPForm()
diff --git a/kipi-plugins/galleryexport/gallerympform.cpp b/kipi-plugins/galleryexport/gallerympform.cpp
index 8f60375..a2cd525 100644
--- a/kipi-plugins/galleryexport/gallerympform.cpp
+++ b/kipi-plugins/galleryexport/gallerympform.cpp
@@ -40,7 +40,7 @@ namespace KIPIGalleryExportPlugin
 GalleryMPForm::GalleryMPForm()
 {
     m_boundary  = "----------";
-    m_boundary += KApplication::randomString( 42 + 13 ).ascii();
+    m_boundary += TDEApplication::randomString( 42 + 13 ).ascii();
 
     if (GalleryTalker::isGallery2())
     {
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index d9ac417..382412d 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -192,7 +192,7 @@ GalleryWindow::~GalleryWindow()
 
 void GalleryWindow::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
+    TDEApplication::kApplication()->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();
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index e87f86c..7eb8522 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -196,7 +196,7 @@ GPSEditDialog::~GPSEditDialog()
 
 void GPSEditDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
 }
 
 void GPSEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index 15aff92..bf7e536 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -282,7 +282,7 @@ GPSSyncDialog::~GPSSyncDialog()
 
 void GPSSyncDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("gpssync", "kipi-plugins");
 }
 
 void GPSSyncDialog::setImages( const KURL::List& images )
diff --git a/kipi-plugins/gpssync/kmlexport.cpp b/kipi-plugins/gpssync/kmlexport.cpp
index c3a1337..bc594cf 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  = KApplication::kApplication()->mainWidget();
+    TQWidget* parent  = TDEApplication::kApplication()->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 = KApplication::kApplication()->mainWidget();
+        TQWidget* parent = TDEApplication::kApplication()->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 fee4112..26b839a 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -328,7 +328,7 @@ void KMLExportConfig::slotOk()
 
 void KMLExportConfig::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("KMLExport", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("KMLExport", "kipi-plugins");
 }
 
 void KMLExportConfig::GoogleMapTargetRadioButton__toggled(bool)
diff --git a/kipi-plugins/htmlexport/plugin.cpp b/kipi-plugins/htmlexport/plugin.cpp
index 0fc8e76..791c798 100644
--- a/kipi-plugins/htmlexport/plugin.cpp
+++ b/kipi-plugins/htmlexport/plugin.cpp
@@ -77,7 +77,7 @@ void Plugin::slotActivate() {
 
 	GalleryInfo info;
 	info.readConfig();
-	TQWidget* parent=KApplication::kApplication()->mainWidget();
+	TQWidget* parent=TDEApplication::kApplication()->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 383048d..35d6cd6 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -225,7 +225,7 @@ Wizard::~Wizard() {
 }
 
 void Wizard::showHelp() {
-	KApplication::kApplication()->invokeHelp("htmlexport", "kipi-plugins");
+	TDEApplication::kApplication()->invokeHelp("htmlexport", "kipi-plugins");
 }
 
 void Wizard::updateFinishButton() {
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index f4122b7..d10b3f1 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -154,7 +154,7 @@ CameraSelection::~CameraSelection() {
 
 void CameraSelection::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("kameraklient",
+    TDEApplication::kApplication()->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index f36960a..0620a67 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -231,7 +231,7 @@ CameraUI::~CameraUI() {
 
 void CameraUI::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("kameraklient",
+    TDEApplication::kApplication()->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/kameraklient/dmessagebox.cpp b/kipi-plugins/kameraklient/dmessagebox.cpp
index 6399111..8df3ae0 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 = KApplication::kApplication()->iconLoader()->loadIcon("error",
+    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error",
                                                                        KIcon::NoGroup,
                                                                        KIcon::SizeMedium,
                                                                        KIcon::DefaultState,
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 0192045..0340737 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -146,7 +146,7 @@ SetupCamera::~SetupCamera() {
 
 void SetupCamera::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("kameraklient",
+    TDEApplication::kApplication()->invokeHelp("kameraklient",
                                              "kipi-plugins");
 }   
 
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index e910bd0..4db2e30 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(KApplication::kApplication()->aboutData()->appName()),
+                                    .arg(TDEApplication::kApplication()->aboutData()->appName()),
                                plainPage());
 
     d->userCommentEdit  = new KTextEdit(plainPage());
@@ -140,7 +140,7 @@ CommentEditDialog::~CommentEditDialog()
 
 void CommentEditDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void CommentEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 5e61fb0..8bd78e6 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(KApplication::kApplication()->aboutData()->appName()), 
+                                    .arg(TDEApplication::kApplication()->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()
 {
-    KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void CommentRemoveDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/exifcaption.cpp b/kipi-plugins/metadataedit/exifcaption.cpp
index 7da7ab4..712576e 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(KApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(TDEApplication::kApplication()->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 8afeada..e25b558 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(KApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(TDEApplication::kApplication()->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 421409e..9867555 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -211,7 +211,7 @@ EXIFEditDialog::~EXIFEditDialog()
 
 void EXIFEditDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void EXIFEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/metadataedit/iptccaption.cpp b/kipi-plugins/metadataedit/iptccaption.cpp
index b9579ee..2f691ce 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(KApplication::kApplication()->aboutData()->appName()), 
+                                            .arg(TDEApplication::kApplication()->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 c350b45..b4f296f 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(KApplication::kApplication()->aboutData()->appName()), 
+                                              .arg(TDEApplication::kApplication()->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 988b9f1..8b4ae24 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -233,7 +233,7 @@ IPTCEditDialog::~IPTCEditDialog()
 
 void IPTCEditDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("metadataedit", "kipi-plugins");
 }
 
 void IPTCEditDialog::closeEvent(TQCloseEvent *e)
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 29ec4ce..8b4e55a 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -769,7 +769,7 @@ void KImg2mpgData::slotOptionDlgOkClicked( void )
 
 void KImg2mpgData::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("mpegencoder",
+    TDEApplication::kApplication()->invokeHelp("mpegencoder",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/picasawebexport/mpform.cpp b/kipi-plugins/picasawebexport/mpform.cpp
index 004e9a7..cc391e1 100644
--- a/kipi-plugins/picasawebexport/mpform.cpp
+++ b/kipi-plugins/picasawebexport/mpform.cpp
@@ -49,7 +49,7 @@ namespace KIPIPicasawebExportPlugin
 MPForm::MPForm()
 {
     m_boundary  = "----------";
-    m_boundary += KApplication::randomString(42 + 13).ascii();
+    m_boundary += TDEApplication::randomString(42 + 13).ascii();
 }
 
 MPForm::~MPForm()
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index 99705fc..fc40467 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()
 {
-    KApplication::kApplication()->invokeHelp("picasawebexport", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("picasawebexport", "kipi-plugins");
 }
 
 void PicasawebWindow::slotGetAlbumsListSucceeded()
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index b61e8fc..0e923d1 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -207,7 +207,7 @@ FrmPrintWizard::~FrmPrintWizard()
 
 void FrmPrintWizard::slotHelp()
 {
-  KApplication::kApplication()->invokeHelp("printwizard","kipi-plugins");
+  TDEApplication::kApplication()->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);
-  KApplication::kApplication()->processEvents();
+  TDEApplication::kApplication()->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);
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->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);
-  KApplication::kApplication()->processEvents();
+  TDEApplication::kApplication()->processEvents();
 
   unsigned int current = 0;
   int pageCount = 1;
@@ -1269,7 +1269,7 @@ TQStringList FrmPrintWizard::printPhotosToFile(TQPtrList<TPhoto> photos, TQStrin
     pageCount++;
 
     PrgPrintProgress->setProgress(current);
-    KApplication::kApplication()->processEvents();
+    TDEApplication::kApplication()->processEvents();
     if (m_cancelPrinting)
       break;
   }
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index a852c32..d3350d1 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -287,7 +287,7 @@ void BatchDialog::saveSettings()
 
 void BatchDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
 }
 
 void BatchDialog::slotUser1()
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index 1026319..3b21f36 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -276,7 +276,7 @@ void SingleDialog::saveSettings()
 
 void SingleDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("rawconverter", "kipi-plugins");
 }
 
 // 'Preview' dialog button.
diff --git a/kipi-plugins/sendimages/sendimages.cpp b/kipi-plugins/sendimages/sendimages.cpp
index 994e31a..338eb34 100644
--- a/kipi-plugins/sendimages/sendimages.cpp
+++ b/kipi-plugins/sendimages/sendimages.cpp
@@ -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" )
         {
-            KApplication::kApplication()->invokeMailer(
+            TDEApplication::kApplication()->invokeMailer(
                 TQString(),                     // Destination address.
                 TQString(),                     // Carbon Copy address.
                 TQString(),                     // Blind Carbon Copy address
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index a717f4c..e46dfa1 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -553,7 +553,7 @@ void SendImagesDialog::setupEmailOptions(void)
 
 void SendImagesDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("sendimages", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("sendimages", "kipi-plugins");
 }
 
 void SendImagesDialog::slotMailAgentChanged(int)
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index dbf09f7..e11a310 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -139,12 +139,12 @@ FirstRunDlg::~FirstRunDlg()
 
 void FirstRunDlg::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
 }
 
 void FirstRunDlg::slotDownload(const TQString &url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void FirstRunDlg::slotURLSelected(const TQString &url)
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 87f5f2a..2ddcec6 100644
--- a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
+++ b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
@@ -112,7 +112,7 @@ SimpleViewerExport::SimpleViewerExport(KIPI::Interface* interface, TQObject *par
     m_simpleViewerFiles.append(viewer);
     m_simpleViewerFiles.append("swfobject.js");
 
-    const KAboutData *data = KApplication::kApplication()->aboutData();
+    const KAboutData *data = TDEApplication::kApplication()->aboutData();
     m_hostName             = TQString( data->appName() );
     m_hostURL              = data->homepage();
 
diff --git a/kipi-plugins/simpleviewerexport/svedialog.cpp b/kipi-plugins/simpleviewerexport/svedialog.cpp
index 160af75..1717bf1 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -117,7 +117,7 @@ SVEDialog::~SVEDialog()
 
 void SVEDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("simpleviewerexport", "kipi-plugins");
 }
 
 void SVEDialog::readConfig()
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index 77a68e5..aae86a3 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -778,7 +778,7 @@ void SlideShowConfig::slotStartClicked()
 
 void SlideShowConfig::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("slideshow",
+    TDEApplication::kApplication()->invokeHelp("slideshow",
                                              "kipi-plugins");
 }
 
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index eaaee83..960bdaa 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -177,7 +177,7 @@ GalleryWindow::~GalleryWindow()
 
 void GalleryWindow::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("galleryexport", "kipi-plugins");
+    TDEApplication::kApplication()->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();
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 );
 
     typedef TQValueList<GAlbum> GAlbumList;
diff --git a/kipi-plugins/sync/sinks/gallery/galleryform.cpp b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
index 3207f67..e726a3b 100644
--- a/kipi-plugins/sync/sinks/gallery/galleryform.cpp
+++ b/kipi-plugins/sync/sinks/gallery/galleryform.cpp
@@ -39,7 +39,7 @@ GalleryForm::GalleryForm(GalleryVersion version, TQString authToken)
  : mVersion(version)
 {
   mBoundary  = "----------";
-  mBoundary += KApplication::randomString( 42 + 13 ).ascii();
+  mBoundary += TDEApplication::randomString( 42 + 13 ).ascii();
 
   if (Gallery2 == mVersion)
   {
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index 23d50b5..506701b 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -296,7 +296,7 @@ TimeAdjustDialog::~TimeAdjustDialog()
 
 void TimeAdjustDialog::slotHelp()
 {
-    KApplication::kApplication()->invokeHelp("timeadjust", "kipi-plugins");
+    TDEApplication::kApplication()->invokeHelp("timeadjust", "kipi-plugins");
 }
 
 void TimeAdjustDialog::slotResetDateToCurrent()