diff options
Diffstat (limited to 'src/plugins/qnx')
52 files changed, 225 insertions, 298 deletions
diff --git a/src/plugins/qnx/pathchooserdelegate.cpp b/src/plugins/qnx/pathchooserdelegate.cpp index 4b99171548..d934e0a88e 100644 --- a/src/plugins/qnx/pathchooserdelegate.cpp +++ b/src/plugins/qnx/pathchooserdelegate.cpp @@ -28,8 +28,8 @@ #include <utils/pathchooser.h> #include <utils/fancylineedit.h> -using namespace Qnx; -using namespace Qnx::Internal; +namespace Qnx { +namespace Internal { PathChooserDelegate::PathChooserDelegate(QObject *parent) : QStyledItemDelegate(parent) @@ -58,7 +58,7 @@ QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionVi editor->setAutoFillBackground(true); // To hide the text beneath the editor widget editor->lineEdit()->setMinimumWidth(0); - connect(editor, SIGNAL(browsingFinished()), this, SLOT(emitCommitData())); + connect(editor, &Utils::PathChooser::browsingFinished, this, &PathChooserDelegate::emitCommitData); return editor; } @@ -101,3 +101,6 @@ void PathChooserDelegate::emitCommitData() { emit commitData(qobject_cast<QWidget*>(sender())); } + +} // namespace Internal +} // namespace Qnx diff --git a/src/plugins/qnx/pathchooserdelegate.h b/src/plugins/qnx/pathchooserdelegate.h index cc2960756b..fca0fe1412 100644 --- a/src/plugins/qnx/pathchooserdelegate.h +++ b/src/plugins/qnx/pathchooserdelegate.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_PATHCHOOSERDELEGATE_H -#define QNX_INTERNAL_PATHCHOOSERDELEGATE_H +#pragma once #include <QStyledItemDelegate> @@ -67,5 +66,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_PATHCHOOSERDELEGATE_H diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro index d4bfe94e9e..6b36ef7a2c 100644 --- a/src/plugins/qnx/qnx.pro +++ b/src/plugins/qnx/qnx.pro @@ -79,7 +79,7 @@ FORMS += \ qnxdeployqtlibrariesdialog.ui -DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QNX_LIBRARY +DEFINES += QNX_LIBRARY RESOURCES += \ qnx.qrc diff --git a/src/plugins/qnx/qnx_export.h b/src/plugins/qnx/qnx_export.h index 32c32b8f7e..1fda4c0a29 100644 --- a/src/plugins/qnx/qnx_export.h +++ b/src/plugins/qnx/qnx_export.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_EXPORT_H -#define QNX_EXPORT_H +#pragma once #include <qglobal.h> @@ -33,5 +32,3 @@ #else # define QNX_EXPORT Q_DECL_IMPORT #endif - -#endif // QNX_EXPORT_H diff --git a/src/plugins/qnx/qnxabstractrunsupport.cpp b/src/plugins/qnx/qnxabstractrunsupport.cpp index 7e2e156983..a7eba6235e 100644 --- a/src/plugins/qnx/qnxabstractrunsupport.cpp +++ b/src/plugins/qnx/qnxabstractrunsupport.cpp @@ -36,8 +36,8 @@ using namespace ProjectExplorer; using namespace RemoteLinux; -using namespace Qnx; -using namespace Qnx::Internal; +namespace Qnx { +namespace Internal { QnxAbstractRunSupport::QnxAbstractRunSupport(QnxRunConfiguration *runConfig, QObject *parent) : QObject(parent) @@ -47,8 +47,10 @@ QnxAbstractRunSupport::QnxAbstractRunSupport(QnxRunConfiguration *runConfig, QOb m_runner = new DeviceApplicationRunner(this); m_portsGatherer = new DeviceUsedPortsGatherer(this); - connect(m_portsGatherer, SIGNAL(error(QString)), SLOT(handleError(QString))); - connect(m_portsGatherer, SIGNAL(portListReady()), SLOT(handlePortListReady())); + connect(m_portsGatherer, &DeviceUsedPortsGatherer::error, + this, &QnxAbstractRunSupport::handleError); + connect(m_portsGatherer, &DeviceUsedPortsGatherer::portListReady, + this, &QnxAbstractRunSupport::handlePortListReady); } void QnxAbstractRunSupport::handleAdapterSetupRequested() @@ -115,12 +117,15 @@ void QnxAbstractRunSupport::handleError(const QString &) { } -bool QnxAbstractRunSupport::setPort(int &port) +bool QnxAbstractRunSupport::setPort(Utils::Port &port) { port = m_portsGatherer->getNextFreePort(&m_portList); - if (port == -1) { + if (!port.isValid()) { handleError(tr("Not enough free ports on device for debugging.")); return false; } return true; } + +} // namespace Internal +} // namespace Qnx diff --git a/src/plugins/qnx/qnxabstractrunsupport.h b/src/plugins/qnx/qnxabstractrunsupport.h index 18658712ff..67cd7f6466 100644 --- a/src/plugins/qnx/qnxabstractrunsupport.h +++ b/src/plugins/qnx/qnxabstractrunsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXABSTRACTRUNSUPPORT_H -#define QNXABSTRACTRUNSUPPORT_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/environment.h> @@ -57,7 +56,7 @@ public: QnxAbstractRunSupport(QnxRunConfiguration *runConfig, QObject *parent = 0); protected: - bool setPort(int &port); + bool setPort(Utils::Port &port); virtual void startExecution() = 0; void setFinished(); @@ -90,5 +89,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXABSTRACTRUNSUPPORT_H diff --git a/src/plugins/qnx/qnxanalyzesupport.cpp b/src/plugins/qnx/qnxanalyzesupport.cpp index 289d7d1756..61a6c26391 100644 --- a/src/plugins/qnx/qnxanalyzesupport.cpp +++ b/src/plugins/qnx/qnxanalyzesupport.cpp @@ -97,7 +97,7 @@ void QnxAnalyzeSupport::startExecution() if (state() == Inactive) return; - if (!setPort(m_qmlPort) && m_qmlPort == -1) + if (!setPort(m_qmlPort) && !m_qmlPort.isValid()) return; setState(StartingRemoteProcess); @@ -105,8 +105,8 @@ void QnxAnalyzeSupport::startExecution() StandardRunnable r = m_runnable; if (!r.commandLineArguments.isEmpty()) r.commandLineArguments += QLatin1Char(' '); - r.commandLineArguments - += QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlProfilerServices, m_qmlPort); + r.commandLineArguments += QmlDebug::qmlDebugTcpArguments(QmlDebug::QmlProfilerServices, + m_qmlPort); appRunner()->start(device(), r); } diff --git a/src/plugins/qnx/qnxanalyzesupport.h b/src/plugins/qnx/qnxanalyzesupport.h index d1361fff3a..19165a1686 100644 --- a/src/plugins/qnx/qnxanalyzesupport.h +++ b/src/plugins/qnx/qnxanalyzesupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXANALYZESUPPORT_H -#define QNXANALYZESUPPORT_H +#pragma once #include "qnxabstractrunsupport.h" @@ -50,12 +49,12 @@ public slots: void handleProfilingFinished(); private slots: - void handleAdapterSetupRequested(); + void handleAdapterSetupRequested() override; - void handleRemoteProcessFinished(bool success); - void handleProgressReport(const QString &progressOutput); - void handleRemoteOutput(const QByteArray &output); - void handleError(const QString &error); + void handleRemoteProcessFinished(bool success) override; + void handleProgressReport(const QString &progressOutput) override; + void handleRemoteOutput(const QByteArray &output) override; + void handleError(const QString &error) override; void showMessage(const QString &, Utils::OutputFormat); void printMissingWarning(); @@ -63,17 +62,15 @@ private slots: void remoteIsRunning(); private: - void startExecution(); + void startExecution() override; ProjectExplorer::StandardRunnable m_runnable; Debugger::AnalyzerRunControl *m_runControl; QmlDebug::QmlOutputParser m_outputParser; - int m_qmlPort; + Utils::Port m_qmlPort; Slog2InfoRunner *m_slog2Info; }; } // namespace Internal } // namespace Qnx - -#endif // QNXANALYZESUPPORT_H diff --git a/src/plugins/qnx/qnxattachdebugdialog.h b/src/plugins/qnx/qnxattachdebugdialog.h index 4b1bed635a..ef124555ff 100644 --- a/src/plugins/qnx/qnxattachdebugdialog.h +++ b/src/plugins/qnx/qnxattachdebugdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H -#define QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H +#pragma once #include <projectexplorer/devicesupport/deviceprocessesdialog.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXATTACHDEBUGDIALOG_H diff --git a/src/plugins/qnx/qnxattachdebugsupport.cpp b/src/plugins/qnx/qnxattachdebugsupport.cpp index 9eea7bf482..87ded8d789 100644 --- a/src/plugins/qnx/qnxattachdebugsupport.cpp +++ b/src/plugins/qnx/qnxattachdebugsupport.cpp @@ -105,14 +105,14 @@ void QnxAttachDebugSupport::launchPDebug() { Utils::PortList portList = m_device->freePorts(); m_pdebugPort = m_portsGatherer->getNextFreePort(&portList); - if (m_pdebugPort == -1) { + if (!m_pdebugPort.isValid()) { handleError(tr("No free ports for debugging.")); return; } StandardRunnable r; r.executable = QLatin1String("pdebug"); - r.commandLineArguments = QString::number(m_pdebugPort); + r.commandLineArguments = QString::number(m_pdebugPort.number()); m_runner->start(m_device, r); } @@ -122,9 +122,11 @@ void QnxAttachDebugSupport::attachToProcess() sp.attachPID = m_process.pid; sp.startMode = Debugger::AttachToRemoteServer; sp.closeMode = Debugger::DetachAtClose; - sp.connParams.port = m_pdebugPort; - sp.remoteChannel = m_device->sshParameters().host + QLatin1Char(':') + QString::number(m_pdebugPort); - sp.displayName = tr("Remote: \"%1:%2\" - Process %3").arg(sp.connParams.host).arg(m_pdebugPort).arg(m_process.pid); + sp.connParams.port = m_pdebugPort.number(); + sp.remoteChannel = m_device->sshParameters().host + QLatin1Char(':') + + QString::number(m_pdebugPort.number()); + sp.displayName = tr("Remote: \"%1:%2\" - Process %3").arg(sp.connParams.host) + .arg(m_pdebugPort.number()).arg(m_process.pid); sp.inferior.executable = m_localExecutablePath; sp.useCtrlCStub = true; diff --git a/src/plugins/qnx/qnxattachdebugsupport.h b/src/plugins/qnx/qnxattachdebugsupport.h index 2044a2d833..3ce4d2fe0a 100644 --- a/src/plugins/qnx/qnxattachdebugsupport.h +++ b/src/plugins/qnx/qnxattachdebugsupport.h @@ -23,12 +23,12 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H -#define QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H +#pragma once #include <debugger/debuggerconstants.h> #include <projectexplorer/devicesupport/deviceprocesslist.h> #include <projectexplorer/devicesupport/idevice.h> +#include <utils/port.h> #include <QObject> @@ -72,12 +72,10 @@ private: ProjectExplorer::DeviceUsedPortsGatherer *m_portsGatherer; Debugger::DebuggerRunControl *m_runControl = 0; - int m_pdebugPort = -1; + Utils::Port m_pdebugPort; QString m_projectSourceDirectory; QString m_localExecutablePath; }; } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXATTACHDEBUGSUPPORT_H diff --git a/src/plugins/qnx/qnxbaseqtconfigwidget.h b/src/plugins/qnx/qnxbaseqtconfigwidget.h index 7c1788dc0b..1dacb1ad39 100644 --- a/src/plugins/qnx/qnxbaseqtconfigwidget.h +++ b/src/plugins/qnx/qnxbaseqtconfigwidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H -#define QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H +#pragma once #include <qtsupport/qtconfigwidget.h> @@ -52,5 +51,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXBASEQTCONFIGWIDGET_H diff --git a/src/plugins/qnx/qnxconfiguration.h b/src/plugins/qnx/qnxconfiguration.h index 22836dfb02..5212560394 100644 --- a/src/plugins/qnx/qnxconfiguration.h +++ b/src/plugins/qnx/qnxconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXCONFIGURATION_H -#define QNXCONFIGURATION_H +#pragma once #include "qnxconstants.h" #include "qnxutils.h" @@ -108,5 +107,3 @@ private: } // Internal } // Qnx - -#endif // QNXCONFIGURATION_H diff --git a/src/plugins/qnx/qnxconfigurationmanager.cpp b/src/plugins/qnx/qnxconfigurationmanager.cpp index d69f1e46c8..207aab9ee9 100644 --- a/src/plugins/qnx/qnxconfigurationmanager.cpp +++ b/src/plugins/qnx/qnxconfigurationmanager.cpp @@ -32,7 +32,6 @@ namespace Qnx { namespace Internal { - const QLatin1String QNXConfigDataKey("QNXConfiguration."); const QLatin1String QNXConfigCountKey("QNXConfiguration.Count"); const QLatin1String QNXConfigsFileVersionKey("Version"); @@ -52,8 +51,8 @@ QnxConfigurationManager::QnxConfigurationManager(QObject *parent) m_writer = new Utils::PersistentSettingsWriter(qnxConfigSettingsFileName(), QLatin1String("QnxConfigurations")); restoreConfigurations(); - connect(Core::ICore::instance(), SIGNAL(saveSettingsRequested()), - this, SLOT(saveConfigs())); + connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, + this, &QnxConfigurationManager::saveConfigs); } QnxConfigurationManager *QnxConfigurationManager::instance() diff --git a/src/plugins/qnx/qnxconfigurationmanager.h b/src/plugins/qnx/qnxconfigurationmanager.h index 9bbcf774d2..ee8d91624a 100644 --- a/src/plugins/qnx/qnxconfigurationmanager.h +++ b/src/plugins/qnx/qnxconfigurationmanager.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXCONFIGURATIONMANAGER_H -#define QNXCONFIGURATIONMANAGER_H +#pragma once #include <utils/fileutils.h> @@ -64,5 +63,3 @@ private: } } - -#endif // QNXCONFIGURATIONMANAGER_H diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h index 795e4560c2..c77dbc21e5 100644 --- a/src/plugins/qnx/qnxconstants.h +++ b/src/plugins/qnx/qnxconstants.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_QNXCONSTANTS_H -#define QNX_QNXCONSTANTS_H +#pragma once #include <QtGlobal> @@ -67,5 +66,3 @@ const char QNX_DEBUGGING_GROUP[] = "Debugger.Group.Qnx"; } // namespace Constants } // namespace Qnx - -#endif // QNX_QNXCONSTANTS_H diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp index 21f988f19f..1f3f2ed9a0 100644 --- a/src/plugins/qnx/qnxdebugsupport.cpp +++ b/src/plugins/qnx/qnxdebugsupport.cpp @@ -44,8 +44,8 @@ using namespace ProjectExplorer; using namespace RemoteLinux; -using namespace Qnx; -using namespace Qnx::Internal; +namespace Qnx { +namespace Internal { QnxDebugSupport::QnxDebugSupport(QnxRunConfiguration *runConfig, Debugger::DebuggerRunControl *runControl) : QnxAbstractRunSupport(runConfig, runControl) @@ -57,12 +57,12 @@ QnxDebugSupport::QnxDebugSupport(QnxRunConfiguration *runConfig, Debugger::Debug , m_useQmlDebugger(runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>()->useQmlDebugger()) { const DeviceApplicationRunner *runner = appRunner(); - connect(runner, SIGNAL(reportError(QString)), SLOT(handleError(QString))); - connect(runner, SIGNAL(remoteProcessStarted()), SLOT(handleRemoteProcessStarted())); - connect(runner, SIGNAL(finished(bool)), SLOT(handleRemoteProcessFinished(bool))); - connect(runner, SIGNAL(reportProgress(QString)), SLOT(handleProgressReport(QString))); - connect(runner, SIGNAL(remoteStdout(QByteArray)), SLOT(handleRemoteOutput(QByteArray))); - connect(runner, SIGNAL(remoteStderr(QByteArray)), SLOT(handleRemoteOutput(QByteArray))); + connect(runner, &DeviceApplicationRunner::reportError, this, &QnxDebugSupport::handleError); + connect(runner, &DeviceApplicationRunner::remoteProcessStarted, this, &QnxDebugSupport::handleRemoteProcessStarted); + connect(runner, &DeviceApplicationRunner::finished, this, &QnxDebugSupport::handleRemoteProcessFinished); + connect(runner, &DeviceApplicationRunner::reportProgress, this, &QnxDebugSupport::handleProgressReport); + connect(runner, &DeviceApplicationRunner::remoteStdout, this, &QnxDebugSupport::handleRemoteOutput); + connect(runner, &DeviceApplicationRunner::remoteStderr, this, &QnxDebugSupport::handleRemoteOutput); connect(m_runControl, &Debugger::DebuggerRunControl::requestRemoteSetup, this, &QnxDebugSupport::handleAdapterSetupRequested); @@ -72,10 +72,10 @@ QnxDebugSupport::QnxDebugSupport(QnxRunConfiguration *runConfig, Debugger::Debug QnxDeviceConfiguration::ConstPtr qnxDevice = dev.dynamicCast<const QnxDeviceConfiguration>(); m_slog2Info = new Slog2InfoRunner(applicationId, qnxDevice, this); - connect(m_slog2Info, SIGNAL(output(QString,Utils::OutputFormat)), this, SLOT(handleApplicationOutput(QString,Utils::OutputFormat))); - connect(runner, SIGNAL(remoteProcessStarted()), m_slog2Info, SLOT(start())); + connect(m_slog2Info, &Slog2InfoRunner::output, this, &QnxDebugSupport::handleApplicationOutput); + connect(runner, &DeviceApplicationRunner::remoteProcessStarted, m_slog2Info, &Slog2InfoRunner::start); if (qnxDevice->qnxVersion() > 0x060500) - connect(m_slog2Info, SIGNAL(commandMissing()), this, SLOT(printMissingWarning())); + connect(m_slog2Info, &Slog2InfoRunner::commandMissing, this, &QnxDebugSupport::printMissingWarning); } void QnxDebugSupport::handleAdapterSetupRequested() @@ -105,7 +105,7 @@ void QnxDebugSupport::startExecution() QStringList arguments; if (m_useCppDebugger) - arguments << QString::number(m_pdebugPort); + arguments << QString::number(m_pdebugPort.number()); else if (m_useQmlDebugger && !m_useCppDebugger) arguments = Utils::QtcProcess::splitArgs( m_runControl->startParameters().inferior.commandLineArguments); @@ -210,3 +210,6 @@ void QnxDebugSupport::handleApplicationOutput(const QString &msg, Utils::OutputF if (m_runControl) m_runControl->showMessage(msg, Debugger::AppOutput); } + +} // namespace Internal +} // namespace Qnx diff --git a/src/plugins/qnx/qnxdebugsupport.h b/src/plugins/qnx/qnxdebugsupport.h index ad4196d7ee..f389c3ee49 100644 --- a/src/plugins/qnx/qnxdebugsupport.h +++ b/src/plugins/qnx/qnxdebugsupport.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEBUGSUPPORT_H -#define QNX_INTERNAL_QNXDEBUGSUPPORT_H +#pragma once #include "qnxabstractrunsupport.h" @@ -52,19 +51,19 @@ public slots: void handleDebuggingFinished(); private slots: - void handleAdapterSetupRequested(); + void handleAdapterSetupRequested() override; - void handleRemoteProcessStarted(); - void handleRemoteProcessFinished(bool success); - void handleProgressReport(const QString &progressOutput); - void handleRemoteOutput(const QByteArray &output); - void handleError(const QString &error); + void handleRemoteProcessStarted() override; + void handleRemoteProcessFinished(bool success) override; + void handleProgressReport(const QString &progressOutput) override; + void handleRemoteOutput(const QByteArray &output) override; + void handleError(const QString &error) override; void printMissingWarning(); void handleApplicationOutput(const QString &msg, Utils::OutputFormat outputFormat); private: - void startExecution(); + void startExecution() override; QString processExecutable() const; @@ -74,8 +73,8 @@ private: Slog2InfoRunner *m_slog2Info; Debugger::DebuggerRunControl *m_runControl; - int m_pdebugPort; - int m_qmlPort; + Utils::Port m_pdebugPort; + Utils::Port m_qmlPort; bool m_useCppDebugger; bool m_useQmlDebugger; @@ -83,5 +82,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEBUGSUPPORT_H diff --git a/src/plugins/qnx/qnxdeployconfiguration.h b/src/plugins/qnx/qnxdeployconfiguration.h index 8ffedb896c..0af2552c0d 100644 --- a/src/plugins/qnx/qnxdeployconfiguration.h +++ b/src/plugins/qnx/qnxdeployconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H -#define QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H +#pragma once #include <remotelinux/remotelinuxdeployconfiguration.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYCONFIGURATION_H diff --git a/src/plugins/qnx/qnxdeployconfigurationfactory.h b/src/plugins/qnx/qnxdeployconfigurationfactory.h index f6a7edd509..6564470c19 100644 --- a/src/plugins/qnx/qnxdeployconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeployconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/deployconfiguration.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYCONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index a5ce49693f..d90b1bc18c 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -38,11 +38,13 @@ #include <QMessageBox> using namespace QtSupport; +using namespace ProjectExplorer; +using namespace RemoteLinux; namespace Qnx { namespace Internal { -QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const ProjectExplorer::IDevice::ConstPtr &device, +QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &device, QWidget *parent) : QDialog(parent), m_ui(new Ui::QnxDeployQtLibrariesDialog), @@ -67,27 +69,31 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const ProjectExplorer::ID m_uploadService = new RemoteLinux::GenericDirectUploadService(this); m_uploadService->setDevice(m_device); - connect(m_uploadService, SIGNAL(progressMessage(QString)), this, SLOT(updateProgress(QString))); - connect(m_uploadService, SIGNAL(progressMessage(QString)), - m_ui->deployLogWindow, SLOT(appendPlainText(QString))); - connect(m_uploadService, SIGNAL(errorMessage(QString)), - m_ui->deployLogWindow, SLOT(appendPlainText(QString))); - connect(m_uploadService, SIGNAL(warningMessage(QString)), - m_ui->deployLogWindow, SLOT(appendPlainText(QString))); - connect(m_uploadService, SIGNAL(stdOutData(QString)), - m_ui->deployLogWindow, SLOT(appendPlainText(QString))); - connect(m_uploadService, SIGNAL(stdErrData(QString)), - m_ui->deployLogWindow, SLOT(appendPlainText(QString))); - connect(m_uploadService, SIGNAL(finished()), this, SLOT(handleUploadFinished())); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::progressMessage, + this, &QnxDeployQtLibrariesDialog::updateProgress); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::progressMessage, + m_ui->deployLogWindow, &QPlainTextEdit::appendPlainText); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::errorMessage, + m_ui->deployLogWindow, &QPlainTextEdit::appendPlainText); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::warningMessage, + m_ui->deployLogWindow, &QPlainTextEdit::appendPlainText); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::stdOutData, + m_ui->deployLogWindow, &QPlainTextEdit::appendPlainText); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::stdErrData, + m_ui->deployLogWindow, &QPlainTextEdit::appendPlainText); + connect(m_uploadService, &AbstractRemoteLinuxDeployService::finished, + this, &QnxDeployQtLibrariesDialog::handleUploadFinished); m_processRunner = new QSsh::SshRemoteProcessRunner(this); - connect(m_processRunner, SIGNAL(connectionError()), - this, SLOT(handleRemoteProcessError())); - connect(m_processRunner, SIGNAL(processClosed(int)), - this, SLOT(handleRemoteProcessCompleted())); - - connect(m_ui->deployButton, SIGNAL(clicked()), this, SLOT(deployLibraries())); - connect(m_ui->closeButton, SIGNAL(clicked()), this, SLOT(close())); + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::connectionError, + this, &QnxDeployQtLibrariesDialog::handleRemoteProcessError); + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::processClosed, + this, &QnxDeployQtLibrariesDialog::handleRemoteProcessCompleted); + + connect(m_ui->deployButton, &QAbstractButton::clicked, + this, &QnxDeployQtLibrariesDialog::deployLibraries); + connect(m_ui->closeButton, &QAbstractButton::clicked, + this, &QWidget::close); } QnxDeployQtLibrariesDialog::~QnxDeployQtLibrariesDialog() @@ -147,7 +153,7 @@ void QnxDeployQtLibrariesDialog::startUpload() m_state = Uploading; - QList<ProjectExplorer::DeployableFile> filesToUpload = gatherFiles(); + QList<DeployableFile> filesToUpload = gatherFiles(); m_ui->deployProgress->setRange(0, filesToUpload.count()); @@ -214,9 +220,9 @@ void QnxDeployQtLibrariesDialog::handleRemoteProcessCompleted() } } -QList<ProjectExplorer::DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles() +QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles() { - QList<ProjectExplorer::DeployableFile> result; + QList<DeployableFile> result; const int qtVersionId = m_ui->qtLibraryCombo->itemData(m_ui->qtLibraryCombo->currentIndex()).toInt(); @@ -243,10 +249,10 @@ QList<ProjectExplorer::DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles() return result; } -QList<ProjectExplorer::DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles( +QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles( const QString &dirPath, const QString &baseDirPath, const QStringList &nameFilters) { - QList<ProjectExplorer::DeployableFile> result; + QList<DeployableFile> result; if (dirPath.isEmpty()) return result; @@ -270,7 +276,7 @@ QList<ProjectExplorer::DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles( remoteDir = fullRemoteDirectory() + QLatin1Char('/') + baseDir.relativeFilePath(dirPath); } - result.append(ProjectExplorer::DeployableFile(fileInfo.absoluteFilePath(), remoteDir)); + result.append(DeployableFile(fileInfo.absoluteFilePath(), remoteDir)); } } diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h index 29d3496c0b..fa6dc6d6ec 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.h +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H -#define QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H +#pragma once #include <QDialog> @@ -100,4 +99,3 @@ private: } // namespace Internal } // namespace Qnx -#endif // QNX_INTERNAL_QNXDEPLOYQTLIBRARIESDIALOG_H diff --git a/src/plugins/qnx/qnxdeploystepfactory.h b/src/plugins/qnx/qnxdeploystepfactory.h index 1e3d2702c6..dc9d6e98a6 100644 --- a/src/plugins/qnx/qnxdeploystepfactory.h +++ b/src/plugins/qnx/qnxdeploystepfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H -#define QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H +#pragma once #include <projectexplorer/buildstep.h> @@ -55,5 +54,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEPLOYSTEPFACTORY_H diff --git a/src/plugins/qnx/qnxdeviceconfiguration.cpp b/src/plugins/qnx/qnxdeviceconfiguration.cpp index ce09301433..1215b39993 100644 --- a/src/plugins/qnx/qnxdeviceconfiguration.cpp +++ b/src/plugins/qnx/qnxdeviceconfiguration.cpp @@ -33,6 +33,7 @@ #include <projectexplorer/devicesupport/sshdeviceprocess.h> #include <projectexplorer/runnables.h> #include <ssh/sshconnection.h> +#include <utils/port.h> #include <utils/qtcassert.h> #include <QApplication> @@ -66,16 +67,16 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod "done"; } - QList<int> usedPorts(const QByteArray &output) const + QList<Port> usedPorts(const QByteArray &output) const { - QList<int> ports; + QList<Port> ports; QList<QByteArray> portStrings = output.split('\n'); portStrings.removeFirst(); foreach (const QByteArray &portString, portStrings) { if (portString.isEmpty()) continue; bool ok; - const int port = portString.toInt(&ok, 16); + const Port port(portString.toInt(&ok, 16)); if (ok) { if (!ports.contains(port)) ports << port; @@ -133,8 +134,8 @@ void QnxDeviceConfiguration::updateVersionNumber() const { QEventLoop eventLoop; SshDeviceProcess versionNumberProcess(sharedFromThis()); - QObject::connect(&versionNumberProcess, SIGNAL(finished()), &eventLoop, SLOT(quit())); - QObject::connect(&versionNumberProcess, SIGNAL(error(QProcess::ProcessError)), &eventLoop, SLOT(quit())); + QObject::connect(&versionNumberProcess, &SshDeviceProcess::finished, &eventLoop, &QEventLoop::quit); + QObject::connect(&versionNumberProcess, &DeviceProcess::error, &eventLoop, &QEventLoop::quit); StandardRunnable r; r.executable = QLatin1String("uname"); diff --git a/src/plugins/qnx/qnxdeviceconfiguration.h b/src/plugins/qnx/qnxdeviceconfiguration.h index e77813fd74..ca42b013bd 100644 --- a/src/plugins/qnx/qnxdeviceconfiguration.h +++ b/src/plugins/qnx/qnxdeviceconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATION_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATION_H +#pragma once #include "qnx_export.h" @@ -43,25 +42,25 @@ public: static Ptr create(); static Ptr create(const QString &name, Core::Id type, MachineType machineType, Origin origin = ManuallyAdded, Core::Id id = Core::Id()); - ProjectExplorer::IDevice::Ptr clone() const; + ProjectExplorer::IDevice::Ptr clone() const override; - ProjectExplorer::PortsGatheringMethod::Ptr portsGatheringMethod() const; - ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const; - ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; + ProjectExplorer::PortsGatheringMethod::Ptr portsGatheringMethod() const override; + ProjectExplorer::DeviceProcessList *createProcessListModel(QObject *parent) const override; + ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override; - ProjectExplorer::DeviceTester *createDeviceTester() const; - ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const; + ProjectExplorer::DeviceTester *createDeviceTester() const override; + ProjectExplorer::DeviceProcess *createProcess(QObject *parent) const override; - QList<Core::Id> actionIds() const; - QString displayNameForActionId(Core::Id actionId) const; - void executeAction(Core::Id actionId, QWidget *parent); + QList<Core::Id> actionIds() const override; + QString displayNameForActionId(Core::Id actionId) const override; + void executeAction(Core::Id actionId, QWidget *parent) override; - QString displayType() const; + QString displayType() const override; int qnxVersion() const; - void fromMap(const QVariantMap &map); - QVariantMap toMap() const; + void fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; protected: QnxDeviceConfiguration(); @@ -79,5 +78,3 @@ private: }; } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATION_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationfactory.h b/src/plugins/qnx/qnxdeviceconfigurationfactory.h index a683c18bdd..cfa5b97f15 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationfactory.h +++ b/src/plugins/qnx/qnxdeviceconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/devicesupport/idevicefactory.h> @@ -51,5 +50,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationwizard.h b/src/plugins/qnx/qnxdeviceconfigurationwizard.h index a32c15337b..83e8857639 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationwizard.h +++ b/src/plugins/qnx/qnxdeviceconfigurationwizard.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <utils/wizard.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARD_H diff --git a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h index 2791632ce5..fcd31884f7 100644 --- a/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h +++ b/src/plugins/qnx/qnxdeviceconfigurationwizardpages.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H -#define QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H +#pragma once #include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h> @@ -42,5 +41,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICECONFIGURATIONWIZARDPAGES_H diff --git a/src/plugins/qnx/qnxdeviceprocess.h b/src/plugins/qnx/qnxdeviceprocess.h index d425b0600c..6fbb6ac8eb 100644 --- a/src/plugins/qnx/qnxdeviceprocess.h +++ b/src/plugins/qnx/qnxdeviceprocess.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXDEVICEPROCESS_H -#define QNXDEVICEPROCESS_H +#pragma once #include "qnx_export.h" #include <remotelinux/linuxdevice.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXDEVICEPROCESS_H diff --git a/src/plugins/qnx/qnxdeviceprocesslist.h b/src/plugins/qnx/qnxdeviceprocesslist.h index 000d4717ff..47c279e2e9 100644 --- a/src/plugins/qnx/qnxdeviceprocesslist.h +++ b/src/plugins/qnx/qnxdeviceprocesslist.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICEPROCESSLIST_H -#define QNX_INTERNAL_QNXDEVICEPROCESSLIST_H +#pragma once #include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/sshdeviceprocesslist.h> @@ -47,5 +46,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICEPROCESSLIST_H diff --git a/src/plugins/qnx/qnxdeviceprocesssignaloperation.h b/src/plugins/qnx/qnxdeviceprocesssignaloperation.h index f161a5167f..9e528a800e 100644 --- a/src/plugins/qnx/qnxdeviceprocesssignaloperation.h +++ b/src/plugins/qnx/qnxdeviceprocesssignaloperation.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXDEVICEPROCESSSIGNALOPERATION_H -#define QNXDEVICEPROCESSSIGNALOPERATION_H +#pragma once #include <remotelinux/remotelinuxsignaloperation.h> @@ -48,5 +47,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXDEVICEPROCESSSIGNALOPERATION_H diff --git a/src/plugins/qnx/qnxdevicetester.cpp b/src/plugins/qnx/qnxdevicetester.cpp index 759458722b..fd23937126 100644 --- a/src/plugins/qnx/qnxdevicetester.cpp +++ b/src/plugins/qnx/qnxdevicetester.cpp @@ -29,8 +29,8 @@ #include <ssh/sshremoteprocessrunner.h> #include <utils/qtcassert.h> -using namespace Qnx; -using namespace Qnx::Internal; +namespace Qnx { +namespace Internal { QnxDeviceTester::QnxDeviceTester(QObject *parent) : ProjectExplorer::DeviceTester(parent) @@ -39,14 +39,18 @@ QnxDeviceTester::QnxDeviceTester(QObject *parent) , m_currentCommandIndex(-1) { m_genericTester = new RemoteLinux::GenericLinuxDeviceTester(this); - connect(m_genericTester, SIGNAL(progressMessage(QString)), SIGNAL(progressMessage(QString))); - connect(m_genericTester, SIGNAL(errorMessage(QString)), SIGNAL(errorMessage(QString))); - connect(m_genericTester, SIGNAL(finished(ProjectExplorer::DeviceTester::TestResult)), - SLOT(handleGenericTestFinished(ProjectExplorer::DeviceTester::TestResult))); + connect(m_genericTester, &DeviceTester::progressMessage, + this, &DeviceTester::progressMessage); + connect(m_genericTester, &DeviceTester::errorMessage, + this, &DeviceTester::errorMessage); + connect(m_genericTester, &DeviceTester::finished, + this, &QnxDeviceTester::handleGenericTestFinished); m_processRunner = new QSsh::SshRemoteProcessRunner(this); - connect(m_processRunner, SIGNAL(connectionError()), SLOT(handleConnectionError())); - connect(m_processRunner, SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int))); + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::connectionError, + this, &QnxDeviceTester::handleConnectionError); + connect(m_processRunner, &QSsh::SshRemoteProcessRunner::processClosed, + this, &QnxDeviceTester::handleProcessFinished); m_commandsToTest << QLatin1String("awk") << QLatin1String("grep") @@ -168,3 +172,6 @@ QStringList QnxDeviceTester::versionSpecificCommandsToTest(int versionNumber) co return result; } + +} // namespace Internal +} // namespace Qnx diff --git a/src/plugins/qnx/qnxdevicetester.h b/src/plugins/qnx/qnxdevicetester.h index 444723e3a1..90da0599e4 100644 --- a/src/plugins/qnx/qnxdevicetester.h +++ b/src/plugins/qnx/qnxdevicetester.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXDEVICETESTER_H -#define QNX_INTERNAL_QNXDEVICETESTER_H +#pragma once #include <remotelinux/linuxdevicetester.h> @@ -41,8 +40,8 @@ class QnxDeviceTester : public ProjectExplorer::DeviceTester public: explicit QnxDeviceTester(QObject *parent = 0); - void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration); - void stopTest(); + void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration) override; + void stopTest() override; private slots: void handleGenericTestFinished(ProjectExplorer::DeviceTester::TestResult result); @@ -74,5 +73,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXDEVICETESTER_H diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 82459c53d6..6c28cbbd21 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -86,7 +86,7 @@ void QnxPlugin::extensionsInitialized() m_attachToQnxApplication = new QAction(this); m_attachToQnxApplication->setText(tr("Attach to remote QNX application...")); - connect(m_attachToQnxApplication, SIGNAL(triggered()), debugSupport, SLOT(showProcessesDialog())); + connect(m_attachToQnxApplication, &QAction::triggered, debugSupport, &QnxAttachDebugSupport::showProcessesDialog); Core::ActionContainer *mstart = Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_DEBUG_STARTDEBUGGING); mstart->appendGroup(Constants::QNX_DEBUGGING_GROUP); @@ -95,7 +95,7 @@ void QnxPlugin::extensionsInitialized() Core::Command *cmd = Core::ActionManager::registerAction(m_attachToQnxApplication, "Debugger.AttachToQnxApplication"); mstart->addAction(cmd, Constants::QNX_DEBUGGING_GROUP); - connect(KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions())); + connect(KitManager::instance(), &KitManager::kitsChanged, this, &QnxPlugin::updateDebuggerActions); } ExtensionSystem::IPlugin::ShutdownFlag QnxPlugin::aboutToShutdown() diff --git a/src/plugins/qnx/qnxplugin.h b/src/plugins/qnx/qnxplugin.h index 9859ddb7dc..1fd1367cb8 100644 --- a/src/plugins/qnx/qnxplugin.h +++ b/src/plugins/qnx/qnxplugin.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXPLUGIN_H -#define QNX_INTERNAL_QNXPLUGIN_H +#pragma once #include <extensionsystem/iplugin.h> @@ -57,5 +56,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXPLUGIN_H diff --git a/src/plugins/qnx/qnxqtversion.h b/src/plugins/qnx/qnxqtversion.h index 04824849d8..225af67867 100644 --- a/src/plugins/qnx/qnxqtversion.h +++ b/src/plugins/qnx/qnxqtversion.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXQTVERSION_H -#define QNX_INTERNAL_QNXQTVERSION_H +#pragma once #include "qnxconstants.h" #include "qnxqtversion.h" @@ -88,5 +87,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXQTVERSION_H diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h index 7904859ece..6f565b0184 100644 --- a/src/plugins/qnx/qnxqtversionfactory.h +++ b/src/plugins/qnx/qnxqtversionfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXQTVERSIONFACTORY_H -#define QNX_INTERNAL_QNXQTVERSIONFACTORY_H +#pragma once #include <qtsupport/qtversionfactory.h> @@ -50,5 +49,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXQTVERSIONFACTORY_H diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h index 7eadf342fe..f897aefa2a 100644 --- a/src/plugins/qnx/qnxrunconfiguration.h +++ b/src/plugins/qnx/qnxrunconfiguration.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONFIGURATION_H -#define QNX_INTERNAL_QNXRUNCONFIGURATION_H +#pragma once #include <remotelinux/remotelinuxrunconfiguration.h> @@ -55,5 +54,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONFIGURATION_H diff --git a/src/plugins/qnx/qnxrunconfigurationfactory.h b/src/plugins/qnx/qnxrunconfigurationfactory.h index 8d1e15d907..5bf5e538be 100644 --- a/src/plugins/qnx/qnxrunconfigurationfactory.h +++ b/src/plugins/qnx/qnxrunconfigurationfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H -#define QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -60,5 +59,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONFIGURATIONFACTORY_H diff --git a/src/plugins/qnx/qnxruncontrol.cpp b/src/plugins/qnx/qnxruncontrol.cpp index 187e2a30d4..67ea7a88fe 100644 --- a/src/plugins/qnx/qnxruncontrol.cpp +++ b/src/plugins/qnx/qnxruncontrol.cpp @@ -32,29 +32,33 @@ #include <projectexplorer/runconfiguration.h> #include <projectexplorer/target.h> -using namespace Qnx; -using namespace Qnx::Internal; +using namespace ProjectExplorer; using namespace RemoteLinux; +using namespace Utils; -QnxRunControl::QnxRunControl(ProjectExplorer::RunConfiguration *runConfig) +namespace Qnx { +namespace Internal { + +QnxRunControl::QnxRunControl(RunConfiguration *runConfig) : RemoteLinuxRunControl(runConfig) , m_slog2Info(0) { - ProjectExplorer::IDevice::ConstPtr dev = ProjectExplorer::DeviceKitInformation::device(runConfig->target()->kit()); + IDevice::ConstPtr dev = DeviceKitInformation::device(runConfig->target()->kit()); QnxDeviceConfiguration::ConstPtr qnxDevice = dev.dynamicCast<const QnxDeviceConfiguration>(); QnxRunConfiguration *qnxRunConfig = qobject_cast<QnxRunConfiguration *>(runConfig); QTC_CHECK(qnxRunConfig); - const QString applicationId = Utils::FileName::fromString(qnxRunConfig->remoteExecutableFilePath()).fileName(); + const QString applicationId = FileName::fromString(qnxRunConfig->remoteExecutableFilePath()).fileName(); m_slog2Info = new Slog2InfoRunner(applicationId, qnxDevice, this); - connect(m_slog2Info, SIGNAL(output(QString,Utils::OutputFormat)), this, SLOT(appendMessage(QString,Utils::OutputFormat))); - connect(this, SIGNAL(started()), m_slog2Info, SLOT(start())); + connect(m_slog2Info, &Slog2InfoRunner::output, + this, static_cast<void(RunControl::*)(const QString &, OutputFormat)>(&RunControl::appendMessage)); + connect(this, &RunControl::started, m_slog2Info, &Slog2InfoRunner::start); if (qnxDevice->qnxVersion() > 0x060500) - connect(m_slog2Info, SIGNAL(commandMissing()), this, SLOT(printMissingWarning())); + connect(m_slog2Info, &Slog2InfoRunner::commandMissing, this, &QnxRunControl::printMissingWarning); } -ProjectExplorer::RunControl::StopResult QnxRunControl::stop() +RunControl::StopResult QnxRunControl::stop() { m_slog2Info->stop(); return RemoteLinuxRunControl::stop(); @@ -62,5 +66,8 @@ ProjectExplorer::RunControl::StopResult QnxRunControl::stop() void QnxRunControl::printMissingWarning() { - appendMessage(tr("Warning: \"slog2info\" is not found on the device, debug output not available."), Utils::ErrorMessageFormat); + appendMessage(tr("Warning: \"slog2info\" is not found on the device, debug output not available."), ErrorMessageFormat); } + +} // namespace Internal +} // namespace Qnx diff --git a/src/plugins/qnx/qnxruncontrol.h b/src/plugins/qnx/qnxruncontrol.h index 39b2902091..61985f6daa 100644 --- a/src/plugins/qnx/qnxruncontrol.h +++ b/src/plugins/qnx/qnxruncontrol.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONTROL_H -#define QNX_INTERNAL_QNXRUNCONTROL_H +#pragma once #include <remotelinux/remotelinuxruncontrol.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONTROL_H diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp index 0b95af65b1..b65ded3e80 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.cpp +++ b/src/plugins/qnx/qnxruncontrolfactory.cpp @@ -75,7 +75,7 @@ static DebuggerStartParameters createDebuggerStartParameters(QnxRunConfiguration auto aspect = runConfig->extraAspect<DebuggerRunConfigurationAspect>(); if (aspect->useQmlDebugger()) { params.qmlServerAddress = device->sshParameters().host; - params.qmlServerPort = 0; // QML port is handed out later + params.qmlServerPort = Utils::Port(); // QML port is handed out later } auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitInformation::qtVersion(k)); @@ -147,7 +147,7 @@ RunControl *QnxRunControlFactory::create(RunConfiguration *runConfig, Core::Id m AnalyzerConnection connection; connection.connParams = device->sshParameters(); connection.analyzerHost = connection.connParams.host; - connection.analyzerPort = connection.connParams.port; + connection.analyzerPort = Utils::Port(connection.connParams.port); runControl->setConnection(connection); auto analyzeSupport = new QnxAnalyzeSupport(rc, runControl); connect(runControl, &RunControl::finished, analyzeSupport, &QnxAnalyzeSupport::handleProfilingFinished); diff --git a/src/plugins/qnx/qnxruncontrolfactory.h b/src/plugins/qnx/qnxruncontrolfactory.h index 003b523e75..af19a7f3dd 100644 --- a/src/plugins/qnx/qnxruncontrolfactory.h +++ b/src/plugins/qnx/qnxruncontrolfactory.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXRUNCONTROLFACTORY_H -#define QNX_INTERNAL_QNXRUNCONTROLFACTORY_H +#pragma once #include <projectexplorer/runconfiguration.h> @@ -46,5 +45,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXRUNCONTROLFACTORY_H diff --git a/src/plugins/qnx/qnxsettingspage.h b/src/plugins/qnx/qnxsettingspage.h index e23d59ae94..6358f7a25b 100644 --- a/src/plugins/qnx/qnxsettingspage.h +++ b/src/plugins/qnx/qnxsettingspage.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXSETTINGSPAGE_H -#define QNXSETTINGSPAGE_H +#pragma once #include <coreplugin/dialogs/ioptionspage.h> @@ -50,5 +49,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXSETTINGSPAGE_H diff --git a/src/plugins/qnx/qnxsettingswidget.cpp b/src/plugins/qnx/qnxsettingswidget.cpp index f9f337b5ae..6ca598db6a 100644 --- a/src/plugins/qnx/qnxsettingswidget.cpp +++ b/src/plugins/qnx/qnxsettingswidget.cpp @@ -34,8 +34,6 @@ #include <QFileDialog> #include <QMessageBox> -#include <qdebug.h> - namespace Qnx { namespace Internal { @@ -47,19 +45,19 @@ QnxSettingsWidget::QnxSettingsWidget(QWidget *parent) : m_ui->setupUi(this); populateConfigsCombo(); - connect(m_ui->addButton, SIGNAL(clicked()), - this, SLOT(addConfiguration())); - connect(m_ui->removeButton, SIGNAL(clicked()), - this, SLOT(removeConfiguration())); - connect(m_ui->configsCombo, SIGNAL(currentIndexChanged(QString)), - this, SLOT(updateInformation())); - connect(m_ui->generateKitsCheckBox, SIGNAL(toggled(bool)), - this, SLOT(generateKits(bool))); - connect(m_qnxConfigManager, SIGNAL(configurationsListUpdated()), - this, SLOT(populateConfigsCombo())); + connect(m_ui->addButton, &QAbstractButton::clicked, + this, &QnxSettingsWidget::addConfiguration); + connect(m_ui->removeButton, &QAbstractButton::clicked, + this, &QnxSettingsWidget::removeConfiguration); + connect(m_ui->configsCombo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + this, &QnxSettingsWidget::updateInformation); + connect(m_ui->generateKitsCheckBox, &QAbstractButton::toggled, + this, &QnxSettingsWidget::generateKits); + connect(m_qnxConfigManager, &QnxConfigurationManager::configurationsListUpdated, + this, &QnxSettingsWidget::populateConfigsCombo); connect(QtSupport::QtVersionManager::instance(), - SIGNAL(qtVersionsChanged(QList<int>,QList<int>,QList<int>)), - this, SLOT(updateInformation())); + &QtSupport::QtVersionManager::qtVersionsChanged, + this, &QnxSettingsWidget::updateInformation); } QnxSettingsWidget::~QnxSettingsWidget() diff --git a/src/plugins/qnx/qnxsettingswidget.h b/src/plugins/qnx/qnxsettingswidget.h index 999417a867..879697f688 100644 --- a/src/plugins/qnx/qnxsettingswidget.h +++ b/src/plugins/qnx/qnxsettingswidget.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXSETTINGSWIDGET_H -#define QNXSETTINGSWIDGET_H +#pragma once #include <QWidget> @@ -89,5 +88,3 @@ private: } } - -#endif // QNXSETTINGSWIDGET_H diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp index 3224521977..ad0cd53e18 100644 --- a/src/plugins/qnx/qnxtoolchain.cpp +++ b/src/plugins/qnx/qnxtoolchain.cpp @@ -32,6 +32,8 @@ #include <QFormLayout> using namespace ProjectExplorer; +using namespace Utils; + namespace Qnx { namespace Internal { @@ -46,10 +48,10 @@ static const QList<Abi> qccSupportedAbis() return abis; } -static void setQnxEnvironment(Utils::Environment &env, const QList<Utils::EnvironmentItem> &qnxEnv) +static void setQnxEnvironment(Environment &env, const QList<EnvironmentItem> &qnxEnv) { // We only need to set QNX_HOST and QNX_TARGET needed when running qcc - foreach (const Utils::EnvironmentItem &item, qnxEnv) { + foreach (const EnvironmentItem &item, qnxEnv) { if (item.name == QLatin1String("QNX_HOST") || item.name == QLatin1String("QNX_TARGET") ) env.set(item.name, item.value); @@ -70,7 +72,7 @@ ToolChainConfigWidget *QnxToolChain::configurationWidget() return new QnxToolChainConfigWidget(this); } -void QnxToolChain::addToEnvironment(Utils::Environment &env) const +void QnxToolChain::addToEnvironment(Environment &env) const { if (env.value(QLatin1String("QNX_HOST")).isEmpty() || env.value(QLatin1String("QNX_TARGET")).isEmpty()) @@ -79,12 +81,12 @@ void QnxToolChain::addToEnvironment(Utils::Environment &env) const GccToolChain::addToEnvironment(env); } -Utils::FileNameList QnxToolChain::suggestedMkspecList() const +FileNameList QnxToolChain::suggestedMkspecList() const { - Utils::FileNameList mkspecList; - mkspecList << Utils::FileName::fromLatin1("qnx-armv7le-qcc"); - mkspecList << Utils::FileName::fromLatin1("qnx-armle-v7-qcc"); - mkspecList << Utils::FileName::fromLatin1("qnx-x86-qcc"); + FileNameList mkspecList; + mkspecList << FileName::fromLatin1("qnx-armv7le-qcc"); + mkspecList << FileName::fromLatin1("qnx-armle-v7-qcc"); + mkspecList << FileName::fromLatin1("qnx-x86-qcc"); return mkspecList; } @@ -179,16 +181,16 @@ ToolChain *QnxToolChainFactory::create() QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc) : ToolChainConfigWidget(tc) - , m_compilerCommand(new Utils::PathChooser) - , m_ndkPath(new Utils::PathChooser) + , m_compilerCommand(new PathChooser) + , m_ndkPath(new PathChooser) , m_abiWidget(new AbiWidget) { - m_compilerCommand->setExpectedKind(Utils::PathChooser::ExistingCommand); + m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand); m_compilerCommand->setHistoryCompleter(QLatin1String("Qnx.ToolChain.History")); m_compilerCommand->setFileName(tc->compilerCommand()); m_compilerCommand->setEnabled(!tc->isAutoDetected()); - m_ndkPath->setExpectedKind(Utils::PathChooser::ExistingDirectory); + m_ndkPath->setExpectedKind(PathChooser::ExistingDirectory); m_ndkPath->setHistoryCompleter(QLatin1String("Qnx.Ndk.History")); m_ndkPath->setPath(tc->ndkPath()); m_ndkPath->setEnabled(!tc->isAutoDetected()); @@ -201,9 +203,9 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc) m_mainLayout->addRow(tr("NDK/SDP path:"), m_ndkPath); m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); - connect(m_compilerCommand, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty())); - connect(m_ndkPath, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty())); - connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty())); + connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty); + connect(m_ndkPath, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty); + connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolChainConfigWidget::dirty); } void QnxToolChainConfigWidget::applyImpl() diff --git a/src/plugins/qnx/qnxtoolchain.h b/src/plugins/qnx/qnxtoolchain.h index 2e989c7374..193e7e36f8 100644 --- a/src/plugins/qnx/qnxtoolchain.h +++ b/src/plugins/qnx/qnxtoolchain.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNXTOOLCHAIN_H -#define QNXTOOLCHAIN_H +#pragma once #include <projectexplorer/gcctoolchain.h> #include <projectexplorer/gcctoolchainfactories.h> @@ -102,5 +101,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNXTOOLCHAIN_H diff --git a/src/plugins/qnx/qnxutils.h b/src/plugins/qnx/qnxutils.h index 9169ea8b3a..f62c50ed37 100644 --- a/src/plugins/qnx/qnxutils.h +++ b/src/plugins/qnx/qnxutils.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_QNXUTILS_H -#define QNX_INTERNAL_QNXUTILS_H +#pragma once #include "qnxconstants.h" @@ -74,5 +73,3 @@ public: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_QNXUTILS_H diff --git a/src/plugins/qnx/qnxversionnumber.h b/src/plugins/qnx/qnxversionnumber.h index 5dfa93c09b..9b619df651 100644 --- a/src/plugins/qnx/qnxversionnumber.h +++ b/src/plugins/qnx/qnxversionnumber.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_VERSION_NUMBER_H -#define QNX_VERSION_NUMBER_H +#pragma once #include <QStringList> @@ -54,5 +53,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_VERSION_NUMBER_H diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp index befca6f9ae..43ad13beee 100644 --- a/src/plugins/qnx/slog2inforunner.cpp +++ b/src/plugins/qnx/slog2inforunner.cpp @@ -47,17 +47,17 @@ Slog2InfoRunner::Slog2InfoRunner(const QString &applicationId, m_applicationId.truncate(63); m_testProcess = new QnxDeviceProcess(device, this); - connect(m_testProcess, &ProjectExplorer::DeviceProcess::finished, this, &Slog2InfoRunner::handleTestProcessCompleted); + connect(m_testProcess, &DeviceProcess::finished, this, &Slog2InfoRunner::handleTestProcessCompleted); - m_launchDateTimeProcess = new ProjectExplorer::SshDeviceProcess(device, this); - connect(m_launchDateTimeProcess, &ProjectExplorer::DeviceProcess::finished, this, &Slog2InfoRunner::launchSlog2Info); + m_launchDateTimeProcess = new SshDeviceProcess(device, this); + connect(m_launchDateTimeProcess, &DeviceProcess::finished, this, &Slog2InfoRunner::launchSlog2Info); m_logProcess = new QnxDeviceProcess(device, this); - connect(m_logProcess, &ProjectExplorer::DeviceProcess::readyReadStandardOutput, this, &Slog2InfoRunner::readLogStandardOutput); - connect(m_logProcess, &ProjectExplorer::DeviceProcess::readyReadStandardError, this, &Slog2InfoRunner::readLogStandardError); - connect(m_logProcess, &ProjectExplorer::DeviceProcess::error, this, &Slog2InfoRunner::handleLogError); - connect(m_logProcess, &ProjectExplorer::DeviceProcess::started, this, &Slog2InfoRunner::started); - connect(m_logProcess, &ProjectExplorer::DeviceProcess::finished, this, &Slog2InfoRunner::finished); + connect(m_logProcess, &DeviceProcess::readyReadStandardOutput, this, &Slog2InfoRunner::readLogStandardOutput); + connect(m_logProcess, &DeviceProcess::readyReadStandardError, this, &Slog2InfoRunner::readLogStandardError); + connect(m_logProcess, &DeviceProcess::error, this, &Slog2InfoRunner::handleLogError); + connect(m_logProcess, &DeviceProcess::started, this, &Slog2InfoRunner::started); + connect(m_logProcess, &DeviceProcess::finished, this, &Slog2InfoRunner::finished); } void Slog2InfoRunner::start() diff --git a/src/plugins/qnx/slog2inforunner.h b/src/plugins/qnx/slog2inforunner.h index 4fbcfaa672..4e08b5f950 100644 --- a/src/plugins/qnx/slog2inforunner.h +++ b/src/plugins/qnx/slog2inforunner.h @@ -23,8 +23,7 @@ ** ****************************************************************************/ -#ifndef QNX_INTERNAL_SLOG2INFORUNNER_H -#define QNX_INTERNAL_SLOG2INFORUNNER_H +#pragma once #include <QObject> @@ -86,5 +85,3 @@ private: } // namespace Internal } // namespace Qnx - -#endif // QNX_INTERNAL_SLOG2INFORUNNER_H |