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

Yet more (minor) compilation fixes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4459 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-06-21 16:40:54 +00:00
parent ab15a1ef50
commit b4e8957abb
8 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,21 @@
2002-06-21 Angus Leeming <leeming@lyx.org>
* Menubar_pimpl.C (c-tor): rename MenuBackend const & mb argument to
avoid name clash with MenuBackend::const_iterator mb.
* QContentPane.C:
* QLPainter.C:
* qscreen.C: add using std::endl directive.
* QLPainter.C (lines, fillPolygon) : wrap QCOORD points inside a
scoped_array as np is not known at compile time and my compiler barfs.
* Toolbar_pimpl.h: forward declare class ToolbarProxy.
* qfont_loader.h: don't #include "font_loader.h".
* qfont_metrics.C: remove trailing ';' from namespace anon scope.
2002-06-21 John Levon <moz@compsoc.man.ac.uk>
* qfont_metrics.C: fix variable names

4
src/frontends/qt2/Menubar_pimpl.C
View File

@ -44,8 +44,8 @@ extern boost::scoped_ptr<kb_keymap> toplevel_keymap;
extern LyXAction lyxaction;
Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mb)
: owner_(static_cast<QtView*>(view)), menubackend_(mb)
Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
: owner_(static_cast<QtView*>(view)), menubackend_(mbe)
{
MenuBackend::const_iterator mb = menubackend_.begin();
MenuBackend::const_iterator mbend = menubackend_.end();

3
src/frontends/qt2/QContentPane.C
View File

@ -20,7 +20,8 @@
#include <qevent.h>
#include <qpainter.h>
using std::endl;
namespace {
/// return the LyX key state from Qt's

20
src/frontends/qt2/QLPainter.C
View File

@ -28,7 +28,11 @@
#include <qpainter.h>
#include <qbrush.h>
#include <qcolor.h>
#include <boost/scoped_array.hpp>
using std::endl;
QLPainter::QLPainter(QWorkArea & qwa)
: Painter(), owner_(qwa), paint_check_(0)
{
@ -112,8 +116,9 @@ Painter & QLPainter::lines(int const * xp, int const * yp,
line_width lw)
{
// FIXME ?
QCOORD points[np * 2];
// Must use new as np is not known at compile time.
boost::scoped_array<QCOORD> points(new QCOORD [np * 2]);
int j = 0;
@ -122,7 +127,8 @@ Painter & QLPainter::lines(int const * xp, int const * yp,
points[j++] = yp[i];
}
setPen(col, ls, lw).drawPolyline(QPointArray(np, points));
setPen(col, ls, lw).drawPolyline(QPointArray(np, points.get()));
return *this;
}
@ -152,7 +158,8 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp,
{
// FIXME ?
QCOORD points[np * 2];
// Must use new as np is not known at compile time.
boost::scoped_array<QCOORD> points(new QCOORD [np * 2]);
int j = 0;
@ -161,7 +168,8 @@ Painter & QLPainter::fillPolygon(int const * xp, int const * yp,
points[j++] = yp[i];
}
setPen(col).drawPolygon(QPointArray(np, points));
setPen(col).drawPolygon(QPointArray(np, points.get()));
return *this;
}

2
src/frontends/qt2/Toolbar_pimpl.h
View File

@ -29,7 +29,7 @@
class QtView;
class QToolBar;
class QComboBox;
class ToolbarProxy;
struct Toolbar::Pimpl {

1
src/frontends/qt2/qfont_loader.h
View File

@ -19,7 +19,6 @@
#include "lyxfont.h"
#include "font_loader.h"
#include "LString.h"
#include <qfont.h>

2
src/frontends/qt2/qfont_metrics.C
View File

@ -26,7 +26,7 @@ namespace {
QFontMetrics const & metrics(LyXFont const & f) {
return fontloader.metrics(f);
}
};
}
namespace font_metrics {

1
src/frontends/qt2/qscreen.C
View File

@ -24,6 +24,7 @@
#include "insets/insettext.h"
#include "debug.h"
using std::endl;
using std::max;
using std::min;