diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 09:56:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-05-18 09:56:01 +0200 |
commit | df8d092c3a3c65bc23bc3c1da281cc4cb10a1e3d (patch) | |
tree | ea5daefc9c1665ab14aeeedc0de4298c7c85a8b1 /compilerplugins/clang/checkunusedparams.cxx | |
parent | 33cbc99fea5a3e4b87e883fd60ec97d4503109f3 (diff) |
Adapt pathname checks to mixed usage of \ and / on Windows
Change-Id: I91bc89a9076c6642e06b238f65f2d31a1d20c6b5
Diffstat (limited to 'compilerplugins/clang/checkunusedparams.cxx')
-rw-r--r-- | compilerplugins/clang/checkunusedparams.cxx | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx index f3118e1391f5..790236873d99 100644 --- a/compilerplugins/clang/checkunusedparams.cxx +++ b/compilerplugins/clang/checkunusedparams.cxx @@ -39,23 +39,23 @@ void CheckUnusedParams::run() { StringRef fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - if (fn.startswith(SRCDIR "/sal/")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/sal/")) return; // Taking pointer to function - if (fn == SRCDIR "/l10ntools/source/xmlparse.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/l10ntools/source/xmlparse.cxx")) return; // macro magic which declares something needed by an external library - if (fn == SRCDIR "/svl/source/misc/gridprinter.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/svl/source/misc/gridprinter.cxx")) return; // valid test/qa code - if (fn.startswith(SRCDIR "/compilerplugins/clang/test/")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/compilerplugins/clang/test/")) return; - if (fn == SRCDIR "/cppu/qa/test_reference.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/cppu/qa/test_reference.cxx")) return; // leave this alone for now - if (fn.startswith(SRCDIR "/libreofficekit/")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/libreofficekit/")) return; m_phase = PluginPhase::FindAddressOf; @@ -135,104 +135,104 @@ bool CheckUnusedParams::VisitFunctionDecl(FunctionDecl const * decl) { StringRef fn = compiler.getSourceManager().getFilename(compiler.getSourceManager().getSpellingLoc(canon->getLocStart())); // Some backwards compat magic. // TODO Can probably be removed, but need to do some checking - if (fn == SRCDIR "/include/sax/fshelper.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/sax/fshelper.hxx")) return true; // Platform-specific code - if (fn == SRCDIR "/include/svl/svdde.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/svl/svdde.hxx")) return true; - if (fn == SRCDIR "/include/vcl/svmain.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/svmain.hxx")) return true; // passing pointer to function - if (fn == SRCDIR "/include/vcl/bitmapaccess.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/bitmapaccess.hxx")) return true; - if (fn == SRCDIR "/vcl/inc/unx/gtk/gtkobject.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/inc/unx/gtk/gtkobject.hxx")) return true; - if (fn == SRCDIR "/vcl/inc/unx/gtk/gtksalframe.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/inc/unx/gtk/gtksalframe.hxx")) return true; - if (fn == SRCDIR "/vcl/inc/unx/gtk/gtkframe.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/inc/unx/gtk/gtkframe.hxx")) return true; - if (fn == SRCDIR "/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx")) return true; - if (fn == SRCDIR "/extensions/source/propctrlr/propertyeditor.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/extensions/source/propctrlr/propertyeditor.hxx")) return true; - if (fn == SRCDIR "/forms/source/solar/inc/navtoolbar.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/forms/source/solar/inc/navtoolbar.hxx")) return true; - if (fn == SRCDIR "/hwpfilter/source/grammar.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/hwpfilter/source/grammar.cxx")) return true; - if (fn == SRCDIR "/hwpfilter/source/lexer.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/hwpfilter/source/lexer.cxx")) return true; // marked with a TODO/FIXME - if (fn == SRCDIR "/vcl/inc/sallayout.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/inc/sallayout.hxx")) return true; - if (fn == SRCDIR "/accessibility/inc/standard/vclxaccessiblelist.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/accessibility/inc/standard/vclxaccessiblelist.hxx")) return true; // these are "extern C" but clang doesn't seem to report that accurately - if (fn == SRCDIR "/sax/source/fastparser/fastparser.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sax/source/fastparser/fastparser.cxx")) return true; // these all follow the same pattern, seems a pity to break that - if (fn == SRCDIR "/include/vcl/graphicfilter.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/vcl/graphicfilter.hxx")) return true; // looks like work in progress - if (fn == SRCDIR "/vcl/source/filter/ipdf/pdfdocument.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/vcl/source/filter/ipdf/pdfdocument.cxx")) return true; // macro magic - if (fn == SRCDIR "/basctl/source/inc/basidesh.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/basctl/source/inc/basidesh.hxx")) return true; // template magic - if (fn.startswith(SRCDIR "/canvas/")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/canvas/")) return true; - if (fn.startswith(SRCDIR "/include/canvas/")) + if (loplugin::hasPathnamePrefix(fn, SRCDIR "/include/canvas/")) return true; - if (fn == SRCDIR "/include/comphelper/unwrapargs.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/comphelper/unwrapargs.hxx")) return true; // this looks like vaguely useful code (ParseError) that I'm loathe to remove - if (fn == SRCDIR "/connectivity/source/inc/RowFunctionParser.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/connectivity/source/inc/RowFunctionParser.hxx")) return true; - if (fn == SRCDIR "/include/svx/EnhancedCustomShapeFunctionParser.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/svx/EnhancedCustomShapeFunctionParser.hxx")) return true; // TODO marker parameter in constructor, should probably be using an enum - if (fn == SRCDIR "/framework/inc/uielement/uicommanddescription.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/framework/inc/uielement/uicommanddescription.hxx")) return true; - if (fn == SRCDIR "/sd/source/ui/inc/SlideTransitionPane.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/inc/SlideTransitionPane.hxx")) return true; - if (fn == SRCDIR "/sd/source/ui/animations/CustomAnimationPane.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/animations/CustomAnimationPane.hxx")) return true; - if (fn == SRCDIR "/sd/source/ui/table/TableDesignPane.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/table/TableDesignPane.hxx")) return true; // debug stuff - if (fn == SRCDIR "/sc/source/core/data/column2.cxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sc/source/core/data/column2.cxx")) return true; // weird stuff - if (fn == SRCDIR "/scaddins/source/analysis/analysishelper.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/scaddins/source/analysis/analysishelper.hxx")) return true; // SFX_DECL_CHILDWINDOWCONTEXT macro stuff - if (fn == SRCDIR "/sd/source/ui/inc/NavigatorChildWindow.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/inc/NavigatorChildWindow.hxx")) return true; // TODO, need to remove this from the .sdi file too - if (fn == SRCDIR "/sd/source/ui/inc/SlideSorterViewShell.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/inc/SlideSorterViewShell.hxx")) return true; - if (fn == SRCDIR "/sd/source/ui/inc/OutlineViewShell.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/inc/OutlineViewShell.hxx")) return true; // SFX_DECL_INTERFACE macro stuff - if (fn == SRCDIR "/sd/source/ui/inc/ViewShellBase.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/ui/inc/ViewShellBase.hxx")) return true; // debug stuff - if (fn == SRCDIR "/sd/source/filter/ppt/pptinanimations.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/sd/source/filter/ppt/pptinanimations.hxx")) return true; // takes pointer to fn - if (fn == SRCDIR "/include/sfx2/shell.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/sfx2/shell.hxx")) return true; // TODO, need to remove this from the .sdi file too if (fqn == "SfxObjectShell::StateView_Impl") return true; // SFX_DECL_CHILDWINDOW_WITHID macro - if (fn == SRCDIR "/include/sfx2/infobar.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/include/sfx2/infobar.hxx")) return true; // this looks like vaguely useful code (ParseError) that I'm loathe to remove - if (fn == SRCDIR "/slideshow/source/inc/slideshowexceptions.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/slideshow/source/inc/slideshowexceptions.hxx")) return true; // SFX_DECL_VIEWFACTORY macro - if (fn == SRCDIR "/starmath/inc/view.hxx") + if (loplugin::isSamePathname(fn, SRCDIR "/starmath/inc/view.hxx")) return true; // debugging if (fqn == "BrowseBox::DoShowCursor" || fqn == "BrowseBox::DoHideCursor") |