summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/window
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-10 13:51:56 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-06-11 06:48:29 +0000
commitd203948fdb780c7af5777fcc26ad88bac1bd714e (patch)
tree95458f3a290eed3d9a4ca13f28ec63f50490d7a6 /vcl/unx/generic/window
parent754ade38ddb2e96187d00f3e621203cea34961fa (diff)
convert 'it.begin() == it.end()' to 'it.empty()'
Change-Id: I244a9eb6bce6b1c649653ec38ebb9a39f8b4c145 Reviewed-on: https://gerrit.libreoffice.org/16212 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx/generic/window')
-rw-r--r--vcl/unx/generic/window/salframe.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index d2511917ee85..fa733cfd5870 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -103,7 +103,7 @@ static int nVisibleFloats = 0;
static void doReparentPresentationDialogues( SalDisplay* pDisplay )
{
GetGenericData()->ErrorTrapPush();
- while( aPresentationReparentList.begin() != aPresentationReparentList.end() )
+ while( !aPresentationReparentList.empty() )
{
int x, y;
::Window aRoot, aChild;
@@ -3539,7 +3539,7 @@ long X11SalFrame::HandleExposeEvent( XEvent *pEvent )
}
if( IsOverrideRedirect() && mbFullScreen &&
- aPresentationReparentList.begin() == aPresentationReparentList.end() )
+ aPresentationReparentList.empty() )
// we are in fullscreen mode -> override redirect
// focus is possibly lost, so reget it
XSetInputFocus( GetXDisplay(), GetShellWindow(), RevertToNone, CurrentTime );
@@ -3562,7 +3562,7 @@ long X11SalFrame::HandleExposeEvent( XEvent *pEvent )
void X11SalFrame::RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWindows )
{
- if( maChildren.begin() != maChildren.end() )
+ if( !maChildren.empty() )
{
int nWindow = nTopLevelWindows;
while( nWindow-- )
@@ -3604,7 +3604,7 @@ void X11SalFrame::RestackChildren( ::Window* pTopLevelWindows, int nTopLevelWind
void X11SalFrame::RestackChildren()
{
if( ! GetDisplay()->getWMAdaptor()->isTransientBehaviourAsExpected()
- && maChildren.begin() != maChildren.end() )
+ && !maChildren.empty() )
{
::Window aRoot, aParent, *pChildren = NULL;
unsigned int nChildren;