1 files changed, 4 insertions, 21 deletions

diff --git a/src/util.h b/src/util.h
index 29b77f4..ed2e40c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -17,14 +17,10 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include "qtbc.h"
 #include <qlist.h>
-#include <qtstream.h>
+#include <qtextstream.h>
 #include <ctype.h>
-//#include "filedef.h"
-//#include "filename.h"
-#include "memberdef.h"
-//#include "outputlist.h"
-
 
 class ClassDef;
 class FileDef;
@@ -33,14 +29,10 @@ class NamespaceDef;
 class FileNameDict;
 class ArgumentList;
 class OutputList;
+class MemberDef;
+class ExampleList;
 
-//extern void writeMemberDecs(OutputList &ol, ClassDef *cd, NamespaceDef *nd,
-//                 FileDef *fd, const char *title, const char *subtitle,
-//                 MemberList *ml);
-//extern void writeMemberDocs(OutputList &ol,
-//                 MemberList *ml,const char *scopeName,MemberDef::MemberType m);
 extern void setAnchors(char id,MemberList *ml);
-//extern int  countMemberDocs(MemberList *ml,MemberDef::MemberType m);
 extern QCString fileToString(const char *name);
 extern QCString dateToString(bool);
 extern void linkifyText(OutputList &ol,const char *clName,const char *name,
@@ -52,8 +44,6 @@ extern void generateRef(OutputList &ol,const char *,
                         const char *,bool inSeeBlock,const char * =0);
 extern void generateLink(OutputList &ol,const char *,
                          const char *,bool inSeeBlock,const char *);
-//extern void generateClassRef(OutputList &ol,const char *clName,
-//                             const char *linkTxt=0);
 extern void generateFileRef(OutputList &ol,const char *,
                              const char *linkTxt=0);
 extern bool matchArguments(ArgumentList *,ArgumentList *,
@@ -64,12 +54,10 @@ extern QCString convertSlashes(const QCString &s,bool dots=FALSE);
 extern QCString substitute(const char *s,const char *src,const char *dst);
 extern QCString resolveDefines(const char *n);
 extern ClassDef *getClass(const char *key);
-//extern int strcscmp(const char *s1,const char *s2);
 extern FileDef *findFileDef(const FileNameDict *fnDict,const char *n,
                 bool &ambig);
 extern void showFileDefMatches(const FileNameDict *fnDict,const char *n);
 extern int guessSection(const char *name);
-//extern QCString nameToFile(const char *name);
 extern bool isId(char c);
 extern QCString removeRedundantWhiteSpace(const QCString &s);
 extern void startTitle(OutputList &ol,const char *fileName);
@@ -85,11 +73,6 @@ void writeExample(OutputList &ol,ExampleList *el);
 void setFileNameForSections(QList<QCString> *anchorList,const char *fileName);
 QCString stripAnnonymousScope(const QCString &s);
 QCString stripAnnonymousNamespaceScope(const QCString &s);
-
-
-//void writeLink(OutputList &ol,ClassDef *cd,NamespaceDef *nd,
-//                      FileDef *fd,MemberDef *md,const char *name);
-//void warnForUndocumentedMember(MemberDef *md);
 QCString stripFromPath(const QCString &path);
 bool rightScopeMatch(const QCString &scope, const QCString &name);
 bool leftScopeMatch(const QCString &scope, const QCString &name);