aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/diagram/branchstatement.hpp (renamed from src/diagram/BranchStatement.hpp)0
-rw-r--r--include/diagram/iteratorstatement.hpp (renamed from src/diagram/IteratorStatement.hpp)0
-rw-r--r--include/diagram/scope.hpp (renamed from src/diagram/Scope.hpp)0
-rw-r--r--include/diagram/statement.hpp (renamed from src/diagram/Statement.hpp)0
-rw-r--r--include/diagram/structogram.hpp (renamed from src/diagram/Structogram.hpp)0
-rw-r--r--src/diagram/branchstatement.cpp (renamed from src/diagram/BranchStatement.cpp)9
-rw-r--r--src/diagram/iteratorstatement.cpp (renamed from src/diagram/IteratorStatement.cpp)9
-rw-r--r--src/diagram/scope.cpp (renamed from src/diagram/Scope.cpp)7
-rw-r--r--src/diagram/statement.cpp (renamed from src/diagram/Statement.cpp)9
-rw-r--r--src/main.cpp28
-rw-r--r--src/ui/Window.cpp33
-rw-r--r--src/ui/Window.hpp28
-rw-r--r--src/ui/mainwindow.cpp14
13 files changed, 25 insertions, 112 deletions
diff --git a/src/diagram/BranchStatement.hpp b/include/diagram/branchstatement.hpp
index b7cc495..b7cc495 100644
--- a/src/diagram/BranchStatement.hpp
+++ b/include/diagram/branchstatement.hpp
diff --git a/src/diagram/IteratorStatement.hpp b/include/diagram/iteratorstatement.hpp
index a14d78d..a14d78d 100644
--- a/src/diagram/IteratorStatement.hpp
+++ b/include/diagram/iteratorstatement.hpp
diff --git a/src/diagram/Scope.hpp b/include/diagram/scope.hpp
index bf85759..bf85759 100644
--- a/src/diagram/Scope.hpp
+++ b/include/diagram/scope.hpp
diff --git a/src/diagram/Statement.hpp b/include/diagram/statement.hpp
index ab8c5b7..ab8c5b7 100644
--- a/src/diagram/Statement.hpp
+++ b/include/diagram/statement.hpp
diff --git a/src/diagram/Structogram.hpp b/include/diagram/structogram.hpp
index 84a4b84..84a4b84 100644
--- a/src/diagram/Structogram.hpp
+++ b/include/diagram/structogram.hpp
diff --git a/src/diagram/BranchStatement.cpp b/src/diagram/branchstatement.cpp
index 6345c1b..2835f35 100644
--- a/src/diagram/BranchStatement.cpp
+++ b/src/diagram/branchstatement.cpp
@@ -1,11 +1,4 @@
-/*
- * BranchStatement.cpp
- *
- * Created on: Nov 28, 2017
- * Author: naopross
- */
-
-#include "BranchStatement.hpp"
+#include "diagram/BranchStatement.hpp"
using namespace samb;
diff --git a/src/diagram/IteratorStatement.cpp b/src/diagram/iteratorstatement.cpp
index 02a7318..675d8eb 100644
--- a/src/diagram/IteratorStatement.cpp
+++ b/src/diagram/iteratorstatement.cpp
@@ -1,11 +1,4 @@
-/*
- * IteratorStatement.cpp
- *
- * Created on: Nov 28, 2017
- * Author: naopross
- */
-
-#include "IteratorStatement.hpp"
+#include "diagram/IteratorStatement.hpp"
using namespace samb;
diff --git a/src/diagram/Scope.cpp b/src/diagram/scope.cpp
index 721ee4b..a1074a3 100644
--- a/src/diagram/Scope.cpp
+++ b/src/diagram/scope.cpp
@@ -1,9 +1,4 @@
-/*
- * Created on: Nov 28, 2017
- * Author: naopross
- */
-
-#include "Scope.hpp"
+#include "diagram/Scope.hpp"
using namespace samb;
diff --git a/src/diagram/Statement.cpp b/src/diagram/statement.cpp
index 711bcf4..9cbcdb4 100644
--- a/src/diagram/Statement.cpp
+++ b/src/diagram/statement.cpp
@@ -1,11 +1,4 @@
-/*
- * Statement.cpp
- *
- * Created on: Nov 23, 2017
- * Author: naopross
- */
-
-#include "Statement.hpp"
+#include "diagram/Statement.hpp"
using namespace samb;
diff --git a/src/main.cpp b/src/main.cpp
index b4a143b..a425e2f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,26 +1,12 @@
-#include "diagram/Structogram.hpp"
-#include "ui/Window.hpp"
-
-#include <iostream>
-#include <memory>
-
+#include "ui/mainwindow.h"
#include <QApplication>
+int main(int argc, char *argv[])
+{
+ QApplication a(argc, argv);
-using namespace samb;
-
-int main(int argc, char *argv[]) {
-
- QApplication app(argc, argv);
-
- Window window;
- window.show();
+ MainWindow w;
+ w.show();
- Structogram st("Example");
-
- return app.exec();
+ return a.exec();
}
-
-
-
-
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 <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QApplication>
-
-
-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 <QWidget>
-#include <QPushButton>
-
-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;
+}