From 95fc74ac52bf09f32eb35198d7131052e128c81c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 9 Jan 2019 10:59:42 +0100 Subject: [PATCH] RemoteLinux: Fix some line breaks Change-Id: I11e13bc05be366c9dd1eb5449fc395c3098c012a Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/embeddedlinuxqtversion.cpp | 3 ++- src/plugins/remotelinux/embeddedlinuxqtversion.h | 4 ++-- src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp | 6 ++++-- .../genericlinuxdeviceconfigurationwizardpages.cpp | 6 ++++-- src/plugins/remotelinux/linuxdevice.cpp | 3 ++- src/plugins/remotelinux/linuxdeviceprocess.cpp | 2 +- src/plugins/remotelinux/publickeydeploymentdialog.cpp | 7 ++++--- .../remotelinux/remotelinuxcheckforfreediskspaceservice.h | 3 ++- .../remotelinux/remotelinuxcustomrunconfiguration.h | 3 ++- src/plugins/remotelinux/remotelinuxplugin.cpp | 3 +-- .../typespecificdeviceconfigurationlistmodel.cpp | 3 +-- 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp index 4db801e49e3..1aad59919c2 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.cpp @@ -35,7 +35,8 @@ namespace RemoteLinux { 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) { setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); diff --git a/src/plugins/remotelinux/embeddedlinuxqtversion.h b/src/plugins/remotelinux/embeddedlinuxqtversion.h index 56d5fff5000..f9b823e4285 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversion.h +++ b/src/plugins/remotelinux/embeddedlinuxqtversion.h @@ -34,8 +34,8 @@ class EmbeddedLinuxQtVersion : public QtSupport::BaseQtVersion { public: EmbeddedLinuxQtVersion() = default; - EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); - ~EmbeddedLinuxQtVersion() override = default; + EmbeddedLinuxQtVersion(const Utils::FileName &path, bool isAutodetected = false, + const QString &autodetectionSource = QString()); EmbeddedLinuxQtVersion *clone() const override; QString type() const override; diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp index 935f057ad28..c804c0a0122 100644 --- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp +++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp @@ -33,8 +33,10 @@ namespace RemoteLinux { namespace Internal { -EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent) : QtSupport::QtVersionFactory(parent) -{ } +EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent) + : QtSupport::QtVersionFactory(parent) +{ +} EmbeddedLinuxQtVersionFactory::~EmbeddedLinuxQtVersionFactory() = default; diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp index dac4449aeeb..e3ffd91e98f 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp @@ -61,7 +61,8 @@ public: using namespace QSsh; using namespace Utils; -GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationWizardSetupPage(QWidget *parent) : +GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationWizardSetupPage( + QWidget *parent) : QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate) { d->ui.setupUi(this); @@ -119,7 +120,8 @@ void GenericLinuxDeviceConfigurationWizardSetupPage::setDevice(const LinuxDevice d->device = device; } -GenericLinuxDeviceConfigurationWizardFinalPage::GenericLinuxDeviceConfigurationWizardFinalPage(QWidget *parent) +GenericLinuxDeviceConfigurationWizardFinalPage::GenericLinuxDeviceConfigurationWizardFinalPage( + QWidget *parent) : QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardFinalPagePrivate) { setTitle(tr("Summary")); diff --git a/src/plugins/remotelinux/linuxdevice.cpp b/src/plugins/remotelinux/linuxdevice.cpp index 0bc3f195b8b..52e22afa49d 100644 --- a/src/plugins/remotelinux/linuxdevice.cpp +++ b/src/plugins/remotelinux/linuxdevice.cpp @@ -140,7 +140,8 @@ class LinuxPortsGatheringMethod : public PortsGatheringMethod // /proc/net/tcp* covers /proc/net/tcp and /proc/net/tcp6 Runnable runnable; 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; } diff --git a/src/plugins/remotelinux/linuxdeviceprocess.cpp b/src/plugins/remotelinux/linuxdeviceprocess.cpp index a4e937a570f..1dac2e44082 100644 --- a/src/plugins/remotelinux/linuxdeviceprocess.cpp +++ b/src/plugins/remotelinux/linuxdeviceprocess.cpp @@ -38,7 +38,7 @@ namespace RemoteLinux { static QString quote(const QString &s) { return Utils::QtcProcess::quoteArgUnix(s); } LinuxDeviceProcess::LinuxDeviceProcess(const QSharedPointer &device, - QObject *parent) + QObject *parent) : ProjectExplorer::SshDeviceProcess(device, parent), m_processId(0) { connect(this, &DeviceProcess::finished, this, [this]() { diff --git a/src/plugins/remotelinux/publickeydeploymentdialog.cpp b/src/plugins/remotelinux/publickeydeploymentdialog.cpp index 1cb506f2730..9d31ea580dc 100644 --- a/src/plugins/remotelinux/publickeydeploymentdialog.cpp +++ b/src/plugins/remotelinux/publickeydeploymentdialog.cpp @@ -46,8 +46,8 @@ public: using namespace Internal; -PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog(const IDevice::ConstPtr &deviceConfig, - QWidget *parent) +PublicKeyDeploymentDialog *PublicKeyDeploymentDialog::createDialog( + const IDevice::ConstPtr &deviceConfig, QWidget *parent) { const QString &dir = QFileInfo(deviceConfig->sshParameters().privateKeyFile).path(); const QString publicKeyFileName = QFileDialog::getOpenFileName(parent @@ -108,7 +108,8 @@ void PublicKeyDeploymentDialog::handleDeploymentFinished(const QString &errorMsg buttonText = errorMsg; textColor = "red"; } - setLabelText(QString::fromLatin1("%2").arg(QLatin1String(textColor), buttonText)); + setLabelText(QString::fromLatin1("%2").arg(QLatin1String(textColor), + buttonText)); setCancelButtonText(tr("Close")); } diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h index 05920904801..3d6e76f5fb8 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h @@ -30,7 +30,8 @@ namespace RemoteLinux { namespace Internal { class RemoteLinuxCheckForFreeDiskSpaceServicePrivate; } -class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceService : public AbstractRemoteLinuxDeployService +class REMOTELINUX_EXPORT RemoteLinuxCheckForFreeDiskSpaceService : + public AbstractRemoteLinuxDeployService { Q_OBJECT public: diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h index e13ed4a5da3..aaaf488ba40 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h @@ -47,7 +47,8 @@ private: ProjectExplorer::Runnable runnable() const override; }; -class RemoteLinuxCustomRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory +class RemoteLinuxCustomRunConfigurationFactory + : public ProjectExplorer::FixedRunConfigurationFactory { public: RemoteLinuxCustomRunConfigurationFactory(); diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index f0f9b7777d9..273a78f3a11 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -95,8 +95,7 @@ RemoteLinuxPlugin::~RemoteLinuxPlugin() delete dd; } -bool RemoteLinuxPlugin::initialize(const QStringList &arguments, - QString *errorMessage) +bool RemoteLinuxPlugin::initialize(const QStringList &arguments, QString *errorMessage) { Q_UNUSED(arguments) Q_UNUSED(errorMessage) diff --git a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp index 4251274129a..56068064ec2 100644 --- a/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp +++ b/src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp @@ -57,8 +57,7 @@ int TypeSpecificDeviceConfigurationListModel::rowCount(const QModelIndex &parent return count; } -QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index, - int role) const +QVariant TypeSpecificDeviceConfigurationListModel::data(const QModelIndex &index, int role) const { if (!index.isValid() || index.row() >= rowCount() || role != Qt::DisplayRole) return QVariant();