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 /kontact/src/aboutdialog.cpp | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kontact/src/aboutdialog.cpp')
| -rw-r--r-- | kontact/src/aboutdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index 8f6be2b0..ae0d0965 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -63,7 +63,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin ) } void AboutDialog::addAboutData( const TQString &title, const TQString &icon, - const KAboutData *about ) + const TDEAboutData *about ) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon, KIcon::Desktop, 48 ); @@ -155,7 +155,7 @@ TQString AboutDialog::formatPerson( const TQString &name, const TQString &email return text; } -void AboutDialog::addLicenseText( const KAboutData *about ) +void AboutDialog::addLicenseText( const TDEAboutData *about ) { if ( !about || about->license().isEmpty() ) return; |