Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 10 deletions

diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 016b8a577..75940e4ca 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -159,7 +159,7 @@ namespace {
 
   private:
     KMSearchRule::Function currentFunction( const TQWidgetStack *functionStack ) const;
-    int currentStatusValue( const TQWidgetStack *valueStack ) const;
+    int currenStatusValue( const TQWidgetStack *valueStack ) const;
   };
 
   class NumericRuleWidgetHandler : public KMail::RuleWidgetHandler {
@@ -403,7 +403,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } TextFunctions[] = {
-    { KMSearchRule::FuncContains,           I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,           I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,        I18N_NOOP( "does not contain" )   },
     { KMSearchRule::FuncEquals,             I18N_NOOP( "equals" )            },
     { KMSearchRule::FuncNotEqual,           I18N_NOOP( "does not equal" )     },
@@ -499,7 +499,7 @@ namespace {
   TQString TextRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack,
                                                KMSearchRule::Function func ) const
   {
-    // here we gotta check the combobox which contains the categories
+    // here we gotta check the combobox which tqcontains the categories
     if ( func  == KMSearchRule::FuncIsInCategory ||
          func  == KMSearchRule::FuncIsNotInCategory ) {
       const TQComboBox *combo=
@@ -738,7 +738,7 @@ namespace {
     const KMSearchRule::Function id;
     const char *displayName;
   } MessageFunctions[] = {
-    { KMSearchRule::FuncContains,        I18N_NOOP( "contains" )          },
+    { KMSearchRule::FuncContains,        I18N_NOOP( "tqcontains" )          },
     { KMSearchRule::FuncContainsNot,     I18N_NOOP( "does not contain" )  },
     { KMSearchRule::FuncRegExp,          I18N_NOOP( "matches regular expr." ) },
     { KMSearchRule::FuncNotRegExp,       I18N_NOOP( "does not match reg. expr." ) },
@@ -1095,7 +1095,7 @@ namespace {
 
   //---------------------------------------------------------------------------
 
-  int StatusRuleWidgetHandler::currentStatusValue( const TQWidgetStack *valueStack ) const
+  int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
   {
     const TQComboBox *statusCombo =
       dynamic_cast<TQComboBox*>( QObject_child_const( valueStack,
@@ -1107,7 +1107,7 @@ namespace {
       return statusCombo->currentItem();
     }
     else
-      kdDebug(5006) << "StatusRuleWidgetHandler::currentStatusValue: "
+      kdDebug(5006) << "StatusRuleWidgetHandler::currenStatusValue: "
                        "statusRuleValueCombo not found." << endl;
     return -1;
   }
@@ -1121,9 +1121,9 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
-      return TQString::fromLatin1( KMail::StatusValues[ status ].text );
+      return TQString::tqfromLatin1( KMail::StatusValues[ status ].text );
     else
       return TQString::null;
   }
@@ -1137,7 +1137,7 @@ namespace {
     if ( !handlesField( field ) )
       return TQString::null;
 
-    const int status = currentStatusValue( valueStack );
+    const int status = currenStatusValue( valueStack );
     if ( status != -1 )
       return i18n( KMail::StatusValues[ status ].text );
     else
@@ -1215,7 +1215,7 @@ namespace {
     const TQString value = rule->contents();
     int valueIndex = 0;
     for ( ; valueIndex < KMail::StatusValueCountWithoutHidden; ++valueIndex )
-      if ( value == TQString::fromLatin1(
+      if ( value == TQString::tqfromLatin1(
                KMail::StatusValues[ valueIndex ].text ) )
         break;
     TQComboBox *statusCombo =