Rename KApplication to TDEApplication to avoid conflicts with KDE4

47 files changed, 70 insertions, 70 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index ea3168e3..d6a7783f 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/digikam/digikam/albumthumbnailloader.cpp b/digikam/digikam/albumthumbnailloader.cpp
index a85e2913..fa4f3664 100644
--- a/digikam/digikam/albumthumbnailloader.cpp
+++ b/digikam/digikam/albumthumbnailloader.cpp
@@ -190,7 +190,7 @@ TQRect AlbumThumbnailLoader::computeBlendRect(int iconSize)
 
 TQPixmap AlbumThumbnailLoader::loadIcon(const TQString &name, int size)
 {
-    KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
     return iconLoader->loadIcon(name, KIcon::NoGroup,
                                 size, KIcon::DefaultState,
                                 0, true);
diff --git a/digikam/digikam/digikamapp.cpp b/digikam/digikam/digikamapp.cpp
index 93366ee9..8ef32b71 100644
--- a/digikam/digikam/digikamapp.cpp
+++ b/digikam/digikam/digikamapp.cpp
@@ -1789,7 +1789,7 @@ void DigikamApp::slotShowTip()
 
 void DigikamApp::slotShowKipiHelp()
 {
-    KApplication::kApplication()->invokeHelp( TQString(), "kipi-plugins" );
+    TDEApplication::kApplication()->invokeHelp( TQString(), "kipi-plugins" );
 }
 
 void DigikamApp::slotRawCameraList()
@@ -2014,12 +2014,12 @@ void DigikamApp::slotSyncAllPicturesMetadataDone()
 
 void DigikamApp::slotDonateMoney()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void DigikamApp::slotContribute()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void DigikamApp::slotRecurseAlbums(bool checked)
diff --git a/digikam/digikam/digikamfirstrun.cpp b/digikam/digikam/digikamfirstrun.cpp
index 7dd22688..5a2a8528 100644
--- a/digikam/digikam/digikamfirstrun.cpp
+++ b/digikam/digikam/digikamfirstrun.cpp
@@ -89,7 +89,7 @@ DigikamFirstRun::DigikamFirstRun(KConfig* config, TQWidget* parent,
                               "include the slash in the translation","/Pictures"));
     m_ui->m_path->setMode(KFile::Directory | KFile::LocalOnly);
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     m_ui->m_pixLabel->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup,
                                 128, KIcon::DefaultState, 0, true));
     m_ui->setMinimumSize(450, m_ui->sizeHint().height());
diff --git a/digikam/digikam/imagepreviewview.cpp b/digikam/digikam/imagepreviewview.cpp
index 25afdc94..ceb29760 100644
--- a/digikam/digikam/imagepreviewview.cpp
+++ b/digikam/digikam/imagepreviewview.cpp
@@ -131,8 +131,8 @@ ImagePreviewView::ImagePreviewView(AlbumWidgetStack *parent)
     d->parent = parent;
 
     // get preview size from screen size, but limit from VGA to WQXGA
-    d->previewSize = TQMAX(KApplication::desktop()->height(),
-                          KApplication::desktop()->width());
+    d->previewSize = TQMAX(TDEApplication::desktop()->height(),
+                          TDEApplication::desktop()->width());
     if (d->previewSize < 640)
         d->previewSize = 640;
     if (d->previewSize > 2560)
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp
index bd7a5c88..feb1b814 100644
--- a/digikam/digikam/main.cpp
+++ b/digikam/digikam/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
 
     KConfig* config = KGlobal::config();
     config->setGroup("General Settings");
diff --git a/digikam/digikam/scanlib.cpp b/digikam/digikam/scanlib.cpp
index 0e169374..e409f8d8 100644
--- a/digikam/digikam/scanlib.cpp
+++ b/digikam/digikam/scanlib.cpp
@@ -93,7 +93,7 @@ ScanLib::~ScanLib()
 void ScanLib::startScan()
 {
     struct timeval tv1, tv2;
-    TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
                   "run", KIcon::NoGroup, 32);
 
     TQString message = i18n("Finding non-existent Albums");
@@ -204,7 +204,7 @@ void ScanLib::findMissingItems()
 
     TQDir dir(albumPath);
     TQStringList fileList(dir.entryList(TQDir::Dirs));
-    TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
                   "folder_image", KIcon::NoGroup, 32);
 
     AlbumDB* db = AlbumManager::instance()->albumDB();
diff --git a/digikam/digikam/syncjob.cpp b/digikam/digikam/syncjob.cpp
index 72b7fac1..f45f3aea 100644
--- a/digikam/digikam/syncjob.cpp
+++ b/digikam/digikam/syncjob.cpp
@@ -243,7 +243,7 @@ TQPixmap SyncJob::getTagThumbnailPriv(const TQString &name, int size)
     }
     else
     {
-        KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+        KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
         *thumbnail_ = iconLoader->loadIcon(name, KIcon::NoGroup, thumbnailSize_,
                                            KIcon::DefaultState, 0, true);
     }
diff --git a/digikam/digikam/tageditdlg.cpp b/digikam/digikam/tageditdlg.cpp
index 3312bd74..88c80ca7 100644
--- a/digikam/digikam/tageditdlg.cpp
+++ b/digikam/digikam/tageditdlg.cpp
@@ -104,7 +104,7 @@ TagEditDlg::TagEditDlg(TQWidget *parent, TAlbum* album, bool create)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true));
 
     d->topLabel = new TQLabel(page);
diff --git a/digikam/digikam/tagspopupmenu.cpp b/digikam/digikam/tagspopupmenu.cpp
index 8968630e..91e6260c 100644
--- a/digikam/digikam/tagspopupmenu.cpp
+++ b/digikam/digikam/tagspopupmenu.cpp
@@ -141,7 +141,7 @@ TagsPopupMenu::TagsPopupMenu(const TQValueList<TQ_LLONG>& selectedImageIDs, int
     d->addToID          = addToID;
     d->mode             = mode;
 
-    KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
     d->addTagPix            = iconLoader->loadIcon("tag",
                                         KIcon::NoGroup,
                                         KIcon::SizeSmall,
diff --git a/digikam/digikam/welcomepageview.cpp b/digikam/digikam/welcomepageview.cpp
index 73834146..54ad537c 100644
--- a/digikam/digikam/welcomepageview.cpp
+++ b/digikam/digikam/welcomepageview.cpp
@@ -93,7 +93,7 @@ WelcomePageView::~WelcomePageView()
 
 void WelcomePageView::slotUrlOpen(const KURL &url)
 {
-    KApplication::kApplication()->invokeBrowser(url.url());
+    TDEApplication::kApplication()->invokeBrowser(url.url());
 }
 
 TQString WelcomePageView::infoPage()
diff --git a/digikam/imageplugins/coreplugin/iccprooftool.cpp b/digikam/imageplugins/coreplugin/iccprooftool.cpp
index 2fb7ece8..58f88f57 100644
--- a/digikam/imageplugins/coreplugin/iccprooftool.cpp
+++ b/digikam/imageplugins/coreplugin/iccprooftool.cpp
@@ -652,7 +652,7 @@ void ICCProofTool::writeSettings()
 
 void ICCProofTool::processLCMSURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void ICCProofTool::slotSpotColorChanged(const DColor &color)
diff --git a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
index e962bbf3..366a3c63 100644
--- a/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
+++ b/digikam/imageplugins/coreplugin/imageeffect_iccproof.cpp
@@ -640,7 +640,7 @@ void ImageEffect_ICCProof::writeUserSettings()
 
 void ImageEffect_ICCProof::processLCMSURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void ImageEffect_ICCProof::slotSpotColorChanged(const Digikam::DColor &color)
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index 72af11f3..4883a5a6 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -309,7 +309,7 @@ void ImageEffect_InPainting_Dialog::resetValues()
 
 void ImageEffect_InPainting_Dialog::processCImgURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void ImageEffect_InPainting_Dialog::prepareEffect()
diff --git a/digikam/imageplugins/inpainting/inpaintingtool.cpp b/digikam/imageplugins/inpainting/inpaintingtool.cpp
index a3f713b7..a9c29598 100644
--- a/digikam/imageplugins/inpainting/inpaintingtool.cpp
+++ b/digikam/imageplugins/inpainting/inpaintingtool.cpp
@@ -273,7 +273,7 @@ void InPaintingTool::slotResetSettings()
 
 void InPaintingTool::processCImgURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void InPaintingTool::prepareEffect()
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
index 994f7f46..0bd40754 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
@@ -246,7 +246,7 @@ void ImageEffect_Restoration::resetValues()
 
 void ImageEffect_Restoration::processCImgURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void ImageEffect_Restoration::prepareEffect()
diff --git a/digikam/imageplugins/restoration/restorationtool.cpp b/digikam/imageplugins/restoration/restorationtool.cpp
index 810083aa..0967a36d 100644
--- a/digikam/imageplugins/restoration/restorationtool.cpp
+++ b/digikam/imageplugins/restoration/restorationtool.cpp
@@ -259,7 +259,7 @@ void RestorationTool::slotResetSettings()
 
 void RestorationTool::processCImgURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void RestorationTool::prepareEffect()
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp
index 84cd84fd..e833c357 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp
@@ -271,7 +271,7 @@ void CtrlPanelDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        KApplication::kApplication()->invokeHelp(d->name, "digikam");
+        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
diff --git a/digikam/libs/dialogs/dprogressdlg.cpp b/digikam/libs/dialogs/dprogressdlg.cpp
index 222b2558..99297e40 100644
--- a/digikam/libs/dialogs/dprogressdlg.cpp
+++ b/digikam/libs/dialogs/dprogressdlg.cpp
@@ -94,7 +94,7 @@ DProgressDlg::DProgressDlg(TQWidget *parent, const TQString &caption)
     vlay->addWidget(d->title);
     vlay->addStretch();
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     d->logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true));
 
     d->actionsList->addColumn("Thumb");   // no i18n here: hiden column
diff --git a/digikam/libs/dialogs/imagedialog.cpp b/digikam/libs/dialogs/imagedialog.cpp
index 62ec2188..7b7e9497 100644
--- a/digikam/libs/dialogs/imagedialog.cpp
+++ b/digikam/libs/dialogs/imagedialog.cpp
@@ -229,7 +229,7 @@ void ImageDialogPreview::slotGotThumbnail(const KURL& url, const TQPixmap& pix)
 
 void ImageDialogPreview::slotFailedThumbnail(const KURL& /*url*/)
 {
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     d->imageLabel->setPixmap(iconLoader->loadIcon("image", KIcon::NoGroup, 128,
                              KIcon::DefaultState, 0, true));
 }
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index cb9ee35c..0b44eaea 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -208,7 +208,7 @@ void ImageDlgBase::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        KApplication::kApplication()->invokeHelp(d->name, "digikam");
+        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index 028ccae8..63b647d4 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -428,7 +428,7 @@ void ImageGuideDlg::slotHelp()
     // else digiKam help. In this case, setHelp() method must be used to set anchor and handbook name.
 
     if (d->aboutData)
-        KApplication::kApplication()->invokeHelp(d->name, "digikam");
+        TDEApplication::kApplication()->invokeHelp(d->name, "digikam");
     else
         KDialogBase::slotHelp();
 }
diff --git a/digikam/libs/dialogs/rawcameradlg.cpp b/digikam/libs/dialogs/rawcameradlg.cpp
index 3688a1f5..8c4a01c9 100644
--- a/digikam/libs/dialogs/rawcameradlg.cpp
+++ b/digikam/libs/dialogs/rawcameradlg.cpp
@@ -93,9 +93,9 @@ RawCameraDlg::RawCameraDlg(TQWidget *parent)
     // --------------------------------------------------------
 
     TQLabel *logo            = new TQLabel(page);
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
 
-    if (KApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
+    if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
         logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true));
     else
         logo->setPixmap(iconLoader->loadIcon("showfoto", KIcon::NoGroup, 96, KIcon::DefaultState, 0, true));
diff --git a/digikam/libs/thumbbar/thumbbar.cpp b/digikam/libs/thumbbar/thumbbar.cpp
index cced715e..2848d79d 100644
--- a/digikam/libs/thumbbar/thumbbar.cpp
+++ b/digikam/libs/thumbbar/thumbbar.cpp
@@ -801,7 +801,7 @@ void ThumbBarView::slotFailedThumbnail(const KURL& url)
     if (!item)
         return;
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, ThumbnailSize::Huge);
 
     if (item->d->pixmap)
diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 5d0e4008..39dba95c 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -90,7 +90,7 @@ int DLogoAction::plug(TQWidget *widget, int index)
 
 void DLogoAction::slotProcessURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 } // namespace Digikam
diff --git a/digikam/libs/widgets/common/dpopupmenu.cpp b/digikam/libs/widgets/common/dpopupmenu.cpp
index 4e7689e2..a81eb02f 100644
--- a/digikam/libs/widgets/common/dpopupmenu.cpp
+++ b/digikam/libs/widgets/common/dpopupmenu.cpp
@@ -68,7 +68,7 @@ void DPopupMenu::generateSidePixmap()
     {
         s_dpopupmenu_sidePixmapColor = newColor;
 
-        if (KApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
+        if (TDEApplication::kApplication()->aboutData()->appName() == TQString("digikam"))
             s_dpopupmenu_sidePixmap.load( locate( "data","digikam/data/menusidepixmap.png" ) );
         else
             s_dpopupmenu_sidePixmap.load( locate( "data","showfoto/menusidepixmap.png" ) );
diff --git a/digikam/libs/widgets/metadata/gpswidget.cpp b/digikam/libs/widgets/metadata/gpswidget.cpp
index 9471bbdc..88017a52 100644
--- a/digikam/libs/widgets/metadata/gpswidget.cpp
+++ b/digikam/libs/widgets/metadata/gpswidget.cpp
@@ -212,7 +212,7 @@ void GPSWidget::slotGPSDetails()
         }
     }
     
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 TQString GPSWidget::getMetadataTitle()
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index a1ec7fbc..3b149422 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -100,7 +100,7 @@ MetadataWidget::MetadataWidget(TQWidget* parent, const char* name)
     d = new MetadataWidgetPriv;
 
     d->mainLayout = new TQGridLayout(this, 3, 4, KDialog::spacingHint(), KDialog::spacingHint());
-    KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
 
     d->levelButtons = new TQHButtonGroup(this);
     d->levelButtons->setInsideMargin( 0 );
@@ -342,7 +342,7 @@ void MetadataWidget::slotPrintMetadata()
         int dpiy = metrics.logicalDpiY();
         int margin = (int) ( (2/2.54)*dpiy ); // 2 cm margins
         TQRect view( margin, margin, metrics.width() - 2*margin, metrics.height() - 2*margin );
-        TQFont font(KApplication::font());
+        TQFont font(TDEApplication::font());
         font.setPointSize( 10 ); // we define 10pt to be a nice base size for printing
         TQSimpleRichText richText( textmetadata, font,
                                   TQString(),
diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp
index 1a1df447..f5696482 100644
--- a/digikam/showfoto/main.cpp
+++ b/digikam/showfoto/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
     TDECmdLineArgs::init( argc, argv, &aboutData );
     TDECmdLineArgs::addCmdLineOptions( options );
 
-    KApplication app;
+    TDEApplication app;
     KImageIO::registerFormats();
 
     KURL::List urlList;
diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp
index f0f7221a..62b1c0bd 100644
--- a/digikam/themedesigner/main.cpp
+++ b/digikam/themedesigner/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char** argv)
 
     KGlobal::locale()->setMainCatalogue( "digikam" );
 
-    KApplication app;
+    TDEApplication app;
     Digikam::MainWindow *im = new Digikam::MainWindow();
     app.setMainWidget(im);
     im->resize(800, 600);
diff --git a/digikam/themedesigner/mainwindow.cpp b/digikam/themedesigner/mainwindow.cpp
index a2caa466..14ca9978 100644
--- a/digikam/themedesigner/mainwindow.cpp
+++ b/digikam/themedesigner/mainwindow.cpp
@@ -231,7 +231,7 @@ MainWindow::MainWindow()
     m_folderView->setResizeMode(TQListView::LastColumn);
     m_folderView->setRootIsDecorated(true);
 
-    KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();    
+    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();    
     for (int i=0; i<10; i++)
     {
         FolderItem* folderItem = new FolderItem(m_folderView, TQString("Album %1").arg(i));
diff --git a/digikam/themedesigner/themediconitem.cpp b/digikam/themedesigner/themediconitem.cpp
index 6b63d903..14a1c25e 100644
--- a/digikam/themedesigner/themediconitem.cpp
+++ b/digikam/themedesigner/themediconitem.cpp
@@ -135,7 +135,7 @@ void ThemedIconItem::paintItem()
 
     {
         r = view->itemPixmapRect();
-        KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();    
+        KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();    
         TQPixmap thumbnail = iconLoader->loadIcon("colors", KIcon::NoGroup,
                                                  100, KIcon::DefaultState, 0, true);
         
diff --git a/digikam/utilities/batch/batchalbumssyncmetadata.cpp b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
index 3e9b802d..ce89aaf9 100644
--- a/digikam/utilities/batch/batchalbumssyncmetadata.cpp
+++ b/digikam/utilities/batch/batchalbumssyncmetadata.cpp
@@ -128,7 +128,7 @@ void BatchAlbumsSyncMetadata::parseAlbum()
 
 void BatchAlbumsSyncMetadata::slotAlbumParsed(const ImageInfoList& list)
 {
-    TQPixmap pix = KApplication::kApplication()->iconLoader()->loadIcon(
+    TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon(
                   "folder_image", KIcon::NoGroup, 32);
 
     ImageInfoList imageInfoList = list;
diff --git a/digikam/utilities/cameragui/albumselectdialog.cpp b/digikam/utilities/cameragui/albumselectdialog.cpp
index 42bab306..5850d437 100644
--- a/digikam/utilities/cameragui/albumselectdialog.cpp
+++ b/digikam/utilities/cameragui/albumselectdialog.cpp
@@ -101,7 +101,7 @@ AlbumSelectDialog::AlbumSelectDialog(TQWidget* parent, PAlbum* albumToSelect,
     TQGridLayout* grid = new TQGridLayout(plainPage(), 2, 1, 0, spacingHint());
 
     TQLabel *logo = new TQLabel(plainPage());
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true));
 
     TQLabel *message = new TQLabel(plainPage());
@@ -216,7 +216,7 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
         return;
     }
 
-    KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
     TQPixmap icon            = iconLoader->loadIcon("folder", KIcon::NoGroup,
                                                    AlbumSettings::instance()->getDefaultTreeIconSize(),
                                                    KIcon::DefaultState, 0, true);
diff --git a/digikam/utilities/cameragui/camerafolderdialog.cpp b/digikam/utilities/cameragui/camerafolderdialog.cpp
index 36e08ed4..1fa82c9d 100644
--- a/digikam/utilities/cameragui/camerafolderdialog.cpp
+++ b/digikam/utilities/cameragui/camerafolderdialog.cpp
@@ -64,7 +64,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV
     TQLabel *logo    = new TQLabel(page);
     TQLabel *message = new TQLabel(page);
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true));    
     message->setText(i18n("<p>Please select the camera folder "
                           "where you want to upload the images.</p>"));
diff --git a/digikam/utilities/cameragui/cameraiconview.cpp b/digikam/utilities/cameragui/cameraiconview.cpp
index 418f4b04..81fee67f 100644
--- a/digikam/utilities/cameragui/cameraiconview.cpp
+++ b/digikam/utilities/cameragui/cameraiconview.cpp
@@ -309,7 +309,7 @@ void CameraIconView::addItem(const GPItemInfo& info)
     }
     else
     {
-        KIconLoader *iconLoader = KApplication::kApplication()->iconLoader();
+        KIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
         thumb = iconLoader->loadIcon("empty", KIcon::Desktop,
                                      ThumbnailSize::Huge, KIcon::DefaultState, 0, true)
                                      .convertToImage();
diff --git a/digikam/utilities/cameragui/cameraui.cpp b/digikam/utilities/cameragui/cameraui.cpp
index ba034c78..ab867f9a 100644
--- a/digikam/utilities/cameragui/cameraui.cpp
+++ b/digikam/utilities/cameragui/cameraui.cpp
@@ -642,7 +642,7 @@ void CameraUI::saveSettings()
 
 void CameraUI::slotProcessURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 bool CameraUI::isBusy() const
diff --git a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
index 571c7f6e..3f19f3f1 100644
--- a/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
+++ b/digikam/utilities/imageeditor/canvas/colorcorrectiondlg.cpp
@@ -105,7 +105,7 @@ ColorCorrectionDlg::ColorCorrectionDlg(TQWidget* parent, DImg *preview,
     
     previewOriginal->setPixmap(preview->convertToPixmap());
     previewTarget->setPixmap(preview->convertToPixmap(m_iccTrans));
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 128, KIcon::DefaultState, 0, true));    
     
     grid->addMultiCellWidget(originalTitle, 0, 0, 0, 0);
diff --git a/digikam/utilities/imageeditor/editor/editorwindow.cpp b/digikam/utilities/imageeditor/editor/editorwindow.cpp
index 2f0b46ea..bfe6d90d 100644
--- a/digikam/utilities/imageeditor/editor/editorwindow.cpp
+++ b/digikam/utilities/imageeditor/editor/editorwindow.cpp
@@ -618,7 +618,7 @@ void EditorWindow::printImage(KURL url)
     DImg image(w, h, sixteenBit, hasAlpha, ptr);
 
     KPrinter printer;
-    TQString appName = KApplication::kApplication()->aboutData()->appName();
+    TQString appName = TDEApplication::kApplication()->aboutData()->appName();
     printer.setDocName( url.filename() );
     printer.setCreator( appName );
 #if KDE_IS_VERSION(3,2,0)
@@ -1839,12 +1839,12 @@ void EditorWindow::setOverExposureToolTip(bool oei)
 
 void EditorWindow::slotDonateMoney()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void EditorWindow::slotContribute()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void EditorWindow::slotToggleSlideShow()
diff --git a/digikam/utilities/imageeditor/tools/imageprint.cpp b/digikam/utilities/imageeditor/tools/imageprint.cpp
index db67ddbb..ce228132 100644
--- a/digikam/utilities/imageeditor/tools/imageprint.cpp
+++ b/digikam/utilities/imageeditor/tools/imageprint.cpp
@@ -204,7 +204,7 @@ bool ImagePrint::printImageWithTQt()
     
         if (size.width() > w || size.height() > h) 
         {
-            int resp = KMessageBox::warningYesNoCancel(KApplication::kApplication()->mainWidget(),
+            int resp = KMessageBox::warningYesNoCancel(TDEApplication::kApplication()->mainWidget(),
                 i18n("The image will not fit on the page, what do you want to do?"),
                 TQString(),KStdGuiItem::cont(),
                 i18n("Shrink") );
diff --git a/digikam/utilities/imageeditor/tools/imageresize.cpp b/digikam/utilities/imageeditor/tools/imageresize.cpp
index d473b779..81b59ef4 100644
--- a/digikam/utilities/imageeditor/tools/imageresize.cpp
+++ b/digikam/utilities/imageeditor/tools/imageresize.cpp
@@ -482,7 +482,7 @@ void ImageResize::slotCancel()
 
 void ImageResize::processCImgURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void ImageResize::closeEvent(TQCloseEvent *e)
diff --git a/digikam/utilities/lighttable/lighttablepreview.cpp b/digikam/utilities/lighttable/lighttablepreview.cpp
index 6a6bf7d5..d163590c 100644
--- a/digikam/utilities/lighttable/lighttablepreview.cpp
+++ b/digikam/utilities/lighttable/lighttablepreview.cpp
@@ -126,8 +126,8 @@ LightTablePreview::LightTablePreview(TQWidget *parent)
     d = new LightTablePreviewPriv;
 
     // get preview size from screen size, but limit from VGA to WTQXGA
-    d->previewSize = TQMAX(KApplication::desktop()->height(),
-                          KApplication::desktop()->width());
+    d->previewSize = TQMAX(TDEApplication::desktop()->height(),
+                          TDEApplication::desktop()->width());
     if (d->previewSize < 640)
         d->previewSize = 640;
     if (d->previewSize > 2560)
diff --git a/digikam/utilities/lighttable/lighttablewindow.cpp b/digikam/utilities/lighttable/lighttablewindow.cpp
index 6338db27..e7321fb5 100644
--- a/digikam/utilities/lighttable/lighttablewindow.cpp
+++ b/digikam/utilities/lighttable/lighttablewindow.cpp
@@ -1491,12 +1491,12 @@ void LightTableWindow::unplugActionAccel(KAction* action)
 
 void LightTableWindow::slotDonateMoney()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=donation");
 }
 
 void LightTableWindow::slotContribute()
 {
-    KApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
+    TDEApplication::kApplication()->invokeBrowser("http://www.digikam.org/?q=contrib");
 }
 
 void LightTableWindow::slotEditKeys()
diff --git a/digikam/utilities/setup/cameraselection.cpp b/digikam/utilities/setup/cameraselection.cpp
index 3c6c8304..76543c78 100644
--- a/digikam/utilities/setup/cameraselection.cpp
+++ b/digikam/utilities/setup/cameraselection.cpp
@@ -180,7 +180,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 
     TQLabel* logo = new TQLabel( box2 );
 
-    KIconLoader* iconLoader = KApplication::kApplication()->iconLoader();
+    KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", KIcon::NoGroup, 64, 
                     KIcon::DefaultState, 0, true));
 
diff --git a/digikam/utilities/setup/setupcamera.cpp b/digikam/utilities/setup/setupcamera.cpp
index 4d935dbe..bb4963dd 100644
--- a/digikam/utilities/setup/setupcamera.cpp
+++ b/digikam/utilities/setup/setupcamera.cpp
@@ -178,7 +178,7 @@ SetupCamera::~SetupCamera()
 
 void SetupCamera::processGphotoURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void SetupCamera::slotSelectionChanged()
diff --git a/digikam/utilities/setup/setupicc.cpp b/digikam/utilities/setup/setupicc.cpp
index aa85179c..0cdc4b3d 100644
--- a/digikam/utilities/setup/setupicc.cpp
+++ b/digikam/utilities/setup/setupicc.cpp
@@ -378,7 +378,7 @@ SetupICC::~SetupICC()
 
 void SetupICC::processLCMSURL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void SetupICC::applySettings()
diff --git a/digikam/utilities/setup/setupmetadata.cpp b/digikam/utilities/setup/setupmetadata.cpp
index 72e311c1..fb1ba8c4 100644
--- a/digikam/utilities/setup/setupmetadata.cpp
+++ b/digikam/utilities/setup/setupmetadata.cpp
@@ -186,7 +186,7 @@ SetupMetadata::~SetupMetadata()
 
 void SetupMetadata::processExiv2URL(const TQString& url)
 {
-    KApplication::kApplication()->invokeBrowser(url);
+    TDEApplication::kApplication()->invokeBrowser(url);
 }
 
 void SetupMetadata::applySettings()