Bug 1399.

4 files changed, 5 insertions, 16 deletions

diff --git a/cpp/CHANGES b/cpp/CHANGES
index c018f04897c..a2a2bbfd9cf 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -195,6 +195,8 @@ Changes since version 3.1.1 (HEAD)
 Changes since version 3.1.0
 ---------------------------     
 
+- Removed obsolete --no-globals option from slice2docbook.
+
 - Fixed a bug in IceStorm where IceStorm stops sending events to
   linked topics if the linked topic becomes unavailable for any
   reason.
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 6d9cf83478b..81fd645ab83 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -19,10 +19,9 @@ using namespace std;
 using namespace Slice;
 using namespace IceUtil;
 
-Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool noGlobals, bool chapter,
+Slice::Gen::Gen(const string& name, const string& file, bool standAlone, bool chapter,
                 bool noIndex, bool sortFields) :
     _standAlone(standAlone),
-    _noGlobals(noGlobals),
     _noIndex(noIndex),
     _sortFields(sortFields)
 {
@@ -82,14 +81,6 @@ Slice::Gen::visitUnitStart(const UnitPtr& p)
 	printHeader();
     }
 
-    if(!_noGlobals && !_noIndex)
-    {
-	start(_chapter, "Global Module", false);
-//	start("section", "Overview", false);
-	visitContainer(p);
-//	end();
-    }
-
     return true;
 }
 
diff --git a/cpp/src/slice2docbook/Gen.h b/cpp/src/slice2docbook/Gen.h
index 76ee1bb6296..2ee41edbe9b 100644
--- a/cpp/src/slice2docbook/Gen.h
+++ b/cpp/src/slice2docbook/Gen.h
@@ -21,7 +21,7 @@ class Gen : private ::IceUtil::noncopyable, public ParserVisitor
 {
 public:
 
-    Gen(const std::string&, const std::string&, bool, bool, bool, bool, bool);
+    Gen(const std::string&, const std::string&, bool, bool, bool, bool);
     virtual ~Gen();
 
     bool operator!() const; // Returns true if there was a constructor error
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index 321c6fd1935..71593b9dd69 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -29,7 +29,6 @@ usage(const char* n)
         "-IDIR                Put DIR in the include file search path.\n"
 	"-E                   Print preprocessor output on stdout.\n"
         "-s, --stand-alone    Create stand-alone docbook file.\n"
-        "--no-globals         Don't document the global module.\n"
         "--chapter            Use \"chapter\" instead of \"section\" as\n"
         "                     top-level element.\n"
 	"--noindex            Suppress generation of index pages.\n"
@@ -46,7 +45,6 @@ main(int argc, char* argv[])
     string cppArgs;
     bool preprocess;
     bool standAlone;
-    bool noGlobals;
     bool chapter;
     bool noIndex;
     bool debug;
@@ -62,7 +60,6 @@ main(int argc, char* argv[])
     opts.addOpt("I", "", IceUtil::Options::NeedArg, "", IceUtil::Options::Repeat);
     opts.addOpt("E");
     opts.addOpt("s", "stand-alone");
-    opts.addOpt("", "no-globals");
     opts.addOpt("", "chapter");
     opts.addOpt("", "noindex");
     opts.addOpt("", "sort-fields");
@@ -118,7 +115,6 @@ main(int argc, char* argv[])
     }
     preprocess = opts.isSet("E");
     standAlone = opts.isSet("stand-alone");
-    noGlobals = opts.isSet("no-globals");
     chapter = opts.isSet("chapter");
     noIndex = opts.isSet("noindex");
     sortFields = opts.isSet("sort-fields");
@@ -194,7 +190,7 @@ main(int argc, char* argv[])
 
     if(status == EXIT_SUCCESS && !preprocess)
     {
-	Gen gen(argv[0], docbook, standAlone, noGlobals, chapter, noIndex, sortFields);
+	Gen gen(argv[0], docbook, standAlone, chapter, noIndex, sortFields);
 	if(!gen)
 	{
 	    p->destroy();