Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 08276021dd
commit 1e229505ab

@ -15282,7 +15282,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.

@ -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.

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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\" "

@ -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\" "

@ -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");

@ -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");

@ -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");

@ -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");

@ -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();

@ -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"),

@ -30,7 +30,7 @@
namespace KIPIPlugins
{
class LIBKIPI_EXPORT KPAboutData : public KAboutData
class LIBKIPI_EXPORT KPAboutData : public TDEAboutData
{
private:
TQString KipiPluginsVersionString;

@ -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,

@ -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");

@ -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");

@ -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"

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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"

@ -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");

@ -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");

@ -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");

@ -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");

@ -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");

@ -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();

@ -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");

@ -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");

@ -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");

@ -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");

Loading…
Cancel
Save