Replace deprecated functions in qtel
Mostly use "tr" instead of "trUtf8".
This commit is contained in:
Tobias Blomberg
parent
de35979b14
commit
d02cc013bc
|
|
@ -481,8 +481,8 @@ void ComDialog::createConnection(const StationData *station)
|
|||
settings->name().toStdString(), settings->info().toStdString());
|
||||
if (!con->initOk())
|
||||
{
|
||||
MyMessageBox *mb = new MyMessageBox(trUtf8("Qtel Error"),
|
||||
trUtf8("Could not create connection to") + " " + callsign);
|
||||
MyMessageBox *mb = new MyMessageBox(tr("Qtel Error"),
|
||||
tr("Could not create connection to") + " " + callsign);
|
||||
mb->show();
|
||||
connect(mb, SIGNAL(closed()), this, SLOT(close()));
|
||||
delete con;
|
||||
|
|
@ -524,8 +524,8 @@ void ComDialog::onStationListUpdated(void)
|
|||
}
|
||||
else
|
||||
{
|
||||
MyMessageBox *mb = new MyMessageBox(trUtf8("Qtel Error"),
|
||||
trUtf8("Station data not found in directory server.\nCan't create "
|
||||
MyMessageBox *mb = new MyMessageBox(tr("Qtel Error"),
|
||||
tr("Station data not found in directory server.\nCan't create "
|
||||
"connection to") + " " + callsign);
|
||||
mb->show();
|
||||
connect(mb, SIGNAL(closed()), this, SLOT(close()));
|
||||
|
|
@ -544,8 +544,8 @@ bool ComDialog::openAudioDevice(AudioIO::Mode mode)
|
|||
mic_open_ok = mic_audio_io->open(AudioIO::MODE_RD);
|
||||
if (!mic_open_ok)
|
||||
{
|
||||
MyMessageBox *mb = new MyMessageBox(trUtf8("Qtel Error"),
|
||||
trUtf8("Could not open mic audio device"));
|
||||
MyMessageBox *mb = new MyMessageBox(tr("Qtel Error"),
|
||||
tr("Could not open mic audio device"));
|
||||
mb->show();
|
||||
connect(mb, SIGNAL(closed()), this, SLOT(close()));
|
||||
}
|
||||
|
|
@ -556,8 +556,8 @@ bool ComDialog::openAudioDevice(AudioIO::Mode mode)
|
|||
spkr_open_ok = spkr_audio_io->open(AudioIO::MODE_WR);
|
||||
if (!spkr_open_ok)
|
||||
{
|
||||
MyMessageBox *mb = new MyMessageBox(trUtf8("Qtel Error"),
|
||||
trUtf8("Could not open speaker audio device"));
|
||||
MyMessageBox *mb = new MyMessageBox(tr("Qtel Error"),
|
||||
tr("Could not open speaker audio device"));
|
||||
mb->show();
|
||||
connect(mb, SIGNAL(closed()), this, SLOT(close()));
|
||||
}
|
||||
|
|
@ -572,8 +572,8 @@ void ComDialog::dnsResultsReady(DnsLookup &)
|
|||
{
|
||||
if (dns->addresses().empty())
|
||||
{
|
||||
MyMessageBox *mb = new MyMessageBox(trUtf8("Qtel Error"),
|
||||
trUtf8("Could not create connection to remote host") + " \"" +
|
||||
MyMessageBox *mb = new MyMessageBox(tr("Qtel Error"),
|
||||
tr("Could not create connection to remote host") + " \"" +
|
||||
dns->label().c_str() + "\"");
|
||||
mb->show();
|
||||
connect(mb, SIGNAL(closed()), this, SLOT(close()));
|
||||
|
|
@ -686,7 +686,7 @@ void ComDialog::sendChatMsg()
|
|||
|
||||
void ComDialog::infoMsgReceived(const string& msg)
|
||||
{
|
||||
info_incoming->append("------------ " + trUtf8("INFO") + " ------------");
|
||||
info_incoming->append("------------ " + tr("INFO") + " ------------");
|
||||
info_incoming->append(msg.c_str());
|
||||
info_incoming->append("------------------------------");
|
||||
} /* ComDialog::infoMsgReceived */
|
||||
|
|
@ -716,7 +716,7 @@ void ComDialog::stateChange(Qso::State state)
|
|||
ptt_button->setEnabled(true);
|
||||
chat_outgoing->setEnabled(true);
|
||||
ptt_button->setFocus();
|
||||
info_incoming->append(trUtf8("Connected to ") + call->text() + "\n");
|
||||
info_incoming->append(tr("Connected to ") + call->text() + "\n");
|
||||
if (name_label->text() == "?")
|
||||
{
|
||||
name_label->setText(con->remoteName().c_str());
|
||||
|
|
@ -729,7 +729,7 @@ void ComDialog::stateChange(Qso::State state)
|
|||
ptt_button->setEnabled(false);
|
||||
chat_outgoing->setEnabled(false);
|
||||
disconnect_button->setFocus();
|
||||
info_incoming->append(trUtf8("Connecting to ") + call->text() + "...\n");
|
||||
info_incoming->append(tr("Connecting to ") + call->text() + "...\n");
|
||||
break;
|
||||
|
||||
case Qso::STATE_BYE_RECEIVED:
|
||||
|
|
@ -749,7 +749,7 @@ void ComDialog::stateChange(Qso::State state)
|
|||
ptt_button->setEnabled(false);
|
||||
chat_outgoing->setEnabled(false);
|
||||
connect_button->setFocus();
|
||||
info_incoming->append(trUtf8("Disconnected") + "\n");
|
||||
info_incoming->append(tr("Disconnected") + "\n");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -132,9 +132,8 @@ EchoLinkDirectoryModel::~EchoLinkDirectoryModel(void)
|
|||
void EchoLinkDirectoryModel::updateStationList(
|
||||
const list<StationData> &stn_list)
|
||||
{
|
||||
QList<StationData> updated_stations =
|
||||
QList<StationData>::fromStdList(stn_list);
|
||||
qStableSort(updated_stations);
|
||||
QList<StationData> updated_stations(stn_list.begin(), stn_list.end());
|
||||
std::stable_sort(updated_stations.begin(), updated_stations.end());
|
||||
|
||||
//cout << "### updated_stations=" << updated_stations.count() << endl;
|
||||
|
||||
|
|
@ -262,17 +261,17 @@ QVariant EchoLinkDirectoryModel::headerData(int section,
|
|||
switch (section)
|
||||
{
|
||||
case 0:
|
||||
return trUtf8("Callsign");
|
||||
return tr("Callsign");
|
||||
case 1:
|
||||
return trUtf8("Location/Description");
|
||||
return tr("Location/Description");
|
||||
case 2:
|
||||
return trUtf8("Status");
|
||||
return tr("Status");
|
||||
case 3:
|
||||
return trUtf8("Local Time");
|
||||
return tr("Local Time");
|
||||
case 4:
|
||||
return trUtf8("Node ID");
|
||||
return tr("Node ID");
|
||||
case 5:
|
||||
return trUtf8("IP Address");
|
||||
return tr("IP Address");
|
||||
default:
|
||||
return QVariant();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ MainWindow::MainWindow(void)
|
|||
connect(directoryBusyAction, SIGNAL(toggled(bool)),
|
||||
this, SLOT(setBusy(bool)));
|
||||
|
||||
//statusBar()->message(trUtf8("Getting calls from directory server..."));
|
||||
//statusBar()->message(tr("Getting calls from directory server..."));
|
||||
//dir->getCalls();
|
||||
refresh_call_list_timer = new QTimer(this);
|
||||
refresh_call_list_timer->start(
|
||||
|
|
@ -363,7 +363,7 @@ void MainWindow::closeEvent(QCloseEvent *e)
|
|||
|
||||
if ((dir->status() != StationData::STAT_OFFLINE) && (close_count++ == 0))
|
||||
{
|
||||
statusBar()->showMessage(trUtf8("Logging off from directory server..."));
|
||||
statusBar()->showMessage(tr("Logging off from directory server..."));
|
||||
dir->makeOffline();
|
||||
QTimer::singleShot(5000, this, SLOT(forceQuit()));
|
||||
e->ignore();
|
||||
|
|
@ -588,23 +588,23 @@ void MainWindow::stationViewSelectorCurrentItemChanged(QListWidgetItem *current,
|
|||
|
||||
QAbstractItemModel *model = 0;
|
||||
QItemSelectionModel *m = station_view->selectionModel();
|
||||
if (current->text() == trUtf8("Bookmarks"))
|
||||
if (current->text() == tr("Bookmarks"))
|
||||
{
|
||||
model = bookmark_model;
|
||||
}
|
||||
else if (current->text() == trUtf8("Conferences"))
|
||||
else if (current->text() == tr("Conferences"))
|
||||
{
|
||||
model = conf_model;
|
||||
}
|
||||
else if (current->text() == trUtf8("Links"))
|
||||
else if (current->text() == tr("Links"))
|
||||
{
|
||||
model = link_model;
|
||||
}
|
||||
else if (current->text() == trUtf8("Repeaters"))
|
||||
else if (current->text() == tr("Repeaters"))
|
||||
{
|
||||
model = repeater_model;
|
||||
}
|
||||
else if (current->text() == trUtf8("Stations"))
|
||||
else if (current->text() == tr("Stations"))
|
||||
{
|
||||
model = station_model;
|
||||
}
|
||||
|
|
@ -659,7 +659,7 @@ void MainWindow::callsignListUpdated(void)
|
|||
repeater_model->updateStationList(dir->repeaters());
|
||||
station_model->updateStationList(dir->stations());
|
||||
|
||||
statusBar()->showMessage(trUtf8("Station list has been refreshed"), 5000);
|
||||
statusBar()->showMessage(tr("Station list has been refreshed"), 5000);
|
||||
|
||||
const string &msg = dir->message();
|
||||
if (msg != old_server_msg)
|
||||
|
|
@ -675,7 +675,7 @@ void MainWindow::refreshCallList(void)
|
|||
{
|
||||
if (dir->status() >= StationData::STAT_ONLINE)
|
||||
{
|
||||
statusBar()->showMessage(trUtf8("Refreshing station list..."));
|
||||
statusBar()->showMessage(tr("Refreshing station list..."));
|
||||
dir->getCalls();
|
||||
}
|
||||
} /* MainWindow::refreshCallList */
|
||||
|
|
@ -779,8 +779,8 @@ void MainWindow::removeSelectedFromBookmarks(void)
|
|||
|
||||
void MainWindow::addNamedStationToBookmarks(void)
|
||||
{
|
||||
QString call = QInputDialog::getText(this, trUtf8("Qtel - Add station..."),
|
||||
trUtf8("Enter callsign of the station to add"));
|
||||
QString call = QInputDialog::getText(this, tr("Qtel - Add station..."),
|
||||
tr("Enter callsign of the station to add"));
|
||||
|
||||
if (!call.isEmpty())
|
||||
{
|
||||
|
|
@ -823,8 +823,8 @@ void MainWindow::connectionConnectToIpActionActivated(void)
|
|||
bool ok;
|
||||
QString remote_host = QInputDialog::getText(
|
||||
this,
|
||||
trUtf8("Qtel: Connect to IP"),
|
||||
trUtf8("Enter an IP address or hostname:"),
|
||||
tr("Qtel: Connect to IP"),
|
||||
tr("Enter an IP address or hostname:"),
|
||||
QLineEdit::Normal, Settings::instance()->connectToIp(), &ok);
|
||||
if (ok)
|
||||
{
|
||||
|
|
@ -863,16 +863,16 @@ void MainWindow::settings(void)
|
|||
|
||||
void MainWindow::helpAbout(void)
|
||||
{
|
||||
QMessageBox::about(this, trUtf8("About Qtel"),
|
||||
trUtf8("Qtel v") + QTEL_VERSION +
|
||||
trUtf8(" - Qt EchoLink client.\n") +
|
||||
QMessageBox::about(this, tr("About Qtel"),
|
||||
tr("Qtel v") + QTEL_VERSION +
|
||||
tr(" - Qt EchoLink client.\n") +
|
||||
"\n" +
|
||||
trUtf8("Copyright (C) 2011 Tobias Blomberg / SM0SVX\n\n"
|
||||
"Qtel comes with ABSOLUTELY NO WARRANTY. "
|
||||
"This is free software, and you "
|
||||
"are welcome to redistribute it in accordance with the "
|
||||
"terms and conditions in "
|
||||
"the GNU GPL (General Public License) version 2 or later."));
|
||||
tr("Copyright (C) 2011 Tobias Blomberg / SM0SVX\n\n"
|
||||
"Qtel comes with ABSOLUTELY NO WARRANTY. "
|
||||
"This is free software, and you "
|
||||
"are welcome to redistribute it in accordance with the "
|
||||
"terms and conditions in "
|
||||
"the GNU GPL (General Public License) version 2 or later."));
|
||||
} /* MainWindow::helpAbout */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -226,49 +226,49 @@ Settings::Settings(void)
|
|||
m_vox_delay(CONF_VOX_DELAY_DEFAULT)
|
||||
{
|
||||
// The default encoding should be first in the list
|
||||
encodings.push_back(Encoding("ISO8859-1", SettingsDialog::trUtf8("Western")));
|
||||
encodings.push_back(Encoding("ISO8859-2", SettingsDialog::trUtf8("Central European")));
|
||||
encodings.push_back(Encoding("ISO8859-3", SettingsDialog::trUtf8("Central European")));
|
||||
encodings.push_back(Encoding("ISO8859-4", SettingsDialog::trUtf8("Baltic")));
|
||||
encodings.push_back(Encoding("ISO8859-5", SettingsDialog::trUtf8("Cyrillic")));
|
||||
encodings.push_back(Encoding("ISO8859-6", SettingsDialog::trUtf8("Arabic")));
|
||||
encodings.push_back(Encoding("ISO8859-7", SettingsDialog::trUtf8("Greek")));
|
||||
encodings.push_back(Encoding("ISO8859-1", SettingsDialog::tr("Western")));
|
||||
encodings.push_back(Encoding("ISO8859-2", SettingsDialog::tr("Central European")));
|
||||
encodings.push_back(Encoding("ISO8859-3", SettingsDialog::tr("Central European")));
|
||||
encodings.push_back(Encoding("ISO8859-4", SettingsDialog::tr("Baltic")));
|
||||
encodings.push_back(Encoding("ISO8859-5", SettingsDialog::tr("Cyrillic")));
|
||||
encodings.push_back(Encoding("ISO8859-6", SettingsDialog::tr("Arabic")));
|
||||
encodings.push_back(Encoding("ISO8859-7", SettingsDialog::tr("Greek")));
|
||||
encodings.push_back(Encoding("ISO8859-8",
|
||||
SettingsDialog::trUtf8("Hebrew, visually ordered")));
|
||||
SettingsDialog::tr("Hebrew, visually ordered")));
|
||||
encodings.push_back(Encoding("ISO8859-8-i",
|
||||
SettingsDialog::trUtf8("Hebrew, logically ordered")));
|
||||
encodings.push_back(Encoding("ISO8859-9", SettingsDialog::trUtf8("Turkish")));
|
||||
SettingsDialog::tr("Hebrew, logically ordered")));
|
||||
encodings.push_back(Encoding("ISO8859-9", SettingsDialog::tr("Turkish")));
|
||||
encodings.push_back(Encoding("ISO8859-10"));
|
||||
encodings.push_back(Encoding("ISO8859-13"));
|
||||
encodings.push_back(Encoding("ISO8859-14"));
|
||||
encodings.push_back(Encoding("ISO8859-15", SettingsDialog::trUtf8("Western")));
|
||||
encodings.push_back(Encoding("utf8", SettingsDialog::trUtf8("Unicode, 8-bit")));
|
||||
encodings.push_back(Encoding("Big5", SettingsDialog::trUtf8("Chinese")));
|
||||
encodings.push_back(Encoding("Big5-HKSCS", SettingsDialog::trUtf8("Chinese")));
|
||||
encodings.push_back(Encoding("eucJP", SettingsDialog::trUtf8("Japanese")));
|
||||
encodings.push_back(Encoding("eucKR", SettingsDialog::trUtf8("Korean")));
|
||||
encodings.push_back(Encoding("GB2312", SettingsDialog::trUtf8("Chinese")));
|
||||
encodings.push_back(Encoding("GBK", SettingsDialog::trUtf8("Chinese")));
|
||||
encodings.push_back(Encoding("GB18030", SettingsDialog::trUtf8("Chinese")));
|
||||
encodings.push_back(Encoding("JIS7", SettingsDialog::trUtf8("Japanese")));
|
||||
encodings.push_back(Encoding("Shift-JIS", SettingsDialog::trUtf8("Japanese")));
|
||||
encodings.push_back(Encoding("TSCII", SettingsDialog::trUtf8("Tamil")));
|
||||
encodings.push_back(Encoding("KOI8-R", SettingsDialog::trUtf8("Russian")));
|
||||
encodings.push_back(Encoding("KOI8-U", SettingsDialog::trUtf8("Ukrainian")));
|
||||
encodings.push_back(Encoding("ISO8859-15", SettingsDialog::tr("Western")));
|
||||
encodings.push_back(Encoding("utf8", SettingsDialog::tr("Unicode, 8-bit")));
|
||||
encodings.push_back(Encoding("Big5", SettingsDialog::tr("Chinese")));
|
||||
encodings.push_back(Encoding("Big5-HKSCS", SettingsDialog::tr("Chinese")));
|
||||
encodings.push_back(Encoding("eucJP", SettingsDialog::tr("Japanese")));
|
||||
encodings.push_back(Encoding("eucKR", SettingsDialog::tr("Korean")));
|
||||
encodings.push_back(Encoding("GB2312", SettingsDialog::tr("Chinese")));
|
||||
encodings.push_back(Encoding("GBK", SettingsDialog::tr("Chinese")));
|
||||
encodings.push_back(Encoding("GB18030", SettingsDialog::tr("Chinese")));
|
||||
encodings.push_back(Encoding("JIS7", SettingsDialog::tr("Japanese")));
|
||||
encodings.push_back(Encoding("Shift-JIS", SettingsDialog::tr("Japanese")));
|
||||
encodings.push_back(Encoding("TSCII", SettingsDialog::tr("Tamil")));
|
||||
encodings.push_back(Encoding("KOI8-R", SettingsDialog::tr("Russian")));
|
||||
encodings.push_back(Encoding("KOI8-U", SettingsDialog::tr("Ukrainian")));
|
||||
encodings.push_back(Encoding("IBM850"));
|
||||
encodings.push_back(Encoding("IBM866"));
|
||||
encodings.push_back(Encoding("CP874"));
|
||||
encodings.push_back(Encoding("CP1250", SettingsDialog::trUtf8("Central European")));
|
||||
encodings.push_back(Encoding("CP1251", SettingsDialog::trUtf8("Cyrillic")));
|
||||
encodings.push_back(Encoding("CP1252", SettingsDialog::trUtf8("Western")));
|
||||
encodings.push_back(Encoding("CP1253", SettingsDialog::trUtf8("Greek")));
|
||||
encodings.push_back(Encoding("CP1254", SettingsDialog::trUtf8("Turkish")));
|
||||
encodings.push_back(Encoding("CP1255", SettingsDialog::trUtf8("Hebrew")));
|
||||
encodings.push_back(Encoding("CP1255", SettingsDialog::trUtf8("Hebrew")));
|
||||
encodings.push_back(Encoding("CP1256", SettingsDialog::trUtf8("Arabic")));
|
||||
encodings.push_back(Encoding("CP1257", SettingsDialog::trUtf8("Baltic")));
|
||||
encodings.push_back(Encoding("CP1250", SettingsDialog::tr("Central European")));
|
||||
encodings.push_back(Encoding("CP1251", SettingsDialog::tr("Cyrillic")));
|
||||
encodings.push_back(Encoding("CP1252", SettingsDialog::tr("Western")));
|
||||
encodings.push_back(Encoding("CP1253", SettingsDialog::tr("Greek")));
|
||||
encodings.push_back(Encoding("CP1254", SettingsDialog::tr("Turkish")));
|
||||
encodings.push_back(Encoding("CP1255", SettingsDialog::tr("Hebrew")));
|
||||
encodings.push_back(Encoding("CP1255", SettingsDialog::tr("Hebrew")));
|
||||
encodings.push_back(Encoding("CP1256", SettingsDialog::tr("Arabic")));
|
||||
encodings.push_back(Encoding("CP1257", SettingsDialog::tr("Baltic")));
|
||||
encodings.push_back(Encoding("CP1258"));
|
||||
encodings.push_back(Encoding("TIS-620", SettingsDialog::trUtf8("Thai")));
|
||||
encodings.push_back(Encoding("TIS-620", SettingsDialog::tr("Thai")));
|
||||
} /* Settings::Settings */
|
||||
|
||||
|
||||
|
|
@ -356,8 +356,8 @@ void Settings::showDialog(void)
|
|||
settings_dialog.my_vpassword->text())
|
||||
{
|
||||
QMessageBox::critical(&settings_dialog,
|
||||
SettingsDialog::trUtf8("Qtel: Password mismatch"),
|
||||
SettingsDialog::trUtf8("Passwords do not match"));
|
||||
SettingsDialog::tr("Qtel: Password mismatch"),
|
||||
SettingsDialog::tr("Passwords do not match"));
|
||||
settings_dialog.my_password->setText("");
|
||||
settings_dialog.my_vpassword->setText("");
|
||||
}
|
||||
|
|
@ -365,8 +365,8 @@ void Settings::showDialog(void)
|
|||
(settings_dialog.proxy_server->text().isEmpty()))
|
||||
{
|
||||
QMessageBox::critical(&settings_dialog,
|
||||
SettingsDialog::trUtf8("EchoLink proxy configuration problem"),
|
||||
SettingsDialog::trUtf8(
|
||||
SettingsDialog::tr("EchoLink proxy configuration problem"),
|
||||
SettingsDialog::tr(
|
||||
"EchoLink proxy enabled but no server given"));
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -130,9 +130,9 @@ class SettingsDialog : public QDialog, public Ui::SettingsDialog
|
|||
{
|
||||
QString s = QFileDialog::getOpenFileName(
|
||||
this,
|
||||
trUtf8("Choose a connect sound file"),
|
||||
tr("Choose a connect sound file"),
|
||||
connect_sound->text(),
|
||||
trUtf8("Raw Sound Files (*.raw)"));
|
||||
tr("Raw Sound Files (*.raw)"));
|
||||
if (!s.isNull())
|
||||
{
|
||||
connect_sound->setText(s);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
PROJECT=master
|
||||
|
||||
# Version for the Qtel application
|
||||
QTEL=1.2.4.99.1
|
||||
QTEL=1.2.4.99.2
|
||||
|
||||
# Version for the EchoLib library
|
||||
LIBECHOLIB=1.3.3.99.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue