← Back to branch summary

~ubuntu-branches/ubuntu/trusty/grantlee/trusty

« back to all changes in this revision

Viewing changes to templates/lib/util.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-07 09:19:01 UTC
  • Revision ID: james.westby@ubuntu.com-20101207091901-hsfsvnkxdshv4k8g
Tags: 0.1.7-0ubuntu3
Revert previous upload and try again with the correct patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/lib/util.cpp
115
115
             << QVariant::Bool
116
116
             << QVariant::Int
117
117
             << QVariant::Double
118
 
             << QVariant::Date
119
 
             << QVariant::Time
120
118
             << QVariant::DateTime;
121
119
  return primitives;
122
120
}
144
142
  } else if ( rhs.userType() == qMetaTypeId<Grantlee::SafeString>() && lhs.userType() == QVariant::String ) {
145
143
    equal = ( rhs.value<Grantlee::SafeString>() == lhs.toString() );
146
144
  } else if ( rhs.userType() == qMetaTypeId<MetaEnumVariable>() ) {
147
 
    if ( lhs.userType() == qMetaTypeId<MetaEnumVariable>() ) {
 
145
    if (lhs.userType() == qMetaTypeId<MetaEnumVariable>() ) {
148
146
      equal = ( rhs.value<MetaEnumVariable>() == lhs.value<MetaEnumVariable>() );
149
147
    } else if ( lhs.type() == QVariant::Int ) {
150
148
      equal = ( rhs.value<MetaEnumVariable>() == lhs.toInt() );