Use tdeApp

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

10 files changed, 23 insertions, 23 deletions

diff --git a/src/utilities/setup/cameraselection.cpp b/src/utilities/setup/cameraselection.cpp
index 2cf2635c..4c564040 100644
--- a/src/utilities/setup/cameraselection.cpp
+++ b/src/utilities/setup/cameraselection.cpp
@@ -102,7 +102,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 {
     d = new CameraSelectionPriv;
 
-    kapp->setOverrideCursor(KCursor::waitCursor());
+    tdeApp->setOverrideCursor(KCursor::waitCursor());
     setHelp("cameraselection.anchor", "digikam");
     d->UMSCameraNameActual = TQString("Directory Browse");   // Don't be i18n!
     d->UMSCameraNameShown  = i18n("Mounted Camera");
@@ -180,7 +180,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 
     TQLabel* logo = new TQLabel( box2 );
 
-    TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
+    TDEIconLoader* iconLoader = tdeApp->iconLoader();
     logo->setPixmap(iconLoader->loadIcon("digikam", TDEIcon::NoGroup, 64, 
                     TDEIcon::DefaultState, 0, true));
 
@@ -246,7 +246,7 @@ CameraSelection::CameraSelection( TQWidget* parent )
 
     getCameraList();
     getSerialPortList();
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
 }
 
 CameraSelection::~CameraSelection()
diff --git a/src/utilities/setup/setup.cpp b/src/utilities/setup/setup.cpp
index bd47796f..e871c955 100644
--- a/src/utilities/setup/setup.cpp
+++ b/src/utilities/setup/setup.cpp
@@ -206,7 +206,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
         showPage((int) page);
     else 
     {
-        TDEConfig* config = kapp->config();
+        TDEConfig* config = tdeApp->config();
         config->setGroup("General Settings");
         showPage(config->readNumEntry("Setup Page", General));
     }
@@ -216,7 +216,7 @@ Setup::Setup(TQWidget* parent, const char* name, Setup::Page page)
 
 Setup::~Setup()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("General Settings");
     config->writeEntry("Setup Page", activePageIndex());
     config->sync();
diff --git a/src/utilities/setup/setupcamera.cpp b/src/utilities/setup/setupcamera.cpp
index 1b8d0bb8..6dc4edff 100644
--- a/src/utilities/setup/setupcamera.cpp
+++ b/src/utilities/setup/setupcamera.cpp
@@ -178,7 +178,7 @@ SetupCamera::~SetupCamera()
 
 void SetupCamera::processGphotoURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupCamera::slotSelectionChanged()
@@ -236,9 +236,9 @@ void SetupCamera::slotAutoDetectCamera()
 {
     TQString model, port;
     
-    kapp->setOverrideCursor( KCursor::waitCursor() );
+    tdeApp->setOverrideCursor( KCursor::waitCursor() );
     int ret = GPCamera::autoDetect(model, port);
-    kapp->restoreOverrideCursor();
+    tdeApp->restoreOverrideCursor();
     
     if (ret != 0) 
     {
diff --git a/src/utilities/setup/setupdcraw.cpp b/src/utilities/setup/setupdcraw.cpp
index 57f9cb2d..7aa0cae2 100644
--- a/src/utilities/setup/setupdcraw.cpp
+++ b/src/utilities/setup/setupdcraw.cpp
@@ -102,7 +102,7 @@ void SetupDcraw::slotSixteenBitsImageToggled(bool)
 
 void SetupDcraw::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("SixteenBitsImage",        d->dcrawSettings->sixteenBits());
     config->writeEntry("WhiteBalance",            d->dcrawSettings->whiteBalance());
@@ -124,7 +124,7 @@ void SetupDcraw::applySettings()
 
 void SetupDcraw::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     d->dcrawSettings->setSixteenBits(config->readBoolEntry("SixteenBitsImage", false));
     d->dcrawSettings->setNoiseReduction(config->readBoolEntry("EnableNoiseReduction", false));
diff --git a/src/utilities/setup/setupeditor.cpp b/src/utilities/setup/setupeditor.cpp
index 337b5655..98381b22 100644
--- a/src/utilities/setup/setupeditor.cpp
+++ b/src/utilities/setup/setupeditor.cpp
@@ -148,7 +148,7 @@ void SetupEditor::slotThemeBackgroundColor(bool e)
 
 void SetupEditor::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     TQColor Black(TQt::black);
     TQColor White(TQt::white);
     config->setGroup("ImageViewer Settings");
@@ -162,7 +162,7 @@ void SetupEditor::readSettings()
 
 void SetupEditor::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("UseThemeBackgroundColor", d->themebackgroundColor->isChecked());
     config->writeEntry("BackgroundColor",         d->backgroundColor->color());
diff --git a/src/utilities/setup/setupicc.cpp b/src/utilities/setup/setupicc.cpp
index b08750c1..3ff258ab 100644
--- a/src/utilities/setup/setupicc.cpp
+++ b/src/utilities/setup/setupicc.cpp
@@ -378,12 +378,12 @@ SetupICC::~SetupICC()
 
 void SetupICC::processLCMSURL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupICC::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     config->writeEntry("EnableCM", d->enableColorManagement->isChecked());
@@ -417,7 +417,7 @@ void SetupICC::applySettings()
 
 void SetupICC::readSettings(bool restore)
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     if (!restore)
@@ -706,7 +706,7 @@ void SetupICC::slotToggleManagedView(bool b)
 
 bool SetupICC::iccRepositoryIsValid()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("Color Management");
 
     // If color management is disable, no need to check anymore.
diff --git a/src/utilities/setup/setupiofiles.cpp b/src/utilities/setup/setupiofiles.cpp
index 6cdf23de..1e59dcac 100644
--- a/src/utilities/setup/setupiofiles.cpp
+++ b/src/utilities/setup/setupiofiles.cpp
@@ -111,7 +111,7 @@ SetupIOFiles::~SetupIOFiles()
 
 void SetupIOFiles::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue());
     config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue());
@@ -124,7 +124,7 @@ void SetupIOFiles::applySettings()
 
 void SetupIOFiles::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("ImageViewer Settings");
     d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) );
     d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) ); // Medium subsampling
diff --git a/src/utilities/setup/setuplighttable.cpp b/src/utilities/setup/setuplighttable.cpp
index 0ed01eab..5134a930 100644
--- a/src/utilities/setup/setuplighttable.cpp
+++ b/src/utilities/setup/setuplighttable.cpp
@@ -108,7 +108,7 @@ SetupLightTable::~SetupLightTable()
 
 void SetupLightTable::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     TQColor Black(TQt::black);
     TQColor White(TQt::white);
     config->setGroup("LightTable Settings");
@@ -120,7 +120,7 @@ void SetupLightTable::readSettings()
 
 void SetupLightTable::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
     config->setGroup("LightTable Settings");
     config->writeEntry("FullScreen Hide ToolBar", d->hideToolBar->isChecked());
     config->writeEntry("Auto Sync Preview", d->autoSyncPreview->isChecked());
diff --git a/src/utilities/setup/setupmetadata.cpp b/src/utilities/setup/setupmetadata.cpp
index e4f74ede..185dfafe 100644
--- a/src/utilities/setup/setupmetadata.cpp
+++ b/src/utilities/setup/setupmetadata.cpp
@@ -186,7 +186,7 @@ SetupMetadata::~SetupMetadata()
 
 void SetupMetadata::processExiv2URL(const TQString& url)
 {
-    TDEApplication::kApplication()->invokeBrowser(url);
+    tdeApp->invokeBrowser(url);
 }
 
 void SetupMetadata::applySettings()
diff --git a/src/utilities/setup/setupslideshow.cpp b/src/utilities/setup/setupslideshow.cpp
index 970d9c67..c42b8b10 100644
--- a/src/utilities/setup/setupslideshow.cpp
+++ b/src/utilities/setup/setupslideshow.cpp
@@ -130,7 +130,7 @@ SetupSlideShow::~SetupSlideShow()
 
 void SetupSlideShow::applySettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
 
     config->setGroup("ImageViewer Settings");
     config->writeEntry("SlideShowDelay", d->delayInput->value());
@@ -147,7 +147,7 @@ void SetupSlideShow::applySettings()
 
 void SetupSlideShow::readSettings()
 {
-    TDEConfig* config = kapp->config();
+    TDEConfig* config = tdeApp->config();
  
     config->setGroup("ImageViewer Settings");
     d->delayInput->setValue(config->readNumEntry("SlideShowDelay", 5));