From 97f1b529acec1aefb7877eb8be41449ecd6d221c Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Thu, 29 Oct 2015 21:36:35 +0100
Subject: [PATCH] Remove obsolete class Window.

---
 Makefile       |  4 ++--
 mainwindow.cpp |  1 -
 window.cpp     | 24 ------------------------
 window.h       | 21 ---------------------
 4 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 window.cpp
 delete mode 100644 window.h

diff --git a/Makefile b/Makefile
index 2355194..b4a8a19 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations
 LDFLAGS=$(shell pkg-config --libs $(PKG_MODULES)) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lzita-resampler -lebur128
 
 # Qt objects
-OBJS=glwidget.o main.o mainwindow.o window.o vumeter.o
-OBJS += glwidget.moc.o mainwindow.moc.o window.moc.o vumeter.moc.o
+OBJS=glwidget.o main.o mainwindow.o vumeter.o
+OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o
 
 # Mixer objects
 OBJS += h264encode.o mixer.o bmusb/bmusb.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampler.o httpd.o
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 0fc17b5..afc2194 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,5 +1,4 @@
 #include "mainwindow.h"
-#include "window.h"
 #include <thread>
 #include <vector>
 #include <string>
diff --git a/window.cpp b/window.cpp
deleted file mode 100644
index 6c67f78..0000000
--- a/window.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "window.h"
-
-#include <QBoxLayout>
-#include <QString>
-
-#include "glwidget.h"
-
-Window::Window(MainWindow *mw)
-	: main_window(mw)
-{
-	gl_widget = new GLWidget;
-
-	QVBoxLayout *mainLayout = new QVBoxLayout;
-	QHBoxLayout *container = new QHBoxLayout;
-	container->addWidget(gl_widget);
-
-	QWidget *w = new QWidget;
-	w->setLayout(container);
-	mainLayout->addWidget(w);
-
-	setLayout(mainLayout);
-
-	setWindowTitle(tr("Nageru"));
-}
diff --git a/window.h b/window.h
deleted file mode 100644
index ff883f4..0000000
--- a/window.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef WINDOW_H
-#define WINDOW_H
-
-#include <QWidget>
-
-class GLWidget;
-class MainWindow;
-
-class Window : public QWidget
-{
-	Q_OBJECT
-
-public:
-	Window(MainWindow *mw);
-
-private:
-	GLWidget *gl_widget;
-	MainWindow *main_window;
-};
-
-#endif
-- 
2.39.2