diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
| commit | 8ba97103df12b002f6b2cf1d24a4b389a6379f61 (patch) | |
| tree | 583bb7f0c8a54d0d497abec2f95a692cda8c7b30 /kfilereplace | |
| parent | 0111fdc2a40580d418d365006c52845c320558b0 (diff) | |
| download | tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.tar.gz tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kfilereplace')
| -rw-r--r-- | kfilereplace/kfilereplacepart.cpp | 6 | ||||
| -rw-r--r-- | kfilereplace/kfilereplacepart.h | 4 | ||||
| -rw-r--r-- | kfilereplace/main.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index 15ea6ef8..d52f0061 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -507,13 +507,13 @@ void KFileReplacePart::resetActions() } //PUBLIC METHODS -KAboutData* KFileReplacePart::createAboutData() +TDEAboutData* KFileReplacePart::createAboutData() { - KAboutData * aboutData = new KAboutData("kfilereplacepart", + TDEAboutData * aboutData = new TDEAboutData("kfilereplacepart", I18N_NOOP("KFileReplacePart"), KFR_VERSION, I18N_NOOP( "Batch search and replace tool."), - KAboutData::License_GPL_V2, + TDEAboutData::License_GPL_V2, "(C) 1999-2002 Fran�is Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org"); aboutData->addAuthor("Fran�is Dupoux", I18N_NOOP("Original author of the KFileReplace tool"), diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index 0b3b61ae..b2206b59 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -20,7 +20,7 @@ // KDE #include <kparts/part.h> class KAboutApplication; -class KAboutData; +class TDEAboutData; class KConfig; // local @@ -86,7 +86,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart //METHODS public: - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); KConfig *config(){ return m_config; } protected: diff --git a/kfilereplace/main.cpp b/kfilereplace/main.cpp index 2f4ff1a3..b3adfffe 100644 --- a/kfilereplace/main.cpp +++ b/kfilereplace/main.cpp @@ -34,8 +34,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description, - KAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."), + TDEAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description, + TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org"); about.addAuthor("Andras Mantia", I18N_NOOP("Shell author, KPart creator, co-maintainer"), "amantia@kde.org"); |