TDE
/
tdepim
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepim
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix a number of accidental tqStatus string conversions

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 018997dddf
commit 029d6084e6
20 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
akregator/src/articlefilter.cpp
Unescape View File

@ -51,7 +51,7 @@ TQString Criterion::subjectToString(Subject subj)
case Description:
return TQString::tqfromLatin1("Description");
case tqStatus:
return TQString::tqfromLatin1("tqStatus");
return TQString::tqfromLatin1("Status");
case KeepFlag:
return TQString::tqfromLatin1("KeepFlag");
default: // should never happen (TM)
@ -69,7 +69,7 @@ Criterion::Subject Criterion::stringToSubject(const TQString& subjStr)
return Description;
else if (subjStr == TQString::tqfromLatin1("Author"))
return Author;
else if (subjStr == TQString::tqfromLatin1("tqStatus"))
else if (subjStr == TQString::tqfromLatin1("Status"))
return tqStatus;
else if (subjStr == TQString::tqfromLatin1("KeepFlag"))
return KeepFlag;

2
akregator/src/searchbar.cpp
Unescape View File

@ -81,7 +81,7 @@ SearchBar::SearchBar(TQWidget* parent, const char* name) : TQHBox(parent, name),
searchLabel->setBuddy(d->searchLine);
TQLabel* statusLabel = new TQLabel(this);
statusLabel->setText( i18n("tqStatus:") );
statusLabel->setText( i18n("Status:") );
d->searchCombo = new KComboBox(this, "searchcombo");
TQPixmap iconAll = KGlobal::iconLoader()->loadIcon("exec", KIcon::Small);

2
kioslaves/mbox/readmbox.cc
Unescape View File

@ -103,7 +103,7 @@ bool ReadMBox::nextLine()
return true;
} else if( m_only_new )
{
if( m_header && m_current_line->left( 7 ) == "tqStatus:" &&
if( m_header && m_current_line->left( 7 ) == "Status:" &&
! m_current_line->contains( "U" ) && ! m_current_line->contains( "N" ) )
{
m_status = false;

2
kitchensync/src/calendardiffalgo.cpp
Unescape View File

@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
conflictField( i18n( "Summary" ), left->summary(), right->summary() );
if ( left->status() != right->status() )
conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
if ( left->secrecy() != right->secrecy() )
conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );

2
kmail/folderdiaquotatab_p.cpp
Unescape View File

@ -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 );

2
kmail/kmacctlocal.cpp
Unescape View File

@ -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));

2
kmail/kmacctmaildir.cpp
Unescape View File

@ -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));

2
kmail/kmfoldermbox.cpp
Unescape View File

@ -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];

6
kmail/kmheaders.cpp
Unescape View File

@ -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);
}
//-----------------------------------------------------------------------------

6
kmail/kmmessage.cpp
Unescape View File

@ -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() ) );

2
kmail/kmmessage.h
Unescape View File

@ -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();

2
kmail/kmmsgbase.cpp
Unescape View File

@ -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')) {

6
kmail/objecttreeparser.cpp
Unescape View File

@ -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>";

2
knode/kngrouppropdlg.cpp
Unescape View File

@ -85,7 +85,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam
l=new TQLabel(g_rp->description(),gb);
grpL->addWidget(l,2,2);
l=new TQLabel(i18n("tqStatus:"), gb);
l=new TQLabel(i18n("Status:"), gb);
grpL->addWidget(l,3,0);
TQString status;
switch (g_rp->status()) {

2
knode/knjobdata.cpp
Unescape View File

@ -139,7 +139,7 @@ void KNJobData::slotJobPercent( KIO::Job*, unsigned long percent )
void KNJobData::slotJobInfoMessage( KIO::Job*, const TQString &msg )
{
kdDebug(5003) << k_funcinfo << "tqStatus: " << msg << endl;
kdDebug(5003) << k_funcinfo << "Status: " << msg << endl;
setqStatus( msg );
}

2
korganizer/koeditordetails.cpp
Unescape View File

@ -199,7 +199,7 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent,
mListView->addColumn( i18n("Name"), 200 );
mListView->addColumn( i18n("Email"), 200 );
mListView->addColumn( i18n("Role"), 80 );
mListView->addColumn( i18n("tqStatus"), 100 );
mListView->addColumn( i18n("Status"), 100 );
mListView->addColumn( i18n("RSVP"), 55 );
mListView->addColumn( i18n("Delegated to"), 120 );
mListView->addColumn( i18n("Delegated from" ), 120 );

4
korganizer/printing/calprintdefaultplugins.cpp
Unescape View File

@ -511,7 +511,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
subitemString += "\n";
}
subitemString += i18n( "subitem tqStatus: statusString",
"tqStatus: %1\n").tqarg( statusString );
"Status: %1\n").tqarg( statusString );
subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
subitemString += i18n( "subitem Priority: N",
"Priority: %1\n").tqarg( (*rit)->priority() );
@ -572,7 +572,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( mShowOptions ) {
TQString optionsString;
if ( !(*it)->statusStr().isEmpty() ) {
optionsString += i18n("tqStatus: %1").tqarg( (*it)->statusStr() );
optionsString += i18n("Status: %1").tqarg( (*it)->statusStr() );
optionsString += "\n";
}
if ( !(*it)->secrecyStr().isEmpty() ) {

4
kresources/groupwise/soap/stdsoap2.cpp
Unescape View File

@ -11951,7 +11951,7 @@ http_response(struct soap *soap, int status, size_t count)
if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
return err;
}
else if ((err = soap->fposthdr(soap, "tqStatus", "200 OK")))
else if ((err = soap->fposthdr(soap, "Status", "200 OK")))
return err;
}
else if (status > 200 && status < 600)
@ -11986,7 +11986,7 @@ http_response(struct soap *soap, int status, size_t count)
if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
return err;
}
else if ((err = soap->fposthdr(soap, "tqStatus", s)))
else if ((err = soap->fposthdr(soap, "Status", s)))
return err;
}
if ((err = soap->fposthdr(soap, "Server", "gSOAP/2.7"))

2
libkdepim/calendardiffalgo.cpp
Unescape View File

@ -138,7 +138,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
conflictField( i18n( "Summary" ), left->summary(), right->summary() );
if ( left->status() != right->status() )
conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
if ( left->secrecy() != right->secrecy() )
conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );

10
libkpgp/kpgpbase.cpp
Unescape View File

@ -157,7 +157,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
//kdDebug(5100) << "Polling pin[1]..." << endl;
pollstatus = poll(&pollin, 1, 5);
if (pollstatus == 1) {
//kdDebug(5100) << "tqStatus for polling pin[1]: " << pollin.revents << endl;
//kdDebug(5100) << "Status for polling pin[1]: " << pollin.revents << endl;
if (pollin.revents & POLLERR) {
kdDebug(5100) << "PGP seems to have hung up" << endl;
break;
@ -189,7 +189,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
//kdDebug(5100) << "Polling pout[0]..." << endl;
pollstatus = poll(&pollout, 1, 0);
if (pollstatus == 1) {
//kdDebug(5100) << "tqStatus for polling pout[0]: " << pollout.revents << endl;
//kdDebug(5100) << "Status for polling pout[0]: " << pollout.revents << endl;
if (pollout.revents & POLLIN) {
//kdDebug(5100) << "Trying to read " << 1024 << " bytes from pout[0]" << endl;
if ((len = read(pout[0],str,1024))>0) {
@ -214,7 +214,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
//kdDebug(5100) << "Polling perr[0]..." << endl;
pollstatus = poll(&pollerr, 1, 0);
if (pollstatus == 1) {
//kdDebug(5100) << "tqStatus for polling perr[0]: " << pollerr.revents << endl;
//kdDebug(5100) << "Status for polling perr[0]: " << pollerr.revents << endl;
if (pollerr.revents & POLLIN) {
//kdDebug(5100) << "Trying to read " << 1024 << " bytes from perr[0]" << endl;
if ((len = read(perr[0],str,1024))>0) {
@ -260,7 +260,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
//kdDebug(5100) << "Polling pout[0]..." << endl;
pollstatus = poll(&pollout, 1, 0);
if (pollstatus == 1) {
//kdDebug(5100) << "tqStatus for polling pout[0]: " << pollout.revents << endl;
//kdDebug(5100) << "Status for polling pout[0]: " << pollout.revents << endl;
if (pollout.revents & POLLIN) {
//kdDebug(5100) << "Trying to read " << 1024 << " bytes from pout[0]" << endl;
if ((len = read(pout[0],str,1024))>0) {
@ -304,7 +304,7 @@ Base::run( const char *cmd, const char *passphrase, bool onlyReadFromPGP )
//kdDebug(5100) << "Polling perr[0]..." << endl;
pollstatus = poll(&pollerr, 1, 0);
if (pollstatus == 1) {
//kdDebug(5100) << "tqStatus for polling perr[0]: " << pollerr.revents << endl;
//kdDebug(5100) << "Status for polling perr[0]: " << pollerr.revents << endl;
if (pollerr.revents & POLLIN) {
//kdDebug(5100) << "Trying to read " << 1024 << " bytes from perr[0]" << endl;
if ((len = read(perr[0],str,1024))>0) {

Write Preview
Loading…
Cancel
Save