1 files changed, 5 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 778f179..3d30f2d 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1853,6 +1853,11 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
 				     	    current->reset();
 					  }
   					}
+<FindFields>"["				{ // attribute list in IDL
+					  squareCount=1;
+					  lastSquareContext = YY_START;
+					  BEGIN(SkipSquare);
+  					}
   /*
 <FindFieldArg>","			{ unput(*yytext); BEGIN(FindFields); }
   */
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index e81c5c5..2be7628 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id$
+# 
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 
diff --git a/addon/doxywizard/Makefile.win_nmake.in b/addon/doxywizard/Makefile.win_nmake.in
index 74a67a5..e48e05e 100644
--- a/addon/doxywizard/Makefile.win_nmake.in
+++ b/addon/doxywizard/Makefile.win_nmake.in
@@ -1,5 +1,5 @@
 #
-# $Id$
+# 
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index ea1f3de..1562b51 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -1,5 +1,5 @@
 #
-# $Id$
+# 
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 #
diff --git a/addon/doxywizard/expert.cpp b/addon/doxywizard/expert.cpp
index e2552a6..10a2e04 100644
--- a/addon/doxywizard/expert.cpp
+++ b/addon/doxywizard/expert.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/expert.h b/addon/doxywizard/expert.h
index e210253..3e13b47 100644
--- a/addon/doxywizard/expert.h
+++ b/addon/doxywizard/expert.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputbool.cpp b/addon/doxywizard/inputbool.cpp
index ffb2e76..a2208f5 100644
--- a/addon/doxywizard/inputbool.cpp
+++ b/addon/doxywizard/inputbool.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputbool.h b/addon/doxywizard/inputbool.h
index b7de7ed..ed7861d 100644
--- a/addon/doxywizard/inputbool.h
+++ b/addon/doxywizard/inputbool.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputint.cpp b/addon/doxywizard/inputint.cpp
index e926b5e..6489f60 100644
--- a/addon/doxywizard/inputint.cpp
+++ b/addon/doxywizard/inputint.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputint.h b/addon/doxywizard/inputint.h
index 094f03c..50e4b61 100644
--- a/addon/doxywizard/inputint.h
+++ b/addon/doxywizard/inputint.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstring.cpp b/addon/doxywizard/inputstring.cpp
index a132ff1..754e045 100644
--- a/addon/doxywizard/inputstring.cpp
+++ b/addon/doxywizard/inputstring.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstring.h b/addon/doxywizard/inputstring.h
index b1b2a7a..7e7b639 100644
--- a/addon/doxywizard/inputstring.h
+++ b/addon/doxywizard/inputstring.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstrlist.cpp b/addon/doxywizard/inputstrlist.cpp
index 3d26f21..2dc80ab 100644
--- a/addon/doxywizard/inputstrlist.cpp
+++ b/addon/doxywizard/inputstrlist.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/inputstrlist.h b/addon/doxywizard/inputstrlist.h
index b3c8909..7c79adb 100644
--- a/addon/doxywizard/inputstrlist.h
+++ b/addon/doxywizard/inputstrlist.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/qtbc.h b/addon/doxywizard/qtbc.h
index 029b84d..b1baec4 100644
--- a/addon/doxywizard/qtbc.h
+++ b/addon/doxywizard/qtbc.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/addon/doxywizard/version.h b/addon/doxywizard/version.h
index b86bb2e..226de7e 100644
--- a/addon/doxywizard/version.h
+++ b/addon/doxywizard/version.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/doc/config.doc b/doc/config.doc
index 2ebb6a5..be0c4a5 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -79,6 +79,7 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_directory_graph DIRECTORY_GRAPH
 \refitem cfg_disable_index DISABLE_INDEX 
 \refitem cfg_distribute_group_doc DISTRIBUTE_GROUP_DOC
+\refitem cfg_dot_graph_max_nodes DOT_GRAPH_MAX_NODES
 \refitem cfg_dot_image_format DOT_IMAGE_FORMAT
 \refitem cfg_dot_multi_targets DOT_MULTI_TARGETS
 \refitem cfg_dot_path DOT_PATH
@@ -160,9 +161,6 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_man_extension MAN_EXTENSION
 \refitem cfg_man_links MAN_LINKS
 \refitem cfg_man_output MAN_OUTPUT
-\refitem cfg_max_dot_graph_depth MAX_DOT_GRAPH_DEPTH
-\refitem cfg_max_dot_graph_height MAX_DOT_GRAPH_HEIGHT
-\refitem cfg_max_dot_graph_width MAX_DOT_GRAPH_WIDTH
 \refitem cfg_max_initializer_lines MAX_INITIALIZER_LINES
 \refitem cfg_multiline_cpp_is_brief MULTILINE_CPP_IS_BRIEF
 \refitem cfg_optimize_output_for_c OPTIMIZE_OUTPUT_FOR_C
@@ -1728,6 +1726,15 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
  in a graphical way. The dependency relations are determined by the \#include
  relations between the files in the directories.
 
+\anchor cfg_dot_graph_max_nodes 
+<dt>\c DOT_GRAPH_MAX_NODES <dd>
+ \addindex DOT_GRAPH_MAX_NODES
+ The \c MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+ nodes that will be shown in the graph. If the number of nodes in a graph 
+ becomes larger than this value, doxygen will truncate the graph, which is
+ visualized by representing a node as a red box. Note that doxygen will always 
+ show the root nodes and its direct children regardless of this setting. 
+
 \anchor cfg_dot_image_format
 <dt>\c DOT_IMAGE_FORMAT <dd>
  \addindex DOT_IMAGE_FORMAT
@@ -1748,39 +1755,6 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
  contain dot files that are included in the documentation (see the
  \\dotfile command).
 
-\anchor cfg_max_dot_graph_height 
-<dt>\c MAX_DOT_GRAPH_HEIGHT <dd>
- \addindex MAX_DOT_GRAPH_HEIGHT
- The \c MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height
- (in pixels) of the graphs generated by dot. If a graph becomes larger than
- this value, doxygen will try to truncate the graph, so that it fits within
- the specified constraint. Beware that most browsers cannot cope with very
- large images.
-
-\anchor cfg_max_dot_graph_depth
-<dt>\c MAX_DOT_GRAPH_DEPTH <dd>
-\addindex MAX_DOT_GRAPH_DEPTH
-The \c MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
-graphs generated by dot. A depth value of 3 means that only nodes reachable 
-from the root by following a path via at most 3 edges will be shown. Nodes that
-lay further from the root node will be omitted. Note that setting this option to 
-1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-note that a graph may be further truncated if the graph's image dimensions are 
-not sufficient to fit the graph (see 
-\ref cfg_max_dot_graph_width "MAX_DOT_GRAPH_WIDTH" and 
-\ref cfg_max_dot_graph_height "MAX_DOT_GRAPH_HEIGHT"). 
-If 0 is used for the depth value (the default), the graph is 
-not depth-constraint.
-
-\anchor cfg_max_dot_graph_width 
-<dt>\c MAX_DOT_GRAPH_WIDTH <dd>
- \addindex MAX_DOT_GRAPH_WIDTH
- The \c MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width
- (in pixels) of the graphs generated by dot. If a graph becomes larger than
- this value, doxygen will try to truncate the graph, so that it fits within
- the specified constraint. Beware that most browsers cannot cope with very
- large images.
-
 \anchor cfg_dot_transparent
 <dt>\c DOT_TRANSPARENT <dd>
  \addindex DOT_TRANSPARENT
diff --git a/doc/translator_report.txt b/doc/translator_report.txt
index 9df007e..65f29c6 100644
--- a/doc/translator_report.txt
+++ b/doc/translator_report.txt
@@ -58,10 +58,6 @@ must be implemented to become up-to-date:
   TranslatorSlovak                1.2.18	22 methods to implement
   TranslatorFinnish               obsolete	96 methods to implement
 
-Note: The adapter classes TranslatorAdapter_1_2_11,
-TranslatorAdapter_1_2_13, TranslatorAdapter_1_2_16,
-TranslatorAdapter_1_2_17 are not used and can be removed.
-
 ----------------------------------------------------------------------
 The following translator classes derive directly from the
 TranslatorEnglish. The class identifier has the suffix 'En' that says
diff --git a/qtools/qgstring.cpp b/qtools/qgstring.cpp
index a19d747..f43cd6b 100644
--- a/qtools/qgstring.cpp
+++ b/qtools/qgstring.cpp
@@ -13,6 +13,7 @@
  *
  */
 
+#include <stdio.h>
 #include "qgstring.h"
 
 #include <assert.h>
@@ -20,25 +21,31 @@
 #define BLOCK_SIZE 64
 #define ROUND_SIZE(x) ((x)+BLOCK_SIZE-1)&~(BLOCK_SIZE-1)
 
+#define DBG_STR(x) do { } while(0)
+
 QGString::QGString() // make null string
   : m_data(0), m_len(0), m_memSize(0) 
 {
+  DBG_STR(("%p: QGString::QGString() %d:%s\n",this,m_len,m_data?m_data:"<none>"));
 } 
 
 QGString::QGString(uint size)
 {
-  m_memSize = ROUND_SIZE(size);
-  if (m_memSize==0)
+  if (size==0)
   {
     m_data=0;
     m_len=0;
   }
   else
   {
+    m_memSize = ROUND_SIZE(size+1);
     m_data = (char*)malloc(m_memSize);
-    m_data[0]='\0';
-    m_len=0;
+    memset(m_data,' ',size);
+    m_data[size]='\0';
+    m_len=size;
   }
+  DBG_STR(("%p: QGString::QGString(uint size=%d) %d:%s\n",
+      this,size,m_len,m_data?m_data:"<none>"));
 }
 
 QGString::QGString( const QGString &s ) 
@@ -56,6 +63,7 @@ QGString::QGString( const QGString &s )
     m_memSize = s.m_memSize;
     qstrcpy(m_data,s.m_data);
   }
+  DBG_STR(("%p: QGString::QGString(const QGString &) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
 } 
 
 QGString::QGString( const char *str )
@@ -74,12 +82,14 @@ QGString::QGString( const char *str )
     m_data = (char *)malloc(m_memSize);
     qstrcpy(m_data,str);
   }
+  DBG_STR(("%p: QGString::QGString(const char *) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
 }
 
 QGString::~QGString() 
 { 
   free(m_data); 
   m_data=0; 
+  DBG_STR(("%p: QGString::~QGString() %d:%s\n",this,m_len,m_data?m_data:"<none>"));
 }
 
 bool QGString::resize( uint newlen )
@@ -89,6 +99,7 @@ bool QGString::resize( uint newlen )
   {
     if (m_data) { free(m_data); m_data=0; }
     m_memSize=0;
+    DBG_STR(("%p: 1.QGString::resize() %d:%s\n",this,m_len,m_data?m_data:"<none>"));
     return TRUE;
   }
   m_memSize = ROUND_SIZE(newlen+1);
@@ -101,9 +112,14 @@ bool QGString::resize( uint newlen )
   {
     m_data = (char *)realloc(m_data,m_memSize);
   }
-  if (m_data==0) return FALSE;
+  if (m_data==0) 
+  {
+    DBG_STR(("%p: 2.QGString::resize() %d:%s\n",this,m_len,m_data?m_data:"<none>"));
+    return FALSE;
+  }
   m_data[newlen-1]='\0';
   m_len = qstrlen(m_data);
+  DBG_STR(("%p: 3.QGString::resize() %d:%s\n",this,m_len,m_data?m_data:"<none>"));
   return TRUE;
 }
 
@@ -123,6 +139,8 @@ QGString &QGString::operator=( const QGString &s )
     m_data    = (char*)malloc(m_memSize);
     qstrcpy(m_data,s.m_data);
   }
+  DBG_STR(("%p: QGString::operator=(const QGString &%p) %d:%s\n",
+      this,&s,m_len,m_data?m_data:"<none>"));
   return *this;
 }
 
@@ -143,6 +161,7 @@ QGString &QGString::operator=( const char *str )
     m_data    = (char*)malloc(m_memSize);
     qstrcpy(m_data,str);
   }
+  DBG_STR(("%p: QGString::operator=(const char *) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
   return *this;
 }
 
@@ -160,6 +179,8 @@ QGString &QGString::operator+=( const QGString &s )
     m_data = newData;
     memcpy( m_data + len1, s, len2 + 1 );
   }
+  m_len = len1+len2;
+  DBG_STR(("%p: QGString::operator+=(const QGString &) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
   return *this;
 }
 
@@ -178,6 +199,7 @@ QGString &QGString::operator+=( const char *str )
     memcpy( m_data + len1, str, len2 + 1 );
   }
   m_len+=len2;
+  DBG_STR(("%p: QGString::operator+=(const char *) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
   return *this;
 }
 
@@ -195,6 +217,7 @@ QGString &QGString::operator+=( char c )
     m_data[len+1] = '\0';
   }
   m_len++;
+  DBG_STR(("%p: QGString::operator+=(char s) %d:%s\n",this,m_len,m_data?m_data:"<none>"));
   return *this;
 }
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 86298ce..e9decc4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
 
 #
-# $Id$
+# 
 #
 # Copyright (C) 1997-2006 by Dimitri van Heesch.
 # 
diff --git a/src/bufstr.h b/src/bufstr.h
index 995211a..3fcdd1d 100644
--- a/src/bufstr.h
+++ b/src/bufstr.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/classdef.cpp b/src/classdef.cpp
index ed4a603..6d00ea5 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -563,7 +563,6 @@ void ClassDef::internalInsertMember(MemberDef *md,
                 {
                   MemberList *ml = createMemberList(MemberList::constructors);
                   ml->append(md);
-                  md->setSectionList(this,ml);
                 }
                 else
                 {
@@ -1260,7 +1259,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
   if (Config_getBool("HAVE_DOT") && Config_getBool("CLASS_GRAPH"))
     // write class diagram using dot
   {
-    DotClassGraph inheritanceGraph(this,DotNode::Inheritance,Config_getInt("MAX_DOT_GRAPH_DEPTH"));
+    DotClassGraph inheritanceGraph(this,DotNode::Inheritance);
     if (!inheritanceGraph.isTrivial())
     {
       ol.pushGeneratorState();
@@ -1295,7 +1294,7 @@ void ClassDef::writeDocumentation(OutputList &ol)
 
   if (Config_getBool("HAVE_DOT") && Config_getBool("COLLABORATION_GRAPH"))
   {
-    DotClassGraph usageImplGraph(this,DotNode::Collaboration,Config_getInt("MAX_DOT_GRAPH_DEPTH"));
+    DotClassGraph usageImplGraph(this,DotNode::Collaboration);
     if (!usageImplGraph.isTrivial())
     {
       ol.pushGeneratorState();
diff --git a/src/classdef.h b/src/classdef.h
index 7152d84..5d745bf 100644
--- a/src/classdef.h
+++ b/src/classdef.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/classlist.cpp b/src/classlist.cpp
index aac8f95..67507d6 100644
--- a/src/classlist.cpp
+++ b/src/classlist.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/classlist.h b/src/classlist.h
index 3621e3b..0b74b03 100644
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/code.h b/src/code.h
index 26d8f7e..15dcdee 100644
--- a/src/code.h
+++ b/src/code.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/code.l b/src/code.l
index fa7b056..6a6224d 100644
--- a/src/code.l
+++ b/src/code.l
@@ -552,7 +552,8 @@ static void codifyLines(char *text)
  */
 static void writeMultiLineCodeLink(CodeOutputInterface &ol,
                   const char *ref,const char *file,
-                  const char *anchor,const char *text)
+                  const char *anchor,const char *text,
+		  const char *tooltip)
 {
   bool done=FALSE;
   char *p=(char *)text;
@@ -566,7 +567,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol,
       g_yyLineNr++;
       *(p-1)='\0';
       //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
-      ol.writeCodeLink(ref,file,anchor,sp);
+      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
       endCodeLine();
       if (g_yyLineNr<g_inputLines) 
       {
@@ -576,7 +577,7 @@ static void writeMultiLineCodeLink(CodeOutputInterface &ol,
     else
     {
       //printf("writeCodeLink(%s,%s,%s,%s)\n",ref,file,anchor,sp);
-      ol.writeCodeLink(ref,file,anchor,sp);
+      ol.writeCodeLink(ref,file,anchor,sp,tooltip);
       done=TRUE;
     }
   }
@@ -834,7 +835,8 @@ static bool getLinkInScope(const QCString &c,  // scope
       writeMultiLineCodeLink(ol,md->getReference(),
 	                        md->getOutputFileBase(),
 	                        md->anchor(),
-				text ? text : memberText);
+				text ? text : memberText,
+				md->briefDescriptionAsTooltip());
       addToSearchIndex(text ? text : memberText);
       return TRUE;
     } 
@@ -942,7 +944,7 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,char *clName,
     }
     ol.linkableSymbol(g_yyLineNr,cd->name(),cd,
                       g_currentMemberDef ? g_currentMemberDef : g_currentDefinition);
-    writeMultiLineCodeLink(ol,cd->getReference(),cd->getOutputFileBase(),0,clName);
+    writeMultiLineCodeLink(ol,cd->getReference(),cd->getOutputFileBase(),0,clName,cd->briefDescriptionAsTooltip());
     addToSearchIndex(className);
     if (md)
     {
@@ -985,7 +987,7 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,char *clName,
 	{
           ol.linkableSymbol(g_yyLineNr,md->name(),md,
 	                    g_currentMemberDef ? g_currentMemberDef : g_currentDefinition);
-	  writeMultiLineCodeLink(ol,md->getReference(),md->getOutputFileBase(),md->anchor(),clName);
+	  writeMultiLineCodeLink(ol,md->getReference(),md->getOutputFileBase(),md->anchor(),clName,md->briefDescriptionAsTooltip());
           addToSearchIndex(clName);
 	  if (g_currentMemberDef)
 	  {
@@ -1057,7 +1059,7 @@ static bool generateClassMemberLink(CodeOutputInterface &ol,ClassDef *mcd,const
         ol.linkableSymbol(g_yyLineNr,xmd->name(),xmd,
                           g_currentMemberDef ? g_currentMemberDef : g_currentDefinition);
 	writeMultiLineCodeLink(ol,xmd->getReference(),
-	    xmd->getOutputFileBase(),xmd->anchor(),memName);
+	    xmd->getOutputFileBase(),xmd->anchor(),memName,xmd->briefDescriptionAsTooltip());
         addToSearchIndex(memName);
 	return TRUE;
       }
@@ -1352,7 +1354,8 @@ static void writeObjCMethodCall(ObjCCallCtx *ctx)
 		                     ctx->method->getReference(),
 	                             ctx->method->getOutputFileBase(),
 	                             ctx->method->anchor(),
-				     pName->data());
+				     pName->data(),
+				     ctx->method->briefDescriptionAsTooltip());
 	      if (g_currentMemberDef)
 	      {
 	        addDocCrossReference(g_currentMemberDef,ctx->method);
@@ -1439,7 +1442,8 @@ static void writeObjCMethodCall(ObjCCallCtx *ctx)
 		    ctx->objectVar->getReference(),
 		    ctx->objectVar->getOutputFileBase(),
 		    ctx->objectVar->anchor(),
-		    pObject->data());
+		    pObject->data(),
+		    ctx->objectVar->briefDescriptionAsTooltip());
 	      if (g_currentMemberDef)
 	      {
 	        addDocCrossReference(g_currentMemberDef,ctx->objectVar);
@@ -1457,7 +1461,8 @@ static void writeObjCMethodCall(ObjCCallCtx *ctx)
 		    cd->getReference(),
 		    cd->getOutputFileBase(),
 		    0,
-		    pObject->data());
+		    pObject->data(),
+		    cd->briefDescriptionAsTooltip());
 	    }
 	    else // object still needs to be resolved
 	    {
@@ -1472,7 +1477,8 @@ static void writeObjCMethodCall(ObjCCallCtx *ctx)
 		    cd->getReference(),
 		    cd->getOutputFileBase(),
 		    0,
-		    pObject->data());
+		    pObject->data(),
+		    cd->briefDescriptionAsTooltip());
 	      }
 	      else
 	      {
@@ -1822,7 +1828,7 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
 					  if (found)
 					  {
 					    //printf("      include file %s found=%d\n",fd->absFilePath().data(),found);
-					    g_code->writeCodeLink(fd->getReference(),fd->getOutputFileBase(),0,yytext);
+					    g_code->writeCodeLink(fd->getReference(),fd->getOutputFileBase(),0,yytext,fd->briefDescriptionAsTooltip());
 					  }
 					  else
 					  {
diff --git a/src/commentcnv.h b/src/commentcnv.h
index 5924135..7ccbc4f 100644
--- a/src/commentcnv.h
+++ b/src/commentcnv.h
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/commentcnv.l b/src/commentcnv.l
index b988c67..c26334e 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -1,6 +1,6 @@
 /*****************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/commentscan.l b/src/commentscan.l
index 82178d4..ddd62a5 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -605,7 +605,6 @@ static inline void setOutput(OutputContext ctx)
 		    newXRefItemKey==xrefItemKey);              // with the same key if \xrefitem
   //printf("refKind=%d newXRefKind=%d xrefAppendToPrev=%d xrefAppendFlag=%d\n",
   //   	  xrefKind,newXRefKind,xrefAppendToPrev,xrefAppendFlag);
-  xrefItemKey = newXRefItemKey;
 
   //printf("setOutput(inContext=%d ctx=%d)\n",inContext,ctx);
   if (inContext==OutputXRef) // end of XRef section => add the item 
@@ -655,6 +654,7 @@ static inline void setOutput(OutputContext ctx)
 	break;
     }
   }
+  xrefItemKey = newXRefItemKey;
 
   int oldContext = inContext;
   inContext = ctx;
@@ -1319,7 +1319,7 @@ MAILADR   [a-z_A-Z0-9.+\-]+"@"[a-z_A-Z0-9\-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]
                                           xrefKind = XRef_Item;
 					  BEGIN( Comment );
   					}
-<XRefItemParam2>{LC}			{ // line continuation
+<XRefItemParam2,XRefItemParam3>{LC}	{ // line continuation
                                           yyLineNr++; 
 					  addOutput('\n');
   					}
diff --git a/src/config.l b/src/config.l
index 1c1dae7..19d3c1e 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
@@ -1145,7 +1145,7 @@ void Config::check()
 
 #undef PUTENV
 #undef SEP
-#if defined(_WIN32) && (__BORLANDC__ < 0x0550)
+#if defined(_WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ < 0x0550))
 #define PUTENV _putenv
 #define SEP ";"
 #else 
@@ -1167,11 +1167,13 @@ void Config::check()
     PUTENV(buf);
   }
 
+#if 0
   int &depth = Config_getInt("MAX_DOT_GRAPH_DEPTH");
   if (depth==0)
   {
     depth=1000;
   }
+#endif
   
   if (Config_getBool("OPTIMIZE_OUTPUT_JAVA") && Config_getBool("INLINE_INFO"))
   {
@@ -2751,38 +2753,18 @@ void Config::create()
   cl->setWidgetType(ConfigList::Dir);
   cl->addDependency("HAVE_DOT");
   ci = addInt(
-                    "MAX_DOT_GRAPH_WIDTH",
-                    "The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width \n"
-                    "(in pixels) of the graphs generated by dot. If a graph becomes larger than \n"
-                    "this value, doxygen will try to truncate the graph, so that it fits within \n"
-                    "the specified constraint. Beware that most browsers cannot cope with very \n"
-                    "large images. \n",
-                    100,30000, 1024
-                );
-  ci->addDependency("HAVE_DOT");
-  ci = addInt(
-                    "MAX_DOT_GRAPH_HEIGHT",
-                    "The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height \n"
-                    "(in pixels) of the graphs generated by dot. If a graph becomes larger than \n"
-                    "this value, doxygen will try to truncate the graph, so that it fits within \n"
-                    "the specified constraint. Beware that most browsers cannot cope with very \n"
-                    "large images. \n",
-                    100,30000,1024
-                );
-  ci = addInt(
-                    "MAX_DOT_GRAPH_DEPTH",
-                    "The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the \n"
-                    "graphs generated by dot. A depth value of 3 means that only nodes reachable \n"
-                    "from the root by following a path via at most 3 edges will be shown. Nodes \n"
-		    "that lay further from the root node will be omitted. Note that setting this \n"
-		    "option to 1 or 2 may greatly reduce the computation time needed for large \n"
-		    "code bases. Also note that a graph may be further truncated if the graph's \n"
-		    "image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH \n"
-		    "and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), \n"
-		    "the graph is not depth-constrained. \n",
-                    0,1000,0
+                    "DOT_GRAPH_MAX_NODES",
+                    "The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of \n"
+                    "nodes that will be shown in the graph. If the number of nodes in a graph \n"
+                    "becomes larger than this value, doxygen will truncate the graph, which is \n"
+                    "visualized by representing a node as a red box. Note that doxygen will always \n"
+                    "show the root nodes and its direct children regardless of this setting. \n",
+                    0,10000, 50
                 );
   ci->addDependency("HAVE_DOT");
+  addObsolete("MAX_DOT_GRAPH_WIDTH");
+  addObsolete("MAX_DOT_GRAPH_HEIGHT");
+  addObsolete("MAX_DOT_GRAPH_DEPTH");
   cb = addBool(
                     "DOT_TRANSPARENT",
 		    "Set the DOT_TRANSPARENT tag to YES to generate images with a transparent \n"
diff --git a/src/constexp.h b/src/constexp.h
index 67a7446..1a6c37b 100644
--- a/src/constexp.h
+++ b/src/constexp.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/constexp.l b/src/constexp.l
index 9b1409f..3a09242 100644
--- a/src/constexp.l
+++ b/src/constexp.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/constexp.y b/src/constexp.y
index 68b1ee9..81282dc 100644
--- a/src/constexp.y
+++ b/src/constexp.y
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/cppvalue.cpp b/src/cppvalue.cpp
index 4a59661..f1df666 100644
--- a/src/cppvalue.cpp
+++ b/src/cppvalue.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/cppvalue.h b/src/cppvalue.h
index 17ca81a..0a8d638 100644
--- a/src/cppvalue.h
+++ b/src/cppvalue.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/debug.cpp b/src/debug.cpp
index 7e8f9a2..258980e 100644
--- a/src/debug.cpp
+++ b/src/debug.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/debug.h b/src/debug.h
index 179e309..777b8fe 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
diff --git a/src/declinfo.h b/src/declinfo.h
index 4e83840..28c8add 100644
--- a/src/declinfo.h
+++ b/src/declinfo.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/declinfo.l b/src/declinfo.l
index f580edf..c269700 100644
--- a/src/declinfo.l
+++ b/src/declinfo.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/defargs.h b/src/defargs.h
index 87c5990..aeb8175 100644
--- a/src/defargs.h
+++ b/src/defargs.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/defargs.l b/src/defargs.l
index ec24ba0..e5a2de4 100644
--- a/src/defargs.l
+++ b/src/defargs.l
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/defgen.cpp b/src/defgen.cpp
index 529b913..8211151 100644
--- a/src/defgen.cpp
+++ b/src/defgen.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
@@ -457,16 +457,14 @@ void generateDEFForClass(ClassDef *cd,QTextStream &t)
   t << "  cp-documentation = <<_EnD_oF_dEf_TeXt_" << endl
     << cd->documentation() << endl << "_EnD_oF_dEf_TeXt_;" << endl;
 
-  DotClassGraph inheritanceGraph(cd,DotNode::Inheritance,
-                                 Config_getInt("MAX_DOT_GRAPH_DEPTH"));
+  DotClassGraph inheritanceGraph(cd,DotNode::Inheritance);
   if (!inheritanceGraph.isTrivial())
   {
     t << "  cp-inheritancegraph = <<_EnD_oF_dEf_TeXt_" << endl;
     inheritanceGraph.writeDEF(t);
     t << endl << "_EnD_oF_dEf_TeXt_;" << endl;
   }
-  DotClassGraph collaborationGraph(cd,DotNode::Collaboration,
-                                 Config_getInt("MAX_DOT_GRAPH_DEPTH"));
+  DotClassGraph collaborationGraph(cd,DotNode::Collaboration);
   if (!collaborationGraph.isTrivial())
   {
     t << "  cp-collaborationgraph = <<_EnD_oF_dEf_TeXt_" << endl;
diff --git a/src/defgen.h b/src/defgen.h
index 1bb562f..0e03064 100644
--- a/src/defgen.h
+++ b/src/defgen.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * $Id$
+ * 
  *
  * Copyright (C) 1997-2006 by Dimitri van Heesch.
  *
diff --git a/src/define.cpp b/src/define.cpp