summaryrefslogtreecommitdiffstats
path: root/kmail/vacation.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/vacation.cpp')
-rw-r--r--kmail/vacation.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/kmail/vacation.cpp b/kmail/vacation.cpp
index e706243cf..edce8d854 100644
--- a/kmail/vacation.cpp
+++ b/kmail/vacation.cpp
@@ -156,7 +156,7 @@ namespace {
const std::map<TQString,TQString> & results() const { return mResults; }
private:
- void process( BuilderMethod method, const TQString & string=TQString::null ) {
+ void process( BuilderMethod method, const TQString & string=TQString() ) {
doProcess( method, string );
mRecursionGuard.clear();
}
@@ -232,7 +232,7 @@ namespace {
{ 0, GIE::TestEnd, 0, 16, 0, 0 }, // 15
- // block of command, find "stop", take nested if's into account:
+ // block of command, tqfind "stop", take nested if's into account:
{ 0, GIE::BlockStart, 0, 17, 0, 0 }, // 16
{ 1, GIE::CommandStart, "stop", 20, 19, "stop" }, // 17
{ -1, GIE::Any, 0, 17, 0, 0 }, // 18
@@ -265,7 +265,7 @@ namespace {
{ 0, GIE::TestStart, "not", 2, 0, 0, }, // 1
{ 0, GIE::TestStart, "address", 3, 0, 0 }, // 2
- // :domain and :tqcontains in arbitrary order:
+ // :domain and :contains in arbitrary order:
{ 0, GIE::TaggedArgument, "domain", 4, 5, 0 }, // 3
{ 0, GIE::TaggedArgument, "tqcontains", 7, 0, 0 }, // 4
{ 0, GIE::TaggedArgument, "tqcontains", 6, 0, 0 }, // 5
@@ -288,7 +288,7 @@ namespace {
{ 0, GIE::TestEnd, 0, 18, 0, 0 }, // 17
{ 0, GIE::TestEnd, 0, 19, 0, 0 }, // 18
- // block of commands, find "stop", take nested if's into account:
+ // block of commands, tqfind "stop", take nested if's into account:
{ 0, GIE::BlockStart, 0, 20, 0, 0 }, // 19
{ 1, GIE::CommandStart, "stop", 23, 22, "stop" }, // 20
{ -1, GIE::Any, 0, 20, 0, 0 }, // 21
@@ -308,7 +308,7 @@ namespace {
TQString domainName() /*not const, since map::op[] isn't const*/ {
return mResults.count( "stop" ) && mResults.count( "from" )
- ? mResults["domainName"] : TQString::null ;
+ ? mResults["domainName"] : TQString() ;
}
};
@@ -420,7 +420,7 @@ namespace {
mContext = None;
mNotificationInterval = 0;
mAliases.clear();
- mMessageText = TQString::null;
+ mMessageText = TQString();
}
};
@@ -428,8 +428,8 @@ namespace {
namespace KMail {
- Vacation::Vacation( TQObject * parent, bool checkOnly, const char * name )
- : TQObject( parent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
+ Vacation::Vacation( TQObject * tqparent, bool checkOnly, const char * name )
+ : TQObject( tqparent, name ), mSieveJob( 0 ), mDialog( 0 ), mWasActive( false ), mCheckOnly( checkOnly )
{
mUrl = findURL();
kdDebug(5006) << "Vacation: found url \"" << mUrl.prettyURL() << "\"" << endl;
@@ -565,9 +565,9 @@ namespace KMail {
TQString Vacation::defaultMessageText() {
return i18n("I am out of office till %1.\n"
"\n"
- "In urgent cases, please contact Mrs. <vacation tqreplacement>\n"
+ "In urgent cases, please contact Mrs. <vacation replacement>\n"
"\n"
- "email: <email address of vacation tqreplacement>\n"
+ "email: <email address of vacation replacement>\n"
"phone: +49 711 1111 11\n"
"fax.: +49 711 1111 12\n"
"\n"