From 029d6084e699568256c53a8270cb36ad4f66b935 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 27 Aug 2011 21:38:57 +0000 Subject: Fix a number of accidental tqStatus string conversions git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- akregator/src/articlefilter.cpp | 4 ++-- akregator/src/searchbar.cpp | 2 +- kioslaves/mbox/readmbox.cc | 2 +- kitchensync/src/calendardiffalgo.cpp | 2 +- kmail/folderdiaquotatab_p.cpp | 2 +- kmail/kmacctlocal.cpp | 2 +- kmail/kmacctmaildir.cpp | 2 +- kmail/kmfoldermbox.cpp | 2 +- kmail/kmheaders.cpp | 6 +++--- kmail/kmmessage.cpp | 6 +++--- kmail/kmmessage.h | 2 +- kmail/kmmsgbase.cpp | 2 +- kmail/objecttreeparser.cpp | 6 +++--- knode/kngrouppropdlg.cpp | 2 +- knode/knjobdata.cpp | 2 +- korganizer/koeditordetails.cpp | 2 +- korganizer/printing/calprintdefaultplugins.cpp | 4 ++-- kresources/groupwise/soap/stdsoap2.cpp | 4 ++-- libkdepim/calendardiffalgo.cpp | 2 +- libkpgp/kpgpbase.cpp | 10 +++++----- 20 files changed, 33 insertions(+), 33 deletions(-) diff --git a/akregator/src/articlefilter.cpp b/akregator/src/articlefilter.cpp index 715ede19..21009190 100644 --- a/akregator/src/articlefilter.cpp +++ b/akregator/src/articlefilter.cpp @@ -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; diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp index d6f9549a..60e5f6fa 100644 --- a/akregator/src/searchbar.cpp +++ b/akregator/src/searchbar.cpp @@ -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); diff --git a/kioslaves/mbox/readmbox.cc b/kioslaves/mbox/readmbox.cc index 6094bfc0..f2af8716 100644 --- a/kioslaves/mbox/readmbox.cc +++ b/kioslaves/mbox/readmbox.cc @@ -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; diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp index 3c9ef292..f3ee5dda 100644 --- a/kitchensync/src/calendardiffalgo.cpp +++ b/kitchensync/src/calendardiffalgo.cpp @@ -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() ) ); diff --git a/kmail/folderdiaquotatab_p.cpp b/kmail/folderdiaquotatab_p.cpp index 859b31a6..98c3579c 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 d283a197..2a68d18f 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 7491f412..edd580f5 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 3aebc8f3..b4841491 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 9d721e9d..c535d2c8 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 45ab5887..2f27c305 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( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) ); diff --git a/kmail/kmmessage.h b/kmail/kmmessage.h index 8f870f44..b222c0b8 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 e69dcdfb..90f7a3a0 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 b3d9c74b..a9b2caa5 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( "" ); txt.append( "
 
" ); - txt.append( i18n( "tqStatus: " ) ); + txt.append( i18n( "Status: " ) ); if ( !messagePart.status.isEmpty() ) { txt.append( "" ); txt.append( messagePart.status ); @@ -2591,7 +2591,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, htmlStr += "
"; if( !statusStr.isEmpty() ) { htmlStr += " 
"; - htmlStr += i18n( "tqStatus: " ); + htmlStr += i18n( "Status: " ); htmlStr += statusStr; } } else { @@ -2634,7 +2634,7 @@ TQString ObjectTreeParser::writeSigstatHeader( PartMetaData & block, "verified." ); if( !statusStr.isEmpty() ) { htmlStr += "
"; - htmlStr += i18n( "tqStatus: " ); + htmlStr += i18n( "Status: " ); htmlStr += ""; htmlStr += statusStr; htmlStr += ""; diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index 264a9444..c0a107af 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -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()) { diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 5d92ca82..de9ffa64 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -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 ); } diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index d5f397f3..4f1915de 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -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 ); diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index 1e162ece..0b764e4a 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -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() ) { diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp index 959ada87..2852eb9c 100644 --- a/kresources/groupwise/soap/stdsoap2.cpp +++ b/kresources/groupwise/soap/stdsoap2.cpp @@ -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")) diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp index d1eb29b3..a0ddfb19 100644 --- a/libkdepim/calendardiffalgo.cpp +++ b/libkdepim/calendardiffalgo.cpp @@ -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() ) ); diff --git a/libkpgp/kpgpbase.cpp b/libkpgp/kpgpbase.cpp index 53058d55..d30f0fd1 100644 --- a/libkpgp/kpgpbase.cpp +++ b/libkpgp/kpgpbase.cpp @@ -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) { -- cgit v1.2.3