noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

asd

Browse source
This commit is contained in:
fourtf 2016-12-30 12:46:03 +01:00
parent bbc1b53c89
commit 42b5de161d
3 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chatterino.pro
View file

@ -38,4 +38,4 @@ HEADERS += mainwindow.h \
notebookpage.h \ notebookpage.h \
notebookbutton.h notebookbutton.h
FORMS += mainwindow.ui FORMS +=

10
mainwindow.cpp
View file

@ -1,19 +1,11 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h"
#include "chatwidget.h" #include "chatwidget.h"
#include "notebook.h" #include "notebook.h"
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow),
notebook(this) notebook(this)
{ {
//ui->setupUi(this);
//ChatWidget widget = new ChatWidget(this);
//this->notebook = new Notebook(this);
setCentralWidget(&this->notebook); setCentralWidget(&this->notebook);
this->notebook.addPage(); this->notebook.addPage();
@ -23,5 +15,5 @@ MainWindow::MainWindow(QWidget *parent) :
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
delete ui;
} }

7
mainwindow.h
View file

@ -4,10 +4,6 @@
#include <QMainWindow> #include <QMainWindow>
#include "notebook.h" #include "notebook.h"
namespace Ui {
class MainWindow;
}
class MainWindow : public QMainWindow class MainWindow : public QMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -16,9 +12,6 @@ public:
explicit MainWindow(QWidget *parent = 0); explicit MainWindow(QWidget *parent = 0);
~MainWindow(); ~MainWindow();
Notebook notebook; Notebook notebook;
private:
Ui::MainWindow *ui;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H