Skip to content

Commit

Permalink
Revert "fix: type(defult)"
Browse files Browse the repository at this point in the history
This reverts commit b7ecef4.
  • Loading branch information
wangfei authored and FeiWang1119 committed Mar 5, 2024
1 parent 22aa466 commit d11abf9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/interface/moduleobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public Q_SLOTS:
* ModuleObject类默认处理为返回第一个未隐藏的子项
* @return 默认active的子项
*/
virtual ModuleObject *defaultModule();
virtual ModuleObject *defultModule();

public Q_SLOTS:
void setHidden(bool hidden);
Expand Down
2 changes: 1 addition & 1 deletion src/frame/mainmodule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ QWidget *MainModule::page()
return d->page();
}

ModuleObject *MainModule::defaultModule()
ModuleObject *MainModule::defultModule()
{
return nullptr;
}
2 changes: 1 addition & 1 deletion src/frame/mainmodule.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class MainModule : public ModuleObject
~MainModule() override;

QWidget *page() override;
ModuleObject *defaultModule() override;
ModuleObject *defultModule() override;
inline DCC_MODULE_TYPE getClassID() const override { return MAINLAYOUT; }

DCC_DECLARE_PRIVATE(MainModule)
Expand Down
4 changes: 2 additions & 2 deletions src/frame/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -435,15 +435,15 @@ void MainWindow::configLayout(QBoxLayout *const layout)

void MainWindow::showModule(ModuleObject *const module)
{
if (m_currentModule.contains(module) && module->defaultModule())
if (m_currentModule.contains(module) && module->defultModule())
return;

m_backwardBtn->setEnabled(module != m_rootModule);
QList<ModuleObject *> modules;

ModuleObject *child = module;
while (child) {
child->setCurrentModule(child->defaultModule());
child->setCurrentModule(child->defultModule());
modules.append(child);
child = child->currentModule();
}
Expand Down
2 changes: 1 addition & 1 deletion src/interface/moduleobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ ModuleObject *ModuleObject::currentModule() const
return d->m_currentModule;
}

ModuleObject *ModuleObject::defaultModule()
ModuleObject *ModuleObject::defultModule()
{
Q_D(const ModuleObject);
// 第一个可见项
Expand Down

0 comments on commit d11abf9

Please sign in to comment.