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 /kontact/plugins/summary | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/summary')
-rw-r--r-- | kontact/plugins/summary/kcmkontactsummary.cpp | 2 | ||||
-rw-r--r-- | kontact/plugins/summary/summaryview_part.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp index 360da023d..f3eae0121 100644 --- a/kontact/plugins/summary/kcmkontactsummary.cpp +++ b/kontact/plugins/summary/kcmkontactsummary.cpp @@ -55,7 +55,7 @@ class PluginItem : public TQCheckListItem : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ), mInfo( info ) { - TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); + TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small ); setPixmap( 0, pm ); } diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp index da0c160dd..ba85836b2 100644 --- a/kontact/plugins/summary/summaryview_part.cpp +++ b/kontact/plugins/summary/summaryview_part.cpp @@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette() void SummaryViewPart::setDate( const TQDate& newDate ) { TQString date( "<b>%1</b>" ); - date = date.arg( KGlobal::locale()->formatDate( newDate ) ); + date = date.arg( TDEGlobal::locale()->formatDate( newDate ) ); mDateLabel->setText( date ); } |