diff options
Diffstat (limited to 'kate/cppsymbolviewer')
| -rw-r--r-- | kate/cppsymbolviewer/cpp_parser.cpp | 54 | ||||
| -rw-r--r-- | kate/cppsymbolviewer/tcl_parser.cpp | 4 |
2 files changed, 29 insertions, 29 deletions
diff --git a/kate/cppsymbolviewer/cpp_parser.cpp b/kate/cppsymbolviewer/cpp_parser.cpp index c99d455..b66c7fc 100644 --- a/kate/cppsymbolviewer/cpp_parser.cpp +++ b/kate/cppsymbolviewer/cpp_parser.cpp @@ -67,21 +67,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) cl = cl.stripWhiteSpace(); func_close = 0; if(cl.at(0) == '/' && cl.at(1) == '/') continue; - if(cl.tqfind("/*") == 0 && (cl.tqfind("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( - if(cl.tqfind("/*") >= 0 && graph == 0) comment = 1; - if(cl.tqfind("*/") >= 0 && graph == 0) comment = 0; - if(cl.tqfind("#") >= 0 && graph == 0 ) macro = 1; + if(cl.find("/*") == 0 && (cl.find("*/") == ((signed)cl.length() - 2)) && graph == 0) continue; // workaround :( + if(cl.find("/*") >= 0 && graph == 0) comment = 1; + if(cl.find("*/") >= 0 && graph == 0) comment = 0; + if(cl.find("#") >= 0 && graph == 0 ) macro = 1; if (comment != 1) { /* *********************** MACRO PARSING *****************************/ if(macro == 1) { - //macro_pos = cl.tqfind("#"); + //macro_pos = cl.find("#"); for (j = 0; j < cl.length(); j++) { if(cl.at(j)=='/' && cl.at(j+1)=='/') { macro = 4; break; } - if( (uint)cl.tqfind("define") == j && - !((uint)cl.tqfind("defined") == j)) + if( (uint)cl.find("define") == j && + !((uint)cl.find("defined") == j)) { macro = 2; j += 6; // skip the word "define" @@ -99,7 +99,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) if(j == cl.length() && macro == 1) macro = 0; if(macro == 4) { - //stripped.tqreplace(0x9, " "); + //stripped.replace(0x9, " "); stripped = stripped.stripWhiteSpace(); if (macro_on == true) { @@ -129,7 +129,7 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) /* ******************************************************************** */ - if ((cl.tqfind("class") >= 0 && graph == 0 && block == 0)) + if ((cl.find("class") >= 0 && graph == 0 && block == 0)) { mclass = 1; for (j = 0; j < cl.length(); j++) @@ -158,19 +158,19 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } if (mclass == 3) { - if (cl.tqfind('{') >= 0) + if (cl.find('{') >= 0) { - cl = cl.right(cl.tqfind('{')); + cl = cl.right(cl.find('{')); mclass = 4; } } - if(cl.tqfind("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) + if(cl.find("(") >= 0 && cl.at(0) != '#' && block == 0 && comment != 2) { structure = false; block = 1; } - if((cl.tqfind("typedef") >= 0 || cl.tqfind("struct") >= 0) && + if((cl.find("typedef") >= 0 || cl.find("struct") >= 0) && graph == 0 && block == 0) { structure = true; block = 2; stripped = ""; } - //if(cl.tqfind(";") >= 0 && graph == 0) + //if(cl.find(";") >= 0 && graph == 0) // block = 0; if(block > 0 && mclass != 1 ) @@ -216,21 +216,21 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) break; } - if(cl.at(j)=='{' && structure == false && cl.tqfind(";") < 0 || - cl.at(j)=='{' && structure == false && cl.tqfind('}') > (int)j) + if(cl.at(j)=='{' && structure == false && cl.find(";") < 0 || + cl.at(j)=='{' && structure == false && cl.find('}') > (int)j) { - stripped.tqreplace(0x9, " "); + stripped.replace(0x9, " "); if(func_on == true) { if (types_on == false) { - while (stripped.tqfind('(') >= 0) - stripped = stripped.left(stripped.tqfind('(')); - while (stripped.tqfind("::") >= 0) - stripped = stripped.mid(stripped.tqfind("::") + 2); + while (stripped.find('(') >= 0) + stripped = stripped.left(stripped.find('(')); + while (stripped.find("::") >= 0) + stripped = stripped.mid(stripped.find("::") + 2); stripped = stripped.stripWhiteSpace(); - while (stripped.tqfind(0x20) >= 0) - stripped = stripped.mid(stripped.tqfind(0x20, 0) + 1); + while (stripped.find(0x20) >= 0) + stripped = stripped.mid(stripped.find(0x20, 0) + 1); } //kdDebug(13000)<<"Function -- Inserted: "<<stripped<<" at row: "<<tmpPos<<" mclass: "<<(uint)mclass<<endl; if (treeMode) @@ -290,9 +290,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) { if(cl.at(j) == ';') { - //stripped.tqreplace(0x9, " "); + //stripped.replace(0x9, " "); stripped.remove('{'); - stripped.tqreplace('}', " "); + stripped.replace('}', " "); if(struct_on == true) { if (treeMode) @@ -319,9 +319,9 @@ void KatePluginSymbolViewerView::parseCppSymbols(void) } // BLOCK > 0 if (mclass == 4 && block == 0 && func_close == 0) { - if (cl.tqfind('}') >= 0) + if (cl.find('}') >= 0) { - cl = cl.right(cl.tqfind('}')); + cl = cl.right(cl.find('}')); mclass = 0; } } diff --git a/kate/cppsymbolviewer/tcl_parser.cpp b/kate/cppsymbolviewer/tcl_parser.cpp index fca2a5d..3402b67 100644 --- a/kate/cppsymbolviewer/tcl_parser.cpp +++ b/kate/cppsymbolviewer/tcl_parser.cpp @@ -80,8 +80,8 @@ void KatePluginSymbolViewerView::parseTclSymbols(void) { stripped = currline.right(currline.length() - 3); stripped = stripped.simplifyWhiteSpace(); - int fnd = stripped.tqfind(' '); - //fnd = stripped.tqfind(";"); + int fnd = stripped.find(' '); + //fnd = stripped.find(";"); if(fnd > 0) stripped = stripped.left(fnd); if (treeMode) |