mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update loplugin:unnnecessaryvirtual to handler destructors

Browse Source 
and update modules writerfilter..xmloff with the resulting changes

Change-Id: I54d19c22ddb0ff579b32e4934d266c925b19305c
Reviewed-on: https://gerrit.libreoffice.org/30530
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2016-11-03 15:12:56 +02:00
parent 7abd369964
commit 5f77e6e930
27 changed files with 151 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
compilerplugins/clang/unnecessaryvirtual.py
View File

@@ -1,9 +1,11 @@
#!/usr/bin/python
import sys
import io
import re
import sys
definitionSet = set()
definitionToSourceLocationMap = dict()
overridingSet = set()
@@ -11,38 +13,54 @@ with io.open("loplugin.unnecessaryvirtual.log", "rb", buffering=1024*1024) as tx
for line in txt:
tokens = line.strip().split("\t")
if tokens[0] == "definition:":
clazzName = tokens[1]
definitionSet.add(clazzName)
fullMethodName = tokens[1]
sourceLocation = tokens[2]
definitionSet.add(fullMethodName)
definitionToSourceLocationMap[fullMethodName] = sourceLocation
elif tokens[0] == "overriding:":
clazzName = tokens[1]
overridingSet.add(clazzName)
fullMethodName = tokens[1]
overridingSet.add(fullMethodName)
unnecessaryVirtualSet = set()
for clazz in (definitionSet - overridingSet):
# windows-specific stuff
if clazz.startswith("canvas::"): continue
if clazz.startswith("psp::PrinterInfoManager"): continue
if clazz.startswith("DdeTopic::"): continue
if clazz == "basegfx::unotools::UnoPolyPolygon::void-modifying()const": continue
if clazz == "SalLayout::_Bool-IsKashidaPosValid(int,)const": continue
if clazz == "SalLayout::void-DisableGlyphInjection(_Bool,)": continue
# Linux-TDF specific
if clazz == "X11SalFrame::void-updateGraphics(_Bool,)": continue
# OSX specific
if clazz == "SalFrame::void-SetRepresentedURL(const class rtl::OUString &,)": continue
if clazz == "SalMenu::_Bool-AddMenuBarButton(const struct SalMenuButtonItem &,)": continue
if clazz == "SalMenu::class Rectangle-GetMenuBarButtonRectPixel(sal_uInt16,class SalFrame *,)": continue
if clazz == "SalMenu::void-RemoveMenuBarButton(sal_uInt16,)": continue
if clazz == "SalLayout::_Bool-DrawTextSpecial(class SalGraphics &,sal_uInt32,)const": continue
# GTK < 3
if clazz == "GtkSalDisplay::int-CaptureMouse(class SalFrame *,)": continue
# some test magic
if clazz.startswith("apitest::"): continue
# ignore external code
if definitionToSourceLocationMap[clazz].startswith("external/"): continue
unnecessaryVirtualSet.add((clazz,definitionToSourceLocationMap[clazz] ))
# sort the results using a "natural order" so sequences like [item1,item2,item10] sort nicely
def natural_sort_key(s, _nsre=re.compile('([0-9]+)')):
return [int(text) if text.isdigit() else text.lower()
for text in re.split(_nsre, s)]
# sort results by name and line number
tmp1list = sorted(unnecessaryVirtualSet, key=lambda v: natural_sort_key(v[1]))
with open("loplugin.unnecessaryvirtual.report", "wt") as f:
for clazz in sorted(definitionSet - overridingSet):
# external code
if clazz.startswith("std::"): continue
if clazz.startswith("icu_"): continue
if clazz.startswith("__cxx"): continue
# windows-specific stuff
if clazz.startswith("canvas::"): continue
if clazz.startswith("psp::PrinterInfoManager"): continue
if clazz.startswith("DdeTopic::"): continue
if clazz == "basegfx::unotools::UnoPolyPolygon::void-modifying()const": continue
if clazz == "SalLayout::_Bool-IsKashidaPosValid(int,)const": continue
if clazz == "SalLayout::void-DisableGlyphInjection(_Bool,)": continue
# Linux-TDF specific
if clazz == "X11SalFrame::void-updateGraphics(_Bool,)": continue
# OSX specific
if clazz == "SalFrame::void-SetRepresentedURL(const class rtl::OUString &,)": continue
if clazz == "SalMenu::_Bool-AddMenuBarButton(const struct SalMenuButtonItem &,)": continue
if clazz == "SalMenu::class Rectangle-GetMenuBarButtonRectPixel(sal_uInt16,class SalFrame *,)": continue
if clazz == "SalMenu::void-RemoveMenuBarButton(sal_uInt16,)": continue
if clazz == "SalLayout::_Bool-DrawTextSpecial(class SalGraphics &,sal_uInt32,)const": continue
# GTK < 3
if clazz == "GtkSalDisplay::int-CaptureMouse(class SalFrame *,)": continue
# some test magic
if clazz.startswith("apitest::"): continue
f.write(clazz + "\n")
# add an empty line at the end to make it easier for the removevirtuals plugin to mmap() the output file
for t in tmp1list:
f.write( t[1] + "\n" )
f.write( " " + t[0] + "\n" )
# add an empty line at the end to make it easier for the removevirtuals plugin to mmap() the output file
f.write("\n")