diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-20 10:14:49 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-20 10:14:49 +0100 |
commit | ab9add5c96490801a7e1761306c41131468db703 (patch) | |
tree | 5656edb0025ae0ae21088099c1b2c024d79069ab /vcl/source | |
parent | f208103998cfeffef239c66043184654c00dffda (diff) |
loplugin:sallogareas
Change-Id: Ib1f06cb5f925535858bc14aab6f59ad7fd2a3a8d
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/opengl/OpenGLContext.cxx | 26 | ||||
-rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 12 | ||||
-rw-r--r-- | vcl/source/window/paint.cxx | 8 |
3 files changed, 23 insertions, 23 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 0dc05fc2025f..4a68ab823bf7 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -69,7 +69,7 @@ OpenGLContext::OpenGLContext(): mpPrevContext(nullptr), mpNextContext(nullptr) { - VCL_GL_INFO("vcl.opengl", "new context: " << this); + VCL_GL_INFO("new context: " << this); ImplSVData* pSVData = ImplGetSVData(); if( pSVData->maGDIData.mpLastContext ) @@ -87,7 +87,7 @@ OpenGLContext::OpenGLContext(): OpenGLContext::~OpenGLContext() { - VCL_GL_INFO("vcl.opengl", "delete context: " << this); + VCL_GL_INFO("delete context: " << this); assert (mnRefCount == 0); mnRefCount = 1; // guard the shutdown paths. @@ -511,7 +511,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int& nBestFBC, bool bUseDoubl if( dpy == nullptr || !glXQueryExtension( dpy, nullptr, nullptr ) ) return nullptr; - VCL_GL_INFO("vcl.opengl", "window: " << win); + VCL_GL_INFO("window: " << win); XWindowAttributes xattr; if( !XGetWindowAttributes( dpy, win, &xattr ) ) @@ -598,7 +598,7 @@ Visual* getVisual(Display* dpy, Window win) SAL_WARN("vcl.opengl", "Failed to get window attributes for getVisual " << win); xattr.visual = nullptr; } - VCL_GL_INFO("vcl.opengl", "using VisualID " << xattr.visual); + VCL_GL_INFO("using VisualID " << xattr.visual); return xattr.visual; } @@ -716,7 +716,7 @@ bool OpenGLContext::ImplInit() TempErrorHandler aErrorHandler(m_aGLWin.dpy, unxErrorHandler); #endif - VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start"); + VCL_GL_INFO("OpenGLContext::ImplInit----start"); if (!g_vShareList.empty()) pSharedCtx = g_vShareList.front(); @@ -811,7 +811,7 @@ bool OpenGLContext::ImplInit() if( errorTriggered ) SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?"); else - VCL_GL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)"); + VCL_GL_INFO("set swap interval to 1 (enable vsync)"); } } @@ -841,7 +841,7 @@ bool OpenGLContext::ImplInit() { OpenGLZone aZone; - VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start"); + VCL_GL_INFO("OpenGLContext::ImplInit----start"); // PixelFormat tells Windows how we want things to be PIXELFORMATDESCRIPTOR PixelFormatFront = { @@ -984,7 +984,7 @@ bool OpenGLContext::ImplInit() { OpenGLZone aZone; - VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start"); + VCL_GL_INFO("OpenGLContext::ImplInit----start"); NSOpenGLView* pView = getOpenGLView(); OpenGLWrapper::makeCurrent(pView); @@ -997,7 +997,7 @@ bool OpenGLContext::ImplInit() bool OpenGLContext::ImplInit() { - VCL_GL_INFO("vcl.opengl", "OpenGLContext not implemented for this platform"); + VCL_GL_INFO("OpenGLContext not implemented for this platform"); return false; } @@ -1021,7 +1021,7 @@ bool OpenGLContext::InitGLEW() bGlewInit = true; } - VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----end"); + VCL_GL_INFO("OpenGLContext::ImplInit----end"); mbInitialized = true; return true; } @@ -1047,7 +1047,7 @@ void OpenGLContext::InitGLEWDebugging() } // Test hooks for inserting tracing messages into the stream - VCL_GL_INFO("vcl.opengl", "LibreOffice GLContext initialized: " << this); + VCL_GL_INFO("LibreOffice GLContext initialized: " << this); #endif } @@ -1322,7 +1322,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool) if( vi ) { - VCL_GL_INFO("vcl.opengl", "using VisualID " << vi->visualid); + VCL_GL_INFO("using VisualID " << vi->visualid); aWinData.pVisual = static_cast<void*>(vi->visual); } #endif @@ -1436,7 +1436,7 @@ void OpenGLContext::registerAsCurrent() // move the context to the end of the contexts list static int nSwitch = 0; - VCL_GL_INFO("vcl.opengl", "******* CONTEXT SWITCH " << ++nSwitch << " *********"); + VCL_GL_INFO("******* CONTEXT SWITCH " << ++nSwitch << " *********"); if( mpNextContext ) { if( mpPrevContext ) diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index bfb043dc7450..c7cbfa354d15 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -396,14 +396,14 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName, OString aFileName = createFileName(rVertexShaderName, rFragmentShaderName, rDigest); bBinaryResult = loadProgramBinary(ProgramID, aFileName); - VCL_GL_INFO("vcl.opengl", "Load binary shader from '" << aFileName << "'" << bBinaryResult); + VCL_GL_INFO("Load binary shader from '" << aFileName << "'" << bBinaryResult); CHECK_GL_ERROR(); } if( bBinaryResult != GL_FALSE ) return ProgramID; - VCL_GL_INFO("vcl.opengl", "Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName); + VCL_GL_INFO("Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName); // Create the shaders GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER); GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); @@ -954,12 +954,12 @@ bool OpenGLWrapper::isVCLOpenGLEnabled() return OpenGLHelper::isVCLOpenGLEnabled(); } -void OpenGLHelper::debugMsgStream(const char *pArea, std::ostringstream const &pStream) +void OpenGLHelper::debugMsgStream(std::ostringstream const &pStream) { - debugMsgPrint(pArea, "%s", pStream.str().c_str()); + debugMsgPrint("%s", pStream.str().c_str()); } -void OpenGLHelper::debugMsgPrint(const char *pArea, const char *pFormat, ...) +void OpenGLHelper::debugMsgPrint(const char *pFormat, ...) { va_list aArgs; va_start (aArgs, pFormat); @@ -975,7 +975,7 @@ void OpenGLHelper::debugMsgPrint(const char *pArea, const char *pFormat, ...) if (!bHasContext) strcat(pStr, "- no GL context"); - SAL_INFO(pArea, pStr); + SAL_INFO("vcl.opengl", pStr); if (bHasContext) { diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 3a13be39fb58..22f98498aaff 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -64,7 +64,7 @@ PaintBufferGuard::PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWind pFrameData->mpBuffer->SetBackground(pWindow->GetBackground()); } //else - //SAL_WARN("vcl.doublebuffering", "the root of the double-buffering hierarchy should not have a transparent background"); + //SAL_WARN("vcl.window", "the root of the double-buffering hierarchy should not have a transparent background"); PushFlags nFlags = PushFlags::NONE; nFlags |= PushFlags::CLIPREGION; @@ -273,7 +273,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) pWindowImpl->mnPaintFlags = 0; if (!pWindowImpl->maInvalidateRegion.IsEmpty()) { - VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint on " << + VCL_GL_INFO("PaintHelper::DoPaint on " << typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "' begin"); OutputDevice::PaintScope aScope( m_pWindow ); @@ -286,7 +286,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) // but we are in the middle of double-buffered paint, we might be // losing information if (pFrameData->mbInBufferedPaint && !m_pWindow->SupportsDoubleBuffering()) - SAL_WARN("vcl.doublebuffering", "non-double buffered window in the double-buffered hierarchy, painting directly: " << typeid(*m_pWindow.get()).name()); + SAL_WARN("vcl.window", "non-double buffered window in the double-buffered hierarchy, painting directly: " << typeid(*m_pWindow.get()).name()); if (pFrameData->mbInBufferedPaint && m_pWindow->SupportsDoubleBuffering()) { @@ -306,7 +306,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion) m_pWindow->Paint(*m_pWindow, m_aPaintRect); } - VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint end on " << + VCL_GL_INFO("PaintHelper::DoPaint end on " << typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "'"); } } |