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

One more second..

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20362 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-09-19 21:28:11 +00:00
parent b6a33822e5
commit 72fe3d9fc1
5 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontends/Dialogs.h
View File

@ -114,7 +114,8 @@ private:
/// ///
std::map<std::string, DialogPtr> dialogs_; std::map<std::string, DialogPtr> dialogs_;
/// flag against a race condition due to multiclicks in Qt frontend, see bug #1119 /// flag against a race condition due to multiclicks in Qt frontend,
/// see bug #1119
bool in_show_; bool in_show_;
/// ///

5
src/frontends/LyXView.cpp
View File

@ -85,6 +85,9 @@ LyXView::~LyXView()
{ {
disconnectBuffer(); disconnectBuffer();
disconnectBufferView(); disconnectBufferView();
delete dialogs_;
delete toolbars_;
delete autosave_timeout_;
} }
@ -228,7 +231,7 @@ void LyXView::connectBufferView(BufferView & bv)
update_dialog_connection_ = bv.updateDialog.connect( update_dialog_connection_ = bv.updateDialog.connect(
boost::bind(&LyXView::updateDialog, this, _1, _2)); boost::bind(&LyXView::updateDialog, this, _1, _2));
layout_changed_connection_ = bv.layoutChanged.connect( layout_changed_connection_ = bv.layoutChanged.connect(
boost::bind(&Toolbars::setLayout, toolbars_.get(), _1)); boost::bind(&Toolbars::setLayout, toolbars_, _1));
} }

23
src/frontends/LyXView.h
View File

@ -18,7 +18,6 @@
#include "LyXFunc.h" #include "LyXFunc.h"
#include <boost/scoped_ptr.hpp>
#include <boost/signal.hpp> #include <boost/signal.hpp>
#include <boost/signals/trackable.hpp> #include <boost/signals/trackable.hpp>
#include <boost/utility.hpp> #include <boost/utility.hpp>
@ -57,15 +56,15 @@ class WorkArea;
*/ */
class LyXView : public boost::signals::trackable, boost::noncopyable { class LyXView : public boost::signals::trackable, boost::noncopyable {
public: public:
///
LyXView(int id); LyXView(int id);
///
virtual ~LyXView(); virtual ~LyXView();
///
int id() const { return id_; } int id() const { return id_; }
///
virtual void close() = 0; virtual void close() = 0;
///
virtual void setFocus() = 0; virtual void setFocus() = 0;
/// ///
@ -131,9 +130,9 @@ public:
virtual void openMenu(docstring const & name) = 0; virtual void openMenu(docstring const & name) = 0;
/// get access to the dialogs /// get access to the dialogs
Dialogs & getDialogs() { return *dialogs_.get(); } Dialogs & getDialogs() { return *dialogs_; }
/// ///
Dialogs const & getDialogs() const { return *dialogs_.get(); } Dialogs const & getDialogs() const { return *dialogs_; }
//@} //@}
@ -193,7 +192,7 @@ protected:
void disconnectBuffer(); void disconnectBuffer();
/// view's toolbar /// view's toolbar
boost::scoped_ptr<Toolbars> toolbars_; Toolbars * toolbars_;
private: private:
/** /**
@ -207,11 +206,9 @@ private:
void autoSave(); void autoSave();
/// auto-saving of buffers /// auto-saving of buffers
boost::scoped_ptr<Timeout> const autosave_timeout_; Timeout * const autosave_timeout_;
/// our function handler
boost::scoped_ptr<LyXFunc> lyxfunc_;
/// dialogs for this view /// dialogs for this view
boost::scoped_ptr<Dialogs> dialogs_; Dialogs * dialogs_;
/// buffer structure changed signal connection /// buffer structure changed signal connection
boost::signals::connection bufferStructureChangedConnection_; boost::signals::connection bufferStructureChangedConnection_;

15
src/frontends/pch.h
View File

@ -1,20 +1,5 @@
#include <config.h> #include <config.h>
#include <boost/function.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/signal.hpp>
#include <boost/signals/trackable.hpp>
#include <boost/utility.hpp>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <limits>
#include <map> #include <map>
#include <string> #include <string>
#include <utility> #include <utility>

3
src/frontends/qt4/pch.h
View File

@ -21,3 +21,6 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <QtCore>
#include <QtGui>