From 1d061b286a8b183b39be60fe531f2b1c2915f03a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:15:55 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 4 ++-- kcontrol/kfontinst/kio/KioFonts.cpp | 2 +- kcontrol/kfontinst/viewpart/FontViewPart.cpp | 2 +- kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp | 10 +++++----- kcontrol/kfontinst/viewpart/FontViewPartFactory.h | 10 +++++----- kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kcontrol/kfontinst') diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c225187fd..5b2ac8a1a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -84,10 +84,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); - KAboutData* about = new KAboutData("kcmfontinst", + TDEAboutData* about = new TDEAboutData("kcmfontinst", I18N_NOOP("TDE Font Installer"), 0, 0, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("GUI front end to the fonts:/ ioslave.\n" "(c) Craig Drummond, 2000 - 2004")); about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org"); diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index a27bebf70..7421d1681 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -110,7 +110,7 @@ int kdemain(int argc, char **argv) KLocale::setMainCatalogue(KFI_CATALOGUE); - KInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL); + TDEInstance instance("kio_" KFI_KIO_FONTS_PROTOCOL); KFI::CKioFonts slave(argv[2], argv[3]); slave.dispatchLoop(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 3c8a47086..7d9d9d3f4 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -85,7 +85,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsToolsFrame->setFrameShape(TQFrame::NoFrame); previewFrame->setFrameShadow(kcm ? TQFrame::Sunken : TQFrame::Raised); previewFrame->setFrameShape(TQFrame::Panel); - setInstance(new KInstance("kfontview")); + setInstance(new TDEInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp index dd695a033..32f36f9e9 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.cpp @@ -45,8 +45,8 @@ extern "C" namespace KFI { -KInstance * CFontViewPartFactory::theirInstance=NULL; -KAboutData * CFontViewPartFactory::theirAbout=NULL; +TDEInstance * CFontViewPartFactory::theirInstance=NULL; +TDEAboutData * CFontViewPartFactory::theirAbout=NULL; CFontViewPartFactory::CFontViewPartFactory() { @@ -71,12 +71,12 @@ TQObject * CFontViewPartFactory::createObject(TQObject *parent, const char *name return new CFontViewPart((TQWidget*) parent, name); } -KInstance* CFontViewPartFactory::instance() +TDEInstance* CFontViewPartFactory::instance() { if(!theirInstance) { - theirAbout = new KAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); - theirInstance = new KInstance(theirAbout); + theirAbout = new TDEAboutData("fontviewpart", I18N_NOOP("CFontViewPart"), "0.1"); + theirInstance = new TDEInstance(theirAbout); } return theirInstance; } diff --git a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h index 44b213632..7ac96e9c8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPartFactory.h +++ b/kcontrol/kfontinst/viewpart/FontViewPartFactory.h @@ -31,8 +31,8 @@ #include -class KInstance; -class KAboutData; +class TDEInstance; +class TDEAboutData; namespace KFI { @@ -47,12 +47,12 @@ class CFontViewPartFactory : public KLibFactory virtual ~CFontViewPartFactory(); virtual TQObject *createObject(TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance * instance(); + static TDEInstance * instance(); private: - static KInstance *theirInstance; - static KAboutData *theirAbout; + static TDEInstance *theirInstance; + static TDEAboutData *theirAbout; }; } diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index acfd96178..bbac01bc8 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -112,8 +112,8 @@ static KCmdLineOptions options[] = KCmdLineLastOption }; -static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), - KAboutData::License_GPL, +static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"), + TDEAboutData::License_GPL, I18N_NOOP("(c) Craig Drummond, 2004")); int main(int argc, char **argv) -- cgit v1.2.3