diff options
| author | danglassey <danglassey> | 2002-10-02 13:02:56 +0000 |
|---|---|---|
| committer | danglassey <danglassey> | 2002-10-02 13:02:56 +0000 |
| commit | bf167779c3051180f10188b1a988def048a8d232 (patch) | |
| tree | 2ad63a7d00c094e5cee55ec056f50e5b86576a14 /src/keys/treekeyidx.cpp | |
| parent | 44e038bb23d56043a458c29676d8ec42ee552fe0 (diff) | |
| download | sword-sf-cvs-bf167779c3051180f10188b1a988def048a8d232.tar.gz | |
sync with crosswire 20021002-1300
Diffstat (limited to 'src/keys/treekeyidx.cpp')
| -rw-r--r-- | src/keys/treekeyidx.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/keys/treekeyidx.cpp b/src/keys/treekeyidx.cpp index 99bd62f..d5d32fe 100644 --- a/src/keys/treekeyidx.cpp +++ b/src/keys/treekeyidx.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * versekey.h - code for class 'versekey'- a standard Biblical verse key * - * $Id: treekeyidx.cpp,v 1.9 2002/09/30 10:35:26 dglassey Exp $ + * $Id: treekeyidx.cpp,v 1.11 2002/10/01 22:04:58 dglassey Exp $ * * Copyright 1998 CrossWire Bible Society (http://www.crosswire.org) * CrossWire Bible Society @@ -32,6 +32,8 @@ #include <unistd.h> #endif +SWORD_NAMESPACE_START + static const char nl = '\n'; static const char *classes[] = {"TreeKeyIdx", "TreeKey", "SWKey", "SWObject", 0}; SWClass TreeKeyIdx::classdef(classes); @@ -127,12 +129,12 @@ void TreeKeyIdx::save() { const char *TreeKeyIdx::getFullName() const { TreeNode parent; - static string fullPath; + static std::string fullPath; fullPath = currentNode.name; parent.parent = currentNode.parent; while (parent.parent > -1) { getTreeNodeFromIdxOffset(parent.parent, &parent); - fullPath = ((string)parent.name) + (string) "/" + fullPath; + fullPath = ((std::string)parent.name) + (std::string) "/" + fullPath; } return fullPath.c_str(); } @@ -303,7 +305,7 @@ void TreeKeyIdx::getTreeNodeFromDatOffset(long ioffset, TreeNode *node) const { read(datfd->getFd(), &tmp, 4); node->firstChild = swordtoarch32(tmp); - string name; + std::string name; do { read(datfd->getFd(), &ch, 1); name += ch; @@ -594,3 +596,4 @@ SWKey *TreeKeyIdx::clone() const return new TreeKeyIdx(*this); } +SWORD_NAMESPACE_END |