Remove unnecessary MainWindow class

sailfishos · May 4, 2016 · 0a1bb5d · 0a1bb5d
1 parent 2dbcaed
commit 0a1bb5d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 101 deletions.
diff --git a/fingerterm.pro b/fingerterm.pro
@@ -30,17 +30,15 @@ HEADERS += \
     textrender.h \
     version.h \
     util.h \
-    keyloader.h \
-    mainwindow.h
+    keyloader.h
 
 SOURCES += \
     main.cpp \
     terminal.cpp \
     textrender.cpp \
     ptyiface.cpp \
     util.cpp \
-    keyloader.cpp \
-    mainwindow.cpp
+    keyloader.cpp
 
 OTHER_FILES += \
     qml/Main.qml \

diff --git a/main.cpp b/main.cpp
@@ -21,6 +21,7 @@
 
 #include <QtGui>
 #include <QtQml>
+#include <QQuickView>
 
 extern "C" {
 #include <pty.h>
@@ -30,7 +31,6 @@ extern "C" {
 #include <sys/types.h>
 }
 
-#include "mainwindow.h"
 #include "ptyiface.h"
 #include "terminal.h"
 #include "textrender.h"
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
     }
 
     qmlRegisterType<TextRender>("TextRender",1,0,"TextRender");
-    MainWindow view;
+    QQuickView view;
 
     Terminal term;
     Util util(settings);

diff --git a/mainwindow.cpp b/mainwindow.cpp
diff --git a/mainwindow.h b/mainwindow.h
diff --git a/qml/Main.qml b/qml/Main.qml
@@ -162,7 +162,7 @@ Item {
             property bool visibleSetting: true
             x: 0
             y: parent.height-vkb.height
-            visible: windowHasFocus && visibleSetting
+            visible: page.activeFocus && visibleSetting
         }
 
         // area that handles gestures/select/scroll modes and vkb-keypresses

diff --git a/util.cpp b/util.cpp
@@ -25,7 +25,6 @@
 #include <QQuickView>
 #include <QDebug>
 
-#include "mainwindow.h"
 #include "terminal.h"
 #include "util.h"
 #include "textrender.h"
@@ -52,7 +51,7 @@ Util::~Util()
 
 void Util::setWindow(QQuickView* win)
 {
-    iWindow = dynamic_cast<MainWindow*>(win);
+    iWindow = win;
     if(!iWindow)
         qFatal("invalid main window");
 }

diff --git a/util.h b/util.h
@@ -23,7 +23,6 @@
 #include <QtCore>
 
 class Terminal;
-class MainWindow;
 class TextRender;
 class QQuickView;
 
@@ -101,7 +100,7 @@ public slots:
     QString iCurrentWinTitle;
 
     QSettings* iSettings;
-    MainWindow* iWindow;
+    QQuickView* iWindow;
     Terminal* iTerm;
     TextRender* iRenderer;
 };