diff --git a/libksieve/ksieveui/vacation/vacationscriptextractor.h b/libksieve/ksieveui/vacation/vacationscriptextractor.h --- a/libksieve/ksieveui/vacation/vacationscriptextractor.h +++ b/libksieve/ksieveui/vacation/vacationscriptextractor.h @@ -168,43 +168,42 @@ if ( const char * str = expected.string ) if ( string.toLower() != QString::fromUtf8( str ).toLower() ) found = false; - kDebug() << ( found ?"found:" :"not found:" ) + /*kDebug() << ( found ?"found:" :"not found:" ) << mState << "->" - << ( found ? expected.if_found : expected.if_not_found ); + << ( found ? expected.if_found : expected.if_not_found );*/ mState = found ? expected.if_found : expected.if_not_found ; assert( mState < mNodes.size() ); if ( found ) if ( const char * save_tag = expected.save_tag ) { - kDebug() << "stored tag" << save_tag << ":" << string; mResults[QString::fromLatin1(save_tag)] = string; } if ( !found && !mRecursionGuard.count( mState ) ) { doProcess( method, string ); } } - void commandStart( const QString & identifier, int lineNumber ) { kDebug() << identifier ; process( CommandStart, identifier ); } - void commandEnd(int lineNumber) { kDebug() ; process( CommandEnd ); } - void testStart( const QString & identifier ) { kDebug() << identifier ; process( TestStart, identifier ); } - void testEnd() { kDebug() ; process( TestEnd ); } - void testListStart() { kDebug() ; process( TestListStart ); } - void testListEnd() { kDebug() ; process( TestListEnd ); } - void blockStart(int lineNumber) { kDebug() ; process( BlockStart ); ++mNestingDepth; } - void blockEnd(int lineNumber) { kDebug() ; --mNestingDepth; process( BlockEnd ); } - void hashComment( const QString & ) { kDebug() ; } - void bracketComment( const QString & ) { kDebug() ; } - void lineFeed() { kDebug() << ++mLineNumber; } + void commandStart( const QString & identifier, int lineNumber ) { process( CommandStart, identifier ); } + void commandEnd(int lineNumber) { process( CommandEnd ); } + void testStart( const QString & identifier ) { process( TestStart, identifier ); } + void testEnd() { process( TestEnd ); } + void testListStart() { process( TestListStart ); } + void testListEnd() { process( TestListEnd ); } + void blockStart(int lineNumber) { process( BlockStart ); ++mNestingDepth; } + void blockEnd(int lineNumber) { --mNestingDepth; process( BlockEnd ); } + void hashComment( const QString & ) { } + void bracketComment( const QString & ) { } + void lineFeed() { ++mLineNumber; } void error( const KSieve::Error & ) { kDebug() ; mState = 0; } - void finished() { kDebug() ; } - - void taggedArgument( const QString & tag ) { kDebug() ; process( TaggedArgument, tag ); } - void stringArgument( const QString & string, bool, const QString & ) { kDebug() ; process( StringArgument, string ); } - void numberArgument( unsigned long number, char ) { kDebug(); process( NumberArgument, QString::number( number ) ); } - void stringListArgumentStart() { kDebug() ; process( StringListArgumentStart ); } - void stringListEntry( const QString & string, bool, const QString & ) { kDebug() ; process( StringListEntry, string ); } - void stringListArgumentEnd() { kDebug() ; process( StringListArgumentEnd ); } + void finished() { } + + void taggedArgument( const QString & tag ) { process( TaggedArgument, tag ); } + void stringArgument( const QString & string, bool, const QString & ) { process( StringArgument, string ); } + void numberArgument( unsigned long number, char ) { process( NumberArgument, QString::number( number ) ); } + void stringListArgumentStart() { process( StringListArgumentStart ); } + void stringListEntry( const QString & string, bool, const QString & ) { process( StringListEntry, string ); } + void stringListArgumentEnd() { process( StringListArgumentEnd ); } }; typedef GenericInformationExtractor GIE; diff --git a/libksieve/ksieveui/vacation/vacationscriptextractor.cpp b/libksieve/ksieveui/vacation/vacationscriptextractor.cpp --- a/libksieve/ksieveui/vacation/vacationscriptextractor.cpp +++ b/libksieve/ksieveui/vacation/vacationscriptextractor.cpp @@ -28,7 +28,6 @@ , mLineStart(0) , mLineEnd(0) { - kDebug(); } VacationDataExtractor::~VacationDataExtractor() @@ -37,7 +36,6 @@ } void VacationDataExtractor::commandStart( const QString & identifier, int lineNumber ) { - kDebug() << "( \"" << identifier <<"\" )"; if (identifier == QLatin1String("if") && mContext == None) { mContext = IfBlock; mLineStart = lineNumber; @@ -77,7 +75,6 @@ if (test == QLatin1String("true") || test == QLatin1String("false")) { mActive = (test == QLatin1String("true")); mIfComment = QString(); - kDebug() << "set active level to" << mActive; } } } @@ -109,7 +106,6 @@ void VacationDataExtractor::taggedArgument( const QString & tag ) { - kDebug() << "( \"" << tag <<"\" )"; if ( mContext != VacationCommand ) return; if ( tag == QLatin1String("days") ) @@ -123,7 +119,6 @@ void VacationDataExtractor::stringArgument( const QString & string, bool, const QString & ) { - kDebug() << "( \"" << string <<"\" )"; if ( mContext == Addresses ) { mAliases.push_back( string ); mContext = VacationCommand; @@ -138,7 +133,6 @@ void VacationDataExtractor::numberArgument( unsigned long number, char ) { - kDebug() << "( \"" << number <<"\" )"; if ( mContext != Days ) return; if ( number > INT_MAX ) @@ -154,7 +148,6 @@ } void VacationDataExtractor::stringListEntry( const QString & string, bool, const QString & ) { - kDebug() << "( \"" << string <<"\" )"; if ( mContext != Addresses ) return; mAliases.push_back( string ); @@ -162,7 +155,6 @@ void VacationDataExtractor::stringListArgumentEnd() { - kDebug(); if ( mContext != Addresses ) return; mContext = VacationCommand; @@ -170,7 +162,6 @@ void VacationDataExtractor::reset() { - kDebug(); mContext = None; mNotificationInterval = 0; mAliases.clear();