diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:28:29 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-10 10:32:00 +0100 |
commit | d3b6cb7ec2da4afb5687c9d28b2be2f96e6aa7b1 (patch) | |
tree | e9d209d6d5f06cacd8e0df78c7f6b8ad45d74be5 /vcl/workben | |
parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/workben')
-rw-r--r-- | vcl/workben/fftester.cxx | 58 | ||||
-rw-r--r-- | vcl/workben/icontest.cxx | 4 | ||||
-rw-r--r-- | vcl/workben/mtfdemo.cxx | 6 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 10 |
4 files changed, 39 insertions, 39 deletions
diff --git a/vcl/workben/fftester.cxx b/vcl/workben/fftester.cxx index c04d6d187499..c57407d661fd 100644 --- a/vcl/workben/fftester.cxx +++ b/vcl/workben/fftester.cxx @@ -111,7 +111,7 @@ try_again: { Graphic aGraphic; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) ImportJPEG(aFileStream, aGraphic, NULL, GraphicFilterImportFlags::NONE); + ret = (int) ImportJPEG(aFileStream, aGraphic, nullptr, GraphicFilterImportFlags::NONE); } else if (strcmp(argv[2], "gif") == 0) { @@ -151,7 +151,7 @@ try_again: } else if (strcmp(argv[2], "pcd") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -162,11 +162,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "dxf") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -177,11 +177,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "met") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -192,11 +192,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if ((strcmp(argv[2], "pbm") == 0) || strcmp(argv[2], "ppm") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -207,11 +207,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "psd") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -222,11 +222,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "eps") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -237,11 +237,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "pct") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -252,11 +252,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "pcx") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -267,11 +267,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "ras") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -282,11 +282,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "tga") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -297,11 +297,11 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if (strcmp(argv[2], "tif") == 0) { - static PFilterCall pfnImport(0); + static PFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -312,14 +312,14 @@ try_again: } Graphic aTarget; SvFileStream aFileStream(out, StreamMode::READ); - ret = (int) (*pfnImport)(aFileStream, aTarget, NULL); + ret = (int) (*pfnImport)(aFileStream, aTarget, nullptr); } else if ( (strcmp(argv[2], "doc") == 0) || (strcmp(argv[2], "ww8") == 0) || (strcmp(argv[2], "ww6") == 0) || (strcmp(argv[2], "ww2") == 0) ) { - static WFilterCall pfnImport(0); + static WFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -338,7 +338,7 @@ try_again: else if ( (strcmp(argv[2], "xls") == 0) || (strcmp(argv[2], "wb2") == 0) ) { - static WFilterCall pfnImport(0); + static WFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -351,7 +351,7 @@ try_again: } else if (strcmp(argv[2], "hwp") == 0) { - static HFilterCall pfnImport(0); + static HFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -364,7 +364,7 @@ try_again: } else if (strcmp(argv[2], "602") == 0) { - static HFilterCall pfnImport(0); + static HFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -377,7 +377,7 @@ try_again: } else if (strcmp(argv[2], "lwp") == 0) { - static HFilterCall pfnImport(0); + static HFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; @@ -390,7 +390,7 @@ try_again: } else if (strcmp(argv[2], "ppt") == 0) { - static HFilterCall pfnImport(0); + static HFilterCall pfnImport(nullptr); if (!pfnImport) { osl::Module aLibrary; diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx index 75910f545cae..f5028b92c4ee 100644 --- a/vcl/workben/icontest.cxx +++ b/vcl/workben/icontest.cxx @@ -84,8 +84,8 @@ public: MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow(pParent, nWinStyle) - , mpBitmap(NULL) - , mpFixedBitmap(NULL) + , mpBitmap(nullptr) + , mpFixedBitmap(nullptr) { mnPaintCount = 0; mnStartTime = getTimeNow(); diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx index ed66ed864998..3c842f9da649 100644 --- a/vcl/workben/mtfdemo.cxx +++ b/vcl/workben/mtfdemo.cxx @@ -41,7 +41,7 @@ class DemoMtfWin : public WorkWindow public: explicit DemoMtfWin(const OUString& rFileName) - : WorkWindow(NULL, WB_APP | WB_STDWORK) + : WorkWindow(nullptr, WB_APP | WB_STDWORK) { SvFileStream aFileStream(rFileName, StreamMode::READ); @@ -80,7 +80,7 @@ class DemoMtfApp : public Application public: DemoMtfApp() - : mpWin(NULL) + : mpWin(nullptr) { } @@ -147,7 +147,7 @@ protected: uno::Reference< lang::XComponent >( comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW)-> dispose(); - ::comphelper::setProcessServiceFactory(NULL); + ::comphelper::setProcessServiceFactory(nullptr); } }; diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 0e98530e8d77..76ec17d0f0f8 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1384,7 +1384,7 @@ class DemoWin : public WorkWindow public: DemoWin(DemoRenderer &rRenderer, bool bThreads) : - WorkWindow(NULL, WB_APP | WB_STDWORK), + WorkWindow(nullptr, WB_APP | WB_STDWORK), mrRenderer(rRenderer), testThreads(bThreads) { @@ -1478,7 +1478,7 @@ class DemoWidgets : public WorkWindow public: DemoWidgets() : - WorkWindow(NULL, WB_APP | WB_STDWORK), + WorkWindow(nullptr, WB_APP | WB_STDWORK), mpBox(VclPtrInstance<VclVBox>(this, false, 3)), mpToolbox(VclPtrInstance<ToolBox>(mpBox.get())), mpButton(VclPtrInstance<PushButton>(mpBox.get())), @@ -1609,7 +1609,7 @@ IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void) class DemoPopup : public FloatingWindow { public: - DemoPopup() : FloatingWindow( NULL, WB_SYSTEMWINDOW|WB_TOOLTIPWIN) + DemoPopup() : FloatingWindow( nullptr, WB_SYSTEMWINDOW|WB_TOOLTIPWIN) { SetType( WINDOW_HELPTEXTWINDOW ); @@ -1702,7 +1702,7 @@ public: } assert (pBuffer->IsFree()); (void)pBuffer; mpB->makeCurrent(); - assert (mpA->mpCurrentFramebuffer == NULL); + assert (mpA->mpCurrentFramebuffer == nullptr); } void testVirtualDevice() @@ -1880,7 +1880,7 @@ protected: uno::Reference< lang::XComponent >( comphelper::getProcessComponentContext(), uno::UNO_QUERY_THROW)-> dispose(); - ::comphelper::setProcessServiceFactory(NULL); + ::comphelper::setProcessServiceFactory(nullptr); } }; |