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/unx/kde4/KDESalDisplay.cxx | |
| parent | 45979047abbd9da7a29401f298e8ef9ab58ad337 (diff) | |
loplugin:nullptr (automatic rewrite)
Change-Id: I05e89f9896170d4df3d1377549ea074f06b884a0
Diffstat (limited to 'vcl/unx/kde4/KDESalDisplay.cxx')
| -rw-r--r-- | vcl/unx/kde4/KDESalDisplay.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx index 06e7b6d06c76..105393fd9b54 100644 --- a/vcl/unx/kde4/KDESalDisplay.cxx +++ b/vcl/unx/kde4/KDESalDisplay.cxx @@ -25,12 +25,12 @@ #include <assert.h> #include <unx/saldata.hxx> -SalKDEDisplay* SalKDEDisplay::selfptr = NULL; +SalKDEDisplay* SalKDEDisplay::selfptr = nullptr; SalKDEDisplay::SalKDEDisplay( Display* pDisp ) : SalX11Display( pDisp ) { - assert( selfptr == NULL ); + assert( selfptr == nullptr ); selfptr = this; xim_protocol = XInternAtom( pDisp_, "_XIM_PROTOCOL", False ); } @@ -41,9 +41,9 @@ SalKDEDisplay::~SalKDEDisplay() static_cast<KDEXLib*>(GetXLib())->doStartup(); // clean up own members doDestruct(); - selfptr = NULL; + selfptr = nullptr; // prevent SalDisplay from closing KApplication's display - pDisp_ = NULL; + pDisp_ = nullptr; } void SalKDEDisplay::Yield() @@ -79,7 +79,7 @@ bool SalKDEDisplay::checkDirectInputEvent( XEvent* ev ) if( ev->xany.type == KeyPress || ev->xany.type == KeyRelease || ( ev->xany.type == ClientMessage && ev->xclient.message_type == xim_protocol )) { - if( QApplication::activeWindow() == NULL ) + if( QApplication::activeWindow() == nullptr ) { Dispatch(ev); return true; |