Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: [cxxplugin]file renamed #336

Merged
merged 1 commit into from
Jan 19, 2024
Merged

refactor: [cxxplugin]file renamed #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/plugins/cxx/cmake/project/cmakeprojectgenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "cmakeitemkeeper.h"
#include "cmake/project/transceiver/projectcmakereceiver.h"
#include "properties/bulidCfgWidget/buildpropertypage.h"
#include "properties/runCfgWidget/runpropertywidget.h"
#include "properties/runCfgWidget/runpropertypage.h"
#include "properties/configWidget/configpropertywidget.h"
#include "properties/configutil.h"
#include "properties/targetsmanager.h"
Expand Down Expand Up @@ -411,7 +411,7 @@ void CmakeProjectGenerator::actionProperties(const dpfservice::ProjectInfo &info
PropertiesDialog dlg;

BuildPropertyPage *buildWidget = new BuildPropertyPage(info);
RunPropertyWidget *runWidget = new RunPropertyWidget(info, item);
RunPropertyPage *runWidget = new RunPropertyPage(info, item);

dlg.insertPropertyPanel(tr("Build"), buildWidget);
dlg.insertPropertyPanel(tr("Run"), runWidget);
Expand Down
16 changes: 8 additions & 8 deletions ...erties/runCfgWidget/runpropertywidget.cpp → ...operties/runCfgWidget/runpropertypage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: GPL-3.0-or-later

#include "runpropertywidget.h"
#include "runpropertypage.h"
#include "environmentwidget.h"
#include "common/common.h"
#include "runconfigpane.h"
Expand All @@ -23,7 +23,7 @@ using namespace config;

class RunPropertyWidgetPrivate
{
friend class RunPropertyWidget;
friend class RunPropertyPage;

DComboBox *exeComboBox{nullptr};
RunConfigPane *runConfigPane{nullptr};
Expand All @@ -33,7 +33,7 @@ class RunPropertyWidgetPrivate
dpfservice::ProjectInfo projectInfo;
};

RunPropertyWidget::RunPropertyWidget(const dpfservice::ProjectInfo &projectInfo, QStandardItem *item, DWidget *parent)
RunPropertyPage::RunPropertyPage(const dpfservice::ProjectInfo &projectInfo, QStandardItem *item, DWidget *parent)
: PageWidget(parent)
, d(new RunPropertyWidgetPrivate())
{
Expand All @@ -42,13 +42,13 @@ RunPropertyWidget::RunPropertyWidget(const dpfservice::ProjectInfo &projectInfo,
setupUi();
}

RunPropertyWidget::~RunPropertyWidget()
RunPropertyPage::~RunPropertyPage()
{
if (d)
delete d;
}

void RunPropertyWidget::setupUi()
void RunPropertyPage::setupUi()
{
ConfigureWidget *runCfgWidget = new ConfigureWidget(this);
runCfgWidget->setFrameShape(QFrame::Shape::NoFrame);
Expand All @@ -71,7 +71,7 @@ void RunPropertyWidget::setupUi()
vLayout->addWidget(runCfgWidget);
}

void RunPropertyWidget::updateData()
void RunPropertyPage::updateData()
{
d->exeComboBox->clear();

Expand All @@ -93,12 +93,12 @@ void RunPropertyWidget::updateData()
}
}

void RunPropertyWidget::readConfig()
void RunPropertyPage::readConfig()
{
updateData();
}

void RunPropertyWidget::saveConfig()
void RunPropertyPage::saveConfig()
{
ConfigureParam *param = ConfigUtil::instance()->getConfigureParamPointer();
auto iter = param->buildConfigures.begin();
Expand Down
6 changes: 3 additions & 3 deletions ...operties/runCfgWidget/runpropertywidget.h → ...properties/runCfgWidget/runpropertypage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

class QStandardItem;
class RunPropertyWidgetPrivate;
class RunPropertyWidget : public PageWidget
class RunPropertyPage : public PageWidget
{
Q_OBJECT
public:
explicit RunPropertyWidget(const dpfservice::ProjectInfo &projectInfo, QStandardItem *item, QWidget *parent = nullptr);
virtual ~RunPropertyWidget() override;
explicit RunPropertyPage(const dpfservice::ProjectInfo &projectInfo, QStandardItem *item, QWidget *parent = nullptr);
virtual ~RunPropertyPage() override;

void saveConfig() override;
void readConfig() override;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/template/templatemanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void TemplateManager::addMenu()

d->newAction.reset(new QAction(MWMFA_NEW_FILE_OR_PROJECT));
actionInit(d->newAction.get(),
"Fiel.New.FileOrProject",
"File.New.FileOrProject",
QKeySequence(Qt::Modifier::CTRL | Qt::Modifier::SHIFT | Qt::Key::Key_O), QString());
QObject::connect(d->newAction.get(), &QAction::triggered,
this, &TemplateManager::newWizard, Qt::DirectConnection);
Expand Down