Наследование от QMainWindow

This commit is contained in:
Andrei Astafev 2019-04-15 03:07:20 +03:00
parent 0bcba3d5de
commit ec2de65005
3 changed files with 7 additions and 7 deletions

6
.gitmodules vendored
View File

@ -1,9 +1,9 @@
[submodule "cmake/cmlib"] [submodule "cmake/cmlib"]
path = cmake/cmlib path = cmake/cmlib
url = ../../f1x1t/cmlib url = ssh://git@gitlab.2/f1x1t/cmlib
[submodule "cmake/generators"] [submodule "cmake/generators"]
path = cmake/generators path = cmake/generators
url = ../../f1x1t/cmake-generators url = ssh://git@gitlab.2/f1x1t/cmake-generators
[submodule "cmake/find"] [submodule "cmake/find"]
path = cmake/find path = cmake/find
url = ../../f1x1t/cmake-find url = ssh://git@gitlab.2/f1x1t/cmake-find

View File

@ -1,7 +1,7 @@
#include "my_main_window.hpp" #include "my_main_window.hpp"
MyMainWindow::MyMainWindow(QWidget* parent) { MyMainWindow::MyMainWindow(QMainWindow* parent) {
Q_UNUSED(parent)
} }
MyMainWindow::~MyMainWindow() { MyMainWindow::~MyMainWindow() {

View File

@ -5,12 +5,12 @@
#include "ui_my_main_window.h" #include "ui_my_main_window.h"
//! @brief Главное окно //! @brief Главное окно
class MyMainWindow : public QWidget, private Ui::MyMainWindow { class MyMainWindow : public QMainWindow, private Ui::MyMainWindow {
Q_OBJECT Q_OBJECT
public: public:
//! @brief Конструктор //! @brief Конструктор
//! @param parent Ссылка на родительский объект //! @param parent Ссылка на родительский объект
MyMainWindow(QWidget* parent = nullptr); MyMainWindow(QMainWindow* parent = nullptr);
//! @brief Деструктор //! @brief Деструктор
virtual ~MyMainWindow(); virtual ~MyMainWindow();