From ec2de650051ee68bbac88f6e13b53a325d105df2 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Mon, 15 Apr 2019 03:07:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D0=BB=D0=B5=D0=B4=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=82=20QMainWindow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 6 +++--- src/cmex/my_main_window.cpp | 4 ++-- src/cmex/my_main_window.hpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 177c834..5d71e9d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "cmake/cmlib"] path = cmake/cmlib - url = ../../f1x1t/cmlib + url = ssh://git@gitlab.2/f1x1t/cmlib [submodule "cmake/generators"] path = cmake/generators - url = ../../f1x1t/cmake-generators + url = ssh://git@gitlab.2/f1x1t/cmake-generators [submodule "cmake/find"] path = cmake/find - url = ../../f1x1t/cmake-find + url = ssh://git@gitlab.2/f1x1t/cmake-find diff --git a/src/cmex/my_main_window.cpp b/src/cmex/my_main_window.cpp index b595fde..255defc 100644 --- a/src/cmex/my_main_window.cpp +++ b/src/cmex/my_main_window.cpp @@ -1,7 +1,7 @@ #include "my_main_window.hpp" -MyMainWindow::MyMainWindow(QWidget* parent) { - +MyMainWindow::MyMainWindow(QMainWindow* parent) { + Q_UNUSED(parent) } MyMainWindow::~MyMainWindow() { diff --git a/src/cmex/my_main_window.hpp b/src/cmex/my_main_window.hpp index 79f6aa5..1396533 100644 --- a/src/cmex/my_main_window.hpp +++ b/src/cmex/my_main_window.hpp @@ -5,12 +5,12 @@ #include "ui_my_main_window.h" //! @brief Главное окно -class MyMainWindow : public QWidget, private Ui::MyMainWindow { +class MyMainWindow : public QMainWindow, private Ui::MyMainWindow { Q_OBJECT public: //! @brief Конструктор //! @param parent Ссылка на родительский объект - MyMainWindow(QWidget* parent = nullptr); + MyMainWindow(QMainWindow* parent = nullptr); //! @brief Деструктор virtual ~MyMainWindow();