Skip to content

Commit

Permalink
const-ify
Browse files Browse the repository at this point in the history
  • Loading branch information
@groleo
groleo committed Sep 25, 2017
1 parent 47d679b commit 5df4341
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 67 deletions.
4 changes: 2 additions & 2 deletions src/classdef.cpp
View file
Expand Up @@ -3656,7 +3656,7 @@ void ClassDef::addInnerCompound(Definition *d)
}
}

Definition *ClassDef::findInnerCompound(const char *name)
Definition *ClassDef::findInnerCompound(const char *name) const
{
Definition *result=0;
if (name==0) return 0;
Expand Down Expand Up @@ -4394,7 +4394,7 @@ bool ClassDef::isLocal() const
return m_impl->isLocal;
}

ClassSDict *ClassDef::getClassSDict()
ClassSDict *ClassDef::getClassSDict() const
{
return m_impl->innerClasses;
}
Expand Down
4 changes: 2 additions & 2 deletions src/classdef.h
View file
Expand Up @@ -122,7 +122,7 @@ class ClassDef : public Definition
bool isLocal() const;

/** returns the classes nested into this class */
ClassSDict *getClassSDict();
ClassSDict *getClassSDict() const;

/** returns TRUE if this class has documentation */
bool hasDocumentation() const;
Expand Down Expand Up @@ -244,7 +244,7 @@ class ClassDef : public Definition
* available, or 0 otherwise.
* @param name The name of the nested compound
*/
virtual Definition *findInnerCompound(const char *name);
virtual Definition *findInnerCompound(const char *name) const;

/** Returns the template parameter lists that form the template
* declaration of this class.
Expand Down
2 changes: 1 addition & 1 deletion src/definition.cpp
View file
Expand Up @@ -1362,7 +1362,7 @@ void Definition::addSourceReferences(MemberDef *md)
}
}

Definition *Definition::findInnerCompound(const char *)
Definition *Definition::findInnerCompound(const char *) const
{
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/definition.h
View file
Expand Up @@ -261,7 +261,7 @@ class Definition : public DefinitionIntf

QList<ListItemInfo> *xrefListItems() const;

virtual Definition *findInnerCompound(const char *name);
virtual Definition *findInnerCompound(const char *name) const ;
virtual Definition *getOuterScope() const;

MemberSDict *getReferencesMembers() const;
Expand Down
2 changes: 1 addition & 1 deletion src/namespacedef.cpp
View file
Expand Up @@ -818,7 +818,7 @@ QCString NamespaceDef::getOutputFileBase() const
return fileName;
}

Definition *NamespaceDef::findInnerCompound(const char *n)
Definition *NamespaceDef::findInnerCompound(const char *n) const
{
if (n==0) return 0;
Definition *d = m_innerCompounds->find(n);
Expand Down
2 changes: 1 addition & 1 deletion src/namespacedef.h
View file
Expand Up @@ -80,7 +80,7 @@ class NamespaceDef : public Definition
void findSectionsInDocumentation();
void sortMemberLists();

virtual Definition *findInnerCompound(const char *name);
virtual Definition *findInnerCompound(const char *name) const;
void addInnerCompound(Definition *d);
void addListReferences();
void setFileName(const QCString &fn);
Expand Down
38 changes: 20 additions & 18 deletions src/sqlite3gen.cpp
View file
Expand Up @@ -543,7 +543,7 @@ static void insertMemberReference(sqlite3 *db, int refid_src, int refid_dst,
step(db,xrefs_insert);
}

static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst)
static void insertMemberReference(sqlite3 *db, const MemberDef *src, const MemberDef *dst)
{
QCString qrefid_dst = dst->getOutputFileBase() + "_1" + dst->anchor();
QCString qrefid_src = src->getOutputFileBase() + "_1" + src->anchor();
Expand All @@ -556,7 +556,7 @@ static void insertMemberReference(sqlite3 *db, MemberDef *src, MemberDef *dst)
}
}

static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef,MemberDef *md,Definition *def)
static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef, const MemberDef *md, const Definition *def)
{
ArgumentList *declAl = md->declArgumentList();
ArgumentList *defAl = md->argumentList();
Expand Down Expand Up @@ -629,7 +629,7 @@ static void insertMemberFunctionParams(sqlite3 *db,int id_memberdef,MemberDef *m
}
}

static void insertMemberDefineParams(sqlite3 *db,int id_memberdef,MemberDef *md,Definition *def)
static void insertMemberDefineParams(sqlite3 *db,int id_memberdef,const MemberDef *md, const Definition *def)
{
if (md->argumentList()->count()==0) // special case for "foo()" to
// disguish it from "foo".
Expand Down Expand Up @@ -793,9 +793,9 @@ static void writeInnerNamespaces(sqlite3 *db,const NamespaceSDict *nl)


static void writeTemplateArgumentList(sqlite3* db,
ArgumentList * al,
Definition * scope,
FileDef * fileScope)
const ArgumentList * al,
const Definition * scope,
const FileDef * fileScope)
{
if (al)
{
Expand Down Expand Up @@ -828,22 +828,22 @@ static void writeTemplateArgumentList(sqlite3* db,
}
}

static void writeMemberTemplateLists(sqlite3* db,MemberDef *md)
static void writeMemberTemplateLists(sqlite3* db,const MemberDef *md)
{
ArgumentList *templMd = md->templateArguments();
if (templMd) // function template prefix
{
writeTemplateArgumentList(db,templMd,md->getClassDef(),md->getFileDef());
}
}
static void writeTemplateList(sqlite3*db,ClassDef *cd)
static void writeTemplateList(sqlite3*db, const ClassDef *cd)
{
writeTemplateArgumentList(db,cd->templateArguments(),cd,0);
}
////////////////////////////////////////////

//////////////////////////////////////////////////////////////////////////////
static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
static void generateSqlite3ForMember(sqlite3*db,const MemberDef *md, const Definition *def)
{
// + declaration/definition arg lists
// + reimplements
Expand Down Expand Up @@ -976,7 +976,7 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
QCString typeStr = md->typeString();
stripQualifiers(typeStr);
StringList l;
linkifyText(TextGeneratorSqlite3Impl(l),def,md->getBodyDef(),md,typeStr);
linkifyText(TextGeneratorSqlite3Impl(l), def, md->getBodyDef(),md,typeStr);
if (typeStr.data())
{
bindTextParameter(memberdef_insert,":type",typeStr.data(),FALSE);
Expand Down Expand Up @@ -1099,8 +1099,10 @@ static void generateSqlite3ForMember(sqlite3*db,MemberDef *md,Definition *def)
}

static void generateSqlite3Section(sqlite3*db,
Definition *d,
MemberList *ml,const char * /*kind*/,const char * /*header*/=0,
const Definition *d,
const MemberList *ml,
const char * /*kind*/,
const char * /*header*/=0,
const char * /*documentation*/=0)
{
if (ml==0) return;
Expand Down Expand Up @@ -1129,7 +1131,7 @@ static void generateSqlite3Section(sqlite3*db,
}


static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd)
static void generateSqlite3ForClass(sqlite3 *db, const ClassDef *cd)
{
// + list of direct super classes
// + list of direct sub classes
Expand Down Expand Up @@ -1270,7 +1272,7 @@ static void generateSqlite3ForClass(sqlite3 *db, ClassDef *cd)
}
}

static void generateSqlite3ForNamespace(sqlite3 *db, NamespaceDef *nd)
static void generateSqlite3ForNamespace(sqlite3 *db, const NamespaceDef *nd)
{
// + contained class definitions
// + contained namespace definitions
Expand Down Expand Up @@ -1313,7 +1315,7 @@ static void generateSqlite3ForNamespace(sqlite3 *db, NamespaceDef *nd)
}
}

static void generateSqlite3ForFile(sqlite3 *db, FileDef *fd)
static void generateSqlite3ForFile(sqlite3 *db, const FileDef *fd)
{
// + includes files
// + includedby files
Expand Down Expand Up @@ -1408,17 +1410,17 @@ static void generateSqlite3ForFile(sqlite3 *db, FileDef *fd)
}
}

static void generateSqlite3ForGroup(sqlite3*db,GroupDef *gd)
static void generateSqlite3ForGroup(sqlite3*db, const GroupDef *gd)
{
#warning WorkInProgress
}

static void generateSqlite3ForDir(sqlite3 *db,DirDef *dd)
static void generateSqlite3ForDir(sqlite3 *db,const DirDef *dd)
{
#warning WorkInProgress
}

static void generateSqlite3ForPage(sqlite3 *db,PageDef *pd,bool isExample)
static void generateSqlite3ForPage(sqlite3 *db,const PageDef *pd,bool isExample)
{
#warning WorkInProgress
}
Expand Down

0 comments on commit 5df4341

Please sign in to comment.