sync with bb-cvs

src/Basemenu.cc

@@ -40,6 +40,7 @@ extern "C" {
 }
 
 #include <algorithm>
+#include <assert.h>
 using namespace std;
 
 #include "i18n.hh"

src/Color.cc

@@ -25,13 +25,15 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
-#include "Color.hh"
-#include "BaseDisplay.hh"
-
 extern "C" {
 #include <stdio.h>
 }
 
+#include <assert.h>
+
+#include "Color.hh"
+#include "BaseDisplay.hh"
+
 
 BColor::ColorCache BColor::colorcache;
 bool BColor::cleancache = false;

src/GCCache.cc

@@ -90,8 +90,6 @@ BGCCache::~BGCCache(void) {
   std::for_each(cache, cache + cache_total_size, PointerAssassin());
   delete [] cache;
   delete [] contexts;
-  cache = 0;
-  contexts = 0;
 }
 
 
@@ -116,6 +114,7 @@ BGCCacheContext *BGCCache::nextContext(unsigned int scr) {
 
   fprintf(stderr, "BGCCache: context fault!\n");
   abort();
+  return (BGCCacheContext*) 0; // not reached
 }
 
 

src/Screen.cc

@@ -66,8 +66,11 @@ extern "C" {
 #endif // HAVE_STDARG_H
 }
 
+#include <assert.h>
+
 #include <algorithm>
 #include <functional>
+#include <string>
 using std::string;
 
 #include "i18n.hh"
@@ -1039,7 +1042,7 @@ void BScreen::changeWorkspaceID(unsigned int id) {
 
     if (blackbox->getFocusedWindow() &&
         blackbox->getFocusedWindow()->getScreen() == this &&
-        (! blackbox->getFocusedWindow()->isStuck())) {
+        ! blackbox->getFocusedWindow()->isStuck()) {
       current_workspace->setLastFocusedWindow(blackbox->getFocusedWindow());
       blackbox->setFocusedWindow((BlackboxWindow *) 0);
     }

src/Texture.cc

@@ -32,6 +32,8 @@ extern "C" {
 #endif
 }
 
+#include <assert.h>
+
 #include "Texture.hh"
 #include "BaseDisplay.hh"
 #include "Image.hh"

src/Util.cc

@@ -52,6 +52,8 @@ extern "C" {
 
 #include <X11/Xatom.h>
 
+#include <assert.h>
+
 #include <algorithm>
 
 #include "Util.hh"

src/Workspace.cc

@@ -38,6 +38,8 @@ extern "C" {
 #endif // HAVE_STRING_H
 }
 
+#include <assert.h>
+
 #include <functional>
 #include <string>
 
@@ -506,26 +508,26 @@ bool Workspace::smartPlacement(Rect& win, const Rect& availableArea) {
   if (screen->getPlacementPolicy() == BScreen::RowSmartPlacement) {
     if(screen->getRowPlacementDirection() == BScreen::LeftRight) {
       if(screen->getColPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(), spaces.end(), rowLRTB);
+        std::sort(spaces.begin(), spaces.end(), rowLRTB);
       else
-        sort(spaces.begin(), spaces.end(), rowLRBT);
+        std::sort(spaces.begin(), spaces.end(), rowLRBT);
     } else {
       if(screen->getColPlacementDirection() == BScreen::TopBottom)
-        sort(spaces.begin(), spaces.end(), rowRLTB);
+        std::sort(spaces.begin(), spaces.end(), rowRLTB);
       else
-        sort(spaces.begin(), spaces.end(), rowRLBT);
+        std::sort(spaces.begin(), spaces.end(), rowRLBT);
     }
   } else {
     if(screen->getColPlacementDirection() == BScreen::TopBottom) {
       if(screen->getRowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(), spaces.end(), colLRTB);
+        std::sort(spaces.begin(), spaces.end(), colLRTB);
       else
-        sort(spaces.begin(), spaces.end(), colRLTB);
+        std::sort(spaces.begin(), spaces.end(), colRLTB);
     } else {
       if(screen->getRowPlacementDirection() == BScreen::LeftRight)
-        sort(spaces.begin(), spaces.end(), colLRBT);
+        std::sort(spaces.begin(), spaces.end(), colLRBT);
       else
-        sort(spaces.begin(), spaces.end(), colRLBT);
+        std::sort(spaces.begin(), spaces.end(), colRLBT);
     }
   }
 

src/blackbox.cc

@@ -90,6 +90,8 @@ extern "C" {
 #endif // HAVE_LIBGEN_H
 }
 
+#include <assert.h>
+
 #include <algorithm>
 #include <string>
 using std::string;

src/main.cc

@@ -62,8 +62,8 @@ static void showHelp(int exitval) {
   // print program usage and command line options
   printf(i18n(mainSet, mainUsage,
               "Openbox %s : (c) 2002 - 2002 Ben Jansens\n"
-              "                 2001 - 2002 Sean 'Shaleh' Perry\n"
-              "                 1997 - 2000, 2002 Brad Hughes\n\n"
+              "                    2001 - 2002 Sean 'Shaleh' Perry\n"
+              "                    1997 - 2000, 2002 Brad Hughes\n\n"
               "  -display <string>\t\tuse display connection.\n"
               "  -rc <string>\t\t\tuse alternate resource file.\n"
               "  -menu <string>\t\tuse alternate menu file.\n"