diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /plugins | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_calendar.cpp | 2 | ||||
| -rw-r--r-- | plugins/kmail/bodypartformatter/text_vcard.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index 2acfdc2d2..843c01f1a 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -971,6 +971,6 @@ extern "C" KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_calendar_create_bodypart_formatter_plugin() { - KGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); + TDEGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); return new Plugin(); } diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index ec3a3bfe5..bc1c4e585 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -270,7 +270,7 @@ namespace { extern "C" KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_vcard_create_bodypart_formatter_plugin() { - KGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); + TDEGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); return new Plugin(); } |