aboutsummaryrefslogtreecommitdiff
path: root/src/FbMenuParser.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbMenuParser.cc')
-rw-r--r--src/FbMenuParser.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/FbMenuParser.cc b/src/FbMenuParser.cc
index d0f5e9b..a5f52bd 100644
--- a/src/FbMenuParser.cc
+++ b/src/FbMenuParser.cc
@@ -34,9 +34,9 @@ bool FbMenuParser::open(const std::string &filename) {
34 return isLoaded(); 34 return isLoaded();
35} 35}
36 36
37Parser &FbMenuParser::operator >> (Parser::Item &out) { 37FbTk::Parser &FbMenuParser::operator >> (FbTk::Parser::Item &out) {
38 if (eof()) { 38 if (eof()) {
39 out = Parser::s_empty_item; 39 out = FbTk::Parser::s_empty_item;
40 return *this; 40 return *this;
41 } 41 }
42 42
@@ -65,7 +65,7 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
65 break; 65 break;
66 case DONE: // get new line and call this again 66 case DONE: // get new line and call this again
67 if (!nextLine()) { 67 if (!nextLine()) {
68 out = Parser::s_empty_item; 68 out = FbTk::Parser::s_empty_item;
69 return *this; 69 return *this;
70 } 70 }
71 return (*this)>>out; 71 return (*this)>>out;
@@ -86,7 +86,7 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
86 else if (m_curr_token == ICON) 86 else if (m_curr_token == ICON)
87 m_curr_token = DONE; 87 m_curr_token = DONE;
88 88
89 out = Parser::s_empty_item; 89 out = FbTk::Parser::s_empty_item;
90 return *this; 90 return *this;
91 } 91 }
92 92
@@ -119,8 +119,8 @@ Parser &FbMenuParser::operator >> (Parser::Item &out) {
119 return *this; 119 return *this;
120} 120}
121 121
122Parser::Item FbMenuParser::nextItem() { 122FbTk::Parser::Item FbMenuParser::nextItem() {
123 Parser::Item item; 123 FbTk::Parser::Item item;
124 (*this)>>item; 124 (*this)>>item;
125 return item; 125 return item;
126} 126}