From e32a7a2c94fd97f25f3f66d52d38106b09317138 Mon Sep 17 00:00:00 2001 From: Xiao YiFang Date: Wed, 12 Apr 2023 20:26:57 +0800 Subject: [PATCH] fix:remove custom treeview class --- CMakeLists.txt | 2 -- favoritespanewidget.cc | 2 +- favoritespanewidget.hh | 5 +++-- goldendict.pro | 2 -- mainwindow.ui | 7 +------ treeview.cc | 10 ---------- treeview.hh | 20 -------------------- 7 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 treeview.cc delete mode 100644 treeview.hh diff --git a/CMakeLists.txt b/CMakeLists.txt index f72e9809..aacbe00a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,8 +410,6 @@ set(PROJECT_SOURCES translatebox.hh transliteration.cc transliteration.hh - treeview.cc - treeview.hh ufile.cc ufile.hh utf8.cc diff --git a/favoritespanewidget.cc b/favoritespanewidget.cc index 588992c2..ff2fdb9e 100644 --- a/favoritespanewidget.cc +++ b/favoritespanewidget.cc @@ -21,7 +21,7 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu ) { m_cfg = cfg; - m_favoritesTree = findChild< TreeView * >( "favoritesTree" ); + m_favoritesTree = findChild< QTreeView * >( "favoritesTree" ); QDockWidget * favoritesPane = qobject_cast< QDockWidget * >( parentWidget() ); m_favoritesTree->setHeaderHidden( true ); diff --git a/favoritespanewidget.hh b/favoritespanewidget.hh index d9848767..9c4db26e 100644 --- a/favoritespanewidget.hh +++ b/favoritespanewidget.hh @@ -13,10 +13,11 @@ #include #include #include +#include +#include #include #include "delegate.hh" -#include "treeview.hh" class FavoritesModel; @@ -78,7 +79,7 @@ private: virtual bool eventFilter( QObject *, QEvent * ); Config::Class * m_cfg ; - TreeView * m_favoritesTree; + QTreeView * m_favoritesTree; QMenu * m_favoritesMenu; QAction * m_deleteSelectedAction; QAction * m_separator; diff --git a/goldendict.pro b/goldendict.pro index 4c6d3ffc..a70434fe 100644 --- a/goldendict.pro +++ b/goldendict.pro @@ -404,7 +404,6 @@ HEADERS += folding.hh \ gls.hh \ splitfile.hh \ favoritespanewidget.hh \ - treeview.hh \ src/dict/lingualibre.h \ src/ui/articleview.h \ src/ui/ftssearchpanel.h \ @@ -540,7 +539,6 @@ SOURCES += folding.cc \ gls.cc \ splitfile.cc \ favoritespanewidget.cc \ - treeview.cc \ src/dict/lingualibre.cpp \ src/ui/articleview.cpp \ src/ui/ftssearchpanel.cpp \ diff --git a/mainwindow.ui b/mainwindow.ui index 578f1084..467ed55b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -252,7 +252,7 @@ 1 - + @@ -624,11 +624,6 @@
favoritespanewidget.hh
1 - - TreeView - QTreeView -
treeview.hh
-
translateLine diff --git a/treeview.cc b/treeview.cc deleted file mode 100644 index b4a22aed..00000000 --- a/treeview.cc +++ /dev/null @@ -1,10 +0,0 @@ -/* This file is (c) 2008-2018 Abs62 - * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ - -#include -#include "treeview.hh" - -void TreeView::dropEvent( QDropEvent * event ) -{ - QTreeView::dropEvent( event ); -} diff --git a/treeview.hh b/treeview.hh deleted file mode 100644 index ec3da9a2..00000000 --- a/treeview.hh +++ /dev/null @@ -1,20 +0,0 @@ -/* This file is (c) 2008-2018 Abs62 - * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */ - -#ifndef __TREEVIEW_HH__INCLUDED -#define __TREEVIEW_HH__INCLUDED - -#include - -class TreeView : public QTreeView -{ -public: - TreeView( QWidget * parent = 0 ) : - QTreeView( parent ) - {} - -protected: - virtual void dropEvent( QDropEvent * event ); -}; - -#endif // TREEVIEW_HH