diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /akregator/src/akregator_part.cpp | |
parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'akregator/src/akregator_part.cpp')
-rw-r--r-- | akregator/src/akregator_part.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp index ffa7c9052..9d9c574eb 100644 --- a/akregator/src/akregator_part.cpp +++ b/akregator/src/akregator_part.cpp @@ -766,14 +766,14 @@ void Part::addFeed() m_view->slotFeedAdd(); } -KAboutData *Part::createAboutData() +TDEAboutData *Part::createAboutData() { return new Akregator::AboutData; } void Part::showKNotifyOptions() { - KAboutData* about = new Akregator::AboutData; + TDEAboutData* about = new Akregator::AboutData; KNotifyDialog::configure(m_view, "akregator_knotify_config", about); delete about; } @@ -934,7 +934,7 @@ bool Part::tryToLock(const TQString& backendName) appName = "akregator"; TQString programName; - const KAboutData *about = kapp->aboutData(); + const TDEAboutData *about = kapp->aboutData(); if ( about ) programName = about->programName(); if ( programName.isEmpty() ) |