summaryrefslogtreecommitdiffstats
path: root/kmail
diff options
context:
space:
mode:
Diffstat (limited to 'kmail')
-rw-r--r--kmail/folderdiaquotatab_p.cpp2
-rw-r--r--kmail/kmacctlocal.cpp2
-rw-r--r--kmail/kmacctmaildir.cpp2
-rw-r--r--kmail/kmfoldermbox.cpp2
-rw-r--r--kmail/kmheaders.cpp6
-rw-r--r--kmail/kmmessage.cpp6
-rw-r--r--kmail/kmmessage.h2
-rw-r--r--kmail/kmmsgbase.cpp2
-rw-r--r--kmail/objecttreeparser.cpp6
9 files changed, 15 insertions, 15 deletions
diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp
index 859b31a67..98c3579c8 100644
--- a/kmail/folderdiaquotatab_p.cpp
+++ b/kmail/folderdiaquotatab_p.cpp
@@ -66,7 +66,7 @@ QuotaWidget::QuotaWidget( TQWidget* parent, const char* name )
tqlayout->addWidget( new TQLabel( i18n("Root:" ), stuff ), 0, 0 );
tqlayout->addWidget( mRootLabel, 0, 1 );
tqlayout->addWidget( new TQLabel( i18n("Usage:"), stuff ), 1, 0 );
- //tqlayout->addWidget( new TQLabel( i18n("tqStatus:"), stuff ), 2, 0 );
+ //tqlayout->addWidget( new TQLabel( i18n("Status:"), stuff ), 2, 0 );
tqlayout->addWidget( mInfoLabel, 1, 1 );
tqlayout->addWidget( mProgressBar, 2, 1 );
box->addWidget( stuff );
diff --git a/kmail/kmacctlocal.cpp b/kmail/kmacctlocal.cpp
index d283a1972..2a68d18f8 100644
--- a/kmail/kmacctlocal.cpp
+++ b/kmail/kmacctlocal.cpp
@@ -214,7 +214,7 @@ bool KMAcctLocal::fetchMsg()
fileD0.close(); // If data is 0 we just create a zero length file.
}
#endif
- msg->setqStatus(msg->headerField("tqStatus").latin1(),
+ msg->setqStatus(msg->headerField("Status").latin1(),
msg->headerField("X-tqStatus").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
diff --git a/kmail/kmacctmaildir.cpp b/kmail/kmacctmaildir.cpp
index 7491f4122..edd580f5c 100644
--- a/kmail/kmacctmaildir.cpp
+++ b/kmail/kmacctmaildir.cpp
@@ -170,7 +170,7 @@ void KMAcctMaildir::processNewMail(bool)
msg = mailFolder.take(0);
if (msg)
{
- msg->setqStatus(msg->headerField("tqStatus").latin1(),
+ msg->setqStatus(msg->headerField("Status").latin1(),
msg->headerField("X-tqStatus").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
diff --git a/kmail/kmfoldermbox.cpp b/kmail/kmfoldermbox.cpp
index 3aebc8f3b..b4841491a 100644
--- a/kmail/kmfoldermbox.cpp
+++ b/kmail/kmfoldermbox.cpp
@@ -727,7 +727,7 @@ int KMFolderMbox::createIndexFromContents()
/* -sanders Make all messages read when auto-recreating index */
/* Reverted, as it breaks reading the sent mail status, for example.
-till */
- if ((needtqStatus & 1) && strncasecmp(line, "tqStatus:", 7) == 0)
+ if ((needtqStatus & 1) && strncasecmp(line, "Status:", 7) == 0)
{
for(i=0; i<4 && line[i+8] > ' '; i++)
status[i] = line[i+8];
diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp
index 9d721e9da..c535d2c8c 100644
--- a/kmail/kmheaders.cpp
+++ b/kmail/kmheaders.cpp
@@ -129,7 +129,7 @@ KMHeaders::KMHeaders(KMMainWidget *aOwner, TQWidget *parent,
mPopup = new KPopupMenu(this);
mPopup->insertTitle(i18n("View Columns"));
mPopup->setCheckable(true);
- mPopup->insertItem(i18n("tqStatus"), KPaintInfo::COL_STATUS);
+ mPopup->insertItem(i18n("Status"), KPaintInfo::COL_STATUS);
mPopup->insertItem(i18n("Important"), KPaintInfo::COL_IMPORTANT);
mPopup->insertItem(i18n("Action Item"), KPaintInfo::COL_TODO);
mPopup->insertItem(i18n("Attachment"), KPaintInfo::COL_ATTACHMENT);
@@ -622,7 +622,7 @@ void KMHeaders::readFolderConfig (void)
mCurrentItemSerNum = config->readNumEntry("CurrentSerialNum", 0);
mPaintInfo.orderOfArrival = config->readBoolEntry( "OrderOfArrival", false );
- mPaintInfo.status = config->readBoolEntry( "tqStatus", false );
+ mPaintInfo.status = config->readBoolEntry( "Status", false );
{ //area for config group "Geometry"
KConfigGroupSaver saver(config, "Geometry");
@@ -653,7 +653,7 @@ void KMHeaders::writeFolderConfig (void)
config->writeEntry("CurrentSerialNum", sernum);
config->writeEntry("OrderOfArrival", mPaintInfo.orderOfArrival);
- config->writeEntry("tqStatus", mPaintInfo.status);
+ config->writeEntry("Status", mPaintInfo.status);
}
//-----------------------------------------------------------------------------
diff --git a/kmail/kmmessage.cpp b/kmail/kmmessage.cpp
index 45ab58870..2f27c305b 100644
--- a/kmail/kmmessage.cpp
+++ b/kmail/kmmessage.cpp
@@ -336,7 +336,7 @@ TQCString KMMessage::headerAsSendableString() const
}
void KMMessage::removePrivateHeaderFields() {
- removeHeaderField("tqStatus");
+ removeHeaderField("Status");
removeHeaderField("X-tqStatus");
removeHeaderField("X-KMail-EncryptionState");
removeHeaderField("X-KMail-SignatureState");
@@ -355,7 +355,7 @@ void KMMessage::seStatusFields()
{
char str[2] = { 0, 0 };
- setHeaderField("tqStatus", status() & KMMsgStatusNew ? "R" : "RO");
+ setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO");
setHeaderField("X-tqStatus", statusToStr(status()));
str[0] = (char)encryptionState();
@@ -410,7 +410,7 @@ void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
mMsg->Parse();
if (aSetqStatus) {
- setqStatus(headerField("tqStatus").latin1(), headerField("X-tqStatus").latin1());
+ setqStatus(headerField("Status").latin1(), headerField("X-tqStatus").latin1());
setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) );
setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) );
diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h
index 8f870f443..b222c0b89 100644
--- a/kmail/kmmessage.h
+++ b/kmail/kmmessage.h
@@ -667,7 +667,7 @@ public:
*/
bool deleteBodyPart( int partIndex );
- /** Set "tqStatus" and "X-tqStatus" fields of the message from the
+ /** Set "Status" and "X-tqStatus" fields of the message from the
* internal message status. */
void seStatusFields();
diff --git a/kmail/kmmsgbase.cpp b/kmail/kmmsgbase.cpp
index e69dcdfb0..90f7a3a0b 100644
--- a/kmail/kmmsgbase.cpp
+++ b/kmail/kmmsgbase.cpp
@@ -288,7 +288,7 @@ void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr)
if (strchr(aXStatusStr, 'C')) setqStatus(KMMsgStatusHasNoAttach);
}
- // Merge the contents of the "tqStatus" field
+ // Merge the contents of the "Status" field
if (aStatusStr) {
if ((aStatusStr[0]== 'R' && aStatusStr[1]== 'O') ||
(aStatusStr[0]== 'O' && aStatusStr[1]== 'R')) {
diff --git a/kmail/objecttreeparser.cpp b/kmail/objecttreeparser.cpp
index b3d9c74b3..a9b2caa5a 100644
--- a/kmail/objecttreeparser.cpp
+++ b/kmail/objecttreeparser.cpp
@@ -667,7 +667,7 @@ namespace KMail {
txt.append( i18n( "The crypto engine returned no cleartext data." ) );
txt.append( "</h2></b>" );
txt.append( "<br>&nbsp;<br>" );
- txt.append( i18n( "tqStatus: " ) );
+ txt.append( i18n( "Status: " ) );
if ( !messagePart.status.isEmpty() ) {
txt.append( "<i>" );
txt.append( messagePart.status );
@@ -2591,7 +2591,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
htmlStr += "<br />";
if( !statusStr.isEmpty() ) {
htmlStr += "&nbsp;<br />";
- htmlStr += i18n( "tqStatus: " );
+ htmlStr += i18n( "Status: " );
htmlStr += statusStr;
}
} else {
@@ -2634,7 +2634,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block,
"verified." );
if( !statusStr.isEmpty() ) {
htmlStr += "<br />";
- htmlStr += i18n( "tqStatus: " );
+ htmlStr += i18n( "Status: " );
htmlStr += "<i>";
htmlStr += statusStr;
htmlStr += "</i>";
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-27 11:29:42 +0000