Rename KInstance and KAboutData to avoid conflicts with KDE4

45 files changed, 46 insertions, 46 deletions

diff --git a/kipi-plugins/ChangeLog b/kipi-plugins/ChangeLog
index f25ae1b..19a9512 100644
--- a/kipi-plugins/ChangeLog
+++ b/kipi-plugins/ChangeLog
@@ -15408,7 +15408,7 @@ v0.1.0-beta1                                                      2004-09-06
 
 	  The basic point of all this was that the
 	  KIPI::Plugin::actionCollection() needed to know about the plugins
-	  KInstance - as it was till this change, it got the KInstance for
+	  TDEInstance - as it was till this change, it got the TDEInstance for
 	  the host application, and would thus look for icons in the host
 	  applications directory.
 
diff --git a/kipi-plugins/acquireimages/acquireimagedialog.cpp b/kipi-plugins/acquireimages/acquireimagedialog.cpp
index 4b6e3b0..5068bc4 100644
--- a/kipi-plugins/acquireimages/acquireimagedialog.cpp
+++ b/kipi-plugins/acquireimages/acquireimagedialog.cpp
@@ -119,7 +119,7 @@ AcquireImageDialog::AcquireImageDialog( KIPI::Interface* interface, TQWidget *pa
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Acquire images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to acquire images"),
                                            "(c) 2003-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/acquireimages/screenshotdialog.cpp b/kipi-plugins/acquireimages/screenshotdialog.cpp
index 8de50bb..91db602 100644
--- a/kipi-plugins/acquireimages/screenshotdialog.cpp
+++ b/kipi-plugins/acquireimages/screenshotdialog.cpp
@@ -149,11 +149,11 @@ ScreenGrabDialog::ScreenGrabDialog( KIPI::Interface* interface, TQWidget *parent
     
     // About data and help button.
     
-    KAboutData* about = new KAboutData("kipiplugins",
+    TDEAboutData* about = new TDEAboutData("kipiplugins",
                                        I18N_NOOP("Acquire images"), 
                                        kipiplugins_version,
                                        I18N_NOOP("A Kipi plugin to acquire images"),
-                                       KAboutData::License_GPL,
+                                       TDEAboutData::License_GPL,
                                        "(c) 2003-2008, Gilles Caulier", 
                                        0,
                                        "http://extragear.kde.org/apps/kipi");
diff --git a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
index 5cf8d86..1aac24a 100644
--- a/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/borderimagesdialog.cpp
@@ -62,7 +62,7 @@ BorderImagesDialog::BorderImagesDialog( KURL::List urlList, KIPI::Interface* int
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch Image-bordering"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for batch bordering images\n"
                                                       "This plugin use the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2008, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
index 051adc0..bca812a 100644
--- a/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/colorimagesdialog.cpp
@@ -61,7 +61,7 @@ ColorImagesDialog::ColorImagesDialog( KURL::List urlList, KIPI::Interface* inter
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image-color enhancement"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for batch image-color enhancement\n"
                                                      "This plugin use the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
index ec3508d..1e7d15e 100644
--- a/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/convertimagesdialog.cpp
@@ -67,7 +67,7 @@ ConvertImagesDialog::ConvertImagesDialog( KURL::List urlList, KIPI::Interface* i
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch convert images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for batch converting images\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
index 81f9466..98cbd8d 100644
--- a/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/effectimagesdialog.cpp
@@ -61,7 +61,7 @@ EffectImagesDialog::EffectImagesDialog( KURL::List urlList, KIPI::Interface* int
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image effects"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for batch image-effect transformations\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
index 98b298d..ca5ecfc 100644
--- a/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/filterimagesdialog.cpp
@@ -61,7 +61,7 @@ FilterImagesDialog::FilterImagesDialog( KURL::List urlList, KIPI::Interface* int
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch image filtering"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to batch filter images\n"
                                                     "This plugin uses the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/imagepreview.cpp b/kipi-plugins/batchprocessimages/imagepreview.cpp
index 1713674..964c0de 100644
--- a/kipi-plugins/batchprocessimages/imagepreview.cpp
+++ b/kipi-plugins/batchprocessimages/imagepreview.cpp
@@ -87,7 +87,7 @@ ImagePreview::ImagePreview(const TQString &fileOrig, const TQString &fileDest, c
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch process images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("An interface to preview the \"Batch Process Images\" "
                                                      "Kipi plugin.\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" "
diff --git a/kipi-plugins/batchprocessimages/outputdialog.cpp b/kipi-plugins/batchprocessimages/outputdialog.cpp
index 06b729a..c64da56 100644
--- a/kipi-plugins/batchprocessimages/outputdialog.cpp
+++ b/kipi-plugins/batchprocessimages/outputdialog.cpp
@@ -54,7 +54,7 @@ OutputDialog::OutputDialog(TQWidget* parent, TQString caption, TQString Messages
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch processes images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("An interface to show the output of the \"Batch Process "
                                                      "Images\" Kipi plugin.\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" "
diff --git a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
index 954fdf7..ab1d959 100644
--- a/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/recompressimagesdialog.cpp
@@ -60,7 +60,7 @@ RecompressImagesDialog::RecompressImagesDialog( KURL::List urlList, KIPI::Interf
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch recompress images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to batch recompress images\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
index 6fc88cf..720431b 100644
--- a/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/renameimagesdialog.cpp
@@ -55,7 +55,7 @@ RenameImagesDialog::RenameImagesDialog(const KURL::List& images,
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch-rename images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to batch-rename images"),
                                            "(c) 2003-2007, Gilles Caulier");
 
diff --git a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
index 3fe0c8d..3de652c 100644
--- a/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
+++ b/kipi-plugins/batchprocessimages/resizeimagesdialog.cpp
@@ -62,7 +62,7 @@ ResizeImagesDialog::ResizeImagesDialog( KURL::List urlList, KIPI::Interface* int
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Batch resize images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to batch-resize images\n"
                                                      "This plugin uses the \"convert\" program from \"ImageMagick\" package."),
                                            "(c) 2003-2007, Gilles Caulier");
diff --git a/kipi-plugins/calendar/calwizard.cpp b/kipi-plugins/calendar/calwizard.cpp
index 66a68c5..51d69d5 100644
--- a/kipi-plugins/calendar/calwizard.cpp
+++ b/kipi-plugins/calendar/calwizard.cpp
@@ -136,7 +136,7 @@ CalWizard::CalWizard( KIPI::Interface* interface, TQWidget *parent )
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Calendar"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to create a calendar"),
                                            "(c) 2003-2004, Renchi Raju, (c) 2006 Tom Albers");
 
diff --git a/kipi-plugins/cdarchiving/cdarchiving.cpp b/kipi-plugins/cdarchiving/cdarchiving.cpp
index 7c6f1dc..b7c9ffc 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 = TDEApplication::kApplication()->aboutData();
+    const TDEAboutData *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 a5b7bfc..88de1dd 100644
--- a/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
+++ b/kipi-plugins/cdarchiving/cdarchivingdialog.cpp
@@ -100,7 +100,7 @@ CDArchivingDialog::CDArchivingDialog( KIPI::Interface* interface, TQWidget *pare
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("CD/DVD Archiving"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("An Album CD/DVD Archiving Kipi plugin.\n"
                                                      "This plugin use K3b CD/DVD burning software available at\n"
                                                      "http://www.k3b.org"),
diff --git a/kipi-plugins/common/include/kpaboutdata.h b/kipi-plugins/common/include/kpaboutdata.h
index 1add86b..a390115 100644
--- a/kipi-plugins/common/include/kpaboutdata.h
+++ b/kipi-plugins/common/include/kpaboutdata.h
@@ -30,7 +30,7 @@
 namespace KIPIPlugins
 {
 
-  class LIBKIPI_EXPORT KPAboutData : public KAboutData
+  class LIBKIPI_EXPORT KPAboutData : public TDEAboutData
   {
     private:
       TQString KipiPluginsVersionString;
diff --git a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
index dff78a6..f8bccf9 100644
--- a/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
+++ b/kipi-plugins/common/libkipiplugins/kpaboutdata.cpp
@@ -37,7 +37,7 @@ namespace KIPIPlugins
                       const char *pluginVersion,
                       int licenseType,
                       const char *pluginDescription,
-                      const char *copyrightStatement) : KAboutData ("kipi-plugins", pluginName,
+                      const char *copyrightStatement) : TDEAboutData ("kipi-plugins", pluginName,
                                                                   pluginVersion,
                                                                   0, licenseType,
                                                                   copyrightStatement,
diff --git a/kipi-plugins/findimages/displaycompare.cpp b/kipi-plugins/findimages/displaycompare.cpp
index 7ff09ef..e24ec6f 100644
--- a/kipi-plugins/findimages/displaycompare.cpp
+++ b/kipi-plugins/findimages/displaycompare.cpp
@@ -134,7 +134,7 @@ DisplayCompare::DisplayCompare(TQWidget* parent, KIPI::Interface* interface,
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to find duplicate images\n"
                                                      "This plugin is based on ShowImg implementation algorithm"),
                                            "(c) 2003-2004, Gilles Caulier");
diff --git a/kipi-plugins/findimages/finddupplicatedialog.cpp b/kipi-plugins/findimages/finddupplicatedialog.cpp
index 53d35af..2f1d39f 100644
--- a/kipi-plugins/findimages/finddupplicatedialog.cpp
+++ b/kipi-plugins/findimages/finddupplicatedialog.cpp
@@ -88,7 +88,7 @@ FindDuplicateDialog::FindDuplicateDialog( KIPI::Interface* interface, TQWidget *
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Find Duplicate Images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to find duplicate images\n"
                                                      "This plugin is based on ShowImg implementation algorithm"),
                                            "(c) 2003-2004, Gilles Caulier");
diff --git a/kipi-plugins/flickrexport/flickrwindow.cpp b/kipi-plugins/flickrexport/flickrwindow.cpp
index 03adf6e..cc997d4 100644
--- a/kipi-plugins/flickrexport/flickrwindow.cpp
+++ b/kipi-plugins/flickrexport/flickrwindow.cpp
@@ -116,7 +116,7 @@ FlickrWindow::FlickrWindow(KIPI::Interface* interface, const TQString &tmpFolder
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flickr Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export image collection to "
                                                      "Flickr web service."),
                                            "(c) 2005-2008, Vardhman Jain\n"
diff --git a/kipi-plugins/galleryexport/gallerywindow.cpp b/kipi-plugins/galleryexport/gallerywindow.cpp
index 382412d..d5623e0 100644
--- a/kipi-plugins/galleryexport/gallerywindow.cpp
+++ b/kipi-plugins/galleryexport/gallerywindow.cpp
@@ -80,7 +80,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Gallery Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export image collection to remote Gallery server."),
                                            "(c) 2003-2005, Renchi Raju");
 
diff --git a/kipi-plugins/gpssync/gpseditdialog.cpp b/kipi-plugins/gpssync/gpseditdialog.cpp
index 7eb8522..a5e3628 100644
--- a/kipi-plugins/gpssync/gpseditdialog.cpp
+++ b/kipi-plugins/gpssync/gpseditdialog.cpp
@@ -143,7 +143,7 @@ GPSEditDialog::GPSEditDialog(TQWidget* parent, const GPSDataContainer& gpsData,
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("GPS Sync"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to synchronize pictures metadata with a GPS device"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/gpssync/gpssyncdialog.cpp b/kipi-plugins/gpssync/gpssyncdialog.cpp
index bf7e536..e251efb 100644
--- a/kipi-plugins/gpssync/gpssyncdialog.cpp
+++ b/kipi-plugins/gpssync/gpssyncdialog.cpp
@@ -247,7 +247,7 @@ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, TQWidget* parent)
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("GPS Sync"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A plugin to synchronize images' metadata with a GPS device"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/gpssync/kmlexportconfig.cpp b/kipi-plugins/gpssync/kmlexportconfig.cpp
index 26b839a..e5fb03b 100644
--- a/kipi-plugins/gpssync/kmlexportconfig.cpp
+++ b/kipi-plugins/gpssync/kmlexportconfig.cpp
@@ -280,7 +280,7 @@ KMLExportConfig::KMLExportConfig( TQWidget* parent, const char* name)
     // About data and help button.
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KML Export"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Kipi plugin for kml exporting"),
                                             "(c) 2006-2007, Stéphane Pontier");
 
diff --git a/kipi-plugins/htmlexport/wizard.cpp b/kipi-plugins/htmlexport/wizard.cpp
index 35d6cd6..28ee474 100644
--- a/kipi-plugins/htmlexport/wizard.cpp
+++ b/kipi-plugins/htmlexport/wizard.cpp
@@ -174,7 +174,7 @@ Wizard::Wizard(TQWidget* parent, KIPI::Interface* interface, GalleryInfo* info)
 	// About data
 	d->mAbout = new KIPIPlugins::KPAboutData(I18N_NOOP("HTML Export"),
 			0,
-			KAboutData::License_GPL,
+			TDEAboutData::License_GPL,
 			I18N_NOOP("A KIPI plugin to export image collections to HTML pages"),
 			"(c) 2006, Aurelien Gateau");
 
diff --git a/kipi-plugins/kameraklient/cameraselection.cpp b/kipi-plugins/kameraklient/cameraselection.cpp
index d10b3f1..c9b1005 100644
--- a/kipi-plugins/kameraklient/cameraselection.cpp
+++ b/kipi-plugins/kameraklient/cameraselection.cpp
@@ -59,7 +59,7 @@ CameraSelection::CameraSelection(TQWidget* parent)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Digital camera interface Kipi plugin"),
                                            "(c) 2003-2004, Renchi Raju\n"
                                            "(c) 2004, Tudor Calin");
diff --git a/kipi-plugins/kameraklient/cameraui.cpp b/kipi-plugins/kameraklient/cameraui.cpp
index 0620a67..d14a2db 100644
--- a/kipi-plugins/kameraklient/cameraui.cpp
+++ b/kipi-plugins/kameraklient/cameraui.cpp
@@ -146,7 +146,7 @@ CameraUI::CameraUI() : TQWidget()
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Digital camera interface Kipi plugin"),
                                            "(c) 2003-2004, Renchi Raju\n"
                                            "(c) 2004, Tudor Calin");
diff --git a/kipi-plugins/kameraklient/setupcamera.cpp b/kipi-plugins/kameraklient/setupcamera.cpp
index 0340737..54c6b4e 100644
--- a/kipi-plugins/kameraklient/setupcamera.cpp
+++ b/kipi-plugins/kameraklient/setupcamera.cpp
@@ -64,7 +64,7 @@ SetupCamera::SetupCamera(TQWidget* parent, const char* name)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("KameraKlient"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("An Digital camera interface Kipi plugin"),
                                            "(c) 2003-2004, Renchi Raju\n"
                                            "(c) 2004, Tudor Calin");
diff --git a/kipi-plugins/metadataedit/commenteditdialog.cpp b/kipi-plugins/metadataedit/commenteditdialog.cpp
index 4db2e30..7ce0789 100644
--- a/kipi-plugins/metadataedit/commenteditdialog.cpp
+++ b/kipi-plugins/metadataedit/commenteditdialog.cpp
@@ -85,7 +85,7 @@ CommentEditDialog::CommentEditDialog(TQWidget* parent)
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to edit images' metadata"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/metadataedit/commentremovedialog.cpp b/kipi-plugins/metadataedit/commentremovedialog.cpp
index 8bd78e6..714b895 100644
--- a/kipi-plugins/metadataedit/commentremovedialog.cpp
+++ b/kipi-plugins/metadataedit/commentremovedialog.cpp
@@ -83,7 +83,7 @@ CommentRemoveDialog::CommentRemoveDialog(TQWidget* parent)
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to edit pictures metadata"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/metadataedit/exifeditdialog.cpp b/kipi-plugins/metadataedit/exifeditdialog.cpp
index 9867555..f116e27 100644
--- a/kipi-plugins/metadataedit/exifeditdialog.cpp
+++ b/kipi-plugins/metadataedit/exifeditdialog.cpp
@@ -164,7 +164,7 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to edit pictures metadata"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/metadataedit/iptceditdialog.cpp b/kipi-plugins/metadataedit/iptceditdialog.cpp
index 8b4ae24..5bf7c28 100644
--- a/kipi-plugins/metadataedit/iptceditdialog.cpp
+++ b/kipi-plugins/metadataedit/iptceditdialog.cpp
@@ -180,7 +180,7 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Edit Metadata"),
                                             0,
-                                            KAboutData::License_GPL,
+                                            TDEAboutData::License_GPL,
                                             I18N_NOOP("A Plugin to edit image metadata"),
                                             "(c) 2006-2008, Gilles Caulier");
 
diff --git a/kipi-plugins/mpegencoder/kimg2mpg.cpp b/kipi-plugins/mpegencoder/kimg2mpg.cpp
index 8b4e55a..c6934d9 100644
--- a/kipi-plugins/mpegencoder/kimg2mpg.cpp
+++ b/kipi-plugins/mpegencoder/kimg2mpg.cpp
@@ -245,7 +245,7 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c
 
   m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("MPEG Slideshow"),
                                       0,
-                                      KAboutData::License_GPL,
+                                      TDEAboutData::License_GPL,
                                       I18N_NOOP("A Kipi plugin for encoding images to an MPEG file."),
                                                 "(c) 2003-2004, Gilles Caulier");
 
diff --git a/kipi-plugins/picasawebexport/picasawebwindow.cpp b/kipi-plugins/picasawebexport/picasawebwindow.cpp
index fc40467..ea9819b 100644
--- a/kipi-plugins/picasawebexport/picasawebwindow.cpp
+++ b/kipi-plugins/picasawebexport/picasawebwindow.cpp
@@ -116,7 +116,7 @@ PicasawebWindow::PicasawebWindow(KIPI::Interface* interface, const TQString &tmp
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Picasaweb Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export image collection to "
                                                      "Picasaweb web service."),
                                            "(c) 2007-2008, Vardhman Jain\n"
diff --git a/kipi-plugins/printwizard/frmprintwizard.cpp b/kipi-plugins/printwizard/frmprintwizard.cpp
index 0e923d1..5328ca8 100644
--- a/kipi-plugins/printwizard/frmprintwizard.cpp
+++ b/kipi-plugins/printwizard/frmprintwizard.cpp
@@ -91,7 +91,7 @@ FrmPrintWizard::FrmPrintWizard(TQWidget *parent, const char *name )
 
   m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Print Wizard"),
                                          0,
-                                         KAboutData::License_GPL,
+                                         TDEAboutData::License_GPL,
                                          I18N_NOOP("A KIPI plugin to print images"),
                                          "(c) 2003-2004, Todd Shoemaker\n(c) 2007-2008, Angelo Naselli");
 
diff --git a/kipi-plugins/rawconverter/batchdialog.cpp b/kipi-plugins/rawconverter/batchdialog.cpp
index d3350d1..82ff60c 100644
--- a/kipi-plugins/rawconverter/batchdialog.cpp
+++ b/kipi-plugins/rawconverter/batchdialog.cpp
@@ -135,7 +135,7 @@ BatchDialog::BatchDialog(TQWidget* /*parent*/)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("RAW Image Converter"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to batch convert Raw images"),
                                            "(c) 2003-2005, Renchi Raju\n"
                                            "(c) 2006-2008, Gilles Caulier");
diff --git a/kipi-plugins/rawconverter/singledialog.cpp b/kipi-plugins/rawconverter/singledialog.cpp
index 3b21f36..fdea7bd 100644
--- a/kipi-plugins/rawconverter/singledialog.cpp
+++ b/kipi-plugins/rawconverter/singledialog.cpp
@@ -115,7 +115,7 @@ SingleDialog::SingleDialog(const TQString& file, TQWidget */*parent*/)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("RAW Image Converter"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to convert a Raw image"),
                                            "(c) 2003-2005, Renchi Raju\n"
                                            "(c) 2006-2008, Gilles Caulier");
diff --git a/kipi-plugins/sendimages/sendimagesdialog.cpp b/kipi-plugins/sendimages/sendimagesdialog.cpp
index e46dfa1..4d3c3c3 100644
--- a/kipi-plugins/sendimages/sendimagesdialog.cpp
+++ b/kipi-plugins/sendimages/sendimagesdialog.cpp
@@ -157,7 +157,7 @@ SendImagesDialog::SendImagesDialog(TQWidget *parent, KIPI::Interface* interface,
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Send Images"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for emailing images"),
                                            "(c) 2003-2007, Gilles Caulier");
 
diff --git a/kipi-plugins/simpleviewerexport/firstrundlg.cpp b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
index e11a310..8f6b016 100644
--- a/kipi-plugins/simpleviewerexport/firstrundlg.cpp
+++ b/kipi-plugins/simpleviewerexport/firstrundlg.cpp
@@ -64,7 +64,7 @@ FirstRunDlg::FirstRunDlg(TQWidget *parent)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flash Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export images to Flash using Simple Viewer component"),
                                            "(c) 2005-2006, Joern Ahrens\n"
                                            "(c) 2008, Gilles Caulier");
diff --git a/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp b/kipi-plugins/simpleviewerexport/simpleviewerexport.cpp
index 2ddcec6..9f148d2 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 = TDEApplication::kApplication()->aboutData();
+    const TDEAboutData *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 1717bf1..95f4ce9 100644
--- a/kipi-plugins/simpleviewerexport/svedialog.cpp
+++ b/kipi-plugins/simpleviewerexport/svedialog.cpp
@@ -80,7 +80,7 @@ SVEDialog::SVEDialog(KIPI::Interface* interface, TQWidget *parent)
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Flash Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export images to Flash using Simple Viewer component"),
                                            "(c) 2005-2006, Joern Ahrens\n"
                                            "(c) 2008, Gilles Caulier");
diff --git a/kipi-plugins/slideshow/slideshowconfig.cpp b/kipi-plugins/slideshow/slideshowconfig.cpp
index aae86a3..80ee37f 100644
--- a/kipi-plugins/slideshow/slideshowconfig.cpp
+++ b/kipi-plugins/slideshow/slideshowconfig.cpp
@@ -83,7 +83,7 @@ SlideShowConfig::SlideShowConfig(bool allowSelectedOnly, KIPI::Interface * inter
 
     KIPIPlugins::KPAboutData * about = new KIPIPlugins::KPAboutData(I18N_NOOP("Slide Show"),
                                         0,
-                                        KAboutData::License_GPL,
+                                        TDEAboutData::License_GPL,
                                         I18N_NOOP("A Kipi plugin for image slideshow"),
                                         "(c) 2003-2004, Renchi Raju\n(c) 2007, Valerio Fuoglio");
 
diff --git a/kipi-plugins/sync/gallerywindow.cpp b/kipi-plugins/sync/gallerywindow.cpp
index 960bdaa..b7dfbe6 100644
--- a/kipi-plugins/sync/gallerywindow.cpp
+++ b/kipi-plugins/sync/gallerywindow.cpp
@@ -80,7 +80,7 @@ GalleryWindow::GalleryWindow(KIPI::Interface* interface, TQWidget *parent, Galle
 
     m_about = new KIPIPlugins::KPAboutData(I18N_NOOP("Gallery Export"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin to export image collection to remote Gallery server."),
                                            "(c) 2003-2005, Renchi Raju");
 
diff --git a/kipi-plugins/timeadjust/timeadjustdialog.cpp b/kipi-plugins/timeadjust/timeadjustdialog.cpp
index 506701b..0c580f3 100644
--- a/kipi-plugins/timeadjust/timeadjustdialog.cpp
+++ b/kipi-plugins/timeadjust/timeadjustdialog.cpp
@@ -159,7 +159,7 @@ TimeAdjustDialog::TimeAdjustDialog(KIPI::Interface* interface, TQWidget* parent)
 
     d->about = new KIPIPlugins::KPAboutData(I18N_NOOP("Time Adjust"),
                                            0,
-                                           KAboutData::License_GPL,
+                                           TDEAboutData::License_GPL,
                                            I18N_NOOP("A Kipi plugin for adjusting time stamp of picture files"),
                                            "(c) 2003-2005, Jesper K. Pedersen\n"
                                            "(c) 2006-2008, Gilles Caulier");