caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clangformat

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-08-08 18:17:34 +02:00
parent ecc21caa77
commit fc5cee6fb8
11 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/command.cc
View File

@ -35,8 +35,8 @@
#include "design_utils.h" #include "design_utils.h"
#include "jsonparse.h" #include "jsonparse.h"
#include "log.h" #include "log.h"
#include "timing.h"
#include "version.h" #include "version.h"
#include <timing.h>
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN

7
common/project.cc
View File

@ -17,12 +17,12 @@
* *
*/ */
#include "project.h"
#include <boost/filesystem/convenience.hpp> #include <boost/filesystem/convenience.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include "project.h"
#include "log.h"
#include "jsonparse.h"
#include <fstream> #include <fstream>
#include "jsonparse.h"
#include "log.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
@ -55,7 +55,6 @@ std::unique_ptr<Context> ProjectHandler::load(std::string filename)
if (version != 1) if (version != 1)
log_error("Wrong project format version.\n"); log_error("Wrong project format version.\n");
ctx = createContext(root); ctx = createContext(root);
std::string arch_name = root.get<std::string>("project.arch.name"); std::string arch_name = root.get<std::string>("project.arch.name");

8
ecp5/project.cc
View File

@ -17,11 +17,11 @@
* *
*/ */
#include "project.h"
#include <boost/filesystem/convenience.hpp> #include <boost/filesystem/convenience.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include "project.h"
#include "log.h"
#include <fstream> #include <fstream>
#include "log.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
@ -50,8 +50,6 @@ std::unique_ptr<Context> ProjectHandler::createContext(pt::ptree &root)
return std::unique_ptr<Context>(new Context(chipArgs)); return std::unique_ptr<Context>(new Context(chipArgs));
} }
void ProjectHandler::loadArch(Context *ctx, pt::ptree &root, std::string path) void ProjectHandler::loadArch(Context *ctx, pt::ptree &root, std::string path) {}
{
}
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

12
generic/project.cc
View File

@ -17,16 +17,14 @@
* *
*/ */
#include <boost/filesystem/convenience.hpp>
#include "project.h" #include "project.h"
#include "log.h" #include <boost/filesystem/convenience.hpp>
#include <fstream> #include <fstream>
#include "log.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
void ProjectHandler::saveArch(Context *ctx, pt::ptree &root) void ProjectHandler::saveArch(Context *ctx, pt::ptree &root) {}
{
}
std::unique_ptr<Context> ProjectHandler::createContext(pt::ptree &root) std::unique_ptr<Context> ProjectHandler::createContext(pt::ptree &root)
{ {
@ -34,8 +32,6 @@ std::unique_ptr<Context> ProjectHandler::createContext(pt::ptree &root)
return std::unique_ptr<Context>(new Context(chipArgs)); return std::unique_ptr<Context>(new Context(chipArgs));
} }
void ProjectHandler::loadArch(Context *ctx, pt::ptree &root, std::string path) void ProjectHandler::loadArch(Context *ctx, pt::ptree &root, std::string path) {}
{
}
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

1
gui/basewindow.cc
View File

@ -463,5 +463,4 @@ void BaseMainWindow::save_proj()
} }
} }
NEXTPNR_NAMESPACE_END NEXTPNR_NAMESPACE_END

1
gui/basewindow.h
View File

@ -49,6 +49,7 @@ class BaseMainWindow : public QMainWindow
virtual ~BaseMainWindow(); virtual ~BaseMainWindow();
Context *getContext() { return ctx.get(); } Context *getContext() { return ctx.get(); }
void updateJsonLoaded(); void updateJsonLoaded();
protected: protected:
void createMenusAndBars(); void createMenusAndBars();
void disableActions(); void disableActions();

10
gui/ecp5/mainwindow.cc
View File

@ -29,7 +29,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), args, parent) MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
: BaseMainWindow(std::move(context), args, parent)
{ {
initMainResource(); initMainResource();
@ -50,7 +51,8 @@ void MainWindow::newContext(Context *ctx)
setWindowTitle(title.c_str()); setWindowTitle(title.c_str());
} }
void MainWindow::createMenu() { void MainWindow::createMenu()
{
// Add arch specific actions // Add arch specific actions
actionLoadBase = new QAction("Open Base Config", this); actionLoadBase = new QAction("Open Base Config", this);
actionLoadBase->setIcon(QIcon(":/icons/resources/open_base.png")); actionLoadBase->setIcon(QIcon(":/icons/resources/open_base.png"));
@ -96,8 +98,8 @@ static QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip)
return packages; return packages;
} }
void MainWindow::new_proj()
void MainWindow::new_proj() { {
QMap<QString, int> arch; QMap<QString, int> arch;
arch.insert("Lattice ECP5 25K", ArchArgs::LFE5U_25F); arch.insert("Lattice ECP5 25K", ArchArgs::LFE5U_25F);
arch.insert("Lattice ECP5 45K", ArchArgs::LFE5U_45F); arch.insert("Lattice ECP5 45K", ArchArgs::LFE5U_45F);

1
gui/ecp5/mainwindow.h
View File

@ -47,6 +47,7 @@ class MainWindow : public BaseMainWindow
void newContext(Context *ctx); void newContext(Context *ctx);
void open_base(); void open_base();
void save_config(); void save_config();
private: private:
QAction *actionLoadBase; QAction *actionLoadBase;
QAction *actionSaveConfig; QAction *actionSaveConfig;

3
gui/generic/mainwindow.cc
View File

@ -23,7 +23,8 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN
MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), args, parent) MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
: BaseMainWindow(std::move(context), args, parent)
{ {
initMainResource(); initMainResource();

2
gui/ice40/mainwindow.cc
View File

@ -24,12 +24,12 @@
#include <QIcon> #include <QIcon>
#include <QInputDialog> #include <QInputDialog>
#include <QLineEdit> #include <QLineEdit>
#include <fstream>
#include "bitstream.h" #include "bitstream.h"
#include "design_utils.h" #include "design_utils.h"
#include "jsonparse.h" #include "jsonparse.h"
#include "log.h" #include "log.h"
#include "pcf.h" #include "pcf.h"
#include <fstream>
static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }

4
ice40/project.cc
View File

@ -17,10 +17,10 @@
* *
*/ */
#include <boost/filesystem/convenience.hpp>
#include "project.h" #include "project.h"
#include "log.h" #include <boost/filesystem/convenience.hpp>
#include <fstream> #include <fstream>
#include "log.h"
#include "pcf.h" #include "pcf.h"
NEXTPNR_NAMESPACE_BEGIN NEXTPNR_NAMESPACE_BEGIN