include/vcl/builder.hxx | 2 +- include/vcl/opengl/OpenGLContext.hxx | 2 +- include/vcl/outdev.hxx | 2 +- include/vcl/scheduler.hxx | 6 +++--- include/vcl/window.hxx | 2 +- solenv/inc/doxygen.cfg | 2 +- vcl/inc/openglgdiimpl.hxx | 4 ++-- vcl/inc/salinst.hxx | 4 ++-- vcl/source/app/scheduler.cxx | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-)
New commits: commit 9468abbdf973e2da8f9b2660c440d3ff55326f9b Author: Chris Sherlock <[email protected]> Date: Fri Jan 8 14:03:54 2016 +1100 vcl: exclude precompiled headers from doxygen Change-Id: I97e931ae654b3c61de92866bf6c4a3d22e3f96c9 diff --git a/solenv/inc/doxygen.cfg b/solenv/inc/doxygen.cfg index 26324fd..4591c79 100644 --- a/solenv/inc/doxygen.cfg +++ b/solenv/inc/doxygen.cfg @@ -796,7 +796,7 @@ RECURSIVE = YES # Note that relative paths are relative to the directory from which doxygen is # run. -EXCLUDE = +EXCLUDE = vcl/inc/pch/ # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # directories that are symbolic links (a Unix file system feature) are excluded commit c89f9b19cefd08b31b6e5dfa55ea0f4ff757da9c Author: Chris Sherlock <[email protected]> Date: Fri Jan 8 13:53:13 2016 +1100 vcl: silence doxygen warning Change-Id: I132672582136abfcec0eeafd2400757def824dbf diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 1b6cc1f..b370b02 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -47,7 +47,7 @@ class VCL_DLLPUBLIC VclBuilder { public: typedef std::map<OString, OString> stringmap; - /// These functions create a new widget with parent @pParent and return it in @rRet + /// These functions create a new widget with parent pParent and return it in rRet typedef void (*customMakeWidget)(VclPtr<vcl::Window> &rRet, VclPtr<vcl::Window> &pParent, stringmap &rVec); public: diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index de22444..d5a9e31 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -177,7 +177,7 @@ public: /// make a VCL context (any context) current, create it if necessary. static void makeVCLCurrent(); - /// fetch any VCL context, creating one if @bMakeIfNecessary is set. + /// fetch any VCL context, creating one if bMakeIfNecessary is set. static rtl::Reference<OpenGLContext> getVCLContext(bool bMakeIfNecessary = true); /// make this GL context current - so it is implicit in subsequent GL calls void makeCurrent(); diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 53755d2..a827fce 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -584,7 +584,7 @@ public: ///@} - /** @Name Direct OutputDevice drawing functions + /** @name Direct OutputDevice drawing functions */ ///@{ diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx index 8e75f33..f3d14f7 100644 --- a/include/vcl/scheduler.hxx +++ b/include/vcl/scheduler.hxx @@ -51,13 +51,13 @@ protected: friend struct ImplSchedulerData; virtual void SetDeletionFlags(); - /// Is this item ready to be dispatched at @nTimeNow + /// Is this item ready to be dispatched at nTimeNow virtual bool ReadyForSchedule( bool bTimerOnly, sal_uInt64 nTimeNow ) const = 0; /// Schedule only when other timers and events are processed virtual bool IsIdle() const = 0; /** - * Adjust @nMinPeriod downwards if we want to be notified before - * then, @nTimeNow is the current time. + * Adjust nMinPeriod downwards if we want to be notified before + * then, nTimeNow is the current time. */ virtual sal_uInt64 UpdateMinPeriod( sal_uInt64 nMinPeriod, sal_uInt64 nTimeNow ) const = 0; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index aafb1d7..a33d965 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1204,7 +1204,7 @@ public: void SetData( void* pNewData ); void* GetData() const; - /// Add all children to @rAllChildren recursively. + /// Add all children to rAllChildren recursively. SAL_DLLPRIVATE void CollectChildren(::std::vector<vcl::Window *>& rAllChildren ); virtual void ShowFocus(const Rectangle& rRect); diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 0220758..64c7086 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -59,11 +59,11 @@ class VCL_DLLPUBLIC OpenGLSalGraphicsImpl : public SalGraphicsImpl friend class OpenGLTests; protected: - /// This context is solely for blitting @maOffscreenTex + /// This context is solely for blitting maOffscreenTex rtl::Reference<OpenGLContext> mpWindowContext; /// This context is whatever is most convenient to render - /// to @maOffscreenTex with. + /// to maOffscreenTex with. rtl::Reference<OpenGLContext> mpContext; SalGraphics& mrParent; diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 033e739..5210945 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -131,9 +131,9 @@ public: virtual bool CheckYieldMutex() = 0; /** - * Wait for the next event (if @bWait) and dispatch it, + * Wait for the next event (if bWait) and dispatch it, * includes posted events, and timers. - * If @bHandleAllCurrentEvents - dispatch multiple posted + * If bHandleAllCurrentEvents - dispatch multiple posted * user events. Returns true if events needed processing. */ virtual SalYieldResult DoYield(bool bWait, bool bHandleAllCurrentEvents, sal_uLong nReleased) = 0; diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx index b1f3fb1..4586a7e 100644 --- a/vcl/source/app/scheduler.cxx +++ b/vcl/source/app/scheduler.cxx @@ -112,10 +112,10 @@ void Scheduler::ImplDeInitScheduler() } /** - * Start a new timer if we need to for @nMS duration. + * Start a new timer if we need to for nMS duration. * * if this is longer than the existing duration we're - * waiting for, do nothing - unless @bForce - which means + * waiting for, do nothing - unless bForce - which means * to reset the minimum period; used by the scheduled itself. */ void Scheduler::ImplStartTimer(sal_uInt64 nMS, bool bForce) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
