Skip to content

Commit

Permalink
Warning removing
Browse files Browse the repository at this point in the history
  • Loading branch information
xarkes committed Sep 2, 2017
1 parent 2e79090 commit 7e493f6
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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-");
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public slots:

void toggleResponsive(bool maybe);

void on_backButton_clicked();
void backButton_clicked();

void refreshVisibleDockWidgets();

Expand Down Expand Up @@ -180,7 +180,7 @@ private slots:

void on_actionDisplay_Offsets_triggered();

void on_actionAsm_syntax_triggered();
void actionAsm_syntax_triggered();

private:
QDockWidget *asmDock;
Expand Down
9 changes: 9 additions & 0 deletions src/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/widgets/commentswidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ private slots:

void on_actionVertical_triggered();

void refreshTree();

private:
Ui::CommentsWidget *ui;
MainWindow *main;

void refreshTree();
};

#endif // COMMENTSWIDGET_H
2 changes: 1 addition & 1 deletion src/widgets/memorywidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 7e493f6

Please sign in to comment.