From 7e493f6cb4a1035b4d9b6e320ab4dffae79184ae Mon Sep 17 00:00:00 2001 From: xarkes <antide.petit@gmail.com> Date: Sat, 2 Sep 2017 10:46:48 +0200 Subject: [PATCH] Warning removing --- src/mainwindow.cpp | 8 ++++---- src/mainwindow.h | 4 ++-- src/mainwindow.ui | 9 +++++++++ src/widgets/commentswidget.h | 4 ++-- src/widgets/memorywidget.cpp | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a6fbc036..d65b555a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -149,7 +149,7 @@ void MainWindow::initUI() backButton->setIcon(QIcon(":/img/icons/arrow_left.svg")); //backButton->setPopupMode(QToolButton::DelayedPopup); ui->mainToolBar->insertWidget(ui->actionForward, backButton); - connect(backButton, SIGNAL(clicked()), this, SLOT(on_backButton_clicked())); + connect(backButton, SIGNAL(clicked()), this, SLOT(backButton_clicked())); // Sepparator between undo/redo and goto lineEdit QWidget *spacer3 = new QWidget(); @@ -193,7 +193,7 @@ void MainWindow::initUI() if (syntax == checked) { action->setChecked(true); } - connect(action, SIGNAL(triggered(bool)), this, SLOT(on_actionAsm_syntax_triggered())); + connect(action, SIGNAL(triggered()), this, SLOT(actionAsm_syntax_triggered())); asmSyntaxes.append(action); ui->menuAsm_syntax->addAction(action); } @@ -806,7 +806,7 @@ void MainWindow::refreshMem() } -void MainWindow::on_backButton_clicked() +void MainWindow::backButton_clicked() { QList<RVA> seek_history = core->getSeekHistory(); this->core->cmd("s-"); @@ -1111,7 +1111,7 @@ void MainWindow::on_actionDisplay_Offsets_triggered() refreshVisibleDockWidgets(); } -void MainWindow::on_actionAsm_syntax_triggered() +void MainWindow::actionAsm_syntax_triggered() { QObject* sender = QObject::sender(); // Uncheck every other choices diff --git a/src/mainwindow.h b/src/mainwindow.h index 38bd65a4..cb0047d4 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -120,7 +120,7 @@ public slots: void toggleResponsive(bool maybe); - void on_backButton_clicked(); + void backButton_clicked(); void refreshVisibleDockWidgets(); @@ -180,7 +180,7 @@ private slots: void on_actionDisplay_Offsets_triggered(); - void on_actionAsm_syntax_triggered(); + void actionAsm_syntax_triggered(); private: QDockWidget *asmDock; diff --git a/src/mainwindow.ui b/src/mainwindow.ui index d58f499c..4131d371 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -486,6 +486,12 @@ QToolButton .svg-icon path { </property> </action> <action name="actionLock"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>true</bool> + </property> <property name="text"> <string>Toggle Panel Locks</string> </property> @@ -647,6 +653,9 @@ QToolButton .svg-icon path { </property> </action> <action name="actionTabs_on_Top"> + <property name="checkable"> + <bool>true</bool> + </property> <property name="text"> <string>Toggle Tab Position</string> </property> diff --git a/src/widgets/commentswidget.h b/src/widgets/commentswidget.h index dfc7c2b4..cbc6dc11 100644 --- a/src/widgets/commentswidget.h +++ b/src/widgets/commentswidget.h @@ -39,11 +39,11 @@ private slots: void on_actionVertical_triggered(); + void refreshTree(); + private: Ui::CommentsWidget *ui; MainWindow *main; - - void refreshTree(); }; #endif // COMMENTSWIDGET_H diff --git a/src/widgets/memorywidget.cpp b/src/widgets/memorywidget.cpp index ba97d439..f004045a 100644 --- a/src/widgets/memorywidget.cpp +++ b/src/widgets/memorywidget.cpp @@ -1941,7 +1941,7 @@ void MemoryWidget::selectHexPreview() void MemoryWidget::seek_back() { //this->main->add_debug_output("Back!"); - this->main->on_backButton_clicked(); + this->main->backButton_clicked(); } void MemoryWidget::frameLoadFinished(bool ok)