5 files changed, 11 insertions, 11 deletions
diff --git a/src/utilities/cameragui/albumselectdialog.cpp b/src/utilities/cameragui/albumselectdialog.cpp
index 486c4711..eed8b627 100644
--- a/src/utilities/cameragui/albumselectdialog.cpp
+++ b/src/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());
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));
 
     TQLabel *message = new TQLabel(plainPage());
@@ -216,7 +216,7 @@ void AlbumSelectDialog::slotAlbumAdded(Album* album)
         return;
     }
 
-    TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader *iconLoader = tdeApp->iconLoader();
     TQPixmap icon            = iconLoader->loadIcon("folder", TDEIcon::NoGroup,
                                                    AlbumSettings::instance()->getDefaultTreeIconSize(),
                                                    TDEIcon::DefaultState, 0, true);
diff --git a/src/utilities/cameragui/camerafolderdialog.cpp b/src/utilities/cameragui/camerafolderdialog.cpp
index 93feb0ab..2cd48e5d 100644
--- a/src/utilities/cameragui/camerafolderdialog.cpp
+++ b/src/utilities/cameragui/camerafolderdialog.cpp
@@ -64,7 +64,7 @@ CameraFolderDialog::CameraFolderDialog(TQWidget *parent, CameraIconView *cameraV
     TQLabel *logo    = new TQLabel(page);
     TQLabel *message = new TQLabel(page);
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 128, TDEIcon::DefaultState, 0, true));    
     message->setText(i18n("<p>Please select the camera folder "
                           "where you want to upload the images.</p>"));
diff --git a/src/utilities/cameragui/cameraiconview.cpp b/src/utilities/cameragui/cameraiconview.cpp
index ba496217..7b6b9fba 100644
--- a/src/utilities/cameragui/cameraiconview.cpp
+++ b/src/utilities/cameragui/cameraiconview.cpp
@@ -309,7 +309,7 @@ void CameraIconView::addItem(const GPItemInfo& info)
     }
     else
     {
-        TDEIconLoader *iconLoader = TDEApplication::kApplication()->iconLoader();
+        TDEIconLoader *iconLoader = tdeApp->iconLoader();
         thumb = iconLoader->loadIcon("application-x-zerosize", TDEIcon::Desktop,
                                      ThumbnailSize::Huge, TDEIcon::DefaultState, 0, true)
                                      .convertToImage();
@@ -739,7 +739,7 @@ void CameraIconView::slotRightButtonClicked(const TQPoint&)
     if (d->cameraUI->isBusy())
         return;
 
-    TQMimeSource *data = kapp->clipboard()->data(TQClipboard::Clipboard);
+    TQMimeSource *data = tdeApp->clipboard()->data(TQClipboard::Clipboard);
     if(!data || !TQUriDrag::canDecode(data))
         return;
 
diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp
index 8b531ea2..157dbaea 100644
--- a/src/utilities/cameragui/cameraui.cpp
+++ b/src/utilities/cameragui/cameraui.cpp
@@ -450,7 +450,7 @@ CameraUI::CameraUI(TQWidget* /*parent*/, const TQString& cameraTitle,
     // -------------------------------------------------------------------------
 
     TQPushButton *helpButton = actionButton( Help );
-    d->helpMenu = new KHelpMenu(this, kapp->aboutData(), false);
+    d->helpMenu = new KHelpMenu(this, tdeApp->aboutData(), false);
     d->helpMenu->menu()->insertItem(SmallIcon("camera-photo"), i18n("Camera Information"),
                                     this, TQ_SLOT(slotInformations()), 0, CAMERA_INFO_MENU_ID, 0);
     helpButton->setPopup( d->helpMenu->menu() );
@@ -591,7 +591,7 @@ CameraUI::~CameraUI()
 
 void CameraUI::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Camera Settings");
     d->advBox->setCurrentIndex(config->readNumEntry("Settings Tab", CameraUIPriv::RENAMEFILEPAGE));
     d->autoRotateCheck->setChecked(config->readBoolEntry("AutoRotate", true));
@@ -623,7 +623,7 @@ void CameraUI::saveSettings()
 {
     saveDialogSize("Camera Settings");
 
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Camera Settings");
     config->writeEntry("Settings Tab", d->advBox->currentIndex());
     config->writeEntry("AutoRotate", d->autoRotateCheck->isChecked());
@@ -642,7 +642,7 @@ void CameraUI::saveSettings()
 
 void CameraUI::slotProcessURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 bool CameraUI::isBusy() const
diff --git a/src/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp
index a906ccb1..4d593959 100644
--- a/src/utilities/cameragui/renamecustomizer.cpp
+++ b/src/utilities/cameragui/renamecustomizer.cpp
@@ -464,7 +464,7 @@ void RenameCustomizer::slotDateTimeButtonClicked()
 
 void RenameCustomizer::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     
     config->setGroup("Camera Settings");
     bool def         = config->readBoolEntry("Rename Use Default", true);
@@ -507,7 +507,7 @@ void RenameCustomizer::readSettings()
 
 void RenameCustomizer::saveSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("Camera Settings");
     config->writeEntry("Rename Use Default", d->renameDefault->isChecked());