Release-1.2.15-20020430

6 files changed, 13 insertions, 4 deletions

diff --git a/addon/doxmlparser/include/doxmlintf.h b/addon/doxmlparser/include/doxmlintf.h
index becbe78..5c051dd 100644
--- a/addon/doxmlparser/include/doxmlintf.h
+++ b/addon/doxmlparser/include/doxmlintf.h
@@ -681,11 +681,11 @@ class IFile : public ICompound
   public:
     virtual IGraph *includeDependencyGraph() const = 0;
     virtual IGraph *includedByDependencyGraph() const = 0;
+    virtual IDocProgramListing *source() const = 0;
 
     // file:
     //  includes()
     //  includedBy()
-    //  IDocProgramListing *source()
     //  ICompound *innerNamespaces()
     //  ICompoundIterator *innerClasses()
 };
diff --git a/addon/doxmlparser/src/compoundhandler.cpp b/addon/doxmlparser/src/compoundhandler.cpp
index 59d4cd9..b6c6235 100644
--- a/addon/doxmlparser/src/compoundhandler.cpp
+++ b/addon/doxmlparser/src/compoundhandler.cpp
@@ -190,7 +190,6 @@ CompoundHandler::CompoundHandler(const QString &xmlDir)
   addStartHandler("innerclass",this,&CompoundHandler::startInnerClass);
   addEndHandler("innerclass");
 
-
 }
 
 CompoundHandler::~CompoundHandler()
@@ -461,3 +460,8 @@ ICompoundIterator *CompoundHandler::nestedClasses() const
   return new CompoundIdIterator(m_mainHandler,m_innerClasses);
 }
 
+IDocProgramListing *CompoundHandler::source() const
+{
+  return m_programListing;
+}
+
diff --git a/addon/doxmlparser/src/compoundhandler.h b/addon/doxmlparser/src/compoundhandler.h
index b331bec..bc725e3 100644
--- a/addon/doxmlparser/src/compoundhandler.h
+++ b/addon/doxmlparser/src/compoundhandler.h
@@ -123,6 +123,7 @@ class CompoundHandler : public IClass,
     // IFile implementation
     IGraph *includeDependencyGraph() const; 
     IGraph *includedByDependencyGraph() const;
+    IDocProgramListing *source() const;
     
   private:
     QList<RelatedCompound>  m_superClasses;
@@ -147,6 +148,7 @@ class CompoundHandler : public IClass,
     GraphHandler           *m_includeDependencyGraph;
     GraphHandler           *m_includedByDependencyGraph;
     QList<QString>          m_innerClasses;
+    ProgramListingHandler  *m_source;
 
 };
 
diff --git a/addon/doxmlparser/src/dochandler.cpp b/addon/doxmlparser/src/dochandler.cpp
index f21c90f..6a37f7a 100644
--- a/addon/doxmlparser/src/dochandler.cpp
+++ b/addon/doxmlparser/src/dochandler.cpp
@@ -627,7 +627,7 @@ void RefHandler::startRef(const QXmlAttributes& attrib)
 {
   m_parent->setDelegate(this);
   m_refId = attrib.value("refid");
-  m_refId = attrib.value("external");
+  m_extId = attrib.value("external");
   ASSERT(attrib.value("kindref")=="compound" || 
          attrib.value("kindref")=="member");
   m_targetKind = attrib.value("kindref")=="compound" ?  Compound : Member;
diff --git a/addon/doxmlparser/src/doxmlintf.h b/addon/doxmlparser/src/doxmlintf.h
index becbe78..5c051dd 100644
--- a/addon/doxmlparser/src/doxmlintf.h
+++ b/addon/doxmlparser/src/doxmlintf.h
@@ -681,11 +681,11 @@ class IFile : public ICompound
   public:
     virtual IGraph *includeDependencyGraph() const = 0;
     virtual IGraph *includedByDependencyGraph() const = 0;
+    virtual IDocProgramListing *source() const = 0;
 
     // file:
     //  includes()
     //  includedBy()
-    //  IDocProgramListing *source()
     //  ICompound *innerNamespaces()
     //  ICompoundIterator *innerClasses()
 };
diff --git a/addon/doxmlparser/test/main.cpp b/addon/doxmlparser/test/main.cpp
index a6b867d..31beab8 100644
--- a/addon/doxmlparser/test/main.cpp
+++ b/addon/doxmlparser/test/main.cpp
@@ -588,6 +588,9 @@ int main(int argc,char **argv)
 
       printf("==== included by dependency graph ==== \n");
       DumpGraph(file->includedByDependencyGraph());
+
+      printf("==== source ====\n");
+      DumpDoc(file->source(),0);
     }
     
     comp->release();