diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2010-12-04 13:22:40 +0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-05 19:05:55 +0000 |
commit | 54b42134116b9d5f7f56caaf0b041782fa5d0d5c (patch) | |
tree | ca066fdf5f400820326ad2add87a251ffcafb176 /vcl/unx/source | |
parent | 9143a46db7c1d0cf4beff83c14e940291fefe6a7 (diff) |
Replace all occured, occurance etc.
Diffstat (limited to 'vcl/unx/source')
-rw-r--r-- | vcl/unx/source/app/saldata.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/app/saldisp.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/app/wmadaptor.cxx | 4 | ||||
-rw-r--r-- | vcl/unx/source/gdi/salbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/window/FWS.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/source/window/salframe.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/source/window/salobj.cxx | 4 |
7 files changed, 13 insertions, 13 deletions
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx index 609ae471ceaa..2d27ec497ec9 100644 --- a/vcl/unx/source/app/saldata.cxx +++ b/vcl/unx/source/app/saldata.cxx @@ -465,7 +465,7 @@ void SalXLib::Init() SalI18N_KeyboardExtension *pKbdExtension = new SalI18N_KeyboardExtension( pDisp ); XSync( pDisp, False ); - pKbdExtension->UseExtension( ! HasXErrorOccured() ); + pKbdExtension->UseExtension( ! HasXErrorOccurred() ); PopXErrorLevel(); pSalDisplay->SetKbdExtension( pKbdExtension ); @@ -535,7 +535,7 @@ void SalXLib::XError( Display *pDisplay, XErrorEvent *pEvent ) static Bool bOnce = False; if ( !bOnce ) { - std::fprintf(stderr, "X-Error occured in a request for X_OpenFont\n"); + std::fprintf(stderr, "X-Error occurred in a request for X_OpenFont\n"); EmitFontpathWarning(); bOnce = True ; diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx index c85c44cb2b61..c24a4f3956eb 100644 --- a/vcl/unx/source/app/saldisp.cxx +++ b/vcl/unx/source/app/saldisp.cxx @@ -2365,13 +2365,13 @@ void SalX11Display::Yield() Dispatch( &aEvent ); #ifdef DBG_UTIL - if( pXLib_->HasXErrorOccured() ) + if( pXLib_->HasXErrorOccurred() ) { XFlush( pDisp_ ); PrintEvent( "SalDisplay::Yield (WasXError)", &aEvent ); } #endif - pXLib_->ResetXErrorOccured(); + pXLib_->ResetXErrorOccurred(); } long SalX11Display::Dispatch( XEvent *pEvent ) diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx index d0680b599615..725ec7d65733 100644 --- a/vcl/unx/source/app/wmadaptor.cxx +++ b/vcl/unx/source/app/wmadaptor.cxx @@ -669,7 +669,7 @@ GnomeWMAdaptor::GnomeWMAdaptor( SalDisplay* pSalDisplay ) : && aRealType == XA_CARDINAL && nFormat == 32 && nItems != 0 - && ! m_pSalDisplay->GetXLib()->HasXErrorOccured() + && ! m_pSalDisplay->GetXLib()->HasXErrorOccurred() ) { aCheckWindow = *(XLIB_Window*)pProperty; @@ -872,7 +872,7 @@ bool WMAdaptor::getNetWmName() && aRealType == XA_WINDOW && nFormat == 32 && nItems != 0 - && ! m_pSalDisplay->GetXLib()->HasXErrorOccured() + && ! m_pSalDisplay->GetXLib()->HasXErrorOccurred() ) { aCheckWindow = *(XLIB_Window*)pProperty; diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx index ec00e0e1fc2e..2ad9f51d92a9 100644 --- a/vcl/unx/source/gdi/salbmp.cxx +++ b/vcl/unx/source/gdi/salbmp.cxx @@ -211,7 +211,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( Drawable aDrawable, // so better catch the XError pXLib->PushXErrorLevel( true ); XImage* pImage = XGetImage( pXDisp, aDrawable, nX, nY, nWidth, nHeight, AllPlanes, ZPixmap ); - bool bWasError = pXLib->HasXErrorOccured() && pXLib->GetLastXErrorRequestCode() == X_GetImage; + bool bWasError = pXLib->HasXErrorOccurred() && pXLib->GetLastXErrorRequestCode() == X_GetImage; pXLib->PopXErrorLevel(); if( ! bWasError && pImage && pImage->data ) diff --git a/vcl/unx/source/window/FWS.cxx b/vcl/unx/source/window/FWS.cxx index 1c08cd6ed42d..a90f76af90c2 100644 --- a/vcl/unx/source/window/FWS.cxx +++ b/vcl/unx/source/window/FWS.cxx @@ -191,7 +191,7 @@ WMSupportsFWS (Display *display, int screen) * * newHandler() - * - * Handle X errors (temporarily) to record the occurance of BadWindow + * Handle X errors (temporarily) to record the occurrence of BadWindow * errors without crashing. Used to detect the FWS_COMM_WINDOW root window * property containing an old or obsolete window id. * diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index e751c04218c6..977c0ecdf93f 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -3753,7 +3753,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) &hDummy, &Children, &nChildren ); - if( GetDisplay()->GetXLib()->HasXErrorOccured() ) + if( GetDisplay()->GetXLib()->HasXErrorOccurred() ) { hWM_Parent = GetShellWindow(); break; @@ -3843,7 +3843,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) * so need real geometries here * (this will fail with virtual roots ?) */ - GetDisplay()->GetXLib()->ResetXErrorOccured(); + GetDisplay()->GetXLib()->ResetXErrorOccurred(); int xp, yp, x, y; unsigned int wp, w, hp, h, bw, d; XGetGeometry( GetXDisplay(), @@ -3855,7 +3855,7 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) &hRoot, &xp, &yp, &wp, &hp, &bw, &d ); bool bResized = false; - if( ! GetDisplay()->GetXLib()->HasXErrorOccured() ) + if( ! GetDisplay()->GetXLib()->HasXErrorOccurred() ) { maGeometry.nRightDecoration = wp - w - maGeometry.nLeftDecoration; maGeometry.nBottomDecoration = hp - h - maGeometry.nTopDecoration; diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx index 65a53ed8ac12..6704077b1ec4 100644 --- a/vcl/unx/source/window/salobj.cxx +++ b/vcl/unx/source/window/salobj.cxx @@ -149,7 +149,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pVisual, CWEventMask|CWColormap, &aAttribs ); XSync( pDisp, False ); - BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured(); + BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccurred(); pSalDisp->GetXLib()->PopXErrorLevel(); if( bWasXError ) { @@ -176,7 +176,7 @@ X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* p pObjData->pAppContext = NULL; XSync(pDisp, False); - BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccured(); + BOOL bWasXError = pSalDisp->GetXLib()->HasXErrorOccurred(); pSalDisp->GetXLib()->PopXErrorLevel(); if( bWasXError ) { |