clangformat

This commit is contained in:
Miodrag Milanovic 2018-08-02 19:25:20 +02:00
parent e40b61e87e
commit 23a7d96f4c
5 changed files with 23 additions and 28 deletions

View File

@ -25,13 +25,13 @@
#include <QIcon>
#include <QInputDialog>
#include <QSplitter>
#include <fstream>
#include "designwidget.h"
#include "fpgaviewwidget.h"
#include "jsonparse.h"
#include "log.h"
#include "mainwindow.h"
#include "pythontab.h"
#include "jsonparse.h"
#include <fstream>
static void initBasenameResource() { Q_INIT_RESOURCE(base); }

View File

@ -50,15 +50,16 @@ class BaseMainWindow : public QMainWindow
Context *getContext() { return ctx.get(); }
void load_json(std::string filename);
protected:
void createMenusAndBars();
void disableActions();
virtual void onDisableActions() {};
virtual void onJsonLoaded() {};
virtual void onPackFinished() {};
virtual void onBudgetFinished() {};
virtual void onPlaceFinished() {};
virtual void onRouteFinished() {};
virtual void onDisableActions(){};
virtual void onJsonLoaded(){};
virtual void onPackFinished(){};
virtual void onBudgetFinished(){};
virtual void onPlaceFinished(){};
virtual void onRouteFinished(){};
protected Q_SLOTS:
void writeInfo(std::string text);

View File

@ -317,7 +317,7 @@ QtProperty *DesignWidget::addSubGroup(QtProperty *topItem, const QString &name)
void DesignWidget::onClickedBel(BelId bel, bool keep)
{
boost::optional<TreeModel::Item*> item;
boost::optional<TreeModel::Item *> item;
{
std::lock_guard<std::mutex> lock_ui(ctx->ui_mutex);
std::lock_guard<std::mutex> lock(ctx->mutex);
@ -334,7 +334,7 @@ void DesignWidget::onClickedBel(BelId bel, bool keep)
void DesignWidget::onClickedWire(WireId wire, bool keep)
{
boost::optional<TreeModel::Item*> item;
boost::optional<TreeModel::Item *> item;
{
std::lock_guard<std::mutex> lock_ui(ctx->ui_mutex);
std::lock_guard<std::mutex> lock(ctx->mutex);
@ -351,7 +351,7 @@ void DesignWidget::onClickedWire(WireId wire, bool keep)
void DesignWidget::onClickedPip(PipId pip, bool keep)
{
boost::optional<TreeModel::Item*> item;
boost::optional<TreeModel::Item *> item;
{
std::lock_guard<std::mutex> lock_ui(ctx->ui_mutex);
std::lock_guard<std::mutex> lock(ctx->mutex);

View File

@ -309,14 +309,7 @@ void MainWindow::onDisableActions()
actionSaveAsc->setEnabled(false);
}
void MainWindow::onJsonLoaded()
{
actionLoadPCF->setEnabled(true);
}
void MainWindow::onRouteFinished()
{
actionSaveAsc->setEnabled(true);
}
void MainWindow::onJsonLoaded() { actionLoadPCF->setEnabled(true); }
void MainWindow::onRouteFinished() { actionSaveAsc->setEnabled(true); }
NEXTPNR_NAMESPACE_END

View File

@ -35,6 +35,7 @@ class MainWindow : public BaseMainWindow
public:
void createMenu();
void load_pcf(std::string filename);
protected:
void onDisableActions() override;
void onJsonLoaded() override;