diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-02-13 18:36:57 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-02-13 18:36:57 +0000 |
| commit | 77b788bb1c5fa861a3f12c76ad3f17bc8edc35b8 (patch) | |
| tree | 441f798cf2c8cb3a760c1ecf259f5faff356124c /src/dom/xpathtoken.cpp | |
| parent | changes_2013_02_01b.patch (diff) | |
| parent | Build. Adding unistd header (fixes compilation on Win32 with OpenSuse cross-c... (diff) | |
| download | inkscape-77b788bb1c5fa861a3f12c76ad3f17bc8edc35b8.tar.gz inkscape-77b788bb1c5fa861a3f12c76ad3f17bc8edc35b8.zip | |
merge from trunk (r12122)
(bzr r11668.1.51)
Diffstat (limited to 'src/dom/xpathtoken.cpp')
| -rw-r--r-- | src/dom/xpathtoken.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/dom/xpathtoken.cpp b/src/dom/xpathtoken.cpp index 79948e55e..216c7a069 100644 --- a/src/dom/xpathtoken.cpp +++ b/src/dom/xpathtoken.cpp @@ -937,19 +937,21 @@ Token Token::create(int type, long ival, /** * */ -TokenExecutor::TokenExecutor() +TokenExecutor::TokenExecutor() : + tokenList (), + nodeList () { - reset(); } /** * */ -TokenExecutor::TokenExecutor(const TokenExecutor &other) +TokenExecutor::TokenExecutor(const TokenExecutor &other) : + tokenList (other.tokenList), + nodeList () { - reset(); - assign(other); + // assign(other); } @@ -970,14 +972,6 @@ void TokenExecutor::assign(const TokenExecutor &other) } -/** - * - */ -void TokenExecutor::reset() -{ -} - - /** |