Skip to content

Commit

Permalink
clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
lmoureaux committed Mar 20, 2022
1 parent f01b0de commit 848d4e6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
20 changes: 10 additions & 10 deletions client/gui-qt/page_game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ pageGame::pageGame(QWidget *parent)
mapview_wdg = new map_view();
mapview_wdg->setFocusPolicy(Qt::WheelFocus);
top_bar_wdg = new top_bar();
sw_map = new top_bar_widget(
Q_("?noun:View"), QStringLiteral("MAP"), top_bar_show_map);
sw_map = new top_bar_widget(Q_("?noun:View"), QStringLiteral("MAP"),
top_bar_show_map);
sw_map->setIcon(fcIcons::instance()->getIcon(QStringLiteral("view")));

sw_tax = new tax_rates_widget();
Expand All @@ -86,24 +86,24 @@ pageGame::pageGame(QWidget *parent)
sw_cities->setWheelUp(center_next_enemy_city);
sw_cities->setWheelDown(center_next_player_city);
sw_cities->setCheckable(true);
sw_diplo = new top_bar_widget(
_("Nations"), QStringLiteral("PLR"), popup_players_dialog);
sw_diplo = new top_bar_widget(_("Nations"), QStringLiteral("PLR"),
popup_players_dialog);
sw_diplo->setIcon(fcIcons::instance()->getIcon(QStringLiteral("nations")));
sw_diplo->setWheelUp(center_next_player_capital);
sw_diplo->setWheelDown(key_center_capital);
sw_diplo->setCheckable(true);
sw_science = new top_bar_widget(
_("Research"), QStringLiteral("SCI"), top_bar_left_click_science);
sw_science = new top_bar_widget(_("Research"), QStringLiteral("SCI"),
top_bar_left_click_science);
sw_science->setIcon(
fcIcons::instance()->getIcon(QStringLiteral("research")));
sw_science->setCheckable(true);
sw_economy = new top_bar_widget(
_("Economy"), QStringLiteral("ECO"), economy_report_dialog_popup);
sw_economy = new top_bar_widget(_("Economy"), QStringLiteral("ECO"),
economy_report_dialog_popup);
sw_economy->setIcon(
fcIcons::instance()->getIcon(QStringLiteral("economy")));
sw_economy->setCheckable(true);
sw_endturn = new top_bar_widget(
_("Turn Done"), QLatin1String(""), top_bar_finish_turn);
sw_endturn = new top_bar_widget(_("Turn Done"), QLatin1String(""),
top_bar_finish_turn);
sw_endturn->setIcon(
fcIcons::instance()->getIcon(QStringLiteral("endturn")));
sw_cunit->setRightClick(top_bar_center_unit);
Expand Down
5 changes: 1 addition & 4 deletions client/gui-qt/top_bar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,7 @@ top_bar_widget::top_bar_widget(const QString &label, const QString &pg,
/**
Sidewidget destructor
*/
top_bar_widget::~top_bar_widget()
{
delete timer;
}
top_bar_widget::~top_bar_widget() { delete timer; }

/**
Sets custom text visible on top of sidewidget
Expand Down

0 comments on commit 848d4e6

Please sign in to comment.