diff options
| author | Timothy Pearson <[email protected]> | 2013-02-07 11:11:11 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-07 11:11:11 -0600 |
| commit | 87620f47926a6451accfd82c57558a99d1c4d21e (patch) | |
| tree | a71fd6671ffdfc7e3416ed49672741e5c52d0dd7 | |
| parent | 02fa17d6dd9d871f40038cd9ac615e9e1154724b (diff) | |
| download | tdepim-87620f47926a6451accfd82c57558a99d1c4d21e.tar.gz tdepim-87620f47926a6451accfd82c57558a99d1c4d21e.zip | |
Rename KAbout to avoid conflicts with KDE4
| -rw-r--r-- | kmailcvt/kmailcvt.cpp | 2 | ||||
| -rw-r--r-- | kontact/src/aboutdialog.cpp | 12 | ||||
| -rw-r--r-- | korn/boxcontaineritem.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp index 4599fe250..6f886a0c8 100644 --- a/kmailcvt/kmailcvt.cpp +++ b/kmailcvt/kmailcvt.cpp @@ -93,7 +93,7 @@ void KMailCVT::reject() { void KMailCVT::help() { - KAboutApplication a( this ); + TDEAboutApplication a( this ); a.exec(); } diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp index faa2a2447..f655ca691 100644 --- a/kontact/src/aboutdialog.cpp +++ b/kontact/src/aboutdialog.cpp @@ -106,11 +106,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, text = ""; - const TQValueList<KAboutPerson> authors = about->authors(); + const TQValueList<TDEAboutPerson> authors = about->authors(); if ( !authors.isEmpty() ) { text += i18n( "<p><b>Authors:</b></p>" ); - TQValueList<KAboutPerson>::ConstIterator it; + TQValueList<TDEAboutPerson>::ConstIterator it; for ( it = authors.begin(); it != authors.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); if ( !(*it).task().isEmpty() ) @@ -118,11 +118,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, } } - const TQValueList<KAboutPerson> credits = about->credits(); + const TQValueList<TDEAboutPerson> credits = about->credits(); if ( !credits.isEmpty() ) { text += i18n( "<p><b>Thanks to:</b></p>" ); - TQValueList<KAboutPerson>::ConstIterator it; + TQValueList<TDEAboutPerson>::ConstIterator it; for ( it = credits.begin(); it != credits.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); if ( !(*it).task().isEmpty() ) @@ -130,11 +130,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon, } } - const TQValueList<KAboutTranslator> translators = about->translators(); + const TQValueList<TDEAboutTranslator> translators = about->translators(); if ( !translators.isEmpty() ) { text += i18n("<p><b>Translators:</b></p>"); - TQValueList<KAboutTranslator>::ConstIterator it; + TQValueList<TDEAboutTranslator>::ConstIterator it; for ( it = translators.begin(); it != translators.end(); ++it ) { text += formatPerson( (*it).name(), (*it).emailAddress() ); } diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index fa6b266e4..becf02c3f 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -411,7 +411,7 @@ void BoxContainerItem::reportBug() void BoxContainerItem::about() { - KAboutApplication about( 0, "KOrn About", true ); + TDEAboutApplication about( 0, "KOrn About", true ); about.exec(); //modal: it doesn't recheck anymore } |