diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 10:30:26 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-26 10:30:52 +0100 |
| commit | 6409db7838751a3671485f035b9f975eb5ca23f2 (patch) | |
| tree | 6462f16b42f5db0f448b960e126a189c2e6d7da3 | |
| parent | add GtkSwipeGesture support and implement swipe left/right to change slides (diff) | |
| download | core-6409db7838751a3671485f035b9f975eb5ca23f2.tar.gz core-6409db7838751a3671485f035b9f975eb5ca23f2.zip | |
loplugin:constantfunction: vcl/unx/gtk3
Change-Id: Ieedf89bebb59e783dfe13ef2d5ae7ba3347cdc62
| -rw-r--r-- | compilerplugins/clang/constantfunction.cxx | 10 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/compilerplugins/clang/constantfunction.cxx b/compilerplugins/clang/constantfunction.cxx index c89e6b76598c..4ca710f35b11 100644 --- a/compilerplugins/clang/constantfunction.cxx +++ b/compilerplugins/clang/constantfunction.cxx @@ -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 = ""; diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index e2702049d67d..416b583c2ea4 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -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 }; |