From 62bd9aa4da85ef87c4d9a9bb7911f8a4e0ac9986 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Mon, 18 Dec 2017 23:01:33 +0100 Subject: Moved to QtCreator project with QMake --- src/ui/Window.cpp | 33 --------------------------------- src/ui/Window.hpp | 28 ---------------------------- src/ui/mainwindow.cpp | 14 ++++++++++++++ 3 files changed, 14 insertions(+), 61 deletions(-) delete mode 100644 src/ui/Window.cpp delete mode 100644 src/ui/Window.hpp create mode 100644 src/ui/mainwindow.cpp (limited to 'src/ui') diff --git a/src/ui/Window.cpp b/src/ui/Window.cpp deleted file mode 100644 index 7f28ffe..0000000 --- a/src/ui/Window.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Window.cpp - * - * Created on: Nov 26, 2017 - * Author: naopross - */ - -#include "Window.hpp" - -#include -#include -#include - - -using namespace samb; - -Window::Window(QWidget *parent): QWidget(parent) { - setWindowTitle("OrbitingYeti"); - - QVBoxLayout *vBox = new QVBoxLayout(this); - QHBoxLayout *hBox = new QHBoxLayout(); - - m_quitBtn = new QPushButton("Quit", this); - connect(m_quitBtn, SIGNAL(clicked()), qApp, SLOT(quit())); - - hBox->addWidget(m_quitBtn, 0, Qt::AlignRight); - vBox->addStretch(1); - vBox->addLayout(hBox); -} - -Window::~Window() { - -} diff --git a/src/ui/Window.hpp b/src/ui/Window.hpp deleted file mode 100644 index 9f48f12..0000000 --- a/src/ui/Window.hpp +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Window.hpp - * - * Created on: Nov 26, 2017 - * Author: naopross - */ - -#ifndef SRC_UI_WINDOW_HPP_ -#define SRC_UI_WINDOW_HPP_ - -#include -#include - -namespace samb { - -class Window : public QWidget { -Q_OBJECT -public: - explicit Window(QWidget *parent = 0); - ~Window(); - -private: - QPushButton *m_quitBtn; -}; - -} /* namespace samb */ - -#endif /* SRC_UI_WINDOW_HPP_ */ diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp new file mode 100644 index 0000000..7e4ca77 --- /dev/null +++ b/src/ui/mainwindow.cpp @@ -0,0 +1,14 @@ +#include "ui/mainwindow.h" +#include "ui_mainwindow.h" + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::MainWindow) +{ + ui->setupUi(this); +} + +MainWindow::~MainWindow() +{ + delete ui; +} -- cgit v1.2.1