[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi-sugarcrm] /: Tasks setter doesn't need to be a union
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2012-01-25 19:34:38
Message-ID: 20120125193438.0DCA1A60D3 () git ! kde ! org
[Download RAW message or body]

Git commit 376e50b52031ccc9eb369b957a01cd00c60c53bb by Kevin Krammer.
Committed on 25/01/2012 at 17:33.
Pushed by krake into branch 'master'.

Tasks setter doesn't need to be a union

M  +1    -2    taskaccessorpair.cpp
M  +1    -3    taskaccessorpair.h
M  +1    -1    taskshandler.cpp

http://commits.kde.org/akonadi-sugarcrm/376e50b52031ccc9eb369b957a01cd00c60c53bb

diff --git a/taskaccessorpair.cpp b/taskaccessorpair.cpp
index 8cd8742..5e4a84c 100644
--- a/taskaccessorpair.cpp
+++ b/taskaccessorpair.cpp
@@ -19,7 +19,6 @@
 #include "taskaccessorpair.h"
 
 TaskAccessorPair::TaskAccessorPair( taskValueGetter get, taskValueSetter set, const QString &name )
-    : getter( get ), diffName( name )
+    : getter( get ), setter( set ), diffName( name )
 {
-    setter.vSetter = set;
 }
diff --git a/taskaccessorpair.h b/taskaccessorpair.h
index 6250078..28731f7 100644
--- a/taskaccessorpair.h
+++ b/taskaccessorpair.h
@@ -32,8 +32,6 @@ public:
 
 public:
     taskValueGetter getter;
-    union tsetter {
-        taskValueSetter vSetter;
-    } setter;
+    taskValueSetter setter;
     const QString diffName;
 };
diff --git a/taskshandler.cpp b/taskshandler.cpp
index cc62f8f..e80a859 100644
--- a/taskshandler.cpp
+++ b/taskshandler.cpp
@@ -403,7 +403,7 @@ Akonadi::Item TasksHandler::itemFromEntry( const TNS__Entry_value &entry, const
             continue;
         }
 
-        (*accessIt)->setter.vSetter( namedValue.value(), *todo );
+        (*accessIt)->setter( namedValue.value(), *todo );
     }    
     
     item.setPayload<KCalCore::Todo::Ptr>( todo );
[prev in list] [next in list] [prev in thread] [next in thread]