RemoteLinux: Fix some line breaks

Change-Id: I11e13bc05be366c9dd1eb5449fc395c3098c012a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2019-01-09 10:59:42 +01:00
parent a0d9e43eb4
commit 95fc74ac52
11 changed files with 25 additions and 18 deletions

View File

@@ -35,7 +35,8 @@
namespace RemoteLinux { namespace RemoteLinux {
namespace Internal { namespace Internal {
EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) EmbeddedLinuxQtVersion::EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected,
const QString &autodetectionSource)
: BaseQtVersion(path, isAutodetected, autodetectionSource) : BaseQtVersion(path, isAutodetected, autodetectionSource)
{ {
setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false));

View File

@@ -34,8 +34,8 @@ class EmbeddedLinuxQtVersion : public QtSupport::BaseQtVersion
{ {
public: public:
EmbeddedLinuxQtVersion() = default; EmbeddedLinuxQtVersion() = default;
EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected = false,
~EmbeddedLinuxQtVersion() override = default; const QString &autodetectionSource = QString());
EmbeddedLinuxQtVersion *clone() const override; EmbeddedLinuxQtVersion *clone() const override;
QString type() const override; QString type() const override;

View File

@@ -33,8 +33,10 @@
namespace RemoteLinux { namespace RemoteLinux {
namespace Internal { namespace Internal {
EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent) : QtSupport::QtVersionFactory(parent) EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent)
{ } : QtSupport::QtVersionFactory(parent)
{
}
EmbeddedLinuxQtVersionFactory::~EmbeddedLinuxQtVersionFactory() = default; EmbeddedLinuxQtVersionFactory::~EmbeddedLinuxQtVersionFactory() = default;

View File

@@ -61,7 +61,8 @@ public:
using namespace QSsh; using namespace QSsh;
using namespace Utils; using namespace Utils;
GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationWizardSetupPage(QWidget *parent) : GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationWizardSetupPage(
QWidget *parent) :
QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate) QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate)
{ {
d->ui.setupUi(this); d->ui.setupUi(this);
@@ -119,7 +120,8 @@ void GenericLinuxDeviceConfigurationWizardSetupPage::setDevice(const LinuxDevice
d->device = device; d->device = device;
} }
GenericLinuxDeviceConfigurationWizardFinalPage::GenericLinuxDeviceConfigurationWizardFinalPage(QWidget *parent) GenericLinuxDeviceConfigurationWizardFinalPage::GenericLinuxDeviceConfigurationWizardFinalPage(
QWidget *parent)
: QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardFinalPagePrivate) : QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardFinalPagePrivate)
{ {
setTitle(tr("Summary")); setTitle(tr("Summary"));

View File

@@ -140,7 +140,8 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod
// /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6 // /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6
Runnable runnable; Runnable runnable;
runnable.executable = "sed"; runnable.executable = "sed";
runnable.commandLineArguments = "-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*"; runnable.commandLineArguments
= "-e 's/.*: [[:xdigit:]]*:\\([[:xdigit:]]\\{4\\}\\).*/\\1/g' /proc/net/tcp*";
return runnable; return runnable;
} }

View File

@@ -46,8 +46,8 @@ public:
using namespace Internal; using namespace Internal;
PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const IDevice::ConstPtr &deviceConfig, PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(
QWidget *parent) const IDevice::ConstPtr &deviceConfig, QWidget *parent)
{ {
const QString &dir = QFileInfo(deviceConfig->sshParameters().privateKeyFile).path(); const QString &dir = QFileInfo(deviceConfig->sshParameters().privateKeyFile).path();
const QString publicKeyFileName = QFileDialog::getOpenFileName(parent const QString publicKeyFileName = QFileDialog::getOpenFileName(parent
@@ -108,7 +108,8 @@ void PublicKeyDeploymentDialog::handleDeploymentFinished(const QString &errorMsg
buttonText = errorMsg; buttonText = errorMsg;
textColor = "red"; textColor = "red";
} }
setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(QLatin1String(textColor), buttonText)); setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(QLatin1String(textColor),
buttonText));
setCancelButtonText(tr("Close")); setCancelButtonText(tr("Close"));
} }

View File

@@ -30,7 +30,8 @@
namespace RemoteLinux { namespace RemoteLinux {
namespace Internal { class RemoteLinuxCheckForFreeDiskSpaceServicePrivate; } namespace Internal { class RemoteLinuxCheckForFreeDiskSpaceServicePrivate; }
class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceService : public AbstractRemoteLinuxDeployService class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceService :
public AbstractRemoteLinuxDeployService
{ {
Q_OBJECT Q_OBJECT
public: public:

View File

@@ -47,7 +47,8 @@ private:
ProjectExplorer::Runnable runnable() const override; ProjectExplorer::Runnable runnable() const override;
}; };
class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory class RemoteLinuxCustomRunConfigurationFactory
: public ProjectExplorer::FixedRunConfigurationFactory
{ {
public: public:
RemoteLinuxCustomRunConfigurationFactory(); RemoteLinuxCustomRunConfigurationFactory();

View File

@@ -95,8 +95,7 @@ RemoteLinuxPlugin::~RemoteLinuxPlugin()
delete dd; delete dd;
} }
bool RemoteLinuxPlugin::initialize(const QStringList &arguments, bool RemoteLinuxPlugin::initialize(const QStringList &arguments, QString *errorMessage)
QString *errorMessage)
{ {
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)

View File

@@ -57,8 +57,7 @@ int TypeSpecificDeviceConfigurationListModel::rowCount(const QModelIndex &parent
return count; return count;
} }
QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index, QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index, int role) const
int role) const
{ {
if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole) if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole)
return QVariant(); return QVariant();