anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the preferred calling for Boost.Signal

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9010 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-09-26 14:19:47 +00:00
parent 53cea42f88
commit ec94b42f51
37 changed files with 122 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: use proper signal include
* LaTeX.h: Use preferred calling of Boost.Signal
* buffer.h: ditto
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: dont include <boost/function/function0.hpp> * pch.h: dont include <boost/function/function0.hpp>

4
src/LaTeX.h
View File

@ -17,7 +17,7 @@
#include "outputparams.h" #include "outputparams.h"
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/signals/signal1.hpp> #include <boost/signal.hpp>
#include <vector> #include <vector>
#include <set> #include <set>
@ -125,7 +125,7 @@ public:
}; };
/// This signal emits an informative message /// This signal emits an informative message
boost::signal1<void, std::string> message; boost::signal<void(std::string)> message;
/** /**

17
src/buffer.h
View File

@ -18,8 +18,7 @@
#include "support/types.h" #include "support/types.h"
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal1.hpp>
#include <iosfwd> #include <iosfwd>
#include <map> #include <map>
@ -107,19 +106,19 @@ public:
bool hasParWithID(int id) const; bool hasParWithID(int id) const;
/// This signal is emitted when a parsing error shows up. /// This signal is emitted when a parsing error shows up.
boost::signal1<void, ErrorItem> error; boost::signal<void(ErrorItem)> error;
/// This signal is emitted when some message shows up. /// This signal is emitted when some message shows up.
boost::signal1<void, std::string> message; boost::signal<void(std::string)> message;
/// This signal is emitted when the buffer busy status change. /// This signal is emitted when the buffer busy status change.
boost::signal1<void, bool> busy; boost::signal<void(bool)> busy;
/// This signal is emitted when the buffer readonly status change. /// This signal is emitted when the buffer readonly status change.
boost::signal1<void, bool> readonly; boost::signal<void(bool)> readonly;
/// Update window titles of all users. /// Update window titles of all users.
boost::signal0<void> updateTitles; boost::signal<void()> updateTitles;
/// Reset autosave timers for all users. /// Reset autosave timers for all users.
boost::signal0<void> resetAutosaveTimers; boost::signal<void()> resetAutosaveTimers;
/// This signal is emitting if the buffer is being closed. /// This signal is emitting if the buffer is being closed.
boost::signal0<void> closing; boost::signal<void()> closing;
/** Save file. /** Save file.

9
src/frontends/ChangeLog
View File

@ -1,3 +1,12 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: include proper signal include
* Dialogs.[Ch]: User preferred calling of Boost.Signal
* LyXView.h: ditto
* Timeout.h: ditto
* WorkArea.h: ditto
2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-08-15 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: new file * pch.h: new file

8
src/frontends/Dialogs.C
View File

@ -16,7 +16,7 @@
#include "controllers/Dialog.h" #include "controllers/Dialog.h"
#include <boost/signals/signal2.hpp> #include <boost/signal.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
@ -44,16 +44,16 @@ private:
}; };
boost::signal0<void> & Dialogs::redrawGUI() boost::signal<void()> & Dialogs::redrawGUI()
{ {
static BugfixSignal<boost::signal0<void> > thesignal; static BugfixSignal<boost::signal<void()> > thesignal;
return thesignal(); return thesignal();
} }
namespace { namespace {
BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal; BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
} }

7
src/frontends/Dialogs.h
View File

@ -13,8 +13,8 @@
#ifndef DIALOGS_H #ifndef DIALOGS_H
#define DIALOGS_H #define DIALOGS_H
#include <boost/signal.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/signals/signal0.hpp>
class InsetBase; class InsetBase;
class LyXView; class LyXView;
@ -27,8 +27,7 @@ class Dialog;
/** Container of all dialogs. /** Container of all dialogs.
*/ */
class Dialogs : boost::noncopyable class Dialogs : boost::noncopyable {
{
public: public:
/// ///
Dialogs(LyXView &); Dialogs(LyXView &);
@ -39,7 +38,7 @@ public:
* Note that static boost signals break some compilers, so we return a * Note that static boost signals break some compilers, so we return a
* reference to some hidden magic ;-) * reference to some hidden magic ;-)
*/ */
static boost::signal0<void> & redrawGUI(); static boost::signal<void()> & redrawGUI();
/// Toggle tooltips on/off in all dialogs. /// Toggle tooltips on/off in all dialogs.
static void toggleTooltips(); static void toggleTooltips();

8
src/frontends/LyXView.h
View File

@ -13,11 +13,11 @@
#ifndef LYXVIEW_H #ifndef LYXVIEW_H
#define LYXVIEW_H #define LYXVIEW_H
#include <boost/utility.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/signals/signal0.hpp> #include <boost/utility.hpp>
class Buffer; class Buffer;
class Toolbars; class Toolbars;
@ -117,10 +117,10 @@ public:
void updateMenubar(); void updateMenubar();
/// focus the command buffer (minibuffer) /// focus the command buffer (minibuffer)
boost::signal0<void> focus_command_buffer; boost::signal<void()> focus_command_buffer;
/// view state string changed /// view state string changed
boost::signal0<void> view_state_changed; boost::signal<void()> view_state_changed;
/// display a message in the view /// display a message in the view
virtual void message(std::string const &) = 0; virtual void message(std::string const &) = 0;

4
src/frontends/Timeout.h
View File

@ -13,7 +13,7 @@
#ifndef TIMEOUT_H #ifndef TIMEOUT_H
#define TIMEOUT_H #define TIMEOUT_H
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
/** /**
@ -39,7 +39,7 @@ public:
/// restart the timer /// restart the timer
void restart(); void restart();
/// signal emitted on timer expiry /// signal emitted on timer expiry
boost::signal0<void> timeout; boost::signal<void()> timeout;
/// emit the signal /// emit the signal
void emit(); void emit();
/// set the timer type /// set the timer type

16
src/frontends/WorkArea.h
View File

@ -16,9 +16,7 @@
#include "frontends/key_state.h" #include "frontends/key_state.h"
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/signals/signal2.hpp>
class Painter; class Painter;
@ -65,17 +63,17 @@ public:
virtual void putClipboard(std::string const &) const = 0; virtual void putClipboard(std::string const &) const = 0;
/// work area dimensions have changed /// work area dimensions have changed
boost::signal0<void> workAreaResize; boost::signal<void()> workAreaResize;
/// the scrollbar has changed /// the scrollbar has changed
boost::signal1<void, int> scrollDocView; boost::signal<void(int)> scrollDocView;
/// a key combination has been pressed /// a key combination has been pressed
boost::signal2<void, LyXKeySymPtr, key_modifier::state> workAreaKeyPress; boost::signal<void(LyXKeySymPtr, key_modifier::state)> workAreaKeyPress;
/// some mouse event /// some mouse event
boost::signal1<void, FuncRequest> dispatch; boost::signal<void(FuncRequest)> dispatch;
/// emitted when an X client has requested our selection /// emitted when an X client has requested our selection
boost::signal0<void> selectionRequested; boost::signal<void()> selectionRequested;
/// emitted when another X client has stolen our selection /// emitted when another X client has stolen our selection
boost::signal0<void> selectionLost; boost::signal<void()> selectionLost;
}; };
#endif // WORKAREA_H #endif // WORKAREA_H

3
src/frontends/pch.h
View File

@ -4,9 +4,6 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signal.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>

10
src/frontends/qt2/lyx_gui.C
View File

@ -34,7 +34,7 @@
// Dear Lord, deliver us from Evil, aka the Qt headers // Dear Lord, deliver us from Evil, aka the Qt headers
// Qt defines a macro 'signals' that clashes with a boost namespace. // Qt defines a macro 'signals' that clashes with a boost namespace.
// All is well if the namespace is visible first. // All is well if the namespace is visible first.
#include <boost/signals/signal1.hpp> #include <boost/signal.hpp> // FIXME: Is this needed? (Lgb)
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
@ -179,13 +179,13 @@ void parse_init(int & argc, char * argv[])
// algorithm on some entries. It lists the menu names that // algorithm on some entries. It lists the menu names that
// should not be moved to the LyX menu // should not be moved to the LyX menu
static QTranslator aqua_trans(0); static QTranslator aqua_trans(0);
aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0, aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0,
"do_not_merge_me")); "do_not_merge_me"));
aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0, aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0,
"do_not_merge_me")); "do_not_merge_me"));
aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0, aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0,
"do_not_merge_me")); "do_not_merge_me"));
aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0, aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0,
"do_not_merge_me")); "do_not_merge_me"));
app.installTranslator(&aqua_trans); app.installTranslator(&aqua_trans);

7
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,10 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: use proper signal include
* Tooltips.[Ch]: Use preffered calling of Boost.Signal
* XFormsView.h: ditto
2004-08-30 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-08-30 Lars Gullik Bjonnes <larsbj@gullik.net>
* forms/pch.h: make it better * forms/pch.h: make it better

2
src/frontends/xforms/Tooltips.C
View File

@ -38,7 +38,7 @@ namespace frontend {
bool Tooltips::enabled_ = true; bool Tooltips::enabled_ = true;
boost::signal0<void> Tooltips::toggled; boost::signal<void()> Tooltips::toggled;
Tooltips::Tooltips() Tooltips::Tooltips()

4
src/frontends/xforms/Tooltips.h
View File

@ -18,7 +18,7 @@
#ifndef TOOLTIPS_H #ifndef TOOLTIPS_H
#define TOOLTIPS_H #define TOOLTIPS_H
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include "forms_fwd.h" // Can't forward-declare FL_OBJECT #include "forms_fwd.h" // Can't forward-declare FL_OBJECT
@ -55,7 +55,7 @@ private:
/** Once enabled_ is changed, then this signal is emitted to update /** Once enabled_ is changed, then this signal is emitted to update
* all the tooltips. * all the tooltips.
*/ */
static boost::signal0<void> toggled; static boost::signal<void()> toggled;
/// The tooltips are stored so that they can be turned on and off. /// The tooltips are stored so that they can be turned on and off.
typedef std::map<FL_OBJECT *, std::string> TooltipsMap; typedef std::map<FL_OBJECT *, std::string> TooltipsMap;

4
src/frontends/xforms/XFormsView.h
View File

@ -18,7 +18,7 @@
#include "frontends/LyXView.h" #include "frontends/LyXView.h"
#include <X11/Xlib.h> // for Pixmap #include <X11/Xlib.h> // for Pixmap
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <map> #include <map>
@ -77,7 +77,7 @@ public:
/// ///
void updateMetrics(bool resize_form = false); void updateMetrics(bool resize_form = false);
/// ///
boost::signal0<void> metricsUpdated; boost::signal<void()> metricsUpdated;
private: private:
/** /**

2
src/frontends/xforms/pch.h
View File

@ -14,8 +14,8 @@
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/signals/connection.hpp> #include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>

10
src/graphics/ChangeLog
View File

@ -1,3 +1,13 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: use proper signal include
* GraphicsCacheItem.[Ch]: Use preferred calling of Boost.Signal
* GraphicsConverter.C: ditto
* GraphicsImage.h: ditto
* GraphicsLoader.[Ch]: ditto
* PreviewLoader.[Ch]: ditto
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: include <boost/function.hpp> instead of * pch.h: include <boost/function.hpp> instead of

2
src/graphics/GraphicsCacheItem.C
View File

@ -122,7 +122,7 @@ struct CacheItem::Impl : public boost::signals::trackable {
ImageStatus status_; ImageStatus status_;
/// This signal is emitted when the image loading status changes. /// This signal is emitted when the image loading status changes.
boost::signal0<void> statusChanged; boost::signal<void()> statusChanged;
/// The connection to the signal Image::finishedLoading /// The connection to the signal Image::finishedLoading
boost::signals::connection cl_; boost::signals::connection cl_;

5
src/graphics/GraphicsCacheItem.h
View File

@ -32,7 +32,7 @@
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
class InsetGraphics; class InsetGraphics;
@ -84,7 +84,8 @@ public:
/** Connect and you'll be informed when the loading status of the image /** Connect and you'll be informed when the loading status of the image
* changes. * changes.
*/ */
typedef boost::signal0<void>::slot_type slot_type; typedef boost::signal<void()> sig_type;
typedef sig_type::slot_type slot_type;
/// ///
boost::signals::connection connect(slot_type const &) const; boost::signals::connection connect(slot_type const &) const;

2
src/graphics/GraphicsConverter.C
View File

@ -67,7 +67,7 @@ struct Converter::Impl : public boost::signals::trackable {
/** At the end of the conversion process inform the outside world /** At the end of the conversion process inform the outside world
* by emitting a signal. * by emitting a signal.
*/ */
typedef boost::signal1<void, bool> SignalType; typedef boost::signal<void(bool)> SignalType;
/// ///
SignalType finishedConversion; SignalType finishedConversion;

5
src/graphics/GraphicsConverter.h
View File

@ -17,8 +17,8 @@
#ifndef GRAPHICSCONVERTER_H #ifndef GRAPHICSCONVERTER_H
#define GRAPHICSCONVERTER_H #define GRAPHICSCONVERTER_H
#include <boost/signals/signal1.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
namespace lyx { namespace lyx {
@ -46,7 +46,8 @@ public:
* finished. * finished.
* If the conversion is succesful, then the listener is passed \c true. * If the conversion is succesful, then the listener is passed \c true.
*/ */
typedef boost::signal1<void, bool>::slot_type slot_type; typedef boost::signal<void(bool)> sig_type;
typedef sig_type::slot_type slot_type;
/// ///
boost::signals::connection connect(slot_type const &) const; boost::signals::connection connect(slot_type const &) const;

6
src/graphics/GraphicsImage.h
View File

@ -26,7 +26,7 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/signal1.hpp> #include <boost/signal.hpp>
#include <vector> #include <vector>
#include <utility> #include <utility>
@ -66,9 +66,9 @@ public:
bool isDrawable() const; bool isDrawable() const;
/** At the end of the loading process inform the outside world /** At the end of the loading process inform the outside world
* by emitting a signal. * by emitting a signal
*/ */
typedef boost::signal1<void, bool> SignalType; typedef boost::signal<void(bool)> SignalType;
/// ///
SignalType finishedLoading; SignalType finishedLoading;

2
src/graphics/GraphicsLoader.C
View File

@ -51,7 +51,7 @@ struct Loader::Impl : boost::signals::trackable {
/// We modify a local copy of the image once it is loaded. /// We modify a local copy of the image once it is loaded.
Image::ImagePtr image_; Image::ImagePtr image_;
/// This signal is emitted when the image loading status changes. /// This signal is emitted when the image loading status changes.
boost::signal0<void> signal_; boost::signal<void()> signal_;
private: private:
/// ///

5
src/graphics/GraphicsLoader.h
View File

@ -26,8 +26,8 @@
#include "GraphicsTypes.h" #include "GraphicsTypes.h"
#include <boost/signals/signal0.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signal.hpp>
class InsetOld; class InsetOld;
@ -90,7 +90,8 @@ public:
/** Connect and you'll be informed when the loading status of the image /** Connect and you'll be informed when the loading status of the image
* changes. * changes.
*/ */
typedef boost::signal0<void>::slot_type slot_type; typedef boost::signal<void()> sig_type;
typedef sig_type::slot_type slot_type;
/// ///
boost::signals::connection connect(slot_type const &) const; boost::signals::connection connect(slot_type const &) const;

2
src/graphics/PreviewLoader.C
View File

@ -139,7 +139,7 @@ struct PreviewLoader::Impl : public boost::signals::trackable {
void startLoading(); void startLoading();
/// Emit this signal when an image is ready for display. /// Emit this signal when an image is ready for display.
boost::signal1<void, PreviewImage const &> imageReady; boost::signal<void(PreviewImage const &)> imageReady;
Buffer const & buffer() const { return buffer_; } Buffer const & buffer() const { return buffer_; }

5
src/graphics/PreviewLoader.h
View File

@ -20,7 +20,7 @@
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signals/signal1.hpp> #include <boost/signal.hpp>
class Buffer; class Buffer;
@ -73,7 +73,8 @@ public:
* has been created and is ready for loading through * has been created and is ready for loading through
* lyx::graphics::PreviewImage::image(). * lyx::graphics::PreviewImage::image().
*/ */
typedef boost::signal1<void, PreviewImage const &>::slot_type slot_type; typedef boost::signal<void(PreviewImage const &)> sig_type;
typedef sig_type::slot_type slot_type;
/// ///
boost::signals::connection connect(slot_type const &) const; boost::signals::connection connect(slot_type const &) const;

3
src/graphics/pch.h
View File

@ -3,8 +3,7 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <fstream> #include <fstream>

6
src/insets/ChangeLog
View File

@ -1,3 +1,9 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* render_preview.h: Use preferred calling of Boost.Signal
* pch.h: use proper signal include
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* ExternalTransforms.h: User preferred calling of Boost.Function * ExternalTransforms.h: User preferred calling of Boost.Function

2
src/insets/pch.h
View File

@ -8,7 +8,7 @@
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signals/connection.hpp> #include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>

4
src/insets/render_preview.h
View File

@ -20,7 +20,7 @@
#include "support/FileMonitor.h" #include "support/FileMonitor.h"
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/signals/connection.hpp> #include <boost/signals/connection.hpp>
@ -116,7 +116,7 @@ public:
/// Connect and you'll be informed when the file changes. /// Connect and you'll be informed when the file changes.
typedef boost::signal0<void>::slot_type slot_type; typedef lyx::support::FileMonitor::slot_type slot_type;
boost::signals::connection fileChanged(slot_type const &); boost::signals::connection fileChanged(slot_type const &);
/// equivalent to dynamic_cast /// equivalent to dynamic_cast

4
src/pch.h
View File

@ -15,9 +15,7 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/connection.hpp> #include <boost/signals/connection.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal1.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/test/detail/nullstream.hpp> #include <boost/test/detail/nullstream.hpp>
#include <boost/tokenizer.hpp> #include <boost/tokenizer.hpp>

11
src/support/ChangeLog
View File

@ -1,3 +1,14 @@
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* pch.h: use proper signal include
* forkedcallqueue.C: remove unused include
* FileMonitor.h: Use the preferred calling for Boost.Signal
* forkedcall.h: ditto
* FileMonitor.C: use the new signal typedef
2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net> 2004-09-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* forkedcall.h: remove include of <boost/function/funtion0.hpp> * forkedcall.h: remove include of <boost/function/funtion0.hpp>

2
src/support/FileMonitor.C
View File

@ -42,7 +42,7 @@ struct FileMonitor::Impl : public boost::signals::trackable {
Timeout timer_; Timeout timer_;
/// This signal is emitted if the file is modified (has a new checksum). /// This signal is emitted if the file is modified (has a new checksum).
boost::signal0<void> fileChanged_; FileMonitor::FileChangedSig fileChanged_;
/** We use these to ascertain whether a file (once loaded successfully) /** We use these to ascertain whether a file (once loaded successfully)
* has changed. * has changed.

5
src/support/FileMonitor.h
View File

@ -17,7 +17,7 @@
#include <boost/utility.hpp> #include <boost/utility.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
namespace lyx { namespace lyx {
namespace support { namespace support {
@ -52,7 +52,8 @@ public:
unsigned long checksum() const; unsigned long checksum() const;
/// Connect and you'll be informed when the file has changed. /// Connect and you'll be informed when the file has changed.
typedef boost::signal0<void>::slot_type slot_type; typedef boost::signal<void()> FileChangedSig;
typedef FileChangedSig::slot_type slot_type;
/// ///
boost::signals::connection connect(slot_type const &) const; boost::signals::connection connect(slot_type const &) const;

4
src/support/forkedcall.h
View File

@ -27,7 +27,7 @@
#define FORKEDCALL_H #define FORKEDCALL_H
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/signal2.hpp> #include <boost/signal.hpp>
#include <sys/types.h> #include <sys/types.h>
@ -60,7 +60,7 @@ public:
* we can return easily to C++ methods, rather than just globally * we can return easily to C++ methods, rather than just globally
* accessible functions. * accessible functions.
*/ */
typedef boost::signal2<void, pid_t, int> SignalType; typedef boost::signal<void(pid_t, int)> SignalType;
/** The signal is connected in the calling routine to the desired /** The signal is connected in the calling routine to the desired
* slot. We pass a shared_ptr rather than a reference to the signal * slot. We pass a shared_ptr rather than a reference to the signal

1
src/support/forkedcallqueue.C
View File

@ -15,7 +15,6 @@
#include "debug.h" #include "debug.h"
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/signals/signal2.hpp>
using std::string; using std::string;

3
src/support/pch.h
View File

@ -8,8 +8,7 @@
#include <boost/scoped_array.hpp> #include <boost/scoped_array.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/signals/signal0.hpp> #include <boost/signal.hpp>
#include <boost/signals/signal2.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/test/detail/nullstream.hpp> #include <boost/test/detail/nullstream.hpp>
#include <boost/tokenizer.hpp> #include <boost/tokenizer.hpp>