Commit 9d5f420f authored by Christian Kandeler's avatar Christian Kandeler
Browse files

RemoteLinux: Rename a bunch of classes.

They still had "Maemo" in their names, even though
they are not Maemo-specific (and will not move
to the respective plugin).

Change-Id: I5eec0de27db8340f2a987a6ed685b3ae46ec17b0
Reviewed-on: http://codereview.qt.nokia.com/2036

Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 4bf65fe4
......@@ -32,8 +32,8 @@
#include "abstractremotelinuxdeploystep.h"
#include "abstractremotelinuxdeployservice.h"
#include "maemodeploystepwidget.h"
#include "remotelinuxdeployconfiguration.h"
#include "remotelinuxdeploystepwidget.h"
#include <projectexplorer/projectexplorerconstants.h>
#include <qt4projectmanager/qt4buildconfiguration.h>
......@@ -113,7 +113,7 @@ void AbstractRemoteLinuxDeployStep::cancel()
BuildStepConfigWidget *AbstractRemoteLinuxDeployStep::createConfigWidget()
{
return new Internal::MaemoDeployStepBaseWidget(this);
return new RemoteLinuxDeployStepWidget(this);
}
RemoteLinuxDeployConfiguration *AbstractRemoteLinuxDeployStep::deployConfiguration() const
......
......@@ -47,7 +47,7 @@ namespace Internal {
class LinuxDeviceConfigurations : public QAbstractListModel
{
Q_OBJECT
friend class MaemoDeviceConfigurationsSettingsWidget;
friend class LinuxDeviceConfigurationsSettingsWidget;
public:
static LinuxDeviceConfigurations *instance(QObject *parent = 0);
......
......@@ -28,15 +28,14 @@
** Nokia at info@qt.nokia.com.
**
**************************************************************************/
#include "linuxdeviceconfigurationssettingswidget.h"
#include "maemodeviceconfigurationssettingswidget.h"
#include "ui_maemodeviceconfigurationssettingswidget.h"
#include "ui_linuxdeviceconfigurationssettingswidget.h"
#include "linuxdeviceconfigurations.h"
#include "linuxdevicefactoryselectiondialog.h"
#include "maemoglobal.h"
#include "maemosshconfigdialog.h"
#include "sshkeycreationdialog.h"
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
......@@ -96,9 +95,9 @@ private:
};
MaemoDeviceConfigurationsSettingsWidget::MaemoDeviceConfigurationsSettingsWidget(QWidget *parent)
LinuxDeviceConfigurationsSettingsWidget::LinuxDeviceConfigurationsSettingsWidget(QWidget *parent)
: QWidget(parent),
m_ui(new Ui_MaemoDeviceConfigurationsSettingsWidget),
m_ui(new Ui_LinuxDeviceConfigurationsSettingsWidget),
m_devConfigs(LinuxDeviceConfigurations::cloneInstance()),
m_nameValidator(new NameValidator(m_devConfigs.data(), this)),
m_saveSettingsRequested(false),
......@@ -109,7 +108,7 @@ MaemoDeviceConfigurationsSettingsWidget::MaemoDeviceConfigurationsSettingsWidget
SLOT(handleAdditionalActionRequest(QString)));
}
MaemoDeviceConfigurationsSettingsWidget::~MaemoDeviceConfigurationsSettingsWidget()
LinuxDeviceConfigurationsSettingsWidget::~LinuxDeviceConfigurationsSettingsWidget()
{
if (m_saveSettingsRequested) {
Core::ICore::instance()->settings()->setValue(LastDeviceConfigIndexKey,
......@@ -119,7 +118,7 @@ MaemoDeviceConfigurationsSettingsWidget::~MaemoDeviceConfigurationsSettingsWidge
delete m_ui;
}
QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
QString LinuxDeviceConfigurationsSettingsWidget::searchKeywords() const
{
QString rc;
QTextStream(&rc) << m_ui->configurationLabel->text()
......@@ -145,7 +144,7 @@ QString MaemoDeviceConfigurationsSettingsWidget::searchKeywords() const
return rc;
}
void MaemoDeviceConfigurationsSettingsWidget::initGui()
void LinuxDeviceConfigurationsSettingsWidget::initGui()
{
m_ui->setupUi(this);
m_ui->configurationComboBox->setModel(m_devConfigs.data());
......@@ -169,7 +168,7 @@ void MaemoDeviceConfigurationsSettingsWidget::initGui()
SLOT(setDefaultDevice()));
}
void MaemoDeviceConfigurationsSettingsWidget::addConfig()
void LinuxDeviceConfigurationsSettingsWidget::addConfig()
{
const QList<ILinuxDeviceConfigurationFactory *> &factories
= ExtensionSystem::PluginManager::instance()->getObjects<ILinuxDeviceConfigurationFactory>();
......@@ -190,14 +189,14 @@ void MaemoDeviceConfigurationsSettingsWidget::addConfig()
m_ui->configurationComboBox->setCurrentIndex(m_ui->configurationComboBox->count()-1);
}
void MaemoDeviceConfigurationsSettingsWidget::deleteConfig()
void LinuxDeviceConfigurationsSettingsWidget::deleteConfig()
{
m_devConfigs->removeConfiguration(currentIndex());
if (m_devConfigs->rowCount() == 0)
currentConfigChanged(-1);
}
void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
void LinuxDeviceConfigurationsSettingsWidget::displayCurrent()
{
const LinuxDeviceConfiguration::ConstPtr &current = currentConfig();
m_ui->defaultDeviceButton->setEnabled(!current->isDefault());
......@@ -220,7 +219,7 @@ void MaemoDeviceConfigurationsSettingsWidget::displayCurrent()
fillInValues();
}
void MaemoDeviceConfigurationsSettingsWidget::fillInValues()
void LinuxDeviceConfigurationsSettingsWidget::fillInValues()
{
const LinuxDeviceConfiguration::ConstPtr &current = currentConfig();
m_ui->nameLineEdit->setText(current->name());
......@@ -239,24 +238,24 @@ void MaemoDeviceConfigurationsSettingsWidget::fillInValues()
m_ui->sshPortSpinBox->setReadOnly(isSimulator);
}
void MaemoDeviceConfigurationsSettingsWidget::saveSettings()
void LinuxDeviceConfigurationsSettingsWidget::saveSettings()
{
// We must defer this step because of a stupid bug on MacOS. See QTCREATORBUG-1675.
m_saveSettingsRequested = true;
}
int MaemoDeviceConfigurationsSettingsWidget::currentIndex() const
int LinuxDeviceConfigurationsSettingsWidget::currentIndex() const
{
return m_ui->configurationComboBox->currentIndex();
}
LinuxDeviceConfiguration::ConstPtr MaemoDeviceConfigurationsSettingsWidget::currentConfig() const
LinuxDeviceConfiguration::ConstPtr LinuxDeviceConfigurationsSettingsWidget::currentConfig() const
{
Q_ASSERT(currentIndex() != -1);
return m_devConfigs->deviceAt(currentIndex());
}
void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::configNameEditingFinished()
{
if (m_ui->configurationComboBox->count() == 0)
return;
......@@ -266,7 +265,7 @@ void MaemoDeviceConfigurationsSettingsWidget::configNameEditingFinished()
m_nameValidator->setDisplayName(newName);
}
void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
void LinuxDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
const bool usePassword = m_ui->passwordButton->isChecked();
......@@ -281,84 +280,84 @@ void MaemoDeviceConfigurationsSettingsWidget::authenticationTypeChanged()
m_ui->makeKeyFileDefaultButton->setEnabled(!usePassword);
}
void MaemoDeviceConfigurationsSettingsWidget::hostNameEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::hostNameEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.host = m_ui->hostLineEdit->text();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::sshPortEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::sshPortEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.port = m_ui->sshPortSpinBox->value();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::timeoutEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::timeoutEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.timeout = m_ui->timeoutSpinBox->value();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::userNameEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::userNameEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.userName = m_ui->userLineEdit->text();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::passwordEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::passwordEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.password = m_ui->pwdLineEdit->text();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::keyFileEditingFinished()
void LinuxDeviceConfigurationsSettingsWidget::keyFileEditingFinished()
{
SshConnectionParameters sshParams = currentConfig()->sshParameters();
sshParams.privateKeyFile = m_ui->keyFileLineEdit->path();
m_devConfigs->setSshParameters(currentIndex(), sshParams);
}
void MaemoDeviceConfigurationsSettingsWidget::handleFreePortsChanged()
void LinuxDeviceConfigurationsSettingsWidget::handleFreePortsChanged()
{
m_devConfigs->setFreePorts(currentIndex(), PortList::fromString(m_ui->portsLineEdit->text()));
updatePortsWarningLabel();
}
void MaemoDeviceConfigurationsSettingsWidget::showPassword(bool showClearText)
void LinuxDeviceConfigurationsSettingsWidget::showPassword(bool showClearText)
{
m_ui->pwdLineEdit->setEchoMode(showClearText
? QLineEdit::Normal : QLineEdit::Password);
}
void MaemoDeviceConfigurationsSettingsWidget::showGenerateSshKeyDialog()
void LinuxDeviceConfigurationsSettingsWidget::showGenerateSshKeyDialog()
{
MaemoSshConfigDialog dialog(this);
SshKeyCreationDialog dialog(this);
dialog.exec();
}
void MaemoDeviceConfigurationsSettingsWidget::setDefaultKeyFilePath()
void LinuxDeviceConfigurationsSettingsWidget::setDefaultKeyFilePath()
{
m_devConfigs->setDefaultSshKeyFilePath(m_ui->keyFileLineEdit->path());
}
void MaemoDeviceConfigurationsSettingsWidget::setDefaultDevice()
void LinuxDeviceConfigurationsSettingsWidget::setDefaultDevice()
{
m_devConfigs->setDefaultDevice(currentIndex());
m_ui->defaultDeviceButton->setEnabled(false);
}
void MaemoDeviceConfigurationsSettingsWidget::setPrivateKey(const QString &path)
void LinuxDeviceConfigurationsSettingsWidget::setPrivateKey(const QString &path)
{
m_ui->keyFileLineEdit->setPath(path);
keyFileEditingFinished();
}
void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
void LinuxDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
{
qDeleteAll(m_additionalActionButtons);
m_additionalActionButtons.clear();
......@@ -387,7 +386,7 @@ void MaemoDeviceConfigurationsSettingsWidget::currentConfigChanged(int index)
}
}
void MaemoDeviceConfigurationsSettingsWidget::clearDetails()
void LinuxDeviceConfigurationsSettingsWidget::clearDetails()
{
m_ui->nameLineEdit->clear();
m_ui->osTypeValueLabel->clear();
......@@ -402,7 +401,7 @@ void MaemoDeviceConfigurationsSettingsWidget::clearDetails()
m_ui->keyFileLineEdit->lineEdit()->clear();
}
void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
void LinuxDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
{
if (currentConfig()->freePorts().hasMore()) {
m_ui->portsWarningLabel->clear();
......@@ -412,7 +411,7 @@ void MaemoDeviceConfigurationsSettingsWidget::updatePortsWarningLabel()
}
}
const ILinuxDeviceConfigurationFactory *MaemoDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const
const ILinuxDeviceConfigurationFactory *LinuxDeviceConfigurationsSettingsWidget::factoryForCurrentConfig() const
{
Q_ASSERT(currentConfig());
const QList<ILinuxDeviceConfigurationFactory *> &factories
......@@ -424,7 +423,7 @@ const ILinuxDeviceConfigurationFactory *MaemoDeviceConfigurationsSettingsWidget:
return 0;
}
void MaemoDeviceConfigurationsSettingsWidget::handleAdditionalActionRequest(const QString &actionId)
void LinuxDeviceConfigurationsSettingsWidget::handleAdditionalActionRequest(const QString &actionId)
{
const ILinuxDeviceConfigurationFactory * const factory = factoryForCurrentConfig();
Q_ASSERT(factory);
......
......@@ -29,8 +29,8 @@
**
**************************************************************************/
#ifndef MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
#define MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
#ifndef LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
#define LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
#include <QtCore/QList>
#include <QtCore/QScopedPointer>
......@@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
class QLineEdit;
class QSignalMapper;
class Ui_MaemoDeviceConfigurationsSettingsWidget;
class Ui_LinuxDeviceConfigurationsSettingsWidget;
QT_END_NAMESPACE
namespace RemoteLinux {
......@@ -54,12 +54,12 @@ namespace Internal {
class NameValidator;
class LinuxDeviceConfigurations;
class MaemoDeviceConfigurationsSettingsWidget : public QWidget
class LinuxDeviceConfigurationsSettingsWidget : public QWidget
{
Q_OBJECT
public:
MaemoDeviceConfigurationsSettingsWidget(QWidget *parent);
~MaemoDeviceConfigurationsSettingsWidget();
LinuxDeviceConfigurationsSettingsWidget(QWidget *parent);
~LinuxDeviceConfigurationsSettingsWidget();
void saveSettings();
QString searchKeywords() const;
......@@ -97,7 +97,7 @@ private:
void updatePortsWarningLabel();
const ILinuxDeviceConfigurationFactory *factoryForCurrentConfig() const;
Ui_MaemoDeviceConfigurationsSettingsWidget *m_ui;
Ui_LinuxDeviceConfigurationsSettingsWidget *m_ui;
const QScopedPointer<LinuxDeviceConfigurations> m_devConfigs;
NameValidator * const m_nameValidator;
bool m_saveSettingsRequested;
......@@ -108,4 +108,4 @@ private:
} // namespace Internal
} // namespace RemoteLinux
#endif // MAEMODEVICECONFIGURATIONSSETTINGSWIDGET_H
#endif // LINUXDEVICECONFIGURATIONSSETTINGSWIDGET_H
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MaemoDeviceConfigurationsSettingsWidget</class>
<widget class="QWidget" name="MaemoDeviceConfigurationsSettingsWidget">
<class>LinuxDeviceConfigurationsSettingsWidget</class>
<widget class="QWidget" name="LinuxDeviceConfigurationsSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>708</width>
<width>726</width>
<height>421</height>
</rect>
</property>
......@@ -457,7 +457,7 @@
<connection>
<sender>hostLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>hostNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -473,7 +473,7 @@
<connection>
<sender>userLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>userNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -489,7 +489,7 @@
<connection>
<sender>pwdLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>passwordEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -505,7 +505,7 @@
<connection>
<sender>addConfigButton</sender>
<signal>clicked()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>addConfig()</slot>
<hints>
<hint type="sourcelabel">
......@@ -521,7 +521,7 @@
<connection>
<sender>passwordButton</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -537,7 +537,7 @@
<connection>
<sender>keyFileLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -553,7 +553,7 @@
<connection>
<sender>keyFileLineEdit</sender>
<signal>browsingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>keyFileEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -569,7 +569,7 @@
<connection>
<sender>keyButton</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>authenticationTypeChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -585,7 +585,7 @@
<connection>
<sender>nameLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>configNameEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -601,7 +601,7 @@
<connection>
<sender>generateKeyButton</sender>
<signal>clicked()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>showGenerateSshKeyDialog()</slot>
<hints>
<hint type="sourcelabel">
......@@ -617,7 +617,7 @@
<connection>
<sender>timeoutSpinBox</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>timeoutEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -633,7 +633,7 @@
<connection>
<sender>timeoutSpinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>timeoutEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -649,7 +649,7 @@
<connection>
<sender>sshPortSpinBox</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>sshPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -665,7 +665,7 @@
<connection>
<sender>sshPortSpinBox</sender>
<signal>valueChanged(int)</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>sshPortEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
......@@ -681,7 +681,7 @@
<connection>
<sender>showPasswordCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>showPassword(bool)</slot>
<hints>
<hint type="sourcelabel">
......@@ -697,7 +697,7 @@
<connection>
<sender>portsLineEdit</sender>
<signal>editingFinished()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>handleFreePortsChanged()</slot>
<hints>
<hint type="sourcelabel">
......@@ -713,7 +713,7 @@
<connection>
<sender>removeConfigButton</sender>
<signal>clicked()</signal>
<receiver>MaemoDeviceConfigurationsSettingsWidget</receiver>
<receiver>LinuxDeviceConfigurationsSettingsWidget</receiver>
<slot>deleteConfig()</slot>
<hints>
<hint type="sourcelabel">
......
......@@ -37,9 +37,9 @@
#include "deploymentinfo.h"
#include "linuxdeviceconfigurations.h"
#include "maemoglobal.h"
#include "maemopertargetdeviceconfigurationlistmodel.h"
#include "maemosettingspages.h"
#include "remotelinuxdeployconfiguration.h"
#include "typespecificdeviceconfigurationlistmodel.h"
#include <coreplugin/icore.h>
#include <utils/qtcassert.h>
......
......@@ -38,10 +38,10 @@
#include "maddedevicetester.h"
#include "maemoglobal.h"
#include "maemokeydeployer.h"
#include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h>
#include <remotelinux/linuxdevicetestdialog.h>
#include <remotelinux/sshkeydeployer.h>
#include <utils/fileutils.h>
#include <utils/ssh/sshkeygenerator.h>
......@@ -395,7 +395,7 @@ public:
: QWizardPage(parent),
m_ui(new Ui::MaemoDeviceConfigWizardKeyDeploymentPage),
m_wizardData(wizardData),
m_keyDeployer(new MaemoKeyDeployer(this))
m_keyDeployer(new SshKeyDeployer(this))
{
m_ui->setupUi(this);
m_instructionTextTemplate = m_ui->instructionLabel->text();
......@@ -486,7 +486,7 @@ private:
const QScopedPointer<Ui::MaemoDeviceConfigWizardKeyDeploymentPage> m_ui;
bool m_isComplete;
const WizardData &m_wizardData;
MaemoKeyDeployer * const m_keyDeployer;
SshKeyDeployer * const m_keyDeployer;
QString m_instructionTextTemplate;
};
......
......@@ -31,8 +31,8 @@
#include "maemosettingspages.h"
#include "linuxdeviceconfigurationssettingswidget.h"
#include "maemoconstants.h"
#include "maemodeviceconfigurationssettingswidget.h"
#include "maemoqemusettings.h"
#include "maemoqemusettingswidget.h"
......@@ -144,7 +144,7 @@ bool MaemoDeviceConfigurationsSettingsPage::matches(const QString &searchKeyWord
QWidget *MaemoDeviceConfigurationsSettingsPage::createPage(QWidget *parent)
{
m_widget = new MaemoDeviceConfigurationsSettingsWidget(parent);
m_widget = new LinuxDeviceConfigurationsSettingsWidget(parent);
if (m_keywords.isEmpty())
m_keywords = m_widget->searchKeywords();
return m_widget;
......
......@@ -37,7 +37,7 @@
namespace RemoteLinux{
namespace Internal {
class MaemoDeviceConfigurationsSettingsWidget;
class LinuxDeviceConfigurationsSettingsWidget;
class MaemoQemuSettingsWidget;
class MaemoDeviceConfigurationsSettingsPage : public Core::IOptionsPage
......@@ -62,7 +62,7 @@ public:
private:
QString m_keywords;
MaemoDeviceConfigurationsSettingsWidget *m_widget;
LinuxDeviceConfigurationsSettingsWidget *m_widget;
};
class MaemoQemuSettingsPage : public Core::IOptionsPage
......
......@@ -31,7 +31,7 @@
#include "publickeydeploymentdialog.h"
#include "linuxdeviceconfiguration.h"
#include "maemokeydeployer.h"
#include "sshkeydeployer.h"
#include <QtGui/QFileDialog>
......@@ -40,7 +40,7 @@ namespace Internal {
class PublicKeyDeploymentDialogPrivate
{
public:
MaemoKeyDeployer *keyDeployer;
SshKeyDeployer *keyDeployer;
bool done;
};
} // namespace Internal;
......@@ -56,7 +56,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const LinuxDeviceConfigurat
setMinimumDuration(0);
setMaximum(1);
m_d->keyDeployer = new MaemoKeyDeployer(this);
m_d->keyDeployer = new SshKeyDeployer(this);
m_d->done = false;