From d7a655137bdb7f02cb79714e7d92aa0c26a55520 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 21 Aug 2002 09:23:00 +0000 Subject: [PATCH] dont pass an unused parameter, and return an unused value --- src/Window.cc | 16 ++++------------ src/Window.hh | 2 +- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/Window.cc b/src/Window.cc index 835cbdec..b129121c 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -3065,7 +3065,6 @@ void BlackboxWindow::doMove(int x_root, int y_root) { assert(flags.moving); assert(blackbox->getChangingWindow() == this); - bool warp = False; int dx = x_root - frame.grab_x, dy = y_root - frame.grab_y; dx -= frame.border_w; dy -= frame.border_w; @@ -3074,7 +3073,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) { if (screen->doOpaqueMove()) { if (screen->doWorkspaceWarping()) - warp = doWorkspaceWarping(x_root, y_root, dx, dy); + doWorkspaceWarping(x_root, y_root, dx); configure(dx, dy, frame.rect.width(), frame.rect.height()); } else { @@ -3086,7 +3085,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) { frame.changing.height() - 1); if (screen->doWorkspaceWarping()) - warp = doWorkspaceWarping(x_root, y_root, dx, dy); + doWorkspaceWarping(x_root, y_root, dx); frame.changing.setPos(dx, dy); @@ -3102,8 +3101,7 @@ void BlackboxWindow::doMove(int x_root, int y_root) { } -bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, - int &dx, int dy) { +void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, int &dx) { // workspace warping bool warp = False; unsigned int dest = screen->getCurrentWorkspaceID(); @@ -3120,7 +3118,7 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, else dest = 0; } if (! warp) - return False; + return; bool focus = flags.focused; // had focus while moving? @@ -3133,11 +3131,6 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, dx -= screen->getRect().width() - 1; } - /* - We grab the X server here so that we dont end up magically grabbing - a different window dring the warp. - */ - if (! flags.stuck) screen->reassociateWindow(this, dest, False); screen->changeWorkspaceID(dest); @@ -3154,7 +3147,6 @@ bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, if (focus) setInputFocus(); - return True; } diff --git a/src/Window.hh b/src/Window.hh index 727f1006..02c15bcb 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -296,7 +296,7 @@ private: void setState(unsigned long new_state); void upsize(void); void doMove(int x_root, int y_root); - bool doWorkspaceWarping(int x_root, int y_root, int &dx, int dy); + void doWorkspaceWarping(int x_root, int y_root, int &dx); void doWindowSnapping(int &dx, int &dy); void endMove(void); void doResize(int x_root, int y_root); -- 2.45.2