Merge pull request #403 from LorenDB/fixEmojiCategories

Get category switching working

scripts/emoji_codegen.py

@@ -11,19 +11,6 @@ class Emoji(object):
         self.code = repr(code.encode('utf-8'))[1:].strip("'")
         self.shortname = shortname
 
-def generate_code(emojis, category):
-    tmpl = Template('''
-const std::vector<Emoji> emoji::Provider::{{ category }} = {
-    // {{ category.capitalize() }}
-    {%- for e in emoji %}
-        Emoji{QString::fromUtf8("{{ e.code }}"), "{{ e.shortname }}", emoji::EmojiCategory::{{ category.capitalize() }}},
-    {%- endfor %}
-};
-    ''')
-
-    d = dict(category=category, emoji=emojis)
-    print(tmpl.render(d))
-
 def generate_qml_list(**kwargs):
     tmpl = Template('''
 const QVector<Emoji> emoji::Provider::emoji = {
@@ -93,12 +80,4 @@ if __name__ == '__main__':
 
     # Use xclip to pipe the output to clipboard.
     # e.g ./codegen.py emoji.json | xclip -sel clip
-    generate_code(people, 'people')
-    generate_code(nature, 'nature')
-    generate_code(food, 'food')
-    generate_code(activity, 'activity')
-    generate_code(travel, 'travel')
-    generate_code(objects, 'objects')
-    generate_code(symbols, 'symbols')
-    generate_code(flags, 'flags')
     generate_qml_list(people=people, nature=nature, food=food, activity=activity, travel=travel, objects=objects, symbols=symbols, flags=flags)

src/Olm.h

@@ -19,11 +19,11 @@ enum class DecryptionErrorCode
                         // and try again
         MissingSessionIndex, // Session was found, but it does not reach back enough to this index,
                              // retrieve from backup or request from other devices and try again
-        DbError,            // DB read failed
-        DecryptionFailed,   // libolm error
-        ParsingFailed,      // Failed to parse the actual event
-        ReplayAttack,       // Megolm index reused
-        UnknownFingerprint, // Unknown device Fingerprint
+        DbError,             // DB read failed
+        DecryptionFailed,    // libolm error
+        ParsingFailed,       // Failed to parse the actual event
+        ReplayAttack,        // Megolm index reused
+        UnknownFingerprint,  // Unknown device Fingerprint
 };
 
 struct DecryptionResult