diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-14 08:18:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-14 08:19:00 +0200 |
| commit | 713dc2fcb4f0c56b8c1808e9ac0231cc8f3a6ba4 (patch) | |
| tree | 275430dc2823fd9ec62ad8774b0be17a7c932656 /i18nlangtag | |
| parent | 04ab8aeb7a11205c0cf8cb26eb2395a43011435f (diff) | |
Fix various warnings in --disable-liblangtag code
Change-Id: I4dbc7ead359fc4cae0ac9d5eb98523590dd8954e
Diffstat (limited to 'i18nlangtag')
| -rw-r--r-- | i18nlangtag/qa/cppunit/test_languagetag.cxx | 8 | ||||
| -rw-r--r-- | i18nlangtag/source/languagetag/simple-langtag.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx b/i18nlangtag/qa/cppunit/test_languagetag.cxx index 773465b017d1..f93f1df53f7d 100644 --- a/i18nlangtag/qa/cppunit/test_languagetag.cxx +++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx @@ -102,12 +102,12 @@ void TestLanguageTag::testAllTags() #else CPPUNIT_ASSERT( klingon.getBcp47() == s_klingon ); CPPUNIT_ASSERT( aLocale.Language == "qlt" ); - CPPUNIT_ASSERT( aLocale.Country == "" ); + CPPUNIT_ASSERT_EQUAL( OUString(), aLocale.Country ); CPPUNIT_ASSERT( aLocale.Variant == s_klingon ); CPPUNIT_ASSERT( LanguageTag::isOnTheFlyID( klingon.getLanguageType()) ); - CPPUNIT_ASSERT( klingon.isValidBcp47() == true ); - CPPUNIT_ASSERT( klingon.isIsoLocale() == false ); - CPPUNIT_ASSERT( klingon.isIsoODF() == false ); + CPPUNIT_ASSERT( klingon.isValidBcp47() ); + CPPUNIT_ASSERT( !klingon.isIsoLocale() ); + CPPUNIT_ASSERT( !klingon.isIsoODF() ); LanguageType nLang = klingon.getLanguageType(); LanguageTag klingon_id( nLang); CPPUNIT_ASSERT( klingon_id.getBcp47() == s_klingon ); diff --git a/i18nlangtag/source/languagetag/simple-langtag.cxx b/i18nlangtag/source/languagetag/simple-langtag.cxx index 0cad44eeb2ff..02c2756564e8 100644 --- a/i18nlangtag/source/languagetag/simple-langtag.cxx +++ b/i18nlangtag/source/languagetag/simple-langtag.cxx @@ -245,13 +245,13 @@ struct my_t_list : public my_t_impl mpList = pList; return *this; } - virtual void append( const char* str, const char* stop ) + virtual void append( const char* str, const char* stop ) override { lt_list_t* p = new lt_list_t; p->assign( str, stop); my_appendToList( &mpList, p); } - virtual void zero() + virtual void zero() override { my_t_impl::zero(); my_unrefList( mpList); @@ -398,7 +398,7 @@ static int lt_tag_parse(lt_tag_t *tag, // allowed, store first as language and return ok. // For i-* simply assume the same. (*ppSub)->append( pStart-1, p); - return !0; // ok + return 1; // ok } else if (nLen == 3) { @@ -514,7 +514,7 @@ static int lt_tag_parse(lt_tag_t *tag, pStart = p+1; } } - return !0; + return 1; } static char* lt_tag_canonicalize(lt_tag_t *tag, |