Removed Wccl:: scope in Parser, because Parser is in Wccl namespace.

libwccl/parser/Parser.cpp

@@ -26,7 +26,7 @@ Parser::~Parser()
  * @arg str operator string
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
+boost::shared_ptr<ANTLRParserResult<StrSet> > Parser::parseStringOperator(
 		const std::string& str) const
 {
 	std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -41,7 +41,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
  * @arg istr input stream with the operator
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
+boost::shared_ptr<ANTLRParserResult<StrSet> > Parser::parseStringOperator(
 		std::istream& istr) const
 {
 	ANTLRLexer lexer(istr);
@@ -57,7 +57,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> > Parser::parseStringOperator(
  * @arg str operator string
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
+boost::shared_ptr<ANTLRParserResult<Bool> > Parser::parsePredicate(
 		const std::string& str) const
 {
 	std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -71,7 +71,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
  * @arg istr input stream with writed predicate
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
+boost::shared_ptr<ANTLRParserResult<Bool> > Parser::parsePredicate(
 		std::istream& istr) const
 {
 	ANTLRLexer lexer(istr);
@@ -87,7 +87,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Bool> > Parser::parsePredicate(
  * @arg str operator string
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
+boost::shared_ptr<ANTLRParserResult<TSet> > Parser::parseSymSetOperator(
 		const std::string& str) const
 {
 	std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -102,7 +102,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
  * @arg istr input stream with the operator
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
+boost::shared_ptr<ANTLRParserResult<TSet> > Parser::parseSymSetOperator(
 		std::istream& istr) const
 {
 	ANTLRLexer lexer(istr);
@@ -117,7 +117,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::TSet> > Parser::parseSymSetOperator(
  * @arg str operator string
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOperator(
+boost::shared_ptr<ANTLRParserResult<Position> > Parser::parsePositionOperator(
 		const std::string& str) const
 {
 	std::stringstream ss (std::stringstream::in | std::stringstream::out);
@@ -132,7 +132,7 @@ boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOpera
  * @arg istr input stream with the operator
  * @return the parsed operator via a shared pointer
  */
-boost::shared_ptr<ANTLRParserResult<Wccl::Position> > Parser::parsePositionOperator(
+boost::shared_ptr<ANTLRParserResult<Position> > Parser::parsePositionOperator(
 		std::istream& istr) const
 {
 	ANTLRLexer lexer(istr);

libwccl/parser/Parser.h

@@ -28,30 +28,30 @@ public:
 
 	// ---------------------------------------------------------------------------
 	// methods for parsing string operators
-	boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> >
+	boost::shared_ptr<ANTLRParserResult<StrSet> >
 			parseStringOperator(const std::string&) const;
-	boost::shared_ptr<ANTLRParserResult<Wccl::StrSet> >
+	boost::shared_ptr<ANTLRParserResult<StrSet> >
 			parseStringOperator(std::istream&) const;
 
 	// ---------------------------------------------------------------------------
 	// methods for parsing bool operators
-	boost::shared_ptr<ANTLRParserResult<Wccl::Bool> >
+	boost::shared_ptr<ANTLRParserResult<Bool> >
 			parsePredicate(const std::string&) const;
-	boost::shared_ptr<ANTLRParserResult<Wccl::Bool> >
+	boost::shared_ptr<ANTLRParserResult<Bool> >
 			parsePredicate(std::istream&) const;
 
 	// ---------------------------------------------------------------------------
 	// methods for parsing bool operators
-	boost::shared_ptr<ANTLRParserResult<Wccl::TSet> >
+	boost::shared_ptr<ANTLRParserResult<TSet> >
 			parseSymSetOperator(const std::string&) const;
-	boost::shared_ptr<ANTLRParserResult<Wccl::TSet> >
+	boost::shared_ptr<ANTLRParserResult<TSet> >
 			parseSymSetOperator(std::istream&) const;
 
 	// ---------------------------------------------------------------------------
 	// methods for parsing position operators
-	boost::shared_ptr<ANTLRParserResult<Wccl::Position> >
+	boost::shared_ptr<ANTLRParserResult<Position> >
 			parsePositionOperator(const std::string&) const;
-	boost::shared_ptr<ANTLRParserResult<Wccl::Position> >
+	boost::shared_ptr<ANTLRParserResult<Position> >
 			parsePositionOperator(std::istream&) const;
 
 	// ---------------------------------------------------------------------------