change the base object of Finder and LogViewer from QObject to QWidget to attach it's lifecycle

Author: 魏鹏

finder.cpp

@@ -1,9 +1,8 @@
 #include "finder.h"
 
 Finder::Finder(QWidget *parent):
-    QObject(parent),
-    mDockWidget(new QDockWidget("finder", parent)),
-    mRootWidget(new QWidget(mDockWidget)),
+    QDockWidget("finder", parent),
+    mRootWidget(new QWidget(this)),
     mMainLayout(new QHBoxLayout(mRootWidget)),
     mRegModeBox(new QCheckBox("regular mode", mRootWidget)),
     mCaseSenseBox(new QCheckBox("case sensitively", mRootWidget)),
@@ -22,18 +21,13 @@ Finder::Finder(QWidget *parent):
 
     mRootWidget->setLayout(mMainLayout);
 
-    mDockWidget->setWidget(mRootWidget);
+    setWidget(mRootWidget);
 
     // setting
     connect(mFindButton, &QPushButton::clicked, this, &Finder::onFindButtonClicked);
     connect(mFindPreButton, &QPushButton::clicked, this, &Finder::onFindPreButtonClicked);
 }
 
-QDockWidget * Finder::dockWidget()
-{
-    return mDockWidget;
-}
-
 void Finder::onFindButtonClicked()
 {
     onFindTriggered(false);

finder.h

@@ -15,15 +15,13 @@
 #include <QString>
 
 
-class Finder : public QObject
+class Finder : public QDockWidget
 {
     Q_OBJECT
 
 public:
     Finder(QWidget *parent);
 
-    QDockWidget *dockWidget();
-
 signals:
     void findTriggered(const QString &exp, const QTextDocument::FindFlags &options, bool regMode);
 
@@ -35,7 +33,6 @@ private slots:
     void onFindTriggered(bool backward);
 
 private:
-    QDockWidget *mDockWidget;
     QWidget *mRootWidget;
     QLayout *mMainLayout;
 

highlighter.cpp

@@ -1,7 +1,7 @@
 #include "highlighter.h"
 
-Highlighter::Highlighter(QObject *parent):
-    QObject(parent)
+Highlighter::Highlighter(QWidget *parent):
+    QDockWidget(parent)
 {
 
 }

highlighter.h

@@ -4,14 +4,15 @@
 #include <QObject>
 #include <QSharedPointer>
 #include <QSyntaxHighlighter>
+#include <QDockWidget>
 
 
-class Highlighter : public QObject
+class Highlighter : public QDockWidget
 {
     Q_OBJECT
 
 public:
-    explicit Highlighter(QObject *parent = nullptr);
+    explicit Highlighter(QWidget *parent = nullptr);
 
     QSharedPointer<QSyntaxHighlighter> logHighlighter();
 

logviewer.cpp

@@ -1,18 +1,19 @@
 #include "logviewer.h"
 
 LogViewer::LogViewer(QWidget *parent):
-    QObject(parent),
-    mRootWidget(new QWidget(parent)),
-    mRootLayout(new QGridLayout(mRootWidget)),
-    mMainTabWidget(new QTabWidget(mRootWidget)),
+    QWidget(parent),
+    mRootLayout(new QGridLayout(this)),
+    mMainTabWidget(new QTabWidget(this)),
     mViewportList(new QVector<Viewport *>()),
     mCurrentIndex(0)
 {
     // set layout
     mMainTabWidget->setContentsMargins(QMargins());
     mRootLayout->addWidget(mMainTabWidget);
     mRootLayout->setContentsMargins(QMargins());
-    mRootWidget->setLayout(mRootLayout);
+    setLayout(mRootLayout);
+
+    mMainTabWidget->setTabsClosable(true);
 }
 
 LogViewer::~LogViewer()
@@ -24,16 +25,11 @@ LogViewer::~LogViewer()
     delete mViewportList;
 }
 
-QWidget *LogViewer::rootWidget()
-{
-    return mRootWidget;
-}
-
 void LogViewer::addViewport(QString title)
 {
     Viewport *viewport;
 
-    viewport = new Viewport(title, new QPlainTextEdit(mRootWidget));
+    viewport = new Viewport(title, new QPlainTextEdit(this));
 
     mViewportList->append(viewport);
     mMainTabWidget->addTab(viewport->textEdit, viewport->title);

logviewer.h

@@ -23,7 +23,7 @@
 #include <QSharedPointer>
 
 
-class LogViewer : public QObject
+class LogViewer : public QWidget
 {
     Q_OBJECT
 
@@ -43,7 +43,6 @@ class LogViewer : public QObject
     LogViewer(QWidget *parent);
     virtual ~LogViewer();
 
-    QWidget *rootWidget();
     void addViewport(QString title = "default.txt");
     void setHighlighter(QSharedPointer<QSyntaxHighlighter> highlighter);
 
@@ -54,7 +53,6 @@ private slots:
     void highlightCurrentLine();
 
 private:
-    QWidget *mRootWidget;
     QLayout *mRootLayout;
     QTabWidget *mMainTabWidget;
     QVector<Viewport *> *mViewportList;

mainwindow.cpp

@@ -7,8 +7,8 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     setWindowTitle("VisualLog");
     mLogViewer->addViewport();
-    setCentralWidget(mLogViewer->rootWidget());
-    addDockWidget(Qt::DockWidgetArea::BottomDockWidgetArea, mFinder->dockWidget());
+    setCentralWidget(mLogViewer);
+    addDockWidget(Qt::DockWidgetArea::BottomDockWidgetArea, mFinder);
 
     connect(mFinder, &Finder::findTriggered, mLogViewer, &LogViewer::find);
 }