Fix a number of accidental tqStatus string conversions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1249829 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent d7c69d672c
commit 52c719697a

@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
} }
mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED); mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED);
status = (TransfertqStatus) config->readNumEntry("tqStatus", ST_RUNNING); status = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING);
startTime = config->readDateTimeEntry("ScheduledTime"); startTime = config->readDateTimeEntry("ScheduledTime");
canResume = config->readBoolEntry("CanResume", true); canResume = config->readBoolEntry("CanResume", true);
totalSize = config->readUnsignedNum64Entry("TotalSize", 0); totalSize = config->readUnsignedNum64Entry("TotalSize", 0);
@ -815,7 +815,7 @@ void Transfer::write(KSimpleConfig * config, int id)
config->writePathEntry("Source", src.url()); config->writePathEntry("Source", src.url());
config->writePathEntry("Dest", dest.url()); config->writePathEntry("Dest", dest.url());
config->writeEntry("Mode", mode); config->writeEntry("Mode", mode);
config->writeEntry("tqStatus", status); config->writeEntry("Status", status);
config->writeEntry("CanResume", canResume); config->writeEntry("CanResume", canResume);
config->writeEntry("TotalSize", totalSize ); config->writeEntry("TotalSize", totalSize );
config->writeEntry("ProcessedSize", processedSize ); config->writeEntry("ProcessedSize", processedSize );

@ -172,7 +172,7 @@ void ChatWindowStyle::readStyleFiles()
TQString nextIncomingFile = d->baseHref + TQString("Incoming/NextContent.html"); TQString nextIncomingFile = d->baseHref + TQString("Incoming/NextContent.html");
TQString outgoingFile = d->baseHref + TQString("Outgoing/Content.html"); TQString outgoingFile = d->baseHref + TQString("Outgoing/Content.html");
TQString nextOutgoingFile = d->baseHref + TQString("Outgoing/NextContent.html"); TQString nextOutgoingFile = d->baseHref + TQString("Outgoing/NextContent.html");
TQString statusFile = d->baseHref + TQString("tqStatus.html"); TQString statusFile = d->baseHref + TQString("Status.html");
TQString actionIncomingFile = d->baseHref + TQString("Incoming/Action.html"); TQString actionIncomingFile = d->baseHref + TQString("Incoming/Action.html");
TQString actionOutgoingFile = d->baseHref + TQString("Outgoing/Action.html"); TQString actionOutgoingFile = d->baseHref + TQString("Outgoing/Action.html");
@ -251,7 +251,7 @@ void ChatWindowStyle::readStyleFiles()
TQTextStream headerStream(&fileAccess); TQTextStream headerStream(&fileAccess);
headerStream.setEncoding(TQTextStream::UnicodeUTF8); headerStream.setEncoding(TQTextStream::UnicodeUTF8);
d->statusHtml = headerStream.read(); d->statusHtml = headerStream.read();
kdDebug(14000) << k_funcinfo << "tqStatus HTML: " << d->statusHtml << endl; kdDebug(14000) << k_funcinfo << "Status HTML: " << d->statusHtml << endl;
fileAccess.close(); fileAccess.close();
} }

@ -263,7 +263,7 @@ void KopeteWindow::initActions()
"SetAvailableAll" ); "SetAvailableAll" );
actionAwayMenu = new KActionMenu( i18n("&Set tqStatus"), "kopeteavailable", actionAwayMenu = new KActionMenu( i18n("&Set tqStatus"), "kopeteavailable",
actionCollection(), "tqStatus" ); actionCollection(), "Status" );
actionAwayMenu->setDelayed( false ); actionAwayMenu->setDelayed( false );
actionAwayMenu->insert(actionSetAvailable); actionAwayMenu->insert(actionSetAvailable);
actionAwayMenu->insert(selectAway); actionAwayMenu->insert(selectAway);
@ -974,7 +974,7 @@ void KopeteWindow::slotBuildStatusMessageMenu()
// pop up a menu containing the away messages, and a lineedit // pop up a menu containing the away messages, and a lineedit
// see kopeteaway // see kopeteaway
//messageMenu = new KPopupMenu( this ); //messageMenu = new KPopupMenu( this );
// messageMenu->insertTitle( i18n( "tqStatus Message" ) ); // messageMenu->insertTitle( i18n( "Status Message" ) );
TQHBox * newMessageBox = new TQHBox( 0 ); TQHBox * newMessageBox = new TQHBox( 0 );
newMessageBox->setMargin( 1 ); newMessageBox->setMargin( 1 );
TQLabel * newMessagePix = new TQLabel( newMessageBox ); TQLabel * newMessagePix = new TQLabel( newMessageBox );

@ -507,7 +507,7 @@ TQString MetaContact::statusString() const
return i18n( "Offline" ); return i18n( "Offline" );
case OnlineStatus::Unknown: case OnlineStatus::Unknown:
default: default:
return i18n( "tqStatus not available" ); return i18n( "Status not available" );
} }
} }

@ -182,7 +182,7 @@ void UserInfoDialog::fillHTML()
} }
if ( d->status.isEmpty() ) { if ( d->status.isEmpty() ) {
text.append( "<div id=\"status\"><b>" + i18n("tqStatus : ") + "</b>" ); text.append( "<div id=\"status\"><b>" + i18n("Status : ") + "</b>" );
text.append( d->status + "</div><br>" ); text.append( d->status + "</div><br>" );
} }
@ -214,7 +214,7 @@ void UserInfoDialog::fillWidgets()
} }
if ( !d->status.isEmpty() ) { if ( !d->status.isEmpty() ) {
d->topLayout->addWidget( addLabelEdit( i18n("tqStatus:"), d->status, d->statusEdit ) ); d->topLayout->addWidget( addLabelEdit( i18n("Status:"), d->status, d->statusEdit ) );
} }
if ( !d->warningLevel.isEmpty() ) { if ( !d->warningLevel.isEmpty() ) {

@ -217,7 +217,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
"<a href=\"monthofyear:12\">December</a>&nbsp;" "<a href=\"monthofyear:12\">December</a>&nbsp;"
"</span></div><br>")); "</span></div><br>"));
// mainWidget->listView->addColumn(i18n("tqStatus")); // mainWidget->listView->addColumn(i18n("Status"));
// mainWidget->listView->addColumn(i18n("Start Date")); // mainWidget->listView->addColumn(i18n("Start Date"));
// mainWidget->listView->addColumn(i18n("End Date")); // mainWidget->listView->addColumn(i18n("End Date"));
// mainWidget->listView->addColumn(i18n("Start Date")); // mainWidget->listView->addColumn(i18n("Start Date"));

@ -62,7 +62,7 @@ GaduSession::isConnected() const
int int
GaduSession::status() const GaduSession::status() const
{ {
kdDebug(14100)<<"tqStatus = " << session_->status <<", initial = "<< session_->initial_status <<endl; kdDebug(14100)<<"Status = " << session_->status <<", initial = "<< session_->initial_status <<endl;
if ( session_ ) { if ( session_ ) {
return session_->status & ( ~GG_STATUS_FRIENDS_MASK ); return session_->status & ( ~GG_STATUS_FRIENDS_MASK );
} }

@ -147,7 +147,7 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList
0, this, Offline, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline), 0, this, Offline, TQString(), i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline),
m_StatusUnknown(Kopete::OnlineStatus::Unknown, m_StatusUnknown(Kopete::OnlineStatus::Unknown,
999, this, 999, "status_unknown", i18n("tqStatus not available")), 999, this, 999, "status_unknown", i18n("Status not available")),
propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ), propChannelTopic(TQString::tqfromLatin1("channelTopic"), i18n("Topic"), TQString(), false, true ),
propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")), propChannelMembers(TQString::tqfromLatin1("channelMembers"), i18n("Members")),

@ -1017,7 +1017,7 @@ void JabberAccount::slotCSError ( int error )
/* Set presence (usually called by dialog widget). */ /* Set presence (usually called by dialog widget). */
void JabberAccount::setPresence ( const XMPP::tqStatus &status ) void JabberAccount::setPresence ( const XMPP::tqStatus &status )
{ {
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "tqStatus: " << status.show () << ", Reason: " << status.status () << endl; kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Status: " << status.show () << ", Reason: " << status.status () << endl;
// fetch input status // fetch input status
XMPP::tqStatus newtqStatus = status; XMPP::tqStatus newtqStatus = status;

@ -60,7 +60,7 @@ MeanwhileProtocol::MeanwhileProtocol(TQObject* parent, const char *name,
TQString(), i18n("Account Offline")), TQString(), i18n("Account Offline")),
statusMessage(TQString::tqfromLatin1("statusMessage"), statusMessage(TQString::tqfromLatin1("statusMessage"),
i18n("tqStatus Message"), TQString(), false, true), i18n("Status Message"), TQString(), false, true),
awayMessage(Kopete::Global::Properties::self()->awayMessage()) awayMessage(Kopete::Global::Properties::self()->awayMessage())
{ {

@ -58,7 +58,7 @@ MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList
FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString(), i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ), FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString(), i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ), HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ),
IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ), IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ),
UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "tqStatus not available" ) ), UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "Status not available" ) ),
CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ), CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ),
propEmail(Kopete::Global::Properties::self()->emailAddress()), propEmail(Kopete::Global::Properties::self()->emailAddress()),
propPhoneHome(Kopete::Global::Properties::self()->privatePhone()), propPhoneHome(Kopete::Global::Properties::self()->privatePhone()),

@ -49,7 +49,7 @@ namespace KPF
view_->setAllColumnsShowFocus(true); view_->setAllColumnsShowFocus(true);
view_->setSelectionMode(TQListView::Extended); view_->setSelectionMode(TQListView::Extended);
view_->addColumn(i18n("tqStatus")); view_->addColumn(i18n("Status"));
view_->addColumn(i18n("Progress")); view_->addColumn(i18n("Progress"));
view_->addColumn(i18n("File Size")); view_->addColumn(i18n("File Size"));
view_->addColumn(i18n("Bytes Sent")); view_->addColumn(i18n("Bytes Sent"));

@ -371,7 +371,7 @@ sub hook_ksirc_dcc_send {
$window->setRange(0, $size); $window->setRange(0, $size);
$window->setCaption("$file=>$nick"); $window->setCaption("$file=>$nick");
$window->setTopText("Sending: $file Size: $size"); $window->setTopText("Sending: $file Size: $size");
$window->setBotText("tqStatus: pending"); $window->setBotText("Status: pending");
$window->setCancel("dcc close send $nick $file"); $window->setCancel("dcc close send $nick $file");
$KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
$KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;
@ -417,7 +417,7 @@ sub hook_ksirc_dcc_get {
$window->setRange(0, $size); $window->setRange(0, $size);
$window->setCaption("$file<=$nick"); $window->setCaption("$file<=$nick");
$window->setTopText("Receiver: $file Size: $size"); $window->setTopText("Receiver: $file Size: $size");
$window->setBotText("tqStatus: pending"); $window->setBotText("Status: pending");
$window->setCancel("dcc close get $nick $file"); $window->setCancel("dcc close get $nick $file");
$KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
$KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;
@ -438,7 +438,7 @@ sub hook_ksirc_dcc_get_status {
$window->setRange(0, 1); $window->setRange(0, 1);
$window->setCaption("$file<=$nick"); $window->setCaption("$file<=$nick");
$window->setTopText("Receiver: $file Size: Unkown"); $window->setTopText("Receiver: $file Size: Unkown");
$window->setBotText("tqStatus: pending"); $window->setBotText("Status: pending");
$window->setCancel("dcc close get $nick $file"); $window->setCancel("dcc close get $nick $file");
$KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'Window'} = $window;
$KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1;

@ -38,7 +38,7 @@ bool tqStatus::generateStatsWidget ()
qual = 0; qual = 0;
device->get_current_quality (sig, noi, qual); device->get_current_quality (sig, noi, qual);
content = content =
new TQGroupBox (2, Qt::Horizontal, i18n ("tqStatus of Active Connection"), new TQGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"),
this); this);
bool has_freq = device->get_device_freq (freq); bool has_freq = device->get_device_freq (freq);
if ((!has_freq) || (qual == 0)) if ((!has_freq) || (qual == 0))

Loading…
Cancel
Save