From 42b5de161d8dcdc5ed7bbe6fda0e10443f492303 Mon Sep 17 00:00:00 2001 From: fourtf Date: Fri, 30 Dec 2016 12:46:03 +0100 Subject: [PATCH] asd --- chatterino.pro | 2 +- mainwindow.cpp | 10 +--------- mainwindow.h | 7 ------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/chatterino.pro b/chatterino.pro index c24d5129..6bd55e9c 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -38,4 +38,4 @@ HEADERS += mainwindow.h \ notebookpage.h \ notebookbutton.h -FORMS += mainwindow.ui +FORMS += diff --git a/mainwindow.cpp b/mainwindow.cpp index 70679785..d10c783f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,19 +1,11 @@ #include "mainwindow.h" -#include "ui_mainwindow.h" #include "chatwidget.h" #include "notebook.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), - ui(new Ui::MainWindow), notebook(this) { - //ui->setupUi(this); - - //ChatWidget widget = new ChatWidget(this); - - //this->notebook = new Notebook(this); - setCentralWidget(&this->notebook); this->notebook.addPage(); @@ -23,5 +15,5 @@ MainWindow::MainWindow(QWidget *parent) : MainWindow::~MainWindow() { - delete ui; + } diff --git a/mainwindow.h b/mainwindow.h index 3ad87afd..6305366c 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -4,10 +4,6 @@ #include #include "notebook.h" -namespace Ui { -class MainWindow; -} - class MainWindow : public QMainWindow { Q_OBJECT @@ -16,9 +12,6 @@ public: explicit MainWindow(QWidget *parent = 0); ~MainWindow(); Notebook notebook; - -private: - Ui::MainWindow *ui; }; #endif // MAINWINDOW_H