summaryrefslogtreecommitdiffstats
path: root/kmail/kmcomposewin.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmcomposewin.cpp')
-rw-r--r--kmail/kmcomposewin.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 45daa0c36..2e0906396 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -971,7 +971,7 @@ int KMComposeWin::calcColumnWidth(int which, long allShowing, int width)
void KMComposeWin::rethinkFields(bool fromSlot)
{
//This sucks even more but again no ids. sorry (sven)
- int tqmask, row, numRows;
+ int mask, row, numRows;
long showHeaders;
if (mShowHeaders < 0)
@@ -979,8 +979,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
else
showHeaders = mShowHeaders;
- for (tqmask=1,mNumHeaders=0; tqmask<=showHeaders; tqmask<<=1)
- if ((showHeaders&tqmask) != 0) mNumHeaders++;
+ for (mask=1,mNumHeaders=0; mask<=showHeaders; mask<<=1)
+ if ((showHeaders&mask) != 0) mNumHeaders++;
numRows = mNumHeaders + 1;
@@ -4091,7 +4091,7 @@ void KMComposeWin::slotContinuePrint( bool rc )
}
//----------------------------------------------------------------------------
-bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addresses )
+bool KMComposeWin::validateAddresses( TQWidget * parent, const TQString & addresses )
{
TQString brokenAddress;
KPIM::EmailParseResult errorCode = KMMessage::isValidEmailAddressList( KMMessage::expandAliases( addresses ), brokenAddress );
@@ -4099,7 +4099,7 @@ bool KMComposeWin::validateAddresses( TQWidget * tqparent, const TQString & addr
TQString errorMsg( "<qt><p><b>" + brokenAddress +
"</b></p><p>" + KPIM::emailParseResultToString( errorCode ) +
"</p></qt>" );
- KMessageBox::sorry( tqparent, errorMsg, i18n("Invalid Email Address") );
+ KMessageBox::sorry( parent, errorMsg, i18n("Invalid Email Address") );
return false;
}
return true;