mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 23:34:06 +00:00
clean: convert a few trivial old SIGNAL/SLOT to new syntax
This commit is contained in:
parent
7e93d787b5
commit
35f39ea7a0
|
@ -246,8 +246,8 @@ FullTextSearchDialog::FullTextSearchDialog( QWidget * parent,
|
||||||
|
|
||||||
connect( this, &QDialog::finished, this, &FullTextSearchDialog::saveData );
|
connect( this, &QDialog::finished, this, &FullTextSearchDialog::saveData );
|
||||||
|
|
||||||
connect( ui.OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
|
connect( ui.OKButton, &QPushButton::clicked, this, &QDialog::accept );
|
||||||
connect( ui.cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
|
connect( ui.cancelButton, &QPushButton::clicked, this, &QDialog::reject );
|
||||||
|
|
||||||
|
|
||||||
helpAction.setShortcut( QKeySequence( "F1" ) );
|
helpAction.setShortcut( QKeySequence( "F1" ) );
|
||||||
|
|
|
@ -176,7 +176,7 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
|
||||||
|
|
||||||
connect( webview, &QWidget::customContextMenuRequested, this, &ArticleView::contextMenuRequested );
|
connect( webview, &QWidget::customContextMenuRequested, this, &ArticleView::contextMenuRequested );
|
||||||
|
|
||||||
connect( webview->page(), SIGNAL( linkHovered( const QString & ) ), this, SLOT( linkHovered( const QString & ) ) );
|
connect( webview->page(), &QWebEnginePage::linkHovered, this, &ArticleView::linkHovered );
|
||||||
|
|
||||||
connect( webview, &ArticleWebView::doubleClicked, this, &ArticleView::doubleClicked );
|
connect( webview, &ArticleWebView::doubleClicked, this, &ArticleView::doubleClicked );
|
||||||
|
|
||||||
|
|
|
@ -113,9 +113,9 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
|
||||||
connect( m_favoritesTree, &QAbstractItemView::clicked, this, &FavoritesPaneWidget::onItemClicked );
|
connect( m_favoritesTree, &QAbstractItemView::clicked, this, &FavoritesPaneWidget::onItemClicked );
|
||||||
|
|
||||||
connect( m_favoritesTree->selectionModel(),
|
connect( m_favoritesTree->selectionModel(),
|
||||||
SIGNAL( selectionChanged( QItemSelection const &, QItemSelection const & ) ),
|
&QItemSelectionModel::selectionChanged,
|
||||||
this,
|
this,
|
||||||
SLOT( onSelectionChanged( QItemSelection const & ) ) );
|
&FavoritesPaneWidget::onSelectionChanged );
|
||||||
|
|
||||||
connect( m_favoritesTree, &QWidget::customContextMenuRequested, this, &FavoritesPaneWidget::showCustomMenu );
|
connect( m_favoritesTree, &QWidget::customContextMenuRequested, this, &FavoritesPaneWidget::showCustomMenu );
|
||||||
}
|
}
|
||||||
|
@ -196,8 +196,10 @@ void FavoritesPaneWidget::showCustomMenu(QPoint const & pos)
|
||||||
m_favoritesMenu->exec( m_favoritesTree->mapToGlobal( pos ) );
|
m_favoritesMenu->exec( m_favoritesTree->mapToGlobal( pos ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
void FavoritesPaneWidget::onSelectionChanged( QItemSelection const & selection )
|
void FavoritesPaneWidget::onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected )
|
||||||
{
|
{
|
||||||
|
Q_UNUSED( deselected )
|
||||||
|
|
||||||
if ( m_favoritesTree->selectionModel()->selectedIndexes().size() != 1
|
if ( m_favoritesTree->selectionModel()->selectedIndexes().size() != 1
|
||||||
|| selection.indexes().isEmpty() )
|
|| selection.indexes().isEmpty() )
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -68,7 +68,7 @@ protected:
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void emitFavoritesItemRequested(QModelIndex const &);
|
void emitFavoritesItemRequested(QModelIndex const &);
|
||||||
void onSelectionChanged(QItemSelection const & selection);
|
void onSelectionChanged( const QItemSelection & selected, const QItemSelection & deselected );
|
||||||
void onItemClicked(QModelIndex const & idx);
|
void onItemClicked(QModelIndex const & idx);
|
||||||
void showCustomMenu(QPoint const & pos);
|
void showCustomMenu(QPoint const & pos);
|
||||||
void deleteSelectedItems();
|
void deleteSelectedItems();
|
||||||
|
|
|
@ -78,8 +78,10 @@ void HistoryPaneWidget::setUp( Config::Class * cfg, History * history, QMenu *
|
||||||
// list selection and keyboard navigation
|
// list selection and keyboard navigation
|
||||||
connect( m_historyList, &QAbstractItemView::clicked, this, &HistoryPaneWidget::onItemClicked );
|
connect( m_historyList, &QAbstractItemView::clicked, this, &HistoryPaneWidget::onItemClicked );
|
||||||
connect( m_history, &History::itemsChanged, this, &HistoryPaneWidget::updateHistoryCounts );
|
connect( m_history, &History::itemsChanged, this, &HistoryPaneWidget::updateHistoryCounts );
|
||||||
connect ( m_historyList->selectionModel(), SIGNAL( selectionChanged ( QItemSelection const & , QItemSelection const & ) ),
|
connect( m_historyList->selectionModel(),
|
||||||
this, SLOT( onSelectionChanged( QItemSelection const & ) ) );
|
&QItemSelectionModel::selectionChanged,
|
||||||
|
this,
|
||||||
|
&HistoryPaneWidget::onSelectionChanged );
|
||||||
|
|
||||||
connect( m_historyList, &QWidget::customContextMenuRequested, this, &HistoryPaneWidget::showCustomMenu );
|
connect( m_historyList, &QWidget::customContextMenuRequested, this, &HistoryPaneWidget::showCustomMenu );
|
||||||
|
|
||||||
|
@ -188,9 +190,9 @@ void HistoryPaneWidget::emitHistoryItemRequested( QModelIndex const & idx )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HistoryPaneWidget::onSelectionChanged( QItemSelection const & selection )
|
void HistoryPaneWidget::onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected )
|
||||||
{
|
{
|
||||||
// qDebug() << "selectionChanged";
|
Q_UNUSED( deselected );
|
||||||
|
|
||||||
if ( selection.empty() )
|
if ( selection.empty() )
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -40,7 +40,7 @@ public slots:
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void emitHistoryItemRequested(QModelIndex const &);
|
void emitHistoryItemRequested(QModelIndex const &);
|
||||||
void onSelectionChanged(QItemSelection const & selection);
|
void onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected );
|
||||||
void onItemClicked(QModelIndex const & idx);
|
void onItemClicked(QModelIndex const & idx);
|
||||||
void showCustomMenu(QPoint const & pos);
|
void showCustomMenu(QPoint const & pos);
|
||||||
void deleteSelectedItems();
|
void deleteSelectedItems();
|
||||||
|
|
|
@ -108,8 +108,10 @@ OrderAndProps::OrderAndProps( QWidget * parent,
|
||||||
connect( ui.dictionaryOrder, &DictListWidget::gotFocus, this, &OrderAndProps::dictListFocused );
|
connect( ui.dictionaryOrder, &DictListWidget::gotFocus, this, &OrderAndProps::dictListFocused );
|
||||||
connect( ui.inactiveDictionaries, &DictListWidget::gotFocus, this, &OrderAndProps::inactiveDictListFocused );
|
connect( ui.inactiveDictionaries, &DictListWidget::gotFocus, this, &OrderAndProps::inactiveDictListFocused );
|
||||||
|
|
||||||
connect ( ui.dictionaryOrder->selectionModel(), SIGNAL( selectionChanged ( const QItemSelection & , const QItemSelection & ) ),
|
connect( ui.dictionaryOrder->selectionModel(),
|
||||||
this, SLOT( dictionarySelectionChanged( const QItemSelection & ) ) );
|
&QItemSelectionModel::selectionChanged,
|
||||||
|
this,
|
||||||
|
&OrderAndProps::dictionarySelectionChanged );
|
||||||
connect( ui.inactiveDictionaries->selectionModel(),
|
connect( ui.inactiveDictionaries->selectionModel(),
|
||||||
&QItemSelectionModel::selectionChanged,
|
&QItemSelectionModel::selectionChanged,
|
||||||
this,
|
this,
|
||||||
|
@ -158,8 +160,10 @@ void OrderAndProps::inactiveDictListFocused()
|
||||||
describeDictionary( ui.inactiveDictionaries, ui.inactiveDictionaries->currentIndex() );
|
describeDictionary( ui.inactiveDictionaries, ui.inactiveDictionaries->currentIndex() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void OrderAndProps::dictionarySelectionChanged( const QItemSelection & current )
|
void OrderAndProps::dictionarySelectionChanged( const QItemSelection & current, const QItemSelection & deselected )
|
||||||
{
|
{
|
||||||
|
Q_UNUSED( deselected )
|
||||||
|
|
||||||
if ( current.empty() )
|
if ( current.empty() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,7 @@ public:
|
||||||
Config::Group getCurrentInactiveDictionaries() const;
|
Config::Group getCurrentInactiveDictionaries() const;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void dictionarySelectionChanged( const QItemSelection & current, const QItemSelection & deselected );
|
||||||
void dictionarySelectionChanged( const QItemSelection ¤t );
|
|
||||||
void inactiveDictionarySelectionChanged( const QItemSelection ¤t );
|
void inactiveDictionarySelectionChanged( const QItemSelection ¤t );
|
||||||
void contextMenuRequested( const QPoint & pos );
|
void contextMenuRequested( const QPoint & pos );
|
||||||
void filterChanged( QString const & filterText );
|
void filterChanged( QString const & filterText );
|
||||||
|
|
Loading…
Reference in a new issue