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

Fix remaining instances of tqStatus embedded in user visible strings

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

4
certmanager/lib/backends/qgpgme/gnupgprocessbase.cpp
Unescape View File

@ -165,14 +165,14 @@ void Kleo::GnuPGProcessBase::parseStatusOutput() {
continue; continue;
// check status token // check status token
if ( line.left( startTokenLen ) != startToken ) { if ( line.left( startTokenLen ) != startToken ) {
kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line doesn't begin with \"" kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line doesn't begin with \""
<< startToken << "\"" << endl; << startToken << "\"" << endl;
continue; continue;
} }
// remove status token: // remove status token:
const TQCString command = line.mid( startTokenLen ).simplifyWhiteSpace() + ' '; const TQCString command = line.mid( startTokenLen ).simplifyWhiteSpace() + ' ';
if ( command == " " ) { if ( command == " " ) {
kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childtqStatus: status-fd protocol error: line without content." << endl; kdDebug( 5150 ) << "Kleo::GnuPGProcessBase::childStatus: status-fd protocol error: line without content." << endl;
continue; continue;
} }
// split into base and args // split into base and args

12
certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp
Unescape View File

@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQS
if ( args.size() < 2 ) { if ( args.size() < 2 ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising ERROR with < 2 args!" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
return; return;
} }
const int source = (*++it).toInt( &ok ); const int source = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for first ERROR arg, got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
return; return;
} }
ok = false; ok = false;
const int code = (*++it).toInt( &ok ); const int code = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for second ERROR arg, got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
return; return;
} }
mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::slotqStatus( GnuPGProcessBase * proc, const TQS
if ( args.size() < 4 ) { if ( args.size() < 4 ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
return; return;
} }
const TQString what = *++it; const TQString what = *++it;
++it; // don't use "type"... ++it; // don't use "type"...
const int cur = (*++it).toInt( &ok ); const int cur = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"cur\", got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl;
return; return;
} }
ok = false; ok = false;
const int total = (*++it).toInt( &ok ); const int total = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotqStatus() expected number for \"total\", got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl;
return; return;
} }
emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );

12
certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp
Unescape View File

@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const
if ( args.size() < 2 ) { if ( args.size() < 2 ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising ERROR with < 2 args!" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl;
return; return;
} }
const int source = (*++it).toInt( &ok ); const int source = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for first ERROR arg, got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl;
return; return;
} }
ok = false; ok = false;
const int code = (*++it).toInt( &ok ); const int code = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for second ERROR arg, got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl;
return; return;
} }
mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code );
@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::slotqStatus( GnuPGProcessBase * proc, const
if ( args.size() < 4 ) { if ( args.size() < 4 ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() not recognising PROGRESS with < 4 args!" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl;
return; return;
} }
const TQString what = *++it; const TQString what = *++it;
++it; // don't use "type"... ++it; // don't use "type"...
const int cur = (*++it).toInt( &ok ); const int cur = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"cur\", got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl;
return; return;
} }
ok = false; ok = false;
const int total = (*++it).toInt( &ok ); const int total = (*++it).toInt( &ok );
if ( !ok ) { if ( !ok ) {
kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotqStatus() expected number for \"total\", got something else" << endl; kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl;
return; return;
} }
emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total );

4
kalarm/daemon.cpp
Unescape View File

@ -341,7 +341,7 @@ void Daemon::updateRegisteredtqStatus(bool timeout)
break; break;
} }
} }
kdDebug(5950) << "Daemon::updateRegisteredtqStatus() -> " << mtqStatus << endl; kdDebug(5950) << "Daemon::updateRegisteredStatus() -> " << mtqStatus << endl;
} }
/****************************************************************************** /******************************************************************************
@ -668,7 +668,7 @@ NotificationHandler::NotificationHandler()
*/ */
void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL) void NotificationHandler::alarmDaemonUpdate(int calendartqStatus, const TQString& calendarURL)
{ {
kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendartqStatus << ")\n"; kdDebug(5950) << "NotificationHandler::alarmDaemonUpdate(" << calendarStatus << ")\n";
KAlarmd::CalendartqStatus status = KAlarmd::CalendartqStatus(calendartqStatus); KAlarmd::CalendartqStatus status = KAlarmd::CalendartqStatus(calendartqStatus);
if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString()) if (expandURL(calendarURL) != AlarmCalendar::activeCalendar()->urlString())
return; // it's not a notification about KAlarm's calendar return; // it's not a notification about KAlarm's calendar

4
kalarm/kalarmd/alarmdaemon.cpp
Unescape View File

@ -579,11 +579,11 @@ void AlarmDaemon::notifyCaltqStatus(const ADCalendar* cal)
{ {
KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED) KAlarmd::CalendartqStatus change = cal->available() ? (cal->enabled() ? KAlarmd::CALENDAR_ENABLED : KAlarmd::CALENDAR_DISABLED)
: KAlarmd::CALENDAR_UNAVAILABLE; : KAlarmd::CALENDAR_UNAVAILABLE;
kdDebug(5900) << "AlarmDaemon::notifyCaltqStatus() sending:" << appname << " -> " << change << endl; kdDebug(5900) << "AlarmDaemon::notifyCalStatus() sending:" << appname << " -> " << change << endl;
AlarmGuiIface_stub stub(appname, client->dcopObject()); AlarmGuiIface_stub stub(appname, client->dcopObject());
stub.alarmDaemonUpdate(change, cal->urlString()); stub.alarmDaemonUpdate(change, cal->urlString());
if (!stub.ok()) if (!stub.ok())
kdError(5900) << "AlarmDaemon::notifyCaltqStatus(): dcop send failed:" << appname << endl; kdError(5900) << "AlarmDaemon::notifyCalStatus(): dcop send failed:" << appname << endl;
} }
} }

2
kalarm/traywindow.cpp
Unescape View File

@ -162,7 +162,7 @@ void TrayWindow::slotQuit()
*/ */
void TrayWindow::setEnabledtqStatus(bool status) void TrayWindow::setEnabledtqStatus(bool status)
{ {
kdDebug(5950) << "TrayWindow::setEnabledtqStatus(" << (int)status << ")\n"; kdDebug(5950) << "TrayWindow::setEnabledStatus(" << (int)status << ")\n";
setPixmap(status ? mPixmapEnabled : mPixmapDisabled); setPixmap(status ? mPixmapEnabled : mPixmapDisabled);
} }

10
kmail/configuredialog.cpp
Unescape View File

@ -1722,10 +1722,10 @@ static const struct {
{ "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") }, { "PGPMessageErr", I18N_NOOP("OpenPGP Message - Bad Signature") },
{ "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") }, { "HTMLWarningColor", I18N_NOOP("Border Around Warning Prepending HTML Messages") },
{ "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") }, { "CloseToQuotaColor", I18N_NOOP("Folder Name and Size When Close to Quota") },
{ "ColorbarBackgroundPlain", I18N_NOOP("HTML tqStatus Bar Background - No HTML Message") }, { "ColorbarBackgroundPlain", I18N_NOOP("HTML Status Bar Background - No HTML Message") },
{ "ColorbarForegroundPlain", I18N_NOOP("HTML tqStatus Bar Foreground - No HTML Message") }, { "ColorbarForegroundPlain", I18N_NOOP("HTML Status Bar Foreground - No HTML Message") },
{ "ColorbarBackgroundHTML", I18N_NOOP("HTML tqStatus Bar Background - HTML Message") }, { "ColorbarBackgroundHTML", I18N_NOOP("HTML Status Bar Background - HTML Message") },
{ "ColorbarForegroundHTML", I18N_NOOP("HTML tqStatus Bar Foreground - HTML Message") }, { "ColorbarForegroundHTML", I18N_NOOP("HTML Status Bar Foreground - HTML Message") },
}; };
static const int numColorNames = sizeof colorNames / sizeof *colorNames; static const int numColorNames = sizeof colorNames / sizeof *colorNames;
@ -2226,7 +2226,7 @@ static const BoolConfigEntry showColorbarMode = {
}; };
static const BoolConfigEntry showSpamStatusMode = { static const BoolConfigEntry showSpamStatusMode = {
"Reader", "showSpamtqStatus", I18N_NOOP("Show s&pam status in fancy headers"), true "Reader", "showSpamStatus", I18N_NOOP("Show s&pam status in fancy headers"), true
}; };
static const BoolConfigEntry showEmoticons = { static const BoolConfigEntry showEmoticons = {

2
kmail/headerlistquicksearch.cpp
Unescape View File

@ -70,7 +70,7 @@ HeaderListQuickSearch::HeaderListQuickSearch( TQWidget *parent,
mStatusCombo = new TQComboBox( parent, "quick search status combo box" ); mStatusCombo = new TQComboBox( parent, "quick search status combo box" );
mStatusCombo->setSizeLimit( 12 ); mStatusCombo->setSizeLimit( 12 );
mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any tqStatus") ); mStatusCombo->insertItem( SmallIcon( "run" ), i18n("Any Status") );
insertqStatus( StatusUnread ); insertqStatus( StatusUnread );
insertqStatus( StatusNew ); insertqStatus( StatusNew );

4
kmail/headerstyle.cpp
Unescape View File

@ -463,7 +463,7 @@ namespace KMail {
TQString spamHTML; TQString spamHTML;
if ( configReader.readBoolEntry( "showSpamtqStatus", true ) ) { if ( configReader.readBoolEntry( "showSpamStatus", true ) ) {
SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message ); SpamScores scores = SpamHeaderAnalyzer::getSpamScores( message );
for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it ) for ( SpamScoresIterator it = scores.begin(); it != scores.end(); ++it )
spamHTML += (*it).agent() + " " + spamHTML += (*it).agent() + " " +
@ -841,7 +841,7 @@ namespace KMail {
if ( !spamHTML.isEmpty() ) if ( !spamHTML.isEmpty() )
headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n") headerStr.append( TQString( "<div class=\"spamheader\" dir=\"%1\"><b>%2</b>&nbsp;<span style=\"padding-left: 20px;\">%3</span></div>\n")
.tqarg( subjectDir, i18n("Spam tqStatus:"), spamHTML ) ); .tqarg( subjectDir, i18n("Spam Status:"), spamHTML ) );
headerStr += "</div>\n\n"; headerStr += "</div>\n\n";
return headerStr; return headerStr;

2
kmail/imapaccountbase.cpp
Unescape View File

@ -1197,7 +1197,7 @@ namespace KMail {
void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags ) void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
{ {
// set the status on the server, the uids are integrated in the path // set the status on the server, the uids are integrated in the path
kdDebug(5006) << "setImaptqStatus path=" << path << " to: " << flags << endl; kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
KURL url = getUrl(); KURL url = getUrl();
url.setPath(path); url.setPath(path);

2
kmail/kmacctlocal.cpp
Unescape View File

@ -215,7 +215,7 @@ bool KMAcctLocal::fetchMsg()
} }
#endif #endif
msg->setqStatus(msg->headerField("Status").latin1(), msg->setqStatus(msg->headerField("Status").latin1(),
msg->headerField("X-tqStatus").latin1()); msg->headerField("X-Status").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) ); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0) );
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));
msg->setComplete(true); msg->setComplete(true);

2
kmail/kmacctmaildir.cpp
Unescape View File

@ -171,7 +171,7 @@ void KMAcctMaildir::processNewMail(bool)
if (msg) if (msg)
{ {
msg->setqStatus(msg->headerField("Status").latin1(), msg->setqStatus(msg->headerField("Status").latin1(),
msg->headerField("X-tqStatus").latin1()); msg->headerField("X-Status").latin1());
msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0)); msg->setEncryptionStateChar( msg->headerField( "X-KMail-EncryptionState" ).at(0));
msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0)); msg->setSignatureStateChar( msg->headerField( "X-KMail-SignatureState" ).at(0));

2
kmail/kmfoldermaildir.cpp
Unescape View File

@ -800,7 +800,7 @@ void KMFolderMaildir::readFileHeaderIntern(const TQString& dir, const TQString&
{ {
xmarkStr = TQCString(line+13); xmarkStr = TQCString(line+13);
} }
else if (strncasecmp(line, "X-tqStatus:", 9) == 0) else if (strncasecmp(line, "X-Status:", 9) == 0)
{ {
statusStr = TQCString(line+9); statusStr = TQCString(line+9);
} }

2
kmail/kmfoldermbox.cpp
Unescape View File

@ -734,7 +734,7 @@ int KMFolderMbox::createIndexFromContents()
status[i] = '\0'; status[i] = '\0';
needtqStatus &= ~1; needtqStatus &= ~1;
} }
else if ((needtqStatus & 2) && strncasecmp(line, "X-tqStatus:", 9)==0) else if ((needtqStatus & 2) && strncasecmp(line, "X-Status:", 9)==0)
{ {
for(i=0; i<4 && line[i+10] > ' '; i++) for(i=0; i<4 && line[i+10] > ' '; i++)
xstatus[i] = line[i+10]; xstatus[i] = line[i+10];

4
kmail/kmheaders.cpp
Unescape View File

@ -803,7 +803,7 @@ void KMHeaders::setFolder( KMFolder *aFolder, bool forceJumpToUnread )
colText = i18n( "Subject" ); colText = i18n( "Subject" );
if (mPaintInfo.status) if (mPaintInfo.status)
colText = colText + i18n( " (tqStatus)" ); colText = colText + i18n( " (Status)" );
setColumnText( mPaintInfo.subCol, colText); setColumnText( mPaintInfo.subCol, colText);
} }
@ -2645,7 +2645,7 @@ void KMHeaders::setSorting( int column, bool ascending )
colText = i18n( "Subject" ); colText = i18n( "Subject" );
if (mPaintInfo.status) if (mPaintInfo.status)
colText = colText + i18n( " (tqStatus)" ); colText = colText + i18n( " (Status)" );
setColumnText( mPaintInfo.subCol, colText); setColumnText( mPaintInfo.subCol, colText);
} }
KListView::setSorting( column, ascending ); KListView::setSorting( column, ascending );

2
kmail/kmmainwidget.cpp
Unescape View File

@ -2689,7 +2689,7 @@ void KMMainWidget::setupActions()
(void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this), (void) new KAction( i18n("&Send Queued Messages"), "mail_send", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued"); TQT_SLOT(slotSendQueued()), actionCollection(), "send_queued");
(void) new KAction( i18n("Online tqStatus (unknown)"), "online_status", 0, TQT_TQOBJECT(this), (void) new KAction( i18n("Online Status (unknown)"), "online_status", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status"); TQT_SLOT(slotOnlinetqStatus()), actionCollection(), "online_status");
KActionMenu *sendActionMenu = new KActionMenu *sendActionMenu = new

6
kmail/kmmessage.cpp
Unescape View File

@ -337,7 +337,7 @@ TQCString KMMessage::headerAsSendableString() const
void KMMessage::removePrivateHeaderFields() { void KMMessage::removePrivateHeaderFields() {
removeHeaderField("Status"); removeHeaderField("Status");
removeHeaderField("X-tqStatus"); removeHeaderField("X-Status");
removeHeaderField("X-KMail-EncryptionState"); removeHeaderField("X-KMail-EncryptionState");
removeHeaderField("X-KMail-SignatureState"); removeHeaderField("X-KMail-SignatureState");
removeHeaderField("X-KMail-MDN-Sent"); removeHeaderField("X-KMail-MDN-Sent");
@ -356,7 +356,7 @@ void KMMessage::seStatusFields()
char str[2] = { 0, 0 }; char str[2] = { 0, 0 };
setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO"); setHeaderField("Status", status() & KMMsgStatusNew ? "R" : "RO");
setHeaderField("X-tqStatus", statusToStr(status())); setHeaderField("X-Status", statusToStr(status()));
str[0] = (char)encryptionState(); str[0] = (char)encryptionState();
setHeaderField("X-KMail-EncryptionState", str); setHeaderField("X-KMail-EncryptionState", str);
@ -410,7 +410,7 @@ void KMMessage::fromDwString(const DwString& str, bool aSetqStatus)
mMsg->Parse(); mMsg->Parse();
if (aSetqStatus) { if (aSetqStatus) {
setqStatus(headerField("Status").latin1(), headerField("X-tqStatus").latin1()); setqStatus(headerField("Status").latin1(), headerField("X-Status").latin1());
setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) ); setEncryptionStateChar( headerField("X-KMail-EncryptionState").at(0) );
setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) ); setSignatureStateChar( headerField("X-KMail-SignatureState").at(0) );
setMDNSentState( static_cast<KMMsgMDNSentState>( headerField("X-KMail-MDN-Sent").tqat(0).latin1() ) ); 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 ); bool deleteBodyPart( int partIndex );
/** Set "Status" and "X-tqStatus" fields of the message from the /** Set "Status" and "X-Status" fields of the message from the
* internal message status. */ * internal message status. */
void seStatusFields(); void seStatusFields();

2
kmail/kmmsgbase.cpp
Unescape View File

@ -269,7 +269,7 @@ void KMMsgBase::setqStatus(const KMMsgtqStatus atqStatus, int idx)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr) void KMMsgBase::setqStatus(const char* aStatusStr, const char* aXStatusStr)
{ {
// first try to find status from "X-tqStatus" field if given // first try to find status from "X-Status" field if given
if (aXStatusStr) { if (aXStatusStr) {
if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew); if (strchr(aXStatusStr, 'N')) setqStatus(KMMsgStatusNew);
if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread); if (strchr(aXStatusStr, 'U')) setqStatus(KMMsgStatusUnread);

2
kmail/kmsearchpatternedit.cpp
Unescape View File

@ -37,7 +37,7 @@ static const struct {
{ "<recipients>", I18N_NOOP( "All Recipients" ) }, { "<recipients>", I18N_NOOP( "All Recipients" ) },
{ "<size>", I18N_NOOP( "Size in Bytes" ) }, { "<size>", I18N_NOOP( "Size in Bytes" ) },
{ "<age in days>", I18N_NOOP( "Age in Days" ) }, { "<age in days>", I18N_NOOP( "Age in Days" ) },
{ "<status>", I18N_NOOP( "Message tqStatus" ) }, { "<status>", I18N_NOOP( "Message Status" ) },
{ "Subject", I18N_NOOP( "Subject" ) }, { "Subject", I18N_NOOP( "Subject" ) },
{ "From", I18N_NOOP( "From" ) }, { "From", I18N_NOOP( "From" ) },
{ "To", I18N_NOOP( "To" ) }, { "To", I18N_NOOP( "To" ) },

4
kmailcvt/filter_kmail_maildir.cxx
Unescape View File

@ -136,9 +136,9 @@ TQString FilterKMail_maildir::getMessageFlags( FilterInfo *info, const TQString&
while ( ! mailfile.atEnd() && mailfile.readLine(input.data(),MAX_LINE) ) { while ( ! mailfile.atEnd() && mailfile.readLine(input.data(),MAX_LINE) ) {
if ((seperate = input.data()).left(10) == "X-tqStatus: ") { if ((seperate = input.data()).left(10) == "X-Status: ") {
status_flag = seperate; status_flag = seperate;
status_flag.remove("X-tqStatus: "); status_flag.remove("X-Status: ");
status_flag = status_flag.stripWhiteSpace(); status_flag = status_flag.stripWhiteSpace();
// qDebug("status_flag: %s", status_flag.latin1() ); // qDebug("status_flag: %s", status_flag.latin1() );
break; break;

4
kmailcvt/filter_mbox.cxx
Unescape View File

@ -91,9 +91,9 @@ void FilterMBox::import(FilterInfo *info)
while ( ! mbox.atEnd() && (l = mbox.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) { while ( ! mbox.atEnd() && (l = mbox.readLine(input.data(),MAX_LINE)) && ((seperate = input.data()).left(5) != "From ")) {
tmp.file()->writeBlock( input, l ); tmp.file()->writeBlock( input, l );
if ((seperate = input.data()).left(10) == "X-tqStatus: ") { if ((seperate = input.data()).left(10) == "X-Status: ") {
x_status_flag = seperate; x_status_flag = seperate;
x_status_flag.remove("X-tqStatus: "); x_status_flag.remove("X-Status: ");
x_status_flag = x_status_flag.stripWhiteSpace(); x_status_flag = x_status_flag.stripWhiteSpace();
// qDebug("x_status_flag: %s", x_status_flag.latin1() ); // qDebug("x_status_flag: %s", x_status_flag.latin1() );
} }

2
knode/knfilterconfigwidget.cpp
Unescape View File

@ -50,7 +50,7 @@ KNFilterConfigWidget::KNFilterConfigWidget(TQWidget *parent, const char *name )
addTab(idW, i18n("M&essage-IDs")); addTab(idW, i18n("M&essage-IDs"));
status=new KNStatusFilterWidget(this); status=new KNStatusFilterWidget(this);
addTab(status, i18n("&tqStatus")); addTab(status, i18n("&Status"));
add=new TQWidget(this); add=new TQWidget(this);
TQVBoxLayout *addL=new TQVBoxLayout(add, 8,5); TQVBoxLayout *addL=new TQVBoxLayout(add, 8,5);

2
kontact/plugins/kpilot/summarywidget.cpp
Unescape View File

@ -90,7 +90,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
// tqStatus // tqStatus
row++; row++;
mDaemonStatusTextLabel = new TQLabel( i18n( "<i>tqStatus:</i>" ), this); mDaemonStatusTextLabel = new TQLabel( i18n( "<i>Status:</i>" ), this);
mLayout->addWidget( mDaemonStatusTextLabel, row, 0 ); mLayout->addWidget( mDaemonStatusTextLabel, row, 0 );
mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this ); mDaemonStatusLabel = new TQLabel( i18n( "No communication with the daemon possible" ), this );
mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 ); mLayout->addMultiCellWidget( mDaemonStatusLabel, row, row, 1, 3 );

2
korganizer/actionmanager.cpp
Unescape View File

@ -522,7 +522,7 @@ void ActionManager::initActions()
connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)),
mSendCancel, TQT_SLOT(setEnabled(bool)) ); mSendCancel, TQT_SLOT(setEnabled(bool)) );
mSendStatusUpdate = new KAction( i18n( "Send tqStatus &Update" ), mSendStatusUpdate = new KAction( i18n( "Send Status &Update" ),
"mail_reply", 0, "mail_reply", 0,
TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()), TQT_TQOBJECT(mCalendarView),TQT_SLOT(schedule_reply()),
mACollection, "schedule_reply" ); mACollection, "schedule_reply" );

4
korganizer/printing/calprintdefaultplugins.cpp
Unescape View File

@ -510,7 +510,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
subitemString += datesString; subitemString += datesString;
subitemString += "\n"; subitemString += "\n";
} }
subitemString += i18n( "subitem tqStatus: statusString", subitemString += i18n( "subitem Status: statusString",
"Status: %1\n").tqarg( statusString ); "Status: %1\n").tqarg( statusString );
subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n"; subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
subitemString += i18n( "subitem Priority: N", subitemString += i18n( "subitem Priority: N",
@ -559,7 +559,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
for ( Attendee::List::ConstIterator ait = attendees.begin(); ait != attendees.end(); ++ait ) { for ( Attendee::List::ConstIterator ait = attendees.begin(); ait != attendees.end(); ++ait ) {
if ( !attendeeString.isEmpty() ) attendeeString += "\n"; if ( !attendeeString.isEmpty() ) attendeeString += "\n";
attendeeString += i18n("Formatting of an attendee: " attendeeString += i18n("Formatting of an attendee: "
"'Name (Role): tqStatus', e.g. 'Reinhold Kainhofer " "'Name (Role): Status', e.g. 'Reinhold Kainhofer "
"<reinhold@kainhofer.com> (Participant): Awaiting Response'", "<reinhold@kainhofer.com> (Participant): Awaiting Response'",
"%1 (%2): %3") "%1 (%2): %3")
.tqarg( (*ait)->fullName() ) .tqarg( (*ait)->fullName() )

2
korganizer/statusdialog.cpp
Unescape View File

@ -38,7 +38,7 @@
StatusDialog::StatusDialog(TQWidget* parent, const char* name) : StatusDialog::StatusDialog(TQWidget* parent, const char* name) :
KDialog(parent,name,true) KDialog(parent,name,true)
{ {
setCaption(i18n("Set Your tqStatus")); setCaption(i18n("Set Your Status"));
TQBoxLayout *topLayout = new TQVBoxLayout( this ); TQBoxLayout *topLayout = new TQVBoxLayout( this );
topLayout->setSpacing( spacingHint() ); topLayout->setSpacing( spacingHint() );

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

@ -518,7 +518,7 @@ void GroupwiseServer::dumpCalendarFolder( const std::string &id )
itemsRequest.container = soap_new_std__string( mSoap, -1 ); itemsRequest.container = soap_new_std__string( mSoap, -1 );
*(itemsRequest.container) = id; *(itemsRequest.container) = id;
std::string *str = soap_new_std__string( mSoap, -1 ); std::string *str = soap_new_std__string( mSoap, -1 );
str->append( "recipients message recipientqStatus" ); str->append( "recipients message recipienStatus" );
itemsRequest.view = str; itemsRequest.view = str;
itemsRequest.filter = 0; itemsRequest.filter = 0;
@ -1106,7 +1106,7 @@ bool GroupwiseServer::checkResponse( int result, ngwt__tqStatus *status )
kdDebug() << "SOAP call succeeded" << endl; kdDebug() << "SOAP call succeeded" << endl;
} }
if ( status && status->code != 0 ) { if ( status && status->code != 0 ) {
TQString msg = "SOAP Response tqStatus: " + TQString::number( status->code ); TQString msg = "SOAP Response Status: " + TQString::number( status->code );
if ( status->description ) { if ( status->description ) {
msg += " "; msg += " ";
msg += status->description->c_str(); msg += status->description->c_str();

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

@ -465,7 +465,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
itemsRequest.container = id; itemsRequest.container = id;
std::string *str = soap_new_std__string( mSoap, -1 ); std::string *str = soap_new_std__string( mSoap, -1 );
str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipientqStatus recurrenceKey" ); str->append( "startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recipienStatus recurrenceKey" );
itemsRequest.view = str; itemsRequest.view = str;
itemsRequest.filter = 0; itemsRequest.filter = 0;
itemsRequest.items = 0; itemsRequest.items = 0;
@ -525,7 +525,7 @@ void ReadCalendarJob::readCalendarFolder( const std::string &id, ReadItemCounts
cursorRequest.container = id; cursorRequest.container = id;
#if 1 #if 1
cursorRequest.view = soap_new_std__string( mSoap, -1 ); cursorRequest.view = soap_new_std__string( mSoap, -1 );
cursorRequest.view->append( "default message recipients attachments recipientqStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ ); cursorRequest.view->append( "default message recipients attachments recipienStatus peek completed status" /*"container status source security distribution acceptLevel startDate endDate subject alarm allDayEvent place timezone iCalId recipients message recurrenceKey"*/ );
#else #else
cursorRequest.view = 0; cursorRequest.view = 0;

670
kresources/groupwise/soap/soapC.cpp
View File

File diff suppressed because it is too large Load Diff

2
ktnef/lib/ktnefparser.cpp
Unescape View File

@ -198,7 +198,7 @@ bool KTNEFParser::decodeMessage()
d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag ); d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
value = c; value = c;
} }
kdDebug() << "Message tqStatus" << " (length=" << i2 << ")" << endl; kdDebug() << "Message Status" << " (length=" << i2 << ")" << endl;
break; break;
case attRECIPTABLE: case attRECIPTABLE:
{ {

2
ktnef/lib/ktnefwriter.cpp
Unescape View File

@ -287,7 +287,7 @@ bool KTNEFWriter::writeProperty( TQDataStream &stream, int &bytes, int tag) {
addToChecksum( i, checksum ); addToChecksum( i, checksum );
// from reader: d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag ); // from reader: d->message_->addProperty( 0x0E07, MAPI_TYPE_ULONG, flag );
} }
kdDebug() << "Message tqStatus" << " (length=" << i2 << ")" << endl; kdDebug() << "Message Status" << " (length=" << i2 << ")" << endl;
break; break;
*/ */

4
ktnef/lib/mapi.cpp
Unescape View File

@ -130,7 +130,7 @@ static struct
{ 0x8004, I18N_NOOP( "Subject" ) }, { 0x8004, I18N_NOOP( "Subject" ) },
{ 0x8005, I18N_NOOP( "Date Sent" ) }, { 0x8005, I18N_NOOP( "Date Sent" ) },
{ 0x8006, I18N_NOOP( "Date Received" ) }, { 0x8006, I18N_NOOP( "Date Received" ) },
{ 0x8007, I18N_NOOP( "Message tqStatus" ) }, { 0x8007, I18N_NOOP( "Message Status" ) },
{ 0x8008, I18N_NOOP( "Message Class" ) }, { 0x8008, I18N_NOOP( "Message Class" ) },
{ 0x8009, I18N_NOOP( "Message ID" ) }, { 0x8009, I18N_NOOP( "Message ID" ) },
{ 0x800A, I18N_NOOP( "Parent ID" ) }, { 0x800A, I18N_NOOP( "Parent ID" ) },
@ -176,7 +176,7 @@ MAPI_NamedTagStrings[] =
{ 0x820D, I18N_NOOP( "Appointment Start Date" ) }, { 0x820D, I18N_NOOP( "Appointment Start Date" ) },
{ 0x820E, I18N_NOOP( "Appointment End Date" ) }, { 0x820E, I18N_NOOP( "Appointment End Date" ) },
{ 0x8213, I18N_NOOP( "Appointment Duration" ) }, { 0x8213, I18N_NOOP( "Appointment Duration" ) },
{ 0x8218, I18N_NOOP( "Appointment Response tqStatus" ) }, { 0x8218, I18N_NOOP( "Appointment Response Status" ) },
{ 0x8223, I18N_NOOP( "Appointment Is Recurring" ) }, { 0x8223, I18N_NOOP( "Appointment Is Recurring" ) },
{ 0x8231, I18N_NOOP( "Appointment Recurrence Type" ) }, { 0x8231, I18N_NOOP( "Appointment Recurrence Type" ) },
{ 0x8232, I18N_NOOP( "Appointment Recurrence Pattern" ) }, { 0x8232, I18N_NOOP( "Appointment Recurrence Pattern" ) },

8
libemailfunctions/networkstatus.cpp
Unescape View File

@ -33,9 +33,9 @@ static KStaticDeleter<NetworktqStatus> networkStatusDeleter;
NetworktqStatus *NetworktqStatus::mSelf = 0; NetworktqStatus *NetworktqStatus::mSelf = 0;
NetworktqStatus::NetworktqStatus() NetworktqStatus::NetworktqStatus()
: TQObject( 0, "NetworktqStatus" ), DCOPObject( "NetworktqStatus" ) : TQObject( 0, "NetworkStatus" ), DCOPObject( "NetworkStatus" )
{ {
KConfigGroup group( KGlobal::config(), "NetworktqStatus" ); KConfigGroup group( KGlobal::config(), "NetworkStatus" );
if ( group.readBoolEntry( "Online", true ) == true ) if ( group.readBoolEntry( "Online", true ) == true )
mtqStatus = Online; mtqStatus = Online;
else else
@ -46,7 +46,7 @@ NetworktqStatus::NetworktqStatus()
NetworktqStatus::~NetworktqStatus() NetworktqStatus::~NetworktqStatus()
{ {
KConfigGroup group( KGlobal::config(), "NetworktqStatus" ); KConfigGroup group( KGlobal::config(), "NetworkStatus" );
group.writeEntry( "Online", mtqStatus == Online ); group.writeEntry( "Online", mtqStatus == Online );
} }
@ -65,7 +65,7 @@ NetworktqStatus::tqStatus NetworktqStatus::status() const
void NetworktqStatus::onlineStatusChanged() void NetworktqStatus::onlineStatusChanged()
{ {
DCOPRef dcopCall( "kded", "networkstatus" ); DCOPRef dcopCall( "kded", "networkstatus" );
DCOPReply reply = dcopCall.call( "onlinetqStatus()", true ); DCOPReply reply = dcopCall.call( "onlineStatus()", true );
if ( reply.isValid() ) { if ( reply.isValid() ) {
int status = reply; int status = reply;
if ( status == 3 ) if ( status == 3 )

2
libkcal/scheduler.cpp
Unescape View File

@ -60,7 +60,7 @@ TQString ScheduleMessage::statusName(ScheduleMessage::tqStatus status)
case RequestUpdate: case RequestUpdate:
return i18n("Updated Request"); return i18n("Updated Request");
default: default:
return i18n("Unknown tqStatus: %1").tqarg(TQString::number(status)); return i18n("Unknown Status: %1").tqarg(TQString::number(status));
} }
} }

6
libkcal/tests/testfields.cpp
Unescape View File

@ -78,7 +78,7 @@ int main(int argc,char **argv)
if (e->pilotId()) { if (e->pilotId()) {
kdDebug() << "Pilot ID = " << e->pilotId() << endl; kdDebug() << "Pilot ID = " << e->pilotId() << endl;
kdDebug() << "Pilot Sync tqStatus = " << e->synctqStatus() << endl; kdDebug() << "Pilot Sync Status = " << e->synctqStatus() << endl;
} else { } else {
kdError() << "No Pilot ID" << endl; kdError() << "No Pilot ID" << endl;
return 1; return 1;
@ -131,7 +131,7 @@ int main(int argc,char **argv)
if (e->pilotId()) { if (e->pilotId()) {
kdDebug() << "First Pilot ID = " << e->pilotId() << endl; kdDebug() << "First Pilot ID = " << e->pilotId() << endl;
kdDebug() << "First Pilot Sync tqStatus = " << e->synctqStatus() << endl; kdDebug() << "First Pilot Sync Status = " << e->synctqStatus() << endl;
} else { } else {
kdError() << "No Pilot ID for first test" << endl; kdError() << "No Pilot ID for first test" << endl;
return 1; return 1;
@ -154,7 +154,7 @@ int main(int argc,char **argv)
if (f->pilotId()) { if (f->pilotId()) {
kdDebug() << "Second Pilot ID = " << f->pilotId() << endl; kdDebug() << "Second Pilot ID = " << f->pilotId() << endl;
kdDebug() << "Second Pilot Sync tqStatus = " << f->synctqStatus() << endl; kdDebug() << "Second Pilot Sync Status = " << f->synctqStatus() << endl;
} else { } else {
kdError() << "No Pilot ID for second read test" << endl; kdError() << "No Pilot ID for second read test" << endl;
return 1; return 1;

2
libkcal/vcalformat.cpp
Unescape View File

@ -1590,7 +1590,7 @@ Attendee::PartStat VCalFormat::readtqStatus(const char *s) const
else if (statStr== "DELEGATED") else if (statStr== "DELEGATED")
status = Attendee::Delegated; status = Attendee::Delegated;
else { else {
kdDebug(5800) << "error setting attendee mtqStatus, unknown mtqStatus!" << endl; kdDebug(5800) << "error setting attendee mStatus, unknown mStatus!" << endl;
status = Attendee::NeedsAction; status = Attendee::NeedsAction;
} }

2
libkdenetwork/gpgmepp/verificationresult.cpp
Unescape View File

@ -338,7 +338,7 @@ std::ostream & GpgME::operator<<( std::ostream & os, const Signature & sig ) {
if ( !sig.isNull() ) { if ( !sig.isNull() ) {
os << "\n Summary: " << sig.summary() os << "\n Summary: " << sig.summary()
<< "\n Fingerprint: " << protect( sig.fingerprint() ) << "\n Fingerprint: " << protect( sig.fingerprint() )
<< "\n tqStatus: " << sig.status() << "\n Status: " << sig.status()
<< "\n creationTime: " << sig.creationTime() << "\n creationTime: " << sig.creationTime()
<< "\n expirationTime: " << sig.expirationTime() << "\n expirationTime: " << sig.expirationTime()
<< "\n wrongKeyUsage: " << sig.wrongKeyUsage() << "\n wrongKeyUsage: " << sig.wrongKeyUsage()

4
libkpgp/kpgpui.cpp
Unescape View File

@ -542,13 +542,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
dt.setTime_t( key->creationDate() ); dt.setTime_t( key->creationDate() );
if( remark.isEmpty() ) { if( remark.isEmpty() ) {
return " " + i18n("creation date and status of an OpenPGP key", return " " + i18n("creation date and status of an OpenPGP key",
"Creation date: %1, tqStatus: %2") "Creation date: %1, Status: %2")
.tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
.tqarg( status ); .tqarg( status );
} }
else { else {
return " " + i18n("creation date, status and remark of an OpenPGP key", return " " + i18n("creation date, status and remark of an OpenPGP key",
"Creation date: %1, tqStatus: %2 (%3)") "Creation date: %1, Status: %2 (%3)")
.tqarg( KGlobal::locale()->formatDate( dt.date(), true ) ) .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
.tqarg( status ) .tqarg( status )
.tqarg( remark ); .tqarg( remark );

Write Preview
Loading…
Cancel
Save