From 52c719697a3a46d48fa618d68b84d7d6bd7c524c Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 27 Aug 2011 21:38:57 +0000 Subject: [PATCH] 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 --- kget/transfer.cpp | 4 ++-- kopete/kopete/chatwindow/kopetechatwindowstyle.cpp | 4 ++-- kopete/kopete/kopetewindow.cpp | 4 ++-- kopete/libkopete/kopetemetacontact.cpp | 2 +- kopete/libkopete/ui/userinfodialog.cpp | 4 ++-- kopete/plugins/statistics/statisticsdialog.cpp | 2 +- kopete/protocols/gadu/gadusession.cpp | 2 +- kopete/protocols/irc/ircprotocol.cpp | 2 +- kopete/protocols/jabber/jabberaccount.cpp | 2 +- kopete/protocols/meanwhile/meanwhileprotocol.cpp | 2 +- kopete/protocols/msn/msnprotocol.cpp | 2 +- kpf/src/ActiveMonitor.cpp | 2 +- ksirc/puke/dcc_status.pm | 6 +++--- wifi/status.cpp | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kget/transfer.cpp b/kget/transfer.cpp index e06cdfc5..9303a9a2 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id) } 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"); canResume = config->readBoolEntry("CanResume", true); totalSize = config->readUnsignedNum64Entry("TotalSize", 0); @@ -815,7 +815,7 @@ void Transfer::write(KSimpleConfig * config, int id) config->writePathEntry("Source", src.url()); config->writePathEntry("Dest", dest.url()); config->writeEntry("Mode", mode); - config->writeEntry("tqStatus", status); + config->writeEntry("Status", status); config->writeEntry("CanResume", canResume); config->writeEntry("TotalSize", totalSize ); config->writeEntry("ProcessedSize", processedSize ); diff --git a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp index 1bc64959..5eba33f0 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstyle.cpp @@ -172,7 +172,7 @@ void ChatWindowStyle::readStyleFiles() TQString nextIncomingFile = d->baseHref + TQString("Incoming/NextContent.html"); TQString outgoingFile = d->baseHref + TQString("Outgoing/Content.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 actionOutgoingFile = d->baseHref + TQString("Outgoing/Action.html"); @@ -251,7 +251,7 @@ void ChatWindowStyle::readStyleFiles() TQTextStream headerStream(&fileAccess); headerStream.setEncoding(TQTextStream::UnicodeUTF8); d->statusHtml = headerStream.read(); - kdDebug(14000) << k_funcinfo << "tqStatus HTML: " << d->statusHtml << endl; + kdDebug(14000) << k_funcinfo << "Status HTML: " << d->statusHtml << endl; fileAccess.close(); } diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 7ec4258d..ec3e69f3 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -263,7 +263,7 @@ void KopeteWindow::initActions() "SetAvailableAll" ); actionAwayMenu = new KActionMenu( i18n("&Set tqStatus"), "kopeteavailable", - actionCollection(), "tqStatus" ); + actionCollection(), "Status" ); actionAwayMenu->setDelayed( false ); actionAwayMenu->insert(actionSetAvailable); actionAwayMenu->insert(selectAway); @@ -974,7 +974,7 @@ void KopeteWindow::slotBuildStatusMessageMenu() // pop up a menu containing the away messages, and a lineedit // see kopeteaway //messageMenu = new KPopupMenu( this ); -// messageMenu->insertTitle( i18n( "tqStatus Message" ) ); +// messageMenu->insertTitle( i18n( "Status Message" ) ); TQHBox * newMessageBox = new TQHBox( 0 ); newMessageBox->setMargin( 1 ); TQLabel * newMessagePix = new TQLabel( newMessageBox ); diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 05925690..1db7b1e5 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -507,7 +507,7 @@ TQString MetaContact::statusString() const return i18n( "Offline" ); case OnlineStatus::Unknown: default: - return i18n( "tqStatus not available" ); + return i18n( "Status not available" ); } } diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 0b642e7b..40ac3de9 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -182,7 +182,7 @@ void UserInfoDialog::fillHTML() } if ( d->status.isEmpty() ) { - text.append( "
" + i18n("tqStatus : ") + "" ); + text.append( "
" + i18n("Status : ") + "" ); text.append( d->status + "

" ); } @@ -214,7 +214,7 @@ void UserInfoDialog::fillWidgets() } 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() ) { diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index 1404e075..8c7e83eb 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -217,7 +217,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T "December " "

")); -// mainWidget->listView->addColumn(i18n("tqStatus")); +// mainWidget->listView->addColumn(i18n("Status")); // mainWidget->listView->addColumn(i18n("Start Date")); // mainWidget->listView->addColumn(i18n("End Date")); // mainWidget->listView->addColumn(i18n("Start Date")); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 345fdd07..a9a84691 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -62,7 +62,7 @@ GaduSession::isConnected() const int GaduSession::status() const { - kdDebug(14100)<<"tqStatus = " << session_->status <<", initial = "<< session_->initial_status <awayMessage()) { diff --git a/kopete/protocols/msn/msnprotocol.cpp b/kopete/protocols/msn/msnprotocol.cpp index 26869ea7..407550f3 100644 --- a/kopete/protocols/msn/msnprotocol.cpp +++ b/kopete/protocols/msn/msnprotocol.cpp @@ -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 ), 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 ), - 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" ) ), propEmail(Kopete::Global::Properties::self()->emailAddress()), propPhoneHome(Kopete::Global::Properties::self()->privatePhone()), diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index d7f72ea1..dc6115df 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -49,7 +49,7 @@ namespace KPF view_->setAllColumnsShowFocus(true); view_->setSelectionMode(TQListView::Extended); - view_->addColumn(i18n("tqStatus")); + view_->addColumn(i18n("Status")); view_->addColumn(i18n("Progress")); view_->addColumn(i18n("File Size")); view_->addColumn(i18n("Bytes Sent")); diff --git a/ksirc/puke/dcc_status.pm b/ksirc/puke/dcc_status.pm index 5101cc58..2954c9f7 100644 --- a/ksirc/puke/dcc_status.pm +++ b/ksirc/puke/dcc_status.pm @@ -371,7 +371,7 @@ sub hook_ksirc_dcc_send { $window->setRange(0, $size); $window->setCaption("$file=>$nick"); $window->setTopText("Sending: $file Size: $size"); - $window->setBotText("tqStatus: pending"); + $window->setBotText("Status: pending"); $window->setCancel("dcc close send $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; @@ -417,7 +417,7 @@ sub hook_ksirc_dcc_get { $window->setRange(0, $size); $window->setCaption("$file<=$nick"); $window->setTopText("Receiver: $file Size: $size"); - $window->setBotText("tqStatus: pending"); + $window->setBotText("Status: pending"); $window->setCancel("dcc close get $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; @@ -438,7 +438,7 @@ sub hook_ksirc_dcc_get_status { $window->setRange(0, 1); $window->setCaption("$file<=$nick"); $window->setTopText("Receiver: $file Size: Unkown"); - $window->setBotText("tqStatus: pending"); + $window->setBotText("Status: pending"); $window->setCancel("dcc close get $nick $file"); $KSIRC_DCC{$fh}{$file}{'Window'} = $window; $KSIRC_DCC{$fh}{$file}{'StartTime'} = time() - 1; diff --git a/wifi/status.cpp b/wifi/status.cpp index 5f295df5..0bd45b3a 100644 --- a/wifi/status.cpp +++ b/wifi/status.cpp @@ -38,7 +38,7 @@ bool tqStatus::generateStatsWidget () qual = 0; device->get_current_quality (sig, noi, qual); content = - new TQGroupBox (2, Qt::Horizontal, i18n ("tqStatus of Active Connection"), + new TQGroupBox (2, Qt::Horizontal, i18n ("Status of Active Connection"), this); bool has_freq = device->get_device_freq (freq); if ((!has_freq) || (qual == 0))