Skip to content
Snippets Groups Projects
Commit 6a871efe authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm double blank lines

parent 4bbcec4a
No related branches found
No related tags found
1 merge request!2177finish code reformatting
Showing
with 27 additions and 11 deletions
......@@ -22,7 +22,6 @@
#include <boost/program_options/variables_map.hpp>
#include <string>
namespace bpo = boost::program_options;
//! Handles command line and config file program options
......
......@@ -31,6 +31,7 @@
#include <csignal>
#include <iostream>
#define ASSERT(condition) \
if (!(condition)) { \
std::cerr << "Assertion " #condition " failed in " __FILE__ ", line " << __LINE__ \
......@@ -48,6 +49,7 @@
#else // BA_DEBUG
#include <stdexcept>
#define ASSERT(condition) \
if (!(condition)) \
throw std::runtime_error("BUG: Assertion " #condition " failed in " __FILE__ ", line " \
......
......@@ -16,8 +16,11 @@
#define BORNAGAIN_DEVICE_DATA_DATAFIELD_H
#ifdef BORNAGAIN_PYTHON
#include "PyCore/Embed/PyObjectDecl.h"
#endif
#include <memory>
#include <string>
#include <vector>
......
......@@ -27,7 +27,6 @@
#include <sstream>
#include <stdexcept>
IO::Filetype1D IO::filename2type1D(const std::string& fname)
{
const std::string ext = ZipUtil::uncompressedExtension(fname);
......
......@@ -21,11 +21,15 @@
#include "Fit/Minimizer/Types.h"
#ifdef _WIN32
#include <Math/FitMethodFunction.h>
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Math/FitMethodFunction.h>
#pragma GCC diagnostic pop
#endif
......
......@@ -21,11 +21,15 @@
#include "Fit/Minimizer/Types.h"
#ifdef _WIN32
#include <Math/Functor.h>
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Math/Functor.h>
#pragma GCC diagnostic pop
#endif
......
......@@ -21,12 +21,16 @@
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4267)
#include <Math/GSLNLSMinimizer.h>
#pragma warning(pop)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Math/GSLNLSMinimizer.h>
#pragma GCC diagnostic pop
#endif
......
......@@ -19,12 +19,16 @@
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4267)
#include <Math/GSLMinimizer.h>
#pragma warning(pop)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Math/GSLMinimizer.h>
#pragma GCC diagnostic pop
#endif
......
......@@ -18,12 +18,16 @@
#ifdef _WIN32
#pragma warning(push)
#pragma warning(disable : 4267)
#include <Math/GSLSimAnMinimizer.h>
#pragma warning(pop)
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#include <Math/GSLSimAnMinimizer.h>
#pragma GCC diagnostic pop
#endif
......
......@@ -15,6 +15,7 @@
#include "GUI/Model/Descriptor/DistributionItems.h"
#include "GUI/Support/XML/UtilXML.h"
#include "Param/Distrib/Distributions.h"
namespace {
namespace Tag {
......
......@@ -19,7 +19,6 @@
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
//! Holds link value, accessible from FitparameterModel.
class LinkItem : public QObject {
Q_OBJECT
......
......@@ -15,6 +15,7 @@
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "Base/Util/Assert.h"
#include "GUI/Support/XML/UtilXML.h"
namespace {
namespace Tag {
......
......@@ -21,7 +21,6 @@
#include <QTreeView>
#include <QWidget>
//! Mostly concerned with fonts
namespace GUI::Style {
......
......@@ -20,7 +20,6 @@
#include <QPair>
#include <QString>
//! The service to collect messages from different senders.
class MessageService {
......
......@@ -18,7 +18,6 @@
#include <QModelIndex>
#include <QString>
namespace GUI::Path {
QString withTildeHomePath(const QString& path);
......
......@@ -20,7 +20,6 @@
#include <QComboBox>
#include <QList>
//! The ItemComboToolbar class is a styled toolbar on top of ItemComboWidget. Contains
//! ComboBox to switch ItemComboWidget, and dynamic list of actions, which are updated
//! according to current state of ItemComboWidget.
......
......@@ -19,7 +19,6 @@
#include <QWidget>
#include <qnamespace.h>
//! Holds information about the widget and its dock.
class DockWidgetInfo {
......
......@@ -23,7 +23,6 @@
#include <QSize>
#include <map>
//! Handles creation and appearance of docked widgets in the context of QMainWindow. It is used for
//! SampleView and JobView which are based on QMainWindow.
......
......@@ -21,7 +21,6 @@
#include <QLabel>
#include <QString>
//! A dialog similar to standard QMessageBox with combo box selector.
class ComboSelectorDialog : public QDialog {
......
......@@ -21,7 +21,6 @@
#include <QString>
#include <QTextEdit>
//! A dialog similar to standard QMessageBox intended for detailed warning messages.
//! On the contrary to QMessageBox, the dialog has size grip and visible text editor.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment