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

loplugin:constantfunction: vcl/unx/gtk3

Browse Source 
Change-Id: Ieedf89bebb59e783dfe13ef2d5ae7ba3347cdc62
This commit is contained in:
Stephan Bergmann
2015-03-26 10:30:26 +01:00
parent 903a420609
commit 6409db7838
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compilerplugins/clang/constantfunction.cxx
View File

@@ -128,6 +128,10 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (aFileName == SRCDIR "/filter/source/svg/svgreader.cxx") {
return true;
}
// vcl/unx/gtk3 re-using vcl/unx/gtk:
if (aFileName.find("/../../gtk/") != std::string::npos) {
return true;
}
// used by code generated by python
if (getFilename(pFunctionDecl->getCanonicalDecl()->getLocStart()) == SRCDIR "/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx") {
return true;
@@ -400,6 +404,12 @@ bool ConstantFunction::VisitFunctionDecl(const FunctionDecl * pFunctionDecl) {
if (aFunctionName == "SwVectorModifyBase::dumpAsXml") {
return true;
}
// vcl/unx/gtk3 re-using vcl/unx/gtk:
if (aFunctionName == "GtkData::initNWF"
|| aFunctionName == "GtkSalFrame::EnsureAppMenuWatch")
{
return true;
}
// can't mess with the TYPEINIT macros in include/tools/rtti.hxx or the LINK macros in include/tools/link.hxx
std::string aImmediateMacro = "";

4
vcl/inc/unx/gtk/gtkdata.hxx
View File

@@ -176,9 +176,7 @@ public:
virtual void PostUserEvent() SAL_OVERRIDE;
#if GTK_CHECK_VERSION(3,0,0)
guint32 GetLastUserEventTime( bool /* b */ ) { return GDK_CURRENT_TIME; } // horrible hack
#else
#if !GTK_CHECK_VERSION(3,0,0)
virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE;
#endif
};