diff --git a/src/columns/ColDepends.cpp b/src/columns/ColDepends.cpp index f051f1d0e..6ad1372ac 100644 --- a/src/columns/ColDepends.cpp +++ b/src/columns/ColDepends.cpp @@ -39,7 +39,6 @@ extern Context context; ColumnDepends::ColumnDepends () { _name = "depends"; - _type = "string"; _style = "list"; _label = STRING_COLUMN_LABEL_DEP; _styles = {"list", diff --git a/src/columns/ColDescription.cpp b/src/columns/ColDescription.cpp index 4d4304e47..782846f4b 100644 --- a/src/columns/ColDescription.cpp +++ b/src/columns/ColDescription.cpp @@ -40,7 +40,6 @@ extern Context context; ColumnDescription::ColumnDescription () { _name = "description"; - _type = "string"; _style = "combined"; _label = STRING_COLUMN_LABEL_DESC; diff --git a/src/columns/ColMask.cpp b/src/columns/ColMask.cpp index 53b0dfa77..d44dec485 100644 --- a/src/columns/ColMask.cpp +++ b/src/columns/ColMask.cpp @@ -37,7 +37,6 @@ extern Context context; ColumnMask::ColumnMask () { _name = "mask"; - _type = "string"; _style = "default"; _label = STRING_COLUMN_LABEL_MASK; _modifiable = false; diff --git a/src/columns/ColProject.cpp b/src/columns/ColProject.cpp index 12574fdc5..5b8d72231 100644 --- a/src/columns/ColProject.cpp +++ b/src/columns/ColProject.cpp @@ -38,7 +38,6 @@ extern Context context; ColumnProject::ColumnProject () { _name = "project"; - _type = "string"; _style = "full"; _label = STRING_COLUMN_LABEL_PROJECT; _styles = {"full", "parent", "indented"}; diff --git a/src/columns/ColRecur.cpp b/src/columns/ColRecur.cpp index b675d835a..777bfcc3f 100644 --- a/src/columns/ColRecur.cpp +++ b/src/columns/ColRecur.cpp @@ -38,11 +38,6 @@ extern Context context; ColumnRecur::ColumnRecur () { _name = "recur"; - - // This is 'string', and not 'duration' to force the value to be stored as a - // raw duration, so that it can be reevaluated every time. - _type = "string"; - _style = "duration"; _label = STRING_COLUMN_LABEL_RECUR; _styles = {"duration", "indicator"}; diff --git a/src/columns/ColRecur.h b/src/columns/ColRecur.h index c6c12c687..5d0b6b5ef 100644 --- a/src/columns/ColRecur.h +++ b/src/columns/ColRecur.h @@ -27,9 +27,11 @@ #ifndef INCLUDED_COLRECUR #define INCLUDED_COLRECUR -#include +#include -class ColumnRecur : public ColumnTypeDuration +// This is 'string', and not 'duration' to force the value to be stored as a +// raw duration, so that it can be reevaluated every time. +class ColumnRecur : public ColumnTypeString { public: ColumnRecur (); diff --git a/src/columns/ColStatus.cpp b/src/columns/ColStatus.cpp index bceb866f3..d36ef95aa 100644 --- a/src/columns/ColStatus.cpp +++ b/src/columns/ColStatus.cpp @@ -37,7 +37,6 @@ extern Context context; ColumnStatus::ColumnStatus () { _name = "status"; - _type = "string"; _style = "long"; _label = STRING_COLUMN_LABEL_STATUS; _styles = {"long", "short"}; diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp index fe3e1224f..89028b42f 100644 --- a/src/columns/ColTags.cpp +++ b/src/columns/ColTags.cpp @@ -38,7 +38,6 @@ extern Context context; ColumnTags::ColumnTags () { _name = "tags"; - _type = "string"; _style = "list"; _label = STRING_COLUMN_LABEL_TAGS; _styles = {"list", "indicator", "count"}; diff --git a/src/columns/ColTypeString.cpp b/src/columns/ColTypeString.cpp index 4f2b120c4..9c580e62a 100644 --- a/src/columns/ColTypeString.cpp +++ b/src/columns/ColTypeString.cpp @@ -30,6 +30,7 @@ //////////////////////////////////////////////////////////////////////////////// ColumnTypeString::ColumnTypeString () { + _type = "string"; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColUUID.cpp b/src/columns/ColUUID.cpp index 9d4aab992..ec71b8885 100644 --- a/src/columns/ColUUID.cpp +++ b/src/columns/ColUUID.cpp @@ -37,7 +37,6 @@ extern Context context; ColumnUUID::ColumnUUID () { _name = "uuid"; - _type = "string"; _style = "long"; _label = STRING_COLUMN_LABEL_UUID; _modifiable = false;