M src/Workspace.cc → src/Workspace.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Workspace.cc,v 1.88 2003/12/18 18:03:22 fluxgen Exp $
+// $Id: Workspace.cc,v 1.89 2003/12/30 18:16:51 fluxgen Exp $
 
 #include "Workspace.hh"
 
@@ -32,8 +32,8 @@ #include "Screen.hh"
 #include "Window.hh"
 #include "WinClient.hh"
 #include "FbWinFrame.hh"
-#include "MenuItem.hh"
 
+#include "FbTk/MenuItem.hh"
 #include "FbTk/StringUtil.hh"
 
 // use GNU extensions
@@ -143,8 +143,7 @@ }
 
 void Workspace::addWindow(FluxboxWindow &w, bool place) {
     // we don't need to add a window that already exist in our list
-    if (find(m_windowlist.begin(), m_windowlist.end(), &w) !=
-        m_windowlist.end())
+    if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
         return;
 
     w.setWorkspace(m_id);

M src/WorkspaceCmd.cc → src/WorkspaceCmd.cc

@@ -20,7 +20,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: WorkspaceCmd.cc,v 1.8 2003/12/03 17:55:13 fluxgen Exp $
+// $Id: WorkspaceCmd.cc,v 1.9 2003/12/30 18:15:55 fluxgen Exp $
 
 #include "WorkspaceCmd.hh"
 
@@ -34,6 +34,7 @@ 
 #include <cmath>
 #include <algorithm>
 #include <functional>
+#include <iostream>
 
 void NextWindowCmd::execute() {
     
@@ -42,7 +43,7 @@ if (screen != 0) {
         Fluxbox *fb = Fluxbox::instance();
         // special case for commands from key events
         if (fb->lastEvent().type == KeyPress) {
-            unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state);
+            unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
             if (mods == 0) // can't stacked cycle unless there is a mod to grab
                 screen->nextFocus(m_option | BScreen::CYCLELINEAR);
             else {
@@ -63,7 +64,7 @@ if (screen != 0) {
         Fluxbox *fb = Fluxbox::instance();
         // special case for commands from key events
         if (fb->lastEvent().type == KeyPress) {
-            unsigned int mods = FbTk::KeyUtil::cleanMods(fb->lastEvent().xkey.state);
+            unsigned int mods = FbTk::KeyUtil::instance().cleanMods(fb->lastEvent().xkey.state);
             if (mods == 0) // can't stacked cycle unless there is a mod to grab
                 screen->prevFocus(m_option | BScreen::CYCLELINEAR);
             else {