diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:59:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:59:28 -0600 |
| commit | 94fbae4a48ae822266a1c37474e54a7ad65b9573 (patch) | |
| tree | f6938772a00499074d752e110e1280e04a4a780d /src/tdesvn_part.cpp | |
| parent | 0ff5f24a742779276d620552ac1efa3979ea63dc (diff) | |
| download | tdesvn-94fbae4a48ae822266a1c37474e54a7ad65b9573.tar.gz tdesvn-94fbae4a48ae822266a1c37474e54a7ad65b9573.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/tdesvn_part.cpp')
| -rw-r--r-- | src/tdesvn_part.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index 18b05d9..2a66471 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -154,13 +154,13 @@ void tdesvnPart::slotDispPopup(const TQString&name,TQWidget**target) *target = hostContainer(name); } -KAboutData* tdesvnPart::createAboutData() +TDEAboutData* tdesvnPart::createAboutData() { m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).arg(svn::Version::linked_version()); m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).arg(svn::Version::running_version()); - KAboutData*about = new KAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description, - KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, + TDEAboutData*about = new TDEAboutData("tdesvnpart", I18N_NOOP("tdesvn Part"), version, description, + TDEAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0, 0, "[email protected]"); about->addAuthor( "Rajko Albrecht", 0, "[email protected]" ); about->setOtherText(m_Extratext.ascii()); @@ -396,8 +396,8 @@ void tdesvnPart::slotSettingsChanged() /* * we may not use generic factory 'cause we make some specials */ -KInstance* cFactory::s_instance = 0L; -KAboutData* cFactory::s_about = 0L; +TDEInstance* cFactory::s_instance = 0L; +TDEAboutData* cFactory::s_about = 0L; commandline_part* cFactory::s_cline = 0L; KParts::Part* cFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, @@ -430,11 +430,11 @@ cFactory::~cFactory() s_cline = 0L; } -KInstance* cFactory::instance() +TDEInstance* cFactory::instance() { if( !s_instance ) { s_about = tdesvnPart::createAboutData(); - s_instance = new KInstance(s_about); + s_instance = new TDEInstance(s_about); } return s_instance; } |