diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /kword/mailmerge/kabc | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kword/mailmerge/kabc')
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABC.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp index 74fc211c..96512f8b 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp @@ -198,7 +198,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if ( name == "Nick name" ) return addr.nickName(); if ( name == "Birthday" ) - return KGlobal::locale()->formatDate( addr.birthday().date() ); + return TDEGlobal::locale()->formatDate( addr.birthday().date() ); if ( name == "Home address: Street" ) { @@ -375,7 +375,7 @@ TQString KWMailMergeKABC::getValue( const TQString &name, int record ) const if ( name == "productId" ) return addr.productId(); if ( name == "Revision" ) - return KGlobal::locale()->formatDate( addr.revision().date() ); + return TDEGlobal::locale()->formatDate( addr.revision().date() ); if ( name == "sortString" ) return addr.sortString(); if ( name == "URL" ) |