Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent f5998f84fd
commit 903d01fcf2

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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) {

@ -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) {

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

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

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

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

@ -59,7 +59,7 @@ public:
TQFrame* bannerFrame=0);
~CtrlPanelDlg();
void setAboutData(KAboutData *about);
void setAboutData(TDEAboutData *about);
public:

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

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

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

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

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

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

Loading…
Cancel
Save