summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-18 16:10:47 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-18 17:11:23 +0200
commitab06a1b74c0edc0d0d792c046afe4afbaaa1ada8 (patch)
tree67234378814a229ce28c85c41d839ba295ae599c /writerfilter
parent1f6017f758b4caa6138ccc1e74b6d2e5b924469d (diff)
writerfilter: drop global 'using' from XPathLogger
Change-Id: I8686a0aa3786284ab946d3c58b458ad211eb347d
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/inc/resourcemodel/XPathLogger.hxx15
-rw-r--r--writerfilter/source/resourcemodel/XPathLogger.cxx6
2 files changed, 9 insertions, 12 deletions
diff --git a/writerfilter/inc/resourcemodel/XPathLogger.hxx b/writerfilter/inc/resourcemodel/XPathLogger.hxx
index bdfd94cc199d..57e8aebc1e3d 100644
--- a/writerfilter/inc/resourcemodel/XPathLogger.hxx
+++ b/writerfilter/inc/resourcemodel/XPathLogger.hxx
@@ -29,19 +29,16 @@
namespace writerfilter
{
-using ::std::stack;
-using ::std::string;
-using ::std::vector;
class XPathLogger
{
- typedef boost::unordered_map<string, unsigned int> TokenMap_t;
+ typedef boost::unordered_map<std::string, unsigned int> TokenMap_t;
typedef boost::shared_ptr<TokenMap_t> TokenMapPointer_t;
TokenMapPointer_t mp_tokenMap;
- stack<TokenMapPointer_t> m_tokenMapStack;
- vector<string> m_path;
- string m_currentPath;
+ std::stack<TokenMapPointer_t> m_tokenMapStack;
+ std::vector<std::string> m_path;
+ std::string m_currentPath;
void updateCurrentPath();
@@ -49,8 +46,8 @@ public:
explicit XPathLogger();
virtual ~XPathLogger();
- string getXPath() const;
- void startElement(string _token);
+ std::string getXPath() const;
+ void startElement(std::string _token);
void endElement();
};
}
diff --git a/writerfilter/source/resourcemodel/XPathLogger.cxx b/writerfilter/source/resourcemodel/XPathLogger.cxx
index a62d1f9aa4b5..93297cbd41f2 100644
--- a/writerfilter/source/resourcemodel/XPathLogger.cxx
+++ b/writerfilter/source/resourcemodel/XPathLogger.cxx
@@ -33,7 +33,7 @@ XPathLogger::~XPathLogger()
{
}
-string XPathLogger::getXPath() const
+std::string XPathLogger::getXPath() const
{
return m_currentPath;
}
@@ -42,7 +42,7 @@ void XPathLogger::updateCurrentPath()
{
m_currentPath = "";
- for (vector<string>::const_iterator aIt = m_path.begin();
+ for (std::vector<std::string>::const_iterator aIt = m_path.begin();
aIt != m_path.end();
++aIt)
{
@@ -53,7 +53,7 @@ void XPathLogger::updateCurrentPath()
}
}
-void XPathLogger::startElement(string _token)
+void XPathLogger::startElement(std::string _token)
{
TokenMap_t::const_iterator aIt = mp_tokenMap->find(_token);