Rename KInstance and KAboutData to avoid conflicts with KDE4

42 files changed, 77 insertions, 77 deletions

diff --git a/ChangeLog b/ChangeLog
index 116c38f..abcc09c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52450,7 +52450,7 @@ v0.8.0-rc1		11/03/05
 
 2005-08-19 03:57  pahlibar
 
-	* trunk/extragear/graphics/digikam/digikam/main.cpp: KInstance
+	* trunk/extragear/graphics/digikam/digikam/main.cpp: TDEInstance
 	  instance is not ready yet. use I18N_NOOP. BUGS: 110984
 
 2005-08-15 20:16  toma
@@ -58456,7 +58456,7 @@ v0.7-rc1		11/01/04
 
 2004-10-27 00:52  aseigo
 
-	* digikam/main.cpp: fix the app name in the KAboutData, clean up
+	* digikam/main.cpp: fix the app name in the TDEAboutData, clean up
 	  the firstrun check slightly
 
 2004-10-24 15:54  pahlibar
diff --git a/digikam/digikam/daboutdata.h b/digikam/digikam/daboutdata.h
index e7cdca2..c777d53 100644
--- a/digikam/digikam/daboutdata.h
+++ b/digikam/digikam/daboutdata.h
@@ -125,7 +125,7 @@ static inline const char* webProjectUrl()
     return "http://www.digikam.org";
 }
 
-static inline void authorsRegistration(KAboutData& aboutData)
+static inline void authorsRegistration(TDEAboutData& aboutData)
 {
     aboutData.addAuthor ( "Caulier Gilles",
             I18N_NOOP("Main developer and coordinator"),
diff --git a/digikam/digikam/main.cpp b/digikam/digikam/main.cpp
index feb1b81..84c6521 100644
--- a/digikam/digikam/main.cpp
+++ b/digikam/digikam/main.cpp
@@ -70,11 +70,11 @@ int main(int argc, char *argv[])
 
     TQString description = Digikam::digiKamDescription();
 
-    KAboutData aboutData( "digikam",
+    TDEAboutData aboutData( "digikam",
                           I18N_NOOP("digiKam"),
                           digikam_version,
                           description.latin1(),
-                          KAboutData::License_GPL,
+                          TDEAboutData::License_GPL,
                           Digikam::copyright(),
                           0,
                           Digikam::webProjectUrl());
diff --git a/digikam/imageplugins/adjustcurves/adjustcurves.cpp b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
index 070d119..a39f8a7 100644
--- a/digikam/imageplugins/adjustcurves/adjustcurves.cpp
+++ b/digikam/imageplugins/adjustcurves/adjustcurves.cpp
@@ -99,11 +99,11 @@ AdjustCurveDialog::AdjustCurveDialog(TQWidget* parent)
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Adjust Color Curves"),
                                        digikam_version,
                                        I18N_NOOP("An image-histogram-curves adjustment plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/adjustlevels/adjustlevels.cpp b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
index 35e099e..8ffd378 100644
--- a/digikam/imageplugins/adjustlevels/adjustlevels.cpp
+++ b/digikam/imageplugins/adjustlevels/adjustlevels.cpp
@@ -98,11 +98,11 @@ AdjustLevelDialog::AdjustLevelDialog(TQWidget* parent)
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Adjust Color Levels"),
                                        digikam_version,
                                        I18N_NOOP("An image-histogram-levels adjustment plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
index 8f04698..9d54663 100644
--- a/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
+++ b/digikam/imageplugins/antivignetting/imageeffect_antivignetting.cpp
@@ -66,11 +66,11 @@ ImageEffect_AntiVignetting::ImageEffect_AntiVignetting(TQWidget* parent)
 {
     TQString whatsThis;
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Vignetting Correction"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to reduce image vignetting."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
index 0c6bbf2..f1d7cca 100644
--- a/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
+++ b/digikam/imageplugins/blurfx/imageeffect_blurfx.cpp
@@ -60,12 +60,12 @@ ImageEffect_BlurFX::ImageEffect_BlurFX(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Blur Effects"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to apply blurring special effect "
                                        "to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/border/imageeffect_border.cpp b/digikam/imageplugins/border/imageeffect_border.cpp
index 8c49c1d..e1e841c 100644
--- a/digikam/imageplugins/border/imageeffect_border.cpp
+++ b/digikam/imageplugins/border/imageeffect_border.cpp
@@ -66,11 +66,11 @@ ImageEffect_Border::ImageEffect_Border(TQWidget* parent)
     
     TQString whatsThis;
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Add Border"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to add a border around an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/channelmixer/channelmixer.cpp b/digikam/imageplugins/channelmixer/channelmixer.cpp
index 004f157..cf4b55a 100644
--- a/digikam/imageplugins/channelmixer/channelmixer.cpp
+++ b/digikam/imageplugins/channelmixer/channelmixer.cpp
@@ -96,11 +96,11 @@ ChannelMixerDialog::ChannelMixerDialog(TQWidget* parent)
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Color Channel Mixer"),
                                        digikam_version,
                                        I18N_NOOP("An image color channel mixer plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
index cbfd046..8d2199f 100644
--- a/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
+++ b/digikam/imageplugins/charcoal/imageeffect_charcoal.cpp
@@ -59,11 +59,11 @@ ImageEffect_Charcoal::ImageEffect_Charcoal(TQWidget* parent)
 {
     TQString whatsThis;
         
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Charcoal Drawing"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam charcoal drawing image effect plugin."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier", 
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
index 6230c7f..839cdc3 100644
--- a/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
+++ b/digikam/imageplugins/colorfx/imageeffect_colorfx.cpp
@@ -77,11 +77,11 @@ ImageEffect_ColorFX::ImageEffect_ColorFX(TQWidget* parent)
 
     // About data and help button.
 
-    KAboutData *about = new KAboutData("digikam",
+    TDEAboutData *about = new TDEAboutData("digikam",
                             I18N_NOOP("Color Effects"),
                             digikam_version,
                             I18N_NOOP("A digiKam plugin to apply special color effects to an image."),
-                            KAboutData::License_GPL,
+                            TDEAboutData::License_GPL,
                             "(c) 2004-2005, Renchi Raju\n(c) 2006-2008, Gilles Caulier",
                             0,
                             "http://www.digikam.org");
diff --git a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
index 14c9fa5..1bc6e38 100644
--- a/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
+++ b/digikam/imageplugins/distortionfx/imageeffect_distortionfx.cpp
@@ -68,11 +68,11 @@ ImageEffect_DistortionFX::ImageEffect_DistortionFX(TQWidget* parent)
 {
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Distortion Effects"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to apply distortion effects to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg", 
                                        0,
diff --git a/digikam/imageplugins/emboss/imageeffect_emboss.cpp b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
index 3722d50..41ba183 100644
--- a/digikam/imageplugins/emboss/imageeffect_emboss.cpp
+++ b/digikam/imageplugins/emboss/imageeffect_emboss.cpp
@@ -57,11 +57,11 @@ ImageEffect_Emboss::ImageEffect_Emboss(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Emboss Image"), 
                                        digikam_version,
                                        I18N_NOOP("Emboss image effect plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2006, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
index e49ff45..b496ccf 100644
--- a/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
+++ b/digikam/imageplugins/filmgrain/imageeffect_filmgrain.cpp
@@ -62,12 +62,12 @@ ImageEffect_FilmGrain::ImageEffect_FilmGrain(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Film Grain"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to apply a film grain "
                                                  "effect to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
index 0345efb..0a012ae 100644
--- a/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
+++ b/digikam/imageplugins/freerotation/imageeffect_freerotation.cpp
@@ -66,12 +66,12 @@ ImageEffect_FreeRotation::ImageEffect_FreeRotation(TQWidget* parent)
 
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Free Rotation"),
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to process free image "
                                        "rotation."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
index 29544db..fb95e0f 100644
--- a/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
+++ b/digikam/imageplugins/hotpixels/imageeffect_hotpixels.cpp
@@ -68,12 +68,12 @@ ImageEffect_HotPixels::ImageEffect_HotPixels(TQWidget* parent)
 
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Hot Pixels Correction"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin for fixing dots produced by "
                                                  "hot/stuck/dead pixels from a CCD."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2006, Unai Garro\n(c) 2005-2008, Gilles Caulier", 
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/infrared/imageeffect_infrared.cpp b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
index 3ad5f44..414e205 100644
--- a/digikam/imageplugins/infrared/imageeffect_infrared.cpp
+++ b/digikam/imageplugins/infrared/imageeffect_infrared.cpp
@@ -64,11 +64,11 @@ ImageEffect_Infrared::ImageEffect_Infrared(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Infrared Film"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to simulate infrared film."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
index 4883a5a..e508d85 100644
--- a/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
+++ b/digikam/imageplugins/inpainting/imageeffect_inpainting.cpp
@@ -134,11 +134,11 @@ ImageEffect_InPainting_Dialog::ImageEffect_InPainting_Dialog(TQWidget* parent)
     m_isComputed = false;
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Photograph Inpainting"),
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to inpaint a photograph."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
index d473ab4..03d4db9 100644
--- a/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
+++ b/digikam/imageplugins/inserttext/imageeffect_inserttext.cpp
@@ -77,11 +77,11 @@ ImageEffect_InsertText::ImageEffect_InsertText(TQWidget* parent)
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Insert Text"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin for inserting text on a photograph."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2006, Gilles Caulier\n"
                                        "(c) 2006-2007, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
index 144d34b..ec7e09c 100644
--- a/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
+++ b/digikam/imageplugins/lensdistortion/imageeffect_lensdistortion.cpp
@@ -68,12 +68,12 @@ ImageEffect_LensDistortion::ImageEffect_LensDistortion(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Lens Distortion Correction"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to reduce spherical aberration caused "
                                                  "by a lens to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2006, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg", 
                                        0,
diff --git a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
index 2e77c30..92e6030 100644
--- a/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
+++ b/digikam/imageplugins/noisereduction/imageeffect_noisereduction.cpp
@@ -68,11 +68,11 @@ ImageEffect_NoiseReduction::ImageEffect_NoiseReduction(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Noise Reduction"),
                                        digikam_version,
                                        I18N_NOOP("A noise reduction image filter plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
index d1e79db..bf7c47e 100644
--- a/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
+++ b/digikam/imageplugins/oilpaint/imageeffect_oilpaint.cpp
@@ -61,11 +61,11 @@ ImageEffect_OilPaint::ImageEffect_OilPaint(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Oil Paint"), 
                                        digikam_version,
                                        I18N_NOOP("An oil painting image effect plugin for digiKam."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg", 
                                        0,
diff --git a/digikam/imageplugins/perspective/imageeffect_perspective.cpp b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
index 2ec2ec4..827ca9c 100644
--- a/digikam/imageplugins/perspective/imageeffect_perspective.cpp
+++ b/digikam/imageplugins/perspective/imageeffect_perspective.cpp
@@ -68,11 +68,11 @@ ImageEffect_Perspective::ImageEffect_Perspective(TQWidget* parent)
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Perspective"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to process image perspective adjustment."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2006, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
index 3ce021a..99e88b8 100644
--- a/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
+++ b/digikam/imageplugins/raindrop/imageeffect_raindrop.cpp
@@ -60,11 +60,11 @@ ImageEffect_RainDrop::ImageEffect_RainDrop(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Raindrops"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to add raindrops to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/restoration/imageeffect_restoration.cpp b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
index 0bd4075..fc21b24 100644
--- a/digikam/imageplugins/restoration/imageeffect_restoration.cpp
+++ b/digikam/imageplugins/restoration/imageeffect_restoration.cpp
@@ -68,11 +68,11 @@ ImageEffect_Restoration::ImageEffect_Restoration(TQWidget* parent)
 
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Photograph Restoration"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to restore a photograph."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2008, Gilles Caulier", 
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
index 7597769..25ed0d2 100644
--- a/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
+++ b/digikam/imageplugins/sheartool/imageeffect_sheartool.cpp
@@ -67,11 +67,11 @@ ImageEffect_ShearTool::ImageEffect_ShearTool(TQWidget* parent)
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Shear Tool"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to shear an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2004-2008, Gilles Caulier",
                                        0,
                                        "http://www.digikam.org");
diff --git a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
index 6c500f0..24de4a6 100644
--- a/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
+++ b/digikam/imageplugins/superimpose/imageeffect_superimpose.cpp
@@ -79,11 +79,11 @@ ImageEffect_SuperImpose::ImageEffect_SuperImpose(TQWidget* parent)
            
     // About data and help button.
     
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Template Superimpose"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to superimpose a template onto a photograph."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2006, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg", 
                                        0,
diff --git a/digikam/imageplugins/texture/imageeffect_texture.cpp b/digikam/imageplugins/texture/imageeffect_texture.cpp
index 12fb7c6..19b582d 100644
--- a/digikam/imageplugins/texture/imageeffect_texture.cpp
+++ b/digikam/imageplugins/texture/imageeffect_texture.cpp
@@ -61,12 +61,12 @@ ImageEffect_Texture::ImageEffect_Texture(TQWidget* parent)
 {
     TQString whatsThis;
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("Apply Texture"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to apply a decorative "
                                        "texture to an image."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005, Gilles Caulier\n"
                                        "(c) 2006-2008, Gilles Caulier and Marcel Wiesweg",
                                        0,
diff --git a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
index 2db833e..d4c759b 100644
--- a/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
+++ b/digikam/imageplugins/whitebalance/imageeffect_whitebalance.cpp
@@ -91,11 +91,11 @@ ImageEffect_WhiteBalance::ImageEffect_WhiteBalance(TQWidget* parent)
 
     // About data and help button.
 
-    KAboutData* about = new KAboutData("digikam",
+    TDEAboutData* about = new TDEAboutData("digikam",
                                        I18N_NOOP("White Color Balance Correction"), 
                                        digikam_version,
                                        I18N_NOOP("A digiKam image plugin to correct white color balance."),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2005-2008, Gilles Caulier", 
                                        0,
                                        "http://wwww.digikam.org");
diff --git a/digikam/kioslave/digikamalbums.cpp b/digikam/kioslave/digikamalbums.cpp
index 0e85f6a..6c3b1d6 100644
--- a/digikam/kioslave/digikamalbums.cpp
+++ b/digikam/kioslave/digikamalbums.cpp
@@ -1952,7 +1952,7 @@ extern "C"
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
         KLocale::setMainCatalogue("digikam");
-        KInstance instance( "kio_digikamalbums" );
+        TDEInstance instance( "kio_digikamalbums" );
         KGlobal::locale();
 
         if (argc != 4) {
diff --git a/digikam/kioslave/digikamdates.cpp b/digikam/kioslave/digikamdates.cpp
index 7ef9c5b..ae1c677 100644
--- a/digikam/kioslave/digikamdates.cpp
+++ b/digikam/kioslave/digikamdates.cpp
@@ -295,7 +295,7 @@ extern "C"
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
         KLocale::setMainCatalogue("digikam");
-        KInstance instance( "kio_digikamdates" );
+        TDEInstance instance( "kio_digikamdates" );
         KGlobal::locale();
 
         if (argc != 4) {
diff --git a/digikam/kioslave/digikamsearch.cpp b/digikam/kioslave/digikamsearch.cpp
index 03b98e8..aeb6f7b 100644
--- a/digikam/kioslave/digikamsearch.cpp
+++ b/digikam/kioslave/digikamsearch.cpp
@@ -675,7 +675,7 @@ extern "C"
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
         KLocale::setMainCatalogue("digikam");
-        KInstance instance( "kio_digikamsearch" );
+        TDEInstance instance( "kio_digikamsearch" );
         KGlobal::locale();
 
         if (argc != 4) 
diff --git a/digikam/kioslave/digikamtags.cpp b/digikam/kioslave/digikamtags.cpp
index 014b18b..5f98505 100644
--- a/digikam/kioslave/digikamtags.cpp
+++ b/digikam/kioslave/digikamtags.cpp
@@ -304,7 +304,7 @@ extern "C"
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
         KLocale::setMainCatalogue("digikam");
-        KInstance instance( "kio_digikamtags" );
+        TDEInstance instance( "kio_digikamtags" );
         ( void ) KGlobal::locale();
 
         kdDebug() << "*** kio_digikamtag started ***" << endl;
diff --git a/digikam/kioslave/digikamthumbnail.cpp b/digikam/kioslave/digikamthumbnail.cpp
index 97acf12..d43c279 100644
--- a/digikam/kioslave/digikamthumbnail.cpp
+++ b/digikam/kioslave/digikamthumbnail.cpp
@@ -615,7 +615,7 @@ extern "C"
     DIGIKAM_EXPORT int kdemain(int argc, char **argv)
     {
         KLocale::setMainCatalogue("digikam");
-        KInstance instance( "kio_digikamthumbnail" );
+        TDEInstance instance( "kio_digikamthumbnail" );
         ( void ) KGlobal::locale();
 
         if (argc != 4) 
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.cpp b/digikam/libs/dialogs/ctrlpaneldlg.cpp
index e833c35..455c1f9 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.cpp
+++ b/digikam/libs/dialogs/ctrlpaneldlg.cpp
@@ -88,7 +88,7 @@ public:
 
     TQString      name;
 
-    KAboutData  *aboutData;
+    TDEAboutData  *aboutData;
 };
 
 CtrlPanelDlg::CtrlPanelDlg(TQWidget* parent, TQString title, TQString name,
@@ -177,7 +177,7 @@ void CtrlPanelDlg::slotInit()
     }
 }
 
-void CtrlPanelDlg::setAboutData(KAboutData *about)
+void CtrlPanelDlg::setAboutData(TDEAboutData *about)
 {
     d->aboutData            = about;
     TQPushButton *helpButton = actionButton( Help );
diff --git a/digikam/libs/dialogs/ctrlpaneldlg.h b/digikam/libs/dialogs/ctrlpaneldlg.h
index f237f7d..a69fb8b 100644
--- a/digikam/libs/dialogs/ctrlpaneldlg.h
+++ b/digikam/libs/dialogs/ctrlpaneldlg.h
@@ -59,7 +59,7 @@ public:
                  TQFrame* bannerFrame=0);
     ~CtrlPanelDlg();
 
-    void setAboutData(KAboutData *about);
+    void setAboutData(TDEAboutData *about);
 
 public:
         
diff --git a/digikam/libs/dialogs/imagedlgbase.cpp b/digikam/libs/dialogs/imagedlgbase.cpp
index 0b44eae..1a65994 100644
--- a/digikam/libs/dialogs/imagedlgbase.cpp
+++ b/digikam/libs/dialogs/imagedlgbase.cpp
@@ -90,7 +90,7 @@ public:
 
     TQSplitter      *splitter;
 
-    KAboutData     *aboutData;
+    TDEAboutData     *aboutData;
 
     Sidebar        *settingsSideBar;
 };
@@ -213,7 +213,7 @@ void ImageDlgBase::slotHelp()
         KDialogBase::slotHelp();
 }
 
-void ImageDlgBase::setAboutData(KAboutData *about)
+void ImageDlgBase::setAboutData(TDEAboutData *about)
 {
     d->aboutData = about;
     TQPushButton *helpButton = actionButton( Help );
diff --git a/digikam/libs/dialogs/imagedlgbase.h b/digikam/libs/dialogs/imagedlgbase.h
index 5d5b224..202b9ca 100644
--- a/digikam/libs/dialogs/imagedlgbase.h
+++ b/digikam/libs/dialogs/imagedlgbase.h
@@ -41,7 +41,7 @@
 
 class TQWidget;
 
-class KAboutData;
+class TDEAboutData;
 
 namespace Digikam
 {
@@ -59,7 +59,7 @@ public:
                  bool loadFileSettings=true, bool tryAction=false, TQFrame* bannerFrame=0);
     ~ImageDlgBase();
 
-    void setAboutData(KAboutData *about);
+    void setAboutData(TDEAboutData *about);
     void setPreviewAreaWidget(TQWidget *w);
     void setUserAreaWidget(TQWidget *w);
 
diff --git a/digikam/libs/dialogs/imageguidedlg.cpp b/digikam/libs/dialogs/imageguidedlg.cpp
index 63b647d..9caedef 100644
--- a/digikam/libs/dialogs/imageguidedlg.cpp
+++ b/digikam/libs/dialogs/imageguidedlg.cpp
@@ -119,7 +119,7 @@ public:
         
     KColorButton *guideColorBt;
 
-    KAboutData   *aboutData;
+    TDEAboutData   *aboutData;
 
     Sidebar      *settingsSideBar;
 };
@@ -328,7 +328,7 @@ void ImageGuideDlg::setUserAreaWidget(TQWidget *w)
     d->settingsLayout->addMultiCellLayout(vLayout, 0, 0, 0, 0);
 }
 
-void ImageGuideDlg::setAboutData(KAboutData *about)
+void ImageGuideDlg::setAboutData(TDEAboutData *about)
 {
     d->aboutData = about;
     TQPushButton *helpButton = actionButton( Help );
diff --git a/digikam/libs/dialogs/imageguidedlg.h b/digikam/libs/dialogs/imageguidedlg.h
index 038f39a..aa57e61 100644
--- a/digikam/libs/dialogs/imageguidedlg.h
+++ b/digikam/libs/dialogs/imageguidedlg.h
@@ -41,7 +41,7 @@
 
 class TQFrame;
 
-class KAboutData;
+class TDEAboutData;
 
 namespace Digikam
 {
@@ -66,7 +66,7 @@ public:
                   bool tryAction=false);
     ~ImageGuideDlg();
 
-    void setAboutData(KAboutData *about);
+    void setAboutData(TDEAboutData *about);
     void setUserAreaWidget(TQWidget *w);
     void setProgressVisible(bool v);
     
diff --git a/digikam/showfoto/main.cpp b/digikam/showfoto/main.cpp
index f569648..3795a52 100644
--- a/digikam/showfoto/main.cpp
+++ b/digikam/showfoto/main.cpp
@@ -54,11 +54,11 @@ int main(int argc, char *argv[])
 
     TQString Description = Digikam::showFotoDescription();
 
-    KAboutData aboutData( "showfoto",
+    TDEAboutData aboutData( "showfoto",
                           I18N_NOOP("showFoto"),
                           showfoto_version,
                           Description.latin1(),
-                          KAboutData::License_GPL,
+                          TDEAboutData::License_GPL,
                           Digikam::copyright(),
                           0,
                           Digikam::webProjectUrl());
diff --git a/digikam/themedesigner/main.cpp b/digikam/themedesigner/main.cpp
index 62b1c0b..ec7fd68 100644
--- a/digikam/themedesigner/main.cpp
+++ b/digikam/themedesigner/main.cpp
@@ -49,11 +49,11 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char** argv)
 {
-    KAboutData aboutData("digikamthemedesigner",
+    TDEAboutData aboutData("digikamthemedesigner",
                      I18N_NOOP("digiKam Theme Designer"),
                      digikam_version,
                      description,
-                     KAboutData::License_GPL,
+                     TDEAboutData::License_GPL,
                      Digikam::copyright(),
                      0,
                      Digikam::webProjectUrl());