feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Fix some line breaks

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/remotelinux/embeddedlinuxqtversion.cpp
View File

@@ -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));

4
src/plugins/remotelinux/embeddedlinuxqtversion.h
View File

@@ -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;

6
src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
View File

@@ -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;

6
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
View File

@@ -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"));

3
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -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;
}

7
src/plugins/remotelinux/publickeydeploymentdialog.cpp
View File

@@ -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("<font color=\"%1\">%2</font>").arg(QLatin1String(textColor), buttonText));
setLabelText(QString::fromLatin1("<font color=\"%1\">%2</font>").arg(QLatin1String(textColor),
buttonText));
setCancelButtonText(tr("Close"));
}

3
src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h
View File

@@ -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:

3
src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
View File

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

3
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -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)

3
src/plugins/remotelinux/typespecificdeviceconfigurationlistmodel.cpp
View File

@@ -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();