forked from qt-creator/qt-creator
Boot2Qt: Tr::tr
Interestingly, the contexts were predominantly Qdb::*, standardize on that. Long term we might collapse RemoteLinux descendants anyway. Change-Id: Id7009ee6b662d6c29f98e3809619b604aeeea7d9 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -3,11 +3,13 @@
|
||||
|
||||
#include "devicedetector.h"
|
||||
|
||||
#include "../qdbutils.h"
|
||||
#include "../qdbconstants.h"
|
||||
#include "../qdbdevice.h"
|
||||
#include "../qdbtr.h"
|
||||
#include "../qdbutils.h"
|
||||
|
||||
#include <projectexplorer/devicesupport/devicemanager.h>
|
||||
|
||||
#include <utils/qtcassert.h>
|
||||
|
||||
#include <QHash>
|
||||
@@ -15,8 +17,7 @@
|
||||
|
||||
using namespace ProjectExplorer;
|
||||
|
||||
namespace Qdb {
|
||||
namespace Internal {
|
||||
namespace Qdb::Internal {
|
||||
|
||||
static bool isAutodetectedQdbDevice(const IDevice::ConstPtr &device)
|
||||
{
|
||||
@@ -74,11 +75,11 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
|
||||
}
|
||||
|
||||
const Utils::Id deviceId = Constants::QdbHardwareDevicePrefix.withSuffix(':' + serial);
|
||||
const auto messagePrefix = tr("Device \"%1\" %2").arg(serial);
|
||||
const auto messagePrefix = Tr::tr("Device \"%1\" %2").arg(serial);
|
||||
DeviceManager * const dm = DeviceManager::instance();
|
||||
|
||||
if (eventType == QdbDeviceTracker::NewDevice) {
|
||||
const QString name = tr("Qt Debug Bridge device %1").arg(serial);
|
||||
const QString name = Tr::tr("Qt Debug Bridge device %1").arg(serial);
|
||||
QdbDevice::Ptr device = QdbDevice::create();
|
||||
device->setupId(IDevice::AutoDetected, deviceId);
|
||||
device->setDisplayName(name);
|
||||
@@ -109,7 +110,7 @@ void DeviceDetector::handleDeviceEvent(QdbDeviceTracker::DeviceEventType eventTy
|
||||
|
||||
void DeviceDetector::handleTrackerError(const QString &errorMessage)
|
||||
{
|
||||
showMessage(tr("Device detection error: %1").arg(errorMessage), true);
|
||||
showMessage(Tr::tr("Device detection error: %1").arg(errorMessage), true);
|
||||
stop();
|
||||
}
|
||||
|
||||
@@ -123,5 +124,4 @@ void DeviceDetector::resetDevices()
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Qdb
|
||||
} // Qdb::Internal
|
||||
|
||||
Reference in New Issue
Block a user