summaryrefslogtreecommitdiffstats
path: root/libksieve
diff options
context:
space:
mode:
Diffstat (limited to 'libksieve')
-rw-r--r--libksieve/parser/lexer.cpp6
-rw-r--r--libksieve/shared/error.cpp30
-rw-r--r--libksieve/tests/parsertest.cpp2
3 files changed, 19 insertions, 19 deletions
diff --git a/libksieve/parser/lexer.cpp b/libksieve/parser/lexer.cpp
index a38c61021..3bc75c96e 100644
--- a/libksieve/parser/lexer.cpp
+++ b/libksieve/parser/lexer.cpp
@@ -40,7 +40,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
#include <memory> // std::auto_ptr
@@ -476,9 +476,9 @@ namespace KSieve {
const int identifierLength = mState.cursor - identifierStart;
- // Can use the fast tqfromLatin1 here, since identifiers are always
+ // Can use the fast fromLatin1 here, since identifiers are always
// in the us-ascii subset:
- result += TQString::tqfromLatin1( identifierStart, identifierLength );
+ result += TQString::fromLatin1( identifierStart, identifierLength );
if ( atEnd() || isDelim( *mState.cursor ) )
return true;
diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index 9fe79c1da..faf20bcc6 100644
--- a/libksieve/shared/error.cpp
+++ b/libksieve/shared/error.cpp
@@ -129,7 +129,7 @@ namespace KSieve {
"follow \"text:\" on the same line");
break;
case NumberOutOfRange:
- err = i18n("Parse error: Number out of Range (must be smaller than %1)").tqarg(UINT_MAX);
+ err = i18n("Parse error: Number out of Range (must be smaller than %1)").arg(UINT_MAX);
break;
case InvalidUTF8:
err = i18n("Parse error: Invalid UTF-8 sequence");
@@ -188,51 +188,51 @@ namespace KSieve {
err = i18n("\"require\" must be first command");
break;
case RequireMissingForCommand:
- err = i18n("\"require\" missing for command \"%1\"").tqarg(mStringOne);
+ err = i18n("\"require\" missing for command \"%1\"").arg(mStringOne);
break;
case RequireMissingForTest:
- err = i18n("\"require\" missing for test \"%1\"").tqarg(mStringOne);
+ err = i18n("\"require\" missing for test \"%1\"").arg(mStringOne);
break;
case RequireMissingForComparator:
- err = i18n("\"require\" missing for comparator \"%1\"").tqarg(mStringOne);
+ err = i18n("\"require\" missing for comparator \"%1\"").arg(mStringOne);
break;
case UnsupportedCommand:
- err = i18n("Command \"%1\" not supported").tqarg(mStringOne);
+ err = i18n("Command \"%1\" not supported").arg(mStringOne);
break;
case UnsupportedTest:
- err = i18n("Test \"%1\" not supported").tqarg(mStringOne);
+ err = i18n("Test \"%1\" not supported").arg(mStringOne);
break;
case UnsupportedComparator:
- err = i18n("Comparator \"%1\" not supported").tqarg(mStringOne);
+ err = i18n("Comparator \"%1\" not supported").arg(mStringOne);
break;
case TestNestingTooDeep:
- err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").tqarg( mStringOne.toUInt() );
+ err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").arg( mStringOne.toUInt() );
break;
case BlockNestingTooDeep:
- err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").tqarg( mStringOne.toUInt() );
+ err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").arg( mStringOne.toUInt() );
break;
case InvalidArgument:
- err = i18n("Invalid Argument \"%1\" to \"%2\"").tqarg(mStringOne).tqarg(mStringTwo);
+ err = i18n("Invalid Argument \"%1\" to \"%2\"").arg(mStringOne).arg(mStringTwo);
break;
case ConflictingArguments:
- err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").tqarg(mStringOne).tqarg(mStringTwo);
+ err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").arg(mStringOne).arg(mStringTwo);
break;
case ArgumentsRepeated:
- err = i18n("Argument \"%1\" Repeated").tqarg(mStringOne);
+ err = i18n("Argument \"%1\" Repeated").arg(mStringOne);
break;
case CommandOrderingConstraintViolation:
- err = i18n("Command \"%1\" violates command ordering constraints").tqarg(mStringOne);
+ err = i18n("Command \"%1\" violates command ordering constraints").arg(mStringOne);
break;
// runtime errors:
case IncompatibleActionsRequested:
- err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").tqarg(mStringOne).tqarg(mStringTwo);
+ err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").arg(mStringOne).arg(mStringTwo);
break;
case MailLoopDetected:
err = i18n("Mail Loop detected");
break;
case TooManyActions:
- err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").tqarg( mStringOne.toUInt() );
+ err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").arg( mStringOne.toUInt() );
break;
default:
err = i18n("Unknown error");
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index f4efcee58..ea718e4d2 100644
--- a/libksieve/tests/parsertest.cpp
+++ b/libksieve/tests/parsertest.cpp
@@ -397,7 +397,7 @@ public:
write( multiLine ? "string type=\"multiline\"" : "string type=\"quoted\"", string );
}
void numberArgument( unsigned long number, char quantifier ) {
- const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").tqarg( quantifier ) : TQString() ) ;
+ const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").arg( quantifier ) : TQString() ) ;
write( txt.latin1(), TQString::number( number ) );
}
void commandStart( const TQString & identifier ) {