From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: Enable kdepim compilation under Qt4 This will likely break Qt3
 compilation temporarily, which is an unintended side effect. A third and
 final kdepim commit will repair Qt3 compilation shortly.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libksieve/shared/error.cpp     | 30 +++++++++++++++---------------
 libksieve/tests/parsertest.cpp |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'libksieve')

diff --git a/libksieve/shared/error.cpp b/libksieve/shared/error.cpp
index faf20bcc..9fe79c1d 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)").arg(UINT_MAX);
+      err = i18n("Parse error: Number out of Range (must be smaller than %1)").tqarg(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\"").arg(mStringOne);
+      err = i18n("\"require\" missing for command \"%1\"").tqarg(mStringOne);
       break;
     case RequireMissingForTest:
-      err = i18n("\"require\" missing for test \"%1\"").arg(mStringOne);
+      err = i18n("\"require\" missing for test \"%1\"").tqarg(mStringOne);
       break;
     case RequireMissingForComparator:
-      err = i18n("\"require\" missing for comparator \"%1\"").arg(mStringOne);
+      err = i18n("\"require\" missing for comparator \"%1\"").tqarg(mStringOne);
       break;
     case UnsupportedCommand:
-      err = i18n("Command \"%1\" not supported").arg(mStringOne);
+      err = i18n("Command \"%1\" not supported").tqarg(mStringOne);
       break;
     case UnsupportedTest:
-      err = i18n("Test \"%1\" not supported").arg(mStringOne);
+      err = i18n("Test \"%1\" not supported").tqarg(mStringOne);
       break;
     case UnsupportedComparator:
-      err = i18n("Comparator \"%1\" not supported").arg(mStringOne);
+      err = i18n("Comparator \"%1\" not supported").tqarg(mStringOne);
       break;
     case TestNestingTooDeep:
-      err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").arg( mStringOne.toUInt() );
+      err = i18n("Site Policy Limit Violation: Test nesting too deep (max. %1)").tqarg( mStringOne.toUInt() );
       break;
     case BlockNestingTooDeep:
-      err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").arg( mStringOne.toUInt() );
+      err = i18n("Site Policy Limit Violation: Block nesting too deep (max. %1)").tqarg( mStringOne.toUInt() );
       break;
     case InvalidArgument:
-      err = i18n("Invalid Argument \"%1\" to \"%2\"").arg(mStringOne).arg(mStringTwo);
+      err = i18n("Invalid Argument \"%1\" to \"%2\"").tqarg(mStringOne).tqarg(mStringTwo);
       break;
     case ConflictingArguments:
-      err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").arg(mStringOne).arg(mStringTwo);
+      err = i18n("Conflicting Arguments: \"%1\" and \"%2\"").tqarg(mStringOne).tqarg(mStringTwo);
       break;
     case ArgumentsRepeated:
-      err = i18n("Argument \"%1\" Repeated").arg(mStringOne);
+      err = i18n("Argument \"%1\" Repeated").tqarg(mStringOne);
       break;
     case CommandOrderingConstraintViolation:
-      err = i18n("Command \"%1\" violates command ordering constraints").arg(mStringOne);
+      err = i18n("Command \"%1\" violates command ordering constraints").tqarg(mStringOne);
       break;
 
       // runtime errors:
     case IncompatibleActionsRequested:
-      err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").arg(mStringOne).arg(mStringTwo);
+      err = i18n("Incompatible Actions \"%1\" and \"%2\" requested").tqarg(mStringOne).tqarg(mStringTwo);
       break;
     case MailLoopDetected:
       err = i18n("Mail Loop detected");
       break;
     case TooManyActions:
-      err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").arg( mStringOne.toUInt() );
+      err = i18n("Site Policy Limit Violation: Too many Actions requested (max. %1)").tqarg( mStringOne.toUInt() );
       break;
     default:
       err = i18n("Unknown error");
diff --git a/libksieve/tests/parsertest.cpp b/libksieve/tests/parsertest.cpp
index ea718e4d..f4efcee5 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\"").arg( quantifier ) : TQString() ) ;
+    const TQString txt = "number" + ( quantifier ? TQString(" quantifier=\"%1\"").tqarg( quantifier ) : TQString() ) ;
     write( txt.latin1(), TQString::number( number ) );
   }
   void commandStart( const TQString & identifier ) {
-- 
cgit v1.2.3