Fix clazy-connect-by-name warnings

This commit is contained in:
Martin Kleusberg
2021-12-27 14:54:00 +01:00
parent b76f6a6200
commit 7ad6063653
18 changed files with 303 additions and 67 deletions

View File

@@ -351,7 +351,7 @@ void AddRecordDialog::help()
QWhatsThis::enterWhatsThisMode();
}
void AddRecordDialog::on_buttonBox_clicked(QAbstractButton* button)
void AddRecordDialog::buttonBoxClicked(QAbstractButton* button)
{
if (button == ui->buttonBox->button(QDialogButtonBox::Cancel))
reject();

View File

@@ -40,7 +40,7 @@ private slots:
void accept() override;
void itemChanged(QTreeWidgetItem* item, int column);
void help();
void on_buttonBox_clicked(QAbstractButton* button);
void buttonBoxClicked(QAbstractButton* button);
private:
Ui::AddRecordDialog* ui;

View File

@@ -139,7 +139,7 @@
<sender>buttonBox</sender>
<signal>clicked(QAbstractButton*)</signal>
<receiver>AddRecordDialog</receiver>
<slot>on_buttonBox_clicked(QAbstractButton*)</slot>
<slot>buttonBoxClicked(QAbstractButton*)</slot>
<hints>
<hint type="sourcelabel">
<x>324</x>
@@ -153,6 +153,6 @@
</connection>
</connections>
<slots>
<slot>itemChanged()</slot>
<slot>buttonBoxClicked(QAbstractButton*)</slot>
</slots>
</ui>

View File

@@ -236,7 +236,7 @@ void CondFormatManager::itemClicked(QTreeWidgetItem* item, int column)
}
}
void CondFormatManager::on_buttonBox_clicked(QAbstractButton* button)
void CondFormatManager::buttonBoxClicked(QAbstractButton* button)
{
if (button == ui->buttonBox->button(QDialogButtonBox::Cancel))
reject();

View File

@@ -47,7 +47,7 @@ private slots:
void moveItem(int offset);
void upItem();
void downItem();
void on_buttonBox_clicked(QAbstractButton* button);
void buttonBoxClicked(QAbstractButton* button);
public slots:
void itemClicked(QTreeWidgetItem* item, int column);

View File

@@ -245,35 +245,22 @@
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<signal>clicked(QAbstractButton*)</signal>
<receiver>CondFormatManager</receiver>
<slot>accept()</slot>
<slot>buttonBoxClicked(QAbstractButton*)</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
<x>374</x>
<y>377</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>CondFormatManager</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
<x>374</x>
<y>199</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>buttonBoxClicked(QAbstractButton*)</slot>
</slots>
</ui>

View File

@@ -2419,13 +2419,13 @@ void MainWindow::checkNewVersion(const QString& versionstring, const QString& ur
}
}
void MainWindow::on_actionWiki_triggered() const
void MainWindow::openLinkWiki() const
{
QDesktopServices::openUrl(QUrl("https://github.com/sqlitebrowser/sqlitebrowser/wiki"));
}
// 'Help | Bug Report...' link will set an appropriate body, add the system information and set the label 'bug' automatically to the issue
void MainWindow::on_actionBug_report_triggered() const
void MainWindow::openLinkBugReport() const
{
const QString version = Application::versionString();
const QString os = QSysInfo::prettyProductName();
@@ -2464,7 +2464,7 @@ void MainWindow::on_actionBug_report_triggered() const
}
// 'Help | Feature Request...' link will set an appropriate body and add the label 'enhancement' automatically to the issue
void MainWindow::on_actionFeature_Request_triggered() const
void MainWindow::openLinkFeatureRequest() const
{
QUrlQuery query;
@@ -2478,17 +2478,17 @@ void MainWindow::on_actionFeature_Request_triggered() const
QDesktopServices::openUrl(url);
}
void MainWindow::on_actionSqlCipherFaq_triggered() const
void MainWindow::openLinkSqlCipherFaq() const
{
QDesktopServices::openUrl(QUrl("https://discuss.zetetic.net/c/sqlcipher/sqlcipher-faq"));
}
void MainWindow::on_actionWebsite_triggered() const
void MainWindow::openLinkWebsite() const
{
QDesktopServices::openUrl(QUrl("https://sqlitebrowser.org"));
}
void MainWindow::on_actionDonatePatreon_triggered() const
void MainWindow::openLinkDonatePatreon() const
{
QDesktopServices::openUrl(QUrl("https://www.patreon.com/bePatron?u=11578749"));
}

View File

@@ -202,12 +202,12 @@ private slots:
void saveSqlResultsAsView();
void loadExtension();
void checkNewVersion(const QString& versionstring, const QString& url);
void on_actionWiki_triggered() const;
void on_actionBug_report_triggered() const;
void on_actionFeature_Request_triggered() const;
void on_actionSqlCipherFaq_triggered() const;
void on_actionWebsite_triggered() const;
void on_actionDonatePatreon_triggered() const;
void openLinkWiki() const;
void openLinkBugReport() const;
void openLinkFeatureRequest() const;
void openLinkSqlCipherFaq() const;
void openLinkWebsite() const;
void openLinkDonatePatreon() const;
bool loadProject(QString filename = QString(), bool readOnly = false);
void saveProject();
void saveProjectAs();

View File

@@ -3750,6 +3750,102 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
</hint>
</hints>
</connection>
<connection>
<sender>actionWiki</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkWiki()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionBug_report</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkBugReport()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionFeature_Request</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkFeatureRequest()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionSqlCipherFaq</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkSqlCipherFaq()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionWebsite</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkWebsite()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionDonatePatreon</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>openLinkDonatePatreon()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>fileOpen()</slot>
@@ -3812,5 +3908,11 @@ You can drag SQL statements from the Schema column and drop them into the SQL ed
<slot>renameTableBrowserTab(int)</slot>
<slot>showContextMenuTableBrowserTabBar(QPoint)</slot>
<slot>newRowCountsTab()</slot>
<slot>openLinkWiki()</slot>
<slot>openLinkBugReport()</slot>
<slot>openLinkFeatureRequest()</slot>
<slot>openLinkSqlCipherFaq()</slot>
<slot>openLinkWebsite()</slot>
<slot>openLinkDonatePatreon()</slot>
</slots>
</ui>

View File

@@ -48,7 +48,6 @@ PlotDock::PlotDock(QWidget* parent)
ui->comboPointShape->setCurrentIndex(Settings::getValue("PlotDock", "pointShape").toInt());
// Connect signals
connect(ui->treePlotColumns, &QTreeWidget::itemChanged, this, &PlotDock::on_treePlotColumns_itemChanged);
connect(ui->plotWidget, &QCustomPlot::selectionChangedByUser, this, &PlotDock::selectionChanged);
// connect slots that takes care that when an axis is selected, only that direction can be dragged and zoomed:
@@ -573,7 +572,7 @@ void PlotDock::resetPlot()
updatePlot(nullptr);
}
void PlotDock::on_treePlotColumns_itemChanged(QTreeWidgetItem* changeitem, int column)
void PlotDock::columnItemChanged(QTreeWidgetItem* changeitem, int column)
{
// disable change updates, or we get unwanted redrawing and weird behavior
ui->treePlotColumns->blockSignals(true);
@@ -639,7 +638,7 @@ void PlotDock::on_treePlotColumns_itemChanged(QTreeWidgetItem* changeitem, int c
updatePlot(m_currentPlotModel, m_currentTableSettings, false);
}
void PlotDock::on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem* item, int column)
void PlotDock::columnItemDoubleClicked(QTreeWidgetItem* item, int column)
{
// disable change updates, or we get unwanted redrawing and weird behavior
ui->treePlotColumns->blockSignals(true);
@@ -684,7 +683,7 @@ void PlotDock::on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem* item, int c
updatePlot(m_currentPlotModel, m_currentTableSettings, false);
}
void PlotDock::on_butSavePlot_clicked()
void PlotDock::savePlot()
{
QString fileName = FileDialog::getSaveFileName(
CreateDataFile,
@@ -717,7 +716,7 @@ void PlotDock::on_butSavePlot_clicked()
}
}
void PlotDock::on_comboLineType_currentIndexChanged(int index)
void PlotDock::lineTypeChanged(int index)
{
Q_ASSERT(index >= QCPGraph::lsNone &&
index <= QCPGraph::lsImpulse);
@@ -760,7 +759,7 @@ void PlotDock::on_comboLineType_currentIndexChanged(int index)
}
}
void PlotDock::on_comboPointShape_currentIndexChanged(int index)
void PlotDock::pointShapeChanged(int index)
{
// WARN: because ssDot point shape is removed
if (index > 0) index += 1;

View File

@@ -112,11 +112,11 @@ private:
void adjustAxisFormat();
private slots:
void on_treePlotColumns_itemChanged(QTreeWidgetItem* item, int column);
void on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem* item, int column);
void on_butSavePlot_clicked();
void on_comboLineType_currentIndexChanged(int index);
void on_comboPointShape_currentIndexChanged(int index);
void columnItemChanged(QTreeWidgetItem* item, int column);
void columnItemDoubleClicked(QTreeWidgetItem* item, int column);
void savePlot();
void lineTypeChanged(int index);
void pointShapeChanged(int index);
void selectionChanged();
void mousePress();
void mouseWheel();

View File

@@ -366,8 +366,93 @@ Select the axes or axes labels to drag and zoom only in that orientation.</strin
</hint>
</hints>
</connection>
<connection>
<sender>treePlotColumns</sender>
<signal>itemChanged(QTreeWidgetItem*,int)</signal>
<receiver>PlotDock</receiver>
<slot>columnItemChanged(QTreeWidgetItem*,int)</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>treePlotColumns</sender>
<signal>itemDoubleClicked(QTreeWidgetItem*,int)</signal>
<receiver>PlotDock</receiver>
<slot>columnItemDoubleClicked(QTreeWidgetItem*,int)</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>butSavePlot</sender>
<signal>clicked()</signal>
<receiver>PlotDock</receiver>
<slot>savePlot()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>comboLineType</sender>
<signal>currentIndexChanged(int)</signal>
<receiver>PlotDock</receiver>
<slot>lineTypeChanged(int)</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>comboPointShape</sender>
<signal>currentIndexChanged(int)</signal>
<receiver>PlotDock</receiver>
<slot>pointShapeChanged(int)</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>fetchAllData()</slot>
<slot>columnItemChanged(QTreeWidgetItem*,int)</slot>
<slot>columnItemDoubleClicked(QTreeWidgetItem*,int)</slot>
<slot>savePlot()</slot>
<slot>lineTypeChanged(int)</slot>
<slot>pointShapeChanged(int)</slot>
</slots>
</ui>

View File

@@ -672,7 +672,7 @@ void PreferencesDialog::updatePreviewFont()
}
}
void PreferencesDialog::on_buttonManageFileExtension_clicked()
void PreferencesDialog::showFileExtensionManager()
{
FileExtensionManager *manager = new FileExtensionManager(m_dbFileExtensions, this);
@@ -682,7 +682,7 @@ void PreferencesDialog::on_buttonManageFileExtension_clicked()
}
}
void PreferencesDialog::on_buttonBox_clicked(QAbstractButton* button)
void PreferencesDialog::buttonBoxClicked(QAbstractButton* button)
{
if (button == ui->buttonBox->button(QDialogButtonBox::Cancel))
reject();

View File

@@ -48,8 +48,8 @@ private slots:
void adjustColorsToStyle(int style);
void configureProxy();
void on_buttonManageFileExtension_clicked();
void on_buttonBox_clicked(QAbstractButton* button);
void showFileExtensionManager();
void buttonBoxClicked(QAbstractButton* button);
private:
Ui::PreferencesDialog* ui;

View File

@@ -2233,7 +2233,7 @@ Can be set to 0 for disabling completion.</string>
<sender>buttonBox</sender>
<signal>clicked(QAbstractButton*)</signal>
<receiver>PreferencesDialog</receiver>
<slot>on_buttonBox_clicked(QAbstractButton*)</slot>
<slot>buttonBoxClicked(QAbstractButton*)</slot>
<hints>
<hint type="sourcelabel">
<x>394</x>
@@ -2261,6 +2261,22 @@ Can be set to 0 for disabling completion.</string>
</hint>
</hints>
</connection>
<connection>
<sender>buttonManageFileExtension</sender>
<signal>clicked()</signal>
<receiver>PreferencesDialog</receiver>
<slot>showFileExtensionManager()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>saveSettings()</slot>
@@ -2273,5 +2289,7 @@ Can be set to 0 for disabling completion.</string>
<slot>removeClientCertificate()</slot>
<slot>chooseRemoteCloneDirectory()</slot>
<slot>configureProxy()</slot>
<slot>buttonBoxClicked()</slot>
<slot>showFileExtensionManager()</slot>
</slots>
</ui>

View File

@@ -823,7 +823,7 @@ void TableBrowser::applyViewportSettings(const BrowseDataTableSettings& storedDa
unlockViewEditing(!storedData.unlockViewPk.isEmpty() && storedData.unlockViewPk != "_rowid_", storedData.unlockViewPk);
// Column hidden status
on_actionShowAllColumns_triggered();
showAllColumns();
for(auto hiddenIt=storedData.hiddenColumns.cbegin();hiddenIt!=storedData.hiddenColumns.cend();++hiddenIt)
hideColumns(hiddenIt->first, hiddenIt->second);
@@ -1064,7 +1064,7 @@ void TableBrowser::hideColumns(int column, bool hide)
emit projectModified();
}
void TableBrowser::on_actionShowAllColumns_triggered()
void TableBrowser::showAllColumns()
{
for(int col = 1; col < ui->dataTable->model()->columnCount(); col++)
{
@@ -1377,12 +1377,7 @@ void TableBrowser::selectTableLine(int lineToSelect)
ui->dataTable->selectTableLine(lineToSelect);
}
void TableBrowser::on_actionClearFilters_triggered()
{
clearFilters();
}
void TableBrowser::on_actionClearSorting_triggered()
void TableBrowser::clearSorting()
{
// Get the current list of sort columns
auto& columns = m_settings[currentlyBrowsedTableName()].sortColumns;

View File

@@ -111,7 +111,7 @@ private slots:
void freezeColumns(size_t columns);
void unlockViewEditing(bool unlock, QString pk = QString());
void hideColumns(int column = -1, bool hide = true);
void on_actionShowAllColumns_triggered();
void showAllColumns();
void updateInsertDeleteRecordButton();
void duplicateRecord(int currentRow);
void headerClicked(int logicalindex);
@@ -127,8 +127,7 @@ private slots:
void navigateEnd();
void navigateGoto();
void selectTableLine(int lineToSelect);
void on_actionClearFilters_triggered();
void on_actionClearSorting_triggered();
void clearSorting();
void editDisplayFormat();
void exportCsvFilteredTable();
void exportJsonFilteredTable();

View File

@@ -1446,6 +1446,54 @@
</hint>
</hints>
</connection>
<connection>
<sender>actionClearFilters</sender>
<signal>triggered()</signal>
<receiver>TableBrowser</receiver>
<slot>clearFilters()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionClearSorting</sender>
<signal>triggered()</signal>
<receiver>TableBrowser</receiver>
<slot>clearSorting()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
<connection>
<sender>actionShowAllColumns</sender>
<signal>triggered()</signal>
<receiver>TableBrowser</receiver>
<slot>showAllColumns()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>-1</x>
<y>-1</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>refresh()</slot>
@@ -1467,5 +1515,8 @@
<slot>setDefaultTableEncoding()</slot>
<slot>hideColumns()</slot>
<slot>setTableEncoding()</slot>
<slot>clearFilters()</slot>
<slot>clearSorting()</slot>
<slot>showAllColumns()</slot>
</slots>
</ui>