diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/workspace/qworkspace.cpp | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/workspace/qworkspace.cpp')
| -rw-r--r-- | src/workspace/qworkspace.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index b6699e8..2121adb 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -1087,7 +1087,7 @@ void QWorkspace::minimizeWindow( QWidget* w) { QWorkspaceChild* c = findChild( w ); - if ( !w || w && (!w->testWFlags( WStyle_Minimize ) || w->testWFlags( WStyle_Tool) ) ) + if ( !w || ( ( w && (!w->testWFlags( WStyle_Minimize ) ) ) || w->testWFlags( WStyle_Tool) ) ) return; if ( c ) { @@ -1184,7 +1184,7 @@ void QWorkspace::maximizeWindow( QWidget* w) { QWorkspaceChild* c = findChild( w ); - if ( !w || w && (!w->testWFlags( WStyle_Maximize ) || w->testWFlags( WStyle_Tool) ) ) + if ( !w || ( ( w && (!w->testWFlags( WStyle_Maximize ) ) ) || w->testWFlags( WStyle_Tool) ) ) return; if ( c ) { |