kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

move from deprecated boost.signals to boost.signals2 library

Browse Source
This commit is contained in:
wmayer
2018-10-30 19:09:03 +01:00
parent 3858b179c3
commit f898eafd64
86 changed files with 268 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Mod/Spreadsheet/App/Sheet.h
View File

@@ -170,13 +170,13 @@ public:
// Signals
boost::signal<void (App::CellAddress)> cellUpdated;
boost::signals2::signal<void (App::CellAddress)> cellUpdated;
boost::signal<void (App::CellAddress)> cellSpanChanged;
boost::signals2::signal<void (App::CellAddress)> cellSpanChanged;
boost::signal<void (int, int)> columnWidthChanged;
boost::signals2::signal<void (int, int)> columnWidthChanged;
boost::signal<void (int, int)> rowHeightChanged;
boost::signals2::signal<void (int, int)> rowHeightChanged;
/** @name Access properties */
//@{
@@ -296,8 +296,8 @@ protected:
typedef std::map<std::string, SheetObserver* > ObserverMap;
ObserverMap observers;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRenamedDocumentConnection;
boost::signals2::scoped_connection onRelabledDocumentConnection;
boost::signals2::scoped_connection onRenamedDocumentConnection;
friend class SheetObserver;

2
src/Mod/Spreadsheet/Gui/SheetModel.h
View File

@@ -52,7 +52,7 @@ public:
private:
void cellUpdated(App::CellAddress address);
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellUpdatedConnection;
boost::signals2::scoped_connection cellUpdatedConnection;
Spreadsheet::Sheet * sheet;
QColor aliasBgColor;
QColor textFgColor;

2
src/Mod/Spreadsheet/Gui/SheetTableView.h
View File

@@ -79,7 +79,7 @@ protected:
QModelIndex currentEditIndex;
Spreadsheet::Sheet * sheet;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection cellSpanChangedConnection;
boost::signals2::scoped_connection cellSpanChangedConnection;
};
}

6
src/Mod/Spreadsheet/Gui/SpreadsheetView.h
View File

@@ -100,9 +100,9 @@ protected:
Spreadsheet::Sheet * sheet;
SpreadsheetDelegate * delegate;
SheetModel * model;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection columnWidthChangedConnection;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection rowHeightChangedConnection;
boost::BOOST_SIGNALS_NAMESPACE::scoped_connection positionChangedConnection;
boost::signals2::scoped_connection columnWidthChangedConnection;
boost::signals2::scoped_connection rowHeightChangedConnection;
boost::signals2::scoped_connection positionChangedConnection;
QMap<int, int> newColumnSizes;
QMap<int, int> newRowSizes;