summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/calendardiffalgo.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-27 21:38:57 +0000
commit029d6084e699568256c53a8270cb36ad4f66b935 (patch)
tree4f95db8e3813306493e454f753180f6933ba2538 /kitchensync/src/calendardiffalgo.cpp
parent018997dddf59bef4b6686d477207137aa39089de (diff)
downloadtdepim-029d6084e699568256c53a8270cb36ad4f66b935.tar.gz
tdepim-029d6084e699568256c53a8270cb36ad4f66b935.zip
Fix a number of accidental tqStatus string conversions
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kitchensync/src/calendardiffalgo.cpp')
-rw-r--r--kitchensync/src/calendardiffalgo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index 3c9ef292d..f3ee5dda8 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
conflictField( i18n( "Summary" ), left->summary(), right->summary() );
if ( left->status() != right->status() )
- conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
+ conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
if ( left->secrecy() != right->secrecy() )
conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );