Skip to content
Permalink
Browse files
Merge pull request #6888 from lioncash/qt-override
DolphinQt2: Minor changes
  • Loading branch information
Tilka committed May 17, 2018
2 parents 6ef7578 + c1f92d3 commit e67f2dc
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
@@ -22,7 +22,7 @@ class NewBreakpointDialog : public QDialog
public:
explicit NewBreakpointDialog(BreakpointWidget* parent);

void accept();
void accept() override;

private:
void CreateWidgets();
@@ -59,7 +59,7 @@ void GameListDialog::PopulateGameList()
m_game_list->sortItems();
}

const QString& GameListDialog::GetSelectedUniqueID()
const QString& GameListDialog::GetSelectedUniqueID() const
{
return m_game_id;
}
@@ -17,8 +17,8 @@ class GameListDialog : public QDialog
public:
explicit GameListDialog(QWidget* parent);

int exec();
const QString& GetSelectedUniqueID();
int exec() override;
const QString& GetSelectedUniqueID() const;

private:
void CreateWidgets();
@@ -17,7 +17,7 @@ class MD5Dialog : public QDialog
{
Q_OBJECT
public:
MD5Dialog(QWidget* parent);
explicit MD5Dialog(QWidget* parent);

void show(const QString& title);
void SetProgress(int pid, int progress);
@@ -30,7 +30,7 @@ class NetPlayDialog : public QDialog, public NetPlayUI
{
Q_OBJECT
public:
NetPlayDialog(QWidget* parent);
explicit NetPlayDialog(QWidget* parent);
~NetPlayDialog();

void show(std::string nickname, bool use_traversal);
@@ -22,7 +22,7 @@ class NetPlaySetupDialog : public QDialog
{
Q_OBJECT
public:
NetPlaySetupDialog(QWidget* parent);
explicit NetPlaySetupDialog(QWidget* parent);

void accept() override;
void show();
@@ -20,7 +20,7 @@ class PadMappingDialog : public QDialog
public:
explicit PadMappingDialog(QWidget* widget);

int exec();
int exec() override;

PadMappingArray GetGCPadArray();
PadMappingArray GetWiimoteArray();
@@ -13,7 +13,7 @@ class AspectRatioWidget : public QWidget
Q_OBJECT
public:
AspectRatioWidget(QWidget* widget, float width, float height, QWidget* parent = nullptr);
void resizeEvent(QResizeEvent* event);
void resizeEvent(QResizeEvent* event) override;

private:
QBoxLayout* m_layout;

0 comments on commit e67f2dc

Please sign in to comment.