From 8bb1049cf0deb0be06287ed962b8bcd0548ced84 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 15 Sep 2022 09:17:17 +0200 Subject: [PATCH] libZRCola: Resolve some warnings reported by -Wall Signed-off-by: Simon Rozman --- lib/libZRCola/include/zrcola/character.h | 8 ++++---- lib/libZRCola/include/zrcola/highlight.h | 4 ++-- lib/libZRCola/include/zrcola/language.h | 12 ++++++------ lib/libZRCola/include/zrcola/tag.h | 16 ++++++++-------- lib/libZRCola/include/zrcola/translate.h | 20 ++++++++++---------- lib/libZRColaUI/include/zrcolaui/chargroup.h | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lib/libZRCola/include/zrcola/character.h b/lib/libZRCola/include/zrcola/character.h index c5e64c7..504a81d 100644 --- a/lib/libZRCola/include/zrcola/character.h +++ b/lib/libZRCola/include/zrcola/character.h @@ -408,8 +408,8 @@ namespace ZRCola { /// virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const { - if (a.cat < b.cat) return -1; - else if (a.cat > b.cat) return 1; + if (a.cat < b.cat) return -1; + if (a.cat > b.cat) return 1; return 0; } @@ -441,8 +441,8 @@ namespace ZRCola { /// virtual int compare(_In_ const chrcat &a, _In_ const chrcat &b) const { - if (a.rank < b.rank) return -1; - else if (a.rank > b.rank) return +1; + if (a.rank < b.rank) return -1; + if (a.rank > b.rank) return +1; return 0; } diff --git a/lib/libZRCola/include/zrcola/highlight.h b/lib/libZRCola/include/zrcola/highlight.h index eba6bde..94606d6 100644 --- a/lib/libZRCola/include/zrcola/highlight.h +++ b/lib/libZRCola/include/zrcola/highlight.h @@ -113,8 +113,8 @@ namespace ZRCola { int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len()); if (r != 0) return r; - if (a.set < b.set) return -1; - else if (a.set > b.set) return +1; + if (a.set < b.set) return -1; + if (a.set > b.set) return +1; return 0; } diff --git a/lib/libZRCola/include/zrcola/language.h b/lib/libZRCola/include/zrcola/language.h index a43474e..42cca7d 100644 --- a/lib/libZRCola/include/zrcola/language.h +++ b/lib/libZRCola/include/zrcola/language.h @@ -97,8 +97,8 @@ namespace ZRCola { int r = ZRCola::CompareString(a.chr(), a.chr_len(), b.chr(), b.chr_len()); if (r != 0) return r; - if (a.lang < b.lang) return -1; - else if (a.lang > b.lang) return 1; + if (a.lang < b.lang) return -1; + if (a.lang > b.lang) return 1; return 0; } @@ -132,8 +132,8 @@ namespace ZRCola { /// virtual int compare(_In_ const langchar &a, _In_ const langchar &b) const { - if (a.lang < b.lang) return -1; - else if (a.lang > b.lang) return 1; + if (a.lang < b.lang) return -1; + if (a.lang > b.lang) return 1; int r = ZRCola::CompareString(a.chr, a.chr_len(), b.chr(), b.chr_len()); if (r != 0) return r; @@ -258,8 +258,8 @@ namespace ZRCola { /// virtual int compare(_In_ const language &a, _In_ const language &b) const { - if (a.lang < b.lang) return -1; - else if (a.lang > b.lang) return 1; + if (a.lang < b.lang) return -1; + if (a.lang > b.lang) return 1; return 0; } diff --git a/lib/libZRCola/include/zrcola/tag.h b/lib/libZRCola/include/zrcola/tag.h index 73332a5..f50ff05 100644 --- a/lib/libZRCola/include/zrcola/tag.h +++ b/lib/libZRCola/include/zrcola/tag.h @@ -153,8 +153,8 @@ namespace ZRCola { /// virtual int compare(_In_ const chrtag &a, _In_ const chrtag &b) const { - if (a.tag < b.tag) return -1; - else if (a.tag > b.tag) return 1; + if (a.tag < b.tag) return -1; + if (a.tag > b.tag) return 1; return 0; } @@ -336,8 +336,8 @@ namespace ZRCola { /// virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const { - if (a.locale < b.locale) return -1; - else if (a.locale > b.locale) return 1; + if (a.locale < b.locale) return -1; + if (a.locale > b.locale) return 1; int r = tagname::CompareName(a.locale, a.name(), a.name_len(), b.name(), b.name_len()); if (r != 0) return r; @@ -398,11 +398,11 @@ namespace ZRCola { /// virtual int compare(_In_ const tagname &a, _In_ const tagname &b) const { - if (a.locale < b.locale) return -1; - else if (a.locale > b.locale) return 1; + if (a.locale < b.locale) return -1; + if (a.locale > b.locale) return 1; - if (a.tag < b.tag) return -1; - else if (a.tag > b.tag) return 1; + if (a.tag < b.tag) return -1; + if (a.tag > b.tag) return 1; return 0; } diff --git a/lib/libZRCola/include/zrcola/translate.h b/lib/libZRCola/include/zrcola/translate.h index 1f5c179..c667bdd 100644 --- a/lib/libZRCola/include/zrcola/translate.h +++ b/lib/libZRCola/include/zrcola/translate.h @@ -158,8 +158,8 @@ namespace ZRCola { /// virtual int compare(_In_ const translation &a, _In_ const translation &b) const { - if (a.set < b.set) return -1; - else if (a.set > b.set) return +1; + if (a.set < b.set) return -1; + if (a.set > b.set) return +1; int r = ZRCola::CompareString(a.src(), a.src_len(), b.src(), b.src_len()); if (r != 0) return r; @@ -223,8 +223,8 @@ namespace ZRCola { /// virtual int compare(_In_ const translation &a, _In_ const translation &b) const { - if (a.set < b.set) return -1; - else if (a.set > b.set) return +1; + if (a.set < b.set) return -1; + if (a.set > b.set) return +1; int r = ZRCola::CompareString(a.dst(), a.dst_len(), b.dst(), b.dst_len()); if (r != 0) return r; @@ -410,8 +410,8 @@ namespace ZRCola { /// virtual int compare(_In_ const transet &a, _In_ const transet &b) const { - if (a.set < b.set) return -1; - else if (a.set > b.set) return 1; + if (a.set < b.set) return -1; + if (a.set > b.set) return 1; return 0; } @@ -530,8 +530,8 @@ namespace ZRCola { /// virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const { - if (a.seq < b.seq) return -1; - else if (a.seq > b.seq) return 1; + if (a.seq < b.seq) return -1; + if (a.seq > b.seq) return 1; return 0; } @@ -563,8 +563,8 @@ namespace ZRCola { /// virtual int compare(_In_ const transeq &a, _In_ const transeq &b) const { - if (a.rank < b.rank) return -1; - else if (a.rank > b.rank) return +1; + if (a.rank < b.rank) return -1; + if (a.rank > b.rank) return +1; return 0; } diff --git a/lib/libZRColaUI/include/zrcolaui/chargroup.h b/lib/libZRColaUI/include/zrcolaui/chargroup.h index 0a44ad3..5dc8bd2 100644 --- a/lib/libZRColaUI/include/zrcolaui/chargroup.h +++ b/lib/libZRColaUI/include/zrcolaui/chargroup.h @@ -126,8 +126,8 @@ namespace ZRCola { /// virtual int compare(_In_ const chrgrp &a, _In_ const chrgrp &b) const { - if (a.rank < b.rank) return -1; - else if (a.rank > b.rank) return +1; + if (a.rank < b.rank) return -1; + if (a.rank > b.rank) return +1; return 0; }