summaryrefslogtreecommitdiffstats
path: root/src/definition.h
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2013-05-12 13:04:34 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2013-05-12 13:04:34 (GMT)
commit8dc4ff6dd22b1603f33537ff03994cc63e658768 (patch)
tree97f0e23b93d45b7917d965e6d1bb70da6c61831a /src/definition.h
parentebf4b3641c9149eaf4468aa8df64e1c7517e5f0c (diff)
downloadDoxygen-8dc4ff6dd22b1603f33537ff03994cc63e658768.zip
Doxygen-8dc4ff6dd22b1603f33537ff03994cc63e658768.tar.gz
Doxygen-8dc4ff6dd22b1603f33537ff03994cc63e658768.tar.bz2
Release-1.8.3.1-20130512
Diffstat (limited to 'src/definition.h')
-rw-r--r--src/definition.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/definition.h b/src/definition.h
index 32c733a..74a801f 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -22,7 +22,6 @@
#include <qdict.h>
#include "types.h"
-#include "lockingptr.h"
class FileDef;
class OutputList;
@@ -89,7 +88,7 @@ class DefinitionIntf
* This can be a class or a member function, or a file, or a namespace, etc.
* Use definitionType() to find which type of definition this is.
*/
-class Definition : public DefinitionIntf, public LockableObj
+class Definition : public DefinitionIntf
{
public:
@@ -246,18 +245,20 @@ class Definition : public DefinitionIntf, public LockableObj
/** Returns the programming language this definition was written in. */
SrcLangExt getLanguage() const;
- LockingPtr<GroupList> partOfGroups() const;
+ GroupList *partOfGroups() const;
- LockingPtr< QList<ListItemInfo> > xrefListItems() const;
+ QList<ListItemInfo> *xrefListItems() const;
virtual Definition *findInnerCompound(const char *name);
virtual Definition *getOuterScope() const;
- LockingPtr<MemberSDict> getReferencesMembers() const;
- LockingPtr<MemberSDict> getReferencedByMembers() const;
+ MemberSDict *getReferencesMembers() const;
+ MemberSDict *getReferencedByMembers() const;
bool hasSections() const;
+ QCString id() const;
+
//-----------------------------------------------------------------------------------
// ---- setters -----
//-----------------------------------------------------------------------------------
@@ -293,8 +294,8 @@ class Definition : public DefinitionIntf, public LockableObj
// source references
void setBodySegment(int bls,int ble);
void setBodyDef(FileDef *fd);
- void addSourceReferencedBy(MemberDef *d, const char *floc=NULL);
- void addSourceReferences(MemberDef *d, const char *floc);
+ void addSourceReferencedBy(MemberDef *d);
+ void addSourceReferences(MemberDef *d);
void setRefItems(const QList<ListItemInfo> *sli);
void mergeRefItems(Definition *d);
@@ -334,12 +335,6 @@ class Definition : public DefinitionIntf, public LockableObj
protected:
- virtual void flushToDisk() const;
- virtual void loadFromDisk() const;
- virtual void makeResident() const;
- void lock() const {}
- void unlock() const {}
-
Definition(const Definition &d);
private: