diff options
Diffstat (limited to 'tdecore/kshell.cpp')
| -rw-r--r-- | tdecore/kshell.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/tdecore/kshell.cpp b/tdecore/kshell.cpp index 7e4eda947..155ecdb1c 100644 --- a/tdecore/kshell.cpp +++ b/tdecore/kshell.cpp @@ -75,17 +75,17 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) c = args.unicode()[pos++]; } while (c.isSpace()); TQString cret; - if ((flags & TildeExpand) && c == (QChar)'~') { + if ((flags & TildeExpand) && c == (TQChar)'~') { uint opos = pos; for (; ; pos++) { if (pos >= args.length()) break; c = args.unicode()[pos]; - if (c == (QChar)'/' || c.isSpace()) + if (c == (TQChar)'/' || c.isSpace()) break; if (isQuoteMeta( c )) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if ((flags & AbortOnMeta) && isMeta( c )) @@ -94,7 +94,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) TQString ccret = homeDir( TQConstString( args.unicode() + opos, pos - opos ).string() ); if (ccret.isEmpty()) { pos = opos; - c = (QChar)'~'; + c = (TQChar)'~'; goto notilde; } if (pos >= args.length()) { @@ -111,67 +111,67 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) } // before the notilde label, as a tilde does not match anyway if (firstword) { - if (c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z')) { + if (c == (TQChar)'_' || (c >= (TQChar)'A' && c <= (TQChar)'Z') || (c >= (TQChar)'a' && c <= (TQChar)'z')) { uint pos2 = pos; TQChar cc; do cc = args[pos2++]; - while (cc == (QChar)'_' || (cc >= (QChar)'A' && cc <= (QChar)'Z') || - (cc >= (QChar)'a' && cc <= (QChar)'z') || (cc >= (QChar)'0' && cc <= (QChar)'9')); - if (cc == (QChar)'=') + while (cc == (TQChar)'_' || (cc >= (TQChar)'A' && cc <= (TQChar)'Z') || + (cc >= (TQChar)'a' && cc <= (TQChar)'z') || (cc >= (TQChar)'0' && cc <= (TQChar)'9')); + if (cc == (TQChar)'=') goto metaerr; } } notilde: do { - if (c == (QChar)'\'') { + if (c == (TQChar)'\'') { uint spos = pos; do { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - } while (c != (QChar)'\''); + } while (c != (TQChar)'\''); cret += TQConstString( args.unicode() + spos, pos - spos - 1 ).string(); - } else if (c == (QChar)'"') { + } else if (c == (TQChar)'"') { for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'"') + if (c == (TQChar)'"') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c != (QChar)'"' && c != (QChar)'\\' && - !((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`'))) - cret += (QChar)'\\'; - } else if ((flags & AbortOnMeta) && (c == (QChar)'$' || c == (QChar)'`')) + if (c != (TQChar)'"' && c != (TQChar)'\\' && + !((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`'))) + cret += (TQChar)'\\'; + } else if ((flags & AbortOnMeta) && (c == (TQChar)'$' || c == (TQChar)'`')) goto metaerr; cret += c; } - } else if (c == (QChar)'$' && args[pos] == (QChar)'\'') { + } else if (c == (TQChar)'$' && args[pos] == (TQChar)'\'') { pos++; for (;;) { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; - if (c == (QChar)'\'') + if (c == (TQChar)'\'') break; - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; switch (c) { - case 'a': cret += (QChar)'\a'; break; - case 'b': cret += (QChar)'\b'; break; - case 'e': cret += (QChar)'\033'; break; - case 'f': cret += (QChar)'\f'; break; - case 'n': cret += (QChar)'\n'; break; - case 'r': cret += (QChar)'\r'; break; - case 't': cret += (QChar)'\t'; break; - case '\\': cret += (QChar)'\\'; break; - case '\'': cret += (QChar)'\''; break; + case 'a': cret += (TQChar)'\a'; break; + case 'b': cret += (TQChar)'\b'; break; + case 'e': cret += (TQChar)'\033'; break; + case 'f': cret += (TQChar)'\f'; break; + case 'n': cret += (TQChar)'\n'; break; + case 'r': cret += (TQChar)'\r'; break; + case 't': cret += (TQChar)'\t'; break; + case '\\': cret += (TQChar)'\\'; break; + case '\'': cret += (TQChar)'\''; break; case 'c': cret += args[pos++] & 31; break; case 'x': { @@ -189,11 +189,11 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) break; } default: - if (c >= (QChar)'0' && c <= (QChar)'7') { + if (c >= (TQChar)'0' && c <= (TQChar)'7') { int hv = c - '0'; for (int i = 0; i < 2; i++) { c = args[pos]; - if (c < (QChar)'0' || c > (QChar)'7') + if (c < (TQChar)'0' || c > (TQChar)'7') break; hv = hv * 8 + (c - '0'); pos++; @@ -209,7 +209,7 @@ TQStringList KShell::splitArgs( const TQString &args, int flags, int *err ) cret += c; } } else { - if (c == (QChar)'\\') { + if (c == (TQChar)'\\') { if (pos >= args.length()) goto quoteerr; c = args.unicode()[pos++]; @@ -354,7 +354,7 @@ TQString KShell::joinArgsDQ( const TQStringList &args ) TQString KShell::tildeExpand( const TQString &fname ) { - if (fname[0] == (QChar)'~') { + if (fname[0] == (TQChar)'~') { int pos = fname.find( '/' ); if (pos < 0) return homeDir( TQConstString( fname.unicode() + 1, fname.length() - 1 ).string() ); |