Use the preferred calling for Boost.Signal

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9010 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -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>
 
 	* pch.h: dont include <boost/function/function0.hpp>

src/LaTeX.h

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

src/buffer.h

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

src/frontends/ChangeLog

@@ -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>
 
 	* pch.h: new file

src/frontends/Dialogs.C

@@ -16,7 +16,7 @@
 
 #include "controllers/Dialog.h"
 
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.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();
 }
 
 
 namespace {
 
-BugfixSignal<boost::signal2<void, string const &, InsetBase*> > hideSignal;
+BugfixSignal<boost::signal<void(string const &, InsetBase*)> > hideSignal;
 
 }
 

src/frontends/Dialogs.h

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

src/frontends/LyXView.h

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

src/frontends/Timeout.h

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

src/frontends/WorkArea.h

@@ -16,9 +16,7 @@
 #include "frontends/key_state.h"
 
 #include <boost/shared_ptr.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal1.hpp>
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
 
 
 class Painter;
@@ -65,17 +63,17 @@ public:
 	virtual void putClipboard(std::string const &) const = 0;
 
 	/// work area dimensions have changed
-	boost::signal0<void> workAreaResize;
+	boost::signal<void()> workAreaResize;
 	/// the scrollbar has changed
-	boost::signal1<void, int> scrollDocView;
+	boost::signal<void(int)> scrollDocView;
 	/// 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
-	boost::signal1<void, FuncRequest> dispatch;
+	boost::signal<void(FuncRequest)> dispatch;
 	/// 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
-	boost::signal0<void> selectionLost;
+	boost::signal<void()> selectionLost;
 };
 
 #endif // WORKAREA_H

src/frontends/pch.h

@@ -4,9 +4,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.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/utility.hpp>
 

src/frontends/qt2/lyx_gui.C

@@ -34,7 +34,7 @@
 // Dear Lord, deliver us from Evil, aka the Qt headers
 // Qt defines a macro 'signals' that clashes with a boost namespace.
 // 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/shared_ptr.hpp>
 
@@ -179,13 +179,13 @@ void parse_init(int & argc, char * argv[])
 	// algorithm on some entries. It lists the menu names that
 	// should not be moved to the LyX menu
 	static QTranslator aqua_trans(0);
-	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0, 
+	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setting", 0,
 					     "do_not_merge_me"));
-	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0, 
+	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Config", 0,
 					     "do_not_merge_me"));
-	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0, 
+	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Options", 0,
 					     "do_not_merge_me"));
-	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0, 
+	aqua_trans.insert(QTranslatorMessage("QMenuBar", "Setup", 0,
 					     "do_not_merge_me"));
 
 	app.installTranslator(&aqua_trans);

src/frontends/xforms/ChangeLog

@@ -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>
 
 	* forms/pch.h: make it better

src/frontends/xforms/Tooltips.C

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

src/frontends/xforms/Tooltips.h

@@ -18,7 +18,7 @@
 #ifndef TOOLTIPS_H
 #define TOOLTIPS_H
 
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
 
 #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
 	 *  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.
 	typedef std::map<FL_OBJECT *, std::string> TooltipsMap;

src/frontends/xforms/XFormsView.h

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

src/frontends/xforms/pch.h

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

src/graphics/ChangeLog

@@ -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>
 
 	* pch.h: include <boost/function.hpp> instead of

src/graphics/GraphicsCacheItem.C

@@ -122,7 +122,7 @@ struct CacheItem::Impl : public boost::signals::trackable {
 	ImageStatus status_;
 
 	/// 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
 	boost::signals::connection cl_;

src/graphics/GraphicsCacheItem.h

@@ -32,7 +32,7 @@
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 
 
 class InsetGraphics;
@@ -84,7 +84,8 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  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;
 

src/graphics/GraphicsConverter.C

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

src/graphics/GraphicsConverter.h

@@ -17,8 +17,8 @@
 #ifndef GRAPHICSCONVERTER_H
 #define GRAPHICSCONVERTER_H
 
-#include <boost/signals/signal1.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 #include <boost/utility.hpp>
 
 namespace lyx {
@@ -46,7 +46,8 @@ public:
 	 *  finished.
 	 *  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;
 

src/graphics/GraphicsImage.h

@@ -26,7 +26,7 @@
 
 #include <boost/function.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
 
 #include <vector>
 #include <utility>
@@ -66,9 +66,9 @@ public:
 	bool isDrawable() const;
 
 	/** 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;
 

src/graphics/GraphicsLoader.C

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

src/graphics/GraphicsLoader.h

@@ -26,8 +26,8 @@
 
 #include "GraphicsTypes.h"
 
-#include <boost/signals/signal0.hpp>
 #include <boost/scoped_ptr.hpp>
+#include <boost/signal.hpp>
 
 class InsetOld;
 
@@ -90,7 +90,8 @@ public:
 	/** Connect and you'll be informed when the loading status of the image
 	 *  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;
 

src/graphics/PreviewLoader.C

@@ -139,7 +139,7 @@ struct PreviewLoader::Impl : public boost::signals::trackable {
 	void startLoading();
 
 	/// 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_; }
 

src/graphics/PreviewLoader.h

@@ -20,7 +20,7 @@
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
 
 class Buffer;
 
@@ -73,7 +73,8 @@ public:
 	 *  has been created and is ready for loading through
 	 *  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;
 

src/graphics/pch.h

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

src/insets/ChangeLog

@@ -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>
 
 	* ExternalTransforms.h: User preferred calling of Boost.Function

src/insets/pch.h

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

src/insets/render_preview.h

@@ -20,7 +20,7 @@
 
 #include "support/FileMonitor.h"
 
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
 #include <boost/signals/connection.hpp>
 
@@ -116,7 +116,7 @@ public:
 
 
 	/// 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 &);
 
 	/// equivalent to dynamic_cast

src/pch.h

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

src/support/ChangeLog

@@ -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>
 
 	* forkedcall.h: remove include of <boost/function/funtion0.hpp>

src/support/FileMonitor.C

@@ -42,7 +42,7 @@ struct FileMonitor::Impl : public boost::signals::trackable {
 	Timeout timer_;
 
 	/// 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)
 	 *  has changed.

src/support/FileMonitor.h

@@ -17,7 +17,7 @@
 
 #include <boost/utility.hpp>
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
+#include <boost/signal.hpp>
 
 namespace lyx {
 namespace support {
@@ -52,7 +52,8 @@ public:
 	unsigned long checksum() const;
 
 	/// 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;
 

src/support/forkedcall.h

@@ -27,7 +27,7 @@
 #define FORKEDCALL_H
 
 #include <boost/shared_ptr.hpp>
-#include <boost/signals/signal2.hpp>
+#include <boost/signal.hpp>
 
 #include <sys/types.h>
 
@@ -60,7 +60,7 @@ public:
 	 *  we can return easily to C++ methods, rather than just globally
 	 *  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
 	 *  slot. We pass a shared_ptr rather than a reference to the signal

src/support/forkedcallqueue.C

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

src/support/pch.h

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