[Libreoffice-commits] core.git: 3 commits - vcl/qa

[Tor Lillqvist]

 vcl/qa/cppunit/app/test_IconThemeInfo.cxx     |    6 ++++--
 vcl/qa/cppunit/app/test_IconThemeScanner.cxx  |    2 ++
 vcl/qa/cppunit/app/test_IconThemeSelector.cxx |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 6bc639523fc350fa45a9d546e0bfecdf7e0f059d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 21 22:23:35 2014 +0200

    WaE: implicit conversion of literal of type 'const char *' to 'bool'
    
    Change-Id: Ia0c05b93bbb5a399257d0e1ab8670aa95be01fd7

diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 34961e7..c1eb785 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -184,7 +184,7 @@ IconThemeSelectorTest::DifferentPreferredThemesAreInequal()
     vcl::IconThemeSelector s1;
     vcl::IconThemeSelector s2;
     s1.SetPreferredIconTheme("oxygen");
-    s2.SetUseHighContrastTheme("katze");
+    s2.SetUseHighContrastTheme(true);
     bool equal = (s1 == s2);
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Different preferred themes are detected as inequal", false, equal);
 }
commit ae993046a9e51222eaac54e6d39325d928136719
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 21 22:21:27 2014 +0200

    WaE: unused variables
    
    Change-Id: Ia5bdfd7db7ed2769b34e8dbd7e0ed7dbe5499d34

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 9e3a8ef..77bb246 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -109,7 +109,7 @@ IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined1()
     bool thrown = false;
     OUString fname("images_oxygen");
     try {
-        OUString sname = vcl::IconThemeInfo::FileNameToThemeId(fname);
+        vcl::IconThemeInfo::FileNameToThemeId(fname);
     }
     catch (std::runtime_error&) {
         thrown = true;
@@ -123,7 +123,7 @@ IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
     bool thrown = false;
     OUString fname("image_oxygen.zip");
     try {
-        OUString sname = vcl::IconThemeInfo::FileNameToThemeId(fname);
+        vcl::IconThemeInfo::FileNameToThemeId(fname);
     }
     catch (std::runtime_error&) {
         thrown = true;
commit 87dc2bfecfc4e33ab9a174e2de4b575af99eb434
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Feb 21 22:17:28 2014 +0200

    Include <stdexcept> for std::runtime_error
    
    Change-Id: I6ef2036f075c2992b692d9a227db257edc4a6955

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index e401046..9e3a8ef 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <stdexcept>
+
 #include <sal/types.h>
 
 #include <rtl/ustring.hxx>
diff --git a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
index af2e957..63c5987 100644
--- a/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeScanner.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <stdexcept>
+
 #include <sal/types.h>
 
 #include <rtl/ustring.hxx>