[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - vcl/qa

[Tor Lillqvist]

 vcl/qa/cppunit/app/test_IconThemeInfo.cxx |   24 ------------------------
 vcl/qa/cppunit/lifecycle.cxx              |    4 ++--
 2 files changed, 2 insertions(+), 26 deletions(-)

New commits:
commit 1c5f64ec42bd8000ee2b0a1becdc67656a506920
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 4 12:25:45 2015 +0300

    WaE: loplugin:redundantcast
    
    Change-Id: Id7d4d937e1bdb94571e774befc5bcc1ab6a73f34

diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index b1f4cf8..a4e7e77 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -220,7 +220,7 @@ public:
         LeakTestObject *pNew = new LeakTestObject();
         pNew->mxRef = VclPtr< LeakTestClass< vcl_type > >::Create( pNew->mbDeleted,
                                                                    std::forward<Arg>(arg)...);
-        pNew->mpRef = reinterpret_cast<void *>(static_cast<vcl::Window *>(pNew->mxRef));
+        pNew->mpRef = static_cast<void *>(static_cast<vcl::Window *>(pNew->mxRef));
         return pNew;
     }
     VclPtr<vcl::Window> getRef() { return mxRef; }
@@ -233,7 +233,7 @@ public:
         if (!mbDeleted)
         {
             OUStringBuffer aMsg = "Type '";
-            vcl::Window *pWin = reinterpret_cast<vcl::Window *>(mpRef);
+            vcl::Window *pWin = static_cast<vcl::Window *>(mpRef);
             aMsg.appendAscii(typeid(*pWin).name());
             aMsg.append("' not freed after dispose");
             CPPUNIT_FAIL(OUStringToOString(aMsg.makeStringAndClear(),
commit 4e858c5e737938da149a31f4895fc5eccf16b77e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 4 12:21:36 2015 +0300

    WaE: loplugin:unreffun
    
    Change-Id: I10553cd6e55d0c7883fcadf5cabe1fe3a25cfe55

diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 416f8e2..2a199d2 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -36,12 +36,6 @@ class IconThemeInfoTest : public CppUnit::TestFixture
     ThemeIdIsDetectedFromFileNameWithUnderscore();
 
     void
-    DisplayNameForHicontrastIsHighContrast();
-
-    void
-    DisplayNameForTango_testingIsTangoTesting();
-
-    void
     ExceptionIsThrownWhenIdCannotBeDetermined1();
 
     void
@@ -120,24 +114,6 @@ IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception was thrown", true, thrown);
 }
 
-void
-IconThemeInfoTest::DisplayNameForHicontrastIsHighContrast()
-{
-    OUString id("hicontrast");
-    OUString expected("High Contrast");
-    OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
-    CPPUNIT_ASSERT_EQUAL(expected, displayName);
-}
-
-void
-IconThemeInfoTest::DisplayNameForTango_testingIsTangoTesting()
-{
-    OUString id("tango_testing");
-    OUString expected("Tango Testing");
-    OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id);
-    CPPUNIT_ASSERT_EQUAL(expected, displayName);
-}
-
 // Put the test suite in the registry
 CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest);