diff --git a/headers/private/print/libprint/MarginView.h b/headers/private/print/libprint/MarginView.h index 88db6a055e..97d1b80008 100644 --- a/headers/private/print/libprint/MarginView.h +++ b/headers/private/print/libprint/MarginView.h @@ -147,7 +147,7 @@ enum MarginUnit { */ class MarginView : public BBox { -friend MarginManager; +friend class MarginManager; private: diff --git a/headers/private/print/libprint/SpoolMetaData.h b/headers/private/print/libprint/SpoolMetaData.h index d02b3b97c7..71fadf4672 100644 --- a/headers/private/print/libprint/SpoolMetaData.h +++ b/headers/private/print/libprint/SpoolMetaData.h @@ -9,6 +9,7 @@ #include #include #include +using namespace std; class SpoolMetaData { private: diff --git a/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp b/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp index 0f402e7a08..50cb9b0b84 100644 --- a/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp +++ b/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp @@ -27,6 +27,7 @@ THE SOFTWARE. */ +#include #include "LinePathBuilder.h" static const float kNearZero = 0.000000000001; diff --git a/src/add-ons/print/drivers/pdf/source/MarginView.h b/src/add-ons/print/drivers/pdf/source/MarginView.h index ca342e697f..cd8a826e7c 100644 --- a/src/add-ons/print/drivers/pdf/source/MarginView.h +++ b/src/add-ons/print/drivers/pdf/source/MarginView.h @@ -140,7 +140,7 @@ const uint32 FLIP_PAGE = 'flip'; */ class MarginView : public BBox { -friend MarginManager; +friend class MarginManager; public: // used to index unitFormat array diff --git a/src/add-ons/print/drivers/pdf/source/PictureIterator.cpp b/src/add-ons/print/drivers/pdf/source/PictureIterator.cpp index f23c47a591..813d412285 100644 --- a/src/add-ons/print/drivers/pdf/source/PictureIterator.cpp +++ b/src/add-ons/print/drivers/pdf/source/PictureIterator.cpp @@ -91,56 +91,56 @@ static void _op49(void * p) { return ((PictureIterator *) p)->Op(49); } static void * playbackHandlers[] = { - _op0, // 0 no operation - _MovePenBy, // 1 MovePenBy(void *user, BPoint delta) - _StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) - _StrokeRect, // 3 StrokeRect(void *user, BRect rect) - _FillRect, // 4 FillRect(void *user, BRect rect) - _StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) - _FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) - _StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) - _FillBezier, // 8 FillBezier(void *user, BPoint *control) - _StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) - _FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) - _StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) - _FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) - _StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) - _FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) - _StrokeShape, // 15 StrokeShape(void *user, BShape *shape) - _FillShape, // 16 FillShape(void *user, BShape *shape) - _DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) - _DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) - _op19, // 19 *reserved* - _SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) - _ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) - _PushState, // 22 PushState(void *user) - _PopState, // 23 PopState(void *user) - _EnterStateChange, // 24 EnterStateChange(void *user) - _ExitStateChange, // 25 ExitStateChange(void *user) - _EnterFontState, // 26 EnterFontState(void *user) - _ExitFontState, // 27 ExitFontState(void *user) - _SetOrigin, // 28 SetOrigin(void *user, BPoint pt) - _SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) - _SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) - _SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) - _SetPenSize, // 32 SetPenSize(void *user, float size) - _SetForeColor, // 33 SetForeColor(void *user, rgb_color color) - _SetBackColor, // 34 SetBackColor(void *user, rgb_color color) - _SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) - _SetScale, // 36 SetScale(void *user, float scale) - _SetFontFamily, // 37 SetFontFamily(void *user, char *family) - _SetFontStyle, // 38 SetFontStyle(void *user, char *style) - _SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) - _SetFontSize, // 40 SetFontSize(void *user, float size) - _SetFontRotate, // 41 SetFontRotate(void *user, float rotation) - _SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) - _SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) - _SetFontShear, // 44 SetFontShear(void *user, float shear) - _op45, // 45 *reserved* - _SetFontFace, // 46 SetFontFace(void *user, int32 flags) - _op47, - _op48, - _op49, + (void*)_op0, // 0 no operation + (void*)_MovePenBy, // 1 MovePenBy(void *user, BPoint delta) + (void*)_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) + (void*)_StrokeRect, // 3 StrokeRect(void *user, BRect rect) + (void*)_FillRect, // 4 FillRect(void *user, BRect rect) + (void*)_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) + (void*)_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) + (void*)_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) + (void*)_FillBezier, // 8 FillBezier(void *user, BPoint *control) + (void*)_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) + (void*)_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) + (void*)_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) + (void*)_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) + (void*)_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) + (void*)_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) + (void*)_StrokeShape, // 15 StrokeShape(void *user, BShape *shape) + (void*)_FillShape, // 16 FillShape(void *user, BShape *shape) + (void*)_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) + (void*)_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) + (void*)_op19, // 19 *reserved* + (void*)_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) + (void*)_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) + (void*)_PushState, // 22 PushState(void *user) + (void*)_PopState, // 23 PopState(void *user) + (void*)_EnterStateChange, // 24 EnterStateChange(void *user) + (void*)_ExitStateChange, // 25 ExitStateChange(void *user) + (void*)_EnterFontState, // 26 EnterFontState(void *user) + (void*)_ExitFontState, // 27 ExitFontState(void *user) + (void*)_SetOrigin, // 28 SetOrigin(void *user, BPoint pt) + (void*)_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) + (void*)_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) + (void*)_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) + (void*)_SetPenSize, // 32 SetPenSize(void *user, float size) + (void*)_SetForeColor, // 33 SetForeColor(void *user, rgb_color color) + (void*)_SetBackColor, // 34 SetBackColor(void *user, rgb_color color) + (void*)_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) + (void*)_SetScale, // 36 SetScale(void *user, float scale) + (void*)_SetFontFamily, // 37 SetFontFamily(void *user, char *family) + (void*)_SetFontStyle, // 38 SetFontStyle(void *user, char *style) + (void*)_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) + (void*)_SetFontSize, // 40 SetFontSize(void *user, float size) + (void*)_SetFontRotate, // 41 SetFontRotate(void *user, float rotation) + (void*)_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) + (void*)_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) + (void*)_SetFontShear, // 44 SetFontShear(void *user, float shear) + (void*)_op45, // 45 *reserved* + (void*)_SetFontFace, // 46 SetFontFace(void *user, int32 flags) + (void*)_op47, + (void*)_op48, + (void*)_op49, NULL }; diff --git a/src/add-ons/print/drivers/pdf/source/PictureIterator.h b/src/add-ons/print/drivers/pdf/source/PictureIterator.h index dfdfbc57b7..2a7155f4cf 100644 --- a/src/add-ons/print/drivers/pdf/source/PictureIterator.h +++ b/src/add-ons/print/drivers/pdf/source/PictureIterator.h @@ -90,4 +90,4 @@ public: virtual void Iterate(BPicture* picture); }; -#endif _PICTURE_ITERATOR_H +#endif // _PICTURE_ITERATOR_H diff --git a/src/add-ons/print/drivers/pdf/source/Utils.cpp b/src/add-ons/print/drivers/pdf/source/Utils.cpp index b25ef53905..7d078b082e 100644 --- a/src/add-ons/print/drivers/pdf/source/Utils.cpp +++ b/src/add-ons/print/drivers/pdf/source/Utils.cpp @@ -29,6 +29,7 @@ THE SOFTWARE. */ +#include #include "Utils.h" // -------------------------------------------------- @@ -64,7 +65,7 @@ static bool InList(const char* list[], const char* name) { // -------------------------------------------------- // copied from BeUtils.cpp -void AddFields(BMessage* to, const BMessage* from, bool overwrite = true, const char* excludeList[], const char* includeList[]) { +void AddFields(BMessage* to, const BMessage* from, bool overwrite, const char* excludeList[], const char* includeList[]) { if (to == from) return; char* name; type_code type; diff --git a/src/add-ons/print/drivers/postscript/Jamfile b/src/add-ons/print/drivers/postscript/Jamfile index c42d08324f..0c4e8feb6c 100644 --- a/src/add-ons/print/drivers/postscript/Jamfile +++ b/src/add-ons/print/drivers/postscript/Jamfile @@ -12,7 +12,7 @@ Addon PS\ Compatible : Print : PSCap.cpp ; -LinkAgainst PS\ Compatible : be $(TARGET_LIBSTDC++) libprint.a ; +LinkAgainst PS\ Compatible : be libprint.a $(TARGET_LIBSTDC++) ; Package haiku-printingkit-cvs : PS\ Compatible : diff --git a/src/add-ons/print/drivers/preview/MarginView.h b/src/add-ons/print/drivers/preview/MarginView.h index ca342e697f..cd8a826e7c 100644 --- a/src/add-ons/print/drivers/preview/MarginView.h +++ b/src/add-ons/print/drivers/preview/MarginView.h @@ -140,7 +140,7 @@ const uint32 FLIP_PAGE = 'flip'; */ class MarginView : public BBox { -friend MarginManager; +friend class MarginManager; public: // used to index unitFormat array diff --git a/src/add-ons/print/drivers/preview/Utils.cpp b/src/add-ons/print/drivers/preview/Utils.cpp index 6c5a0dad74..da631bad41 100644 --- a/src/add-ons/print/drivers/preview/Utils.cpp +++ b/src/add-ons/print/drivers/preview/Utils.cpp @@ -30,6 +30,7 @@ THE SOFTWARE. */ +#include #include "Utils.h" // -------------------------------------------------- @@ -135,4 +136,4 @@ BRect ScaleRect(BRect rect, float scale) { rect.top *= scale; rect.bottom *= scale; return rect; -} \ No newline at end of file +} diff --git a/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp b/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp index 64c563fafc..86f52980a1 100644 --- a/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp +++ b/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp @@ -6,7 +6,7 @@ #include #include #include -#include "_sstream" +#include #include #include #include diff --git a/src/add-ons/print/drivers/shared/libprint/_sstream b/src/add-ons/print/drivers/shared/libprint/_sstream deleted file mode 100644 index 0239578396..0000000000 --- a/src/add-ons/print/drivers/shared/libprint/_sstream +++ /dev/null @@ -1,24 +0,0 @@ -/* - * _sstream - * Copyright 1999-2000 Y.Takagi. All Rights Reserved. - */ - -#if __MWERKS__ -#include -#else - -#ifndef __SSTREAM_H -#define __SSTREAM_H - -#include -#include - -class ostringstream : public ostrstream { -public: - ostringstream() : ostrstream() {} - ~ostringstream() { delete [] ostrstream::str(); } - string str() { *this << ends; return string(ostrstream::str()); } -}; - -#endif /* __SSTREAM_H */ -#endif /* USING_STRSTREAM */ diff --git a/src/add-ons/print/shared/PictureIterator.cpp b/src/add-ons/print/shared/PictureIterator.cpp index b89825c46a..65f1c868b2 100644 --- a/src/add-ons/print/shared/PictureIterator.cpp +++ b/src/add-ons/print/shared/PictureIterator.cpp @@ -91,56 +91,56 @@ static void _op49(void * p) { return ((PictureIterator *) p)->Op(49); } static void * playbackHandlers[] = { - _op0, // 0 no operation - _MovePenBy, // 1 MovePenBy(void *user, BPoint delta) - _StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) - _StrokeRect, // 3 StrokeRect(void *user, BRect rect) - _FillRect, // 4 FillRect(void *user, BRect rect) - _StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) - _FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) - _StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) - _FillBezier, // 8 FillBezier(void *user, BPoint *control) - _StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) - _FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) - _StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) - _FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) - _StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) - _FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) - _StrokeShape, // 15 StrokeShape(void *user, BShape *shape) - _FillShape, // 16 FillShape(void *user, BShape *shape) - _DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) - _DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) - _op19, // 19 *reserved* - _SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) - _ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) - _PushState, // 22 PushState(void *user) - _PopState, // 23 PopState(void *user) - _EnterStateChange, // 24 EnterStateChange(void *user) - _ExitStateChange, // 25 ExitStateChange(void *user) - _EnterFontState, // 26 EnterFontState(void *user) - _ExitFontState, // 27 ExitFontState(void *user) - _SetOrigin, // 28 SetOrigin(void *user, BPoint pt) - _SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) - _SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) - _SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) - _SetPenSize, // 32 SetPenSize(void *user, float size) - _SetForeColor, // 33 SetForeColor(void *user, rgb_color color) - _SetBackColor, // 34 SetBackColor(void *user, rgb_color color) - _SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) - _SetScale, // 36 SetScale(void *user, float scale) - _SetFontFamily, // 37 SetFontFamily(void *user, char *family) - _SetFontStyle, // 38 SetFontStyle(void *user, char *style) - _SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) - _SetFontSize, // 40 SetFontSize(void *user, float size) - _SetFontRotate, // 41 SetFontRotate(void *user, float rotation) - _SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) - _SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) - _SetFontShear, // 44 SetFontShear(void *user, float shear) - _op45, // 45 *reserved* - _SetFontFace, // 46 SetFontFace(void *user, int32 flags) - _op47, - _op48, - _op49, + (void *)_op0, // 0 no operation + (void *)_MovePenBy, // 1 MovePenBy(void *user, BPoint delta) + (void *)_StrokeLine, // 2 StrokeLine(void *user, BPoint start, BPoint end) + (void *)_StrokeRect, // 3 StrokeRect(void *user, BRect rect) + (void *)_FillRect, // 4 FillRect(void *user, BRect rect) + (void *)_StrokeRoundRect, // 5 StrokeRoundRect(void *user, BRect rect, BPoint radii) + (void *)_FillRoundRect, // 6 FillRoundRect(void *user, BRect rect, BPoint radii) + (void *)_StrokeBezier, // 7 StrokeBezier(void *user, BPoint *control) + (void *)_FillBezier, // 8 FillBezier(void *user, BPoint *control) + (void *)_StrokeArc, // 9 StrokeArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) + (void *)_FillArc, // 10 FillArc(void *user, BPoint center, BPoint radii, float startTheta, float arcTheta) + (void *)_StrokeEllipse, // 11 StrokeEllipse(void *user, BPoint center, BPoint radii) + (void *)_FillEllipse, // 12 FillEllipse(void *user, BPoint center, BPoint radii) + (void *)_StrokePolygon, // 13 StrokePolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) + (void *)_FillPolygon, // 14 FillPolygon(void *user, int32 numPoints, BPoint *points, bool isClosed) + (void *)_StrokeShape, // 15 StrokeShape(void *user, BShape *shape) + (void *)_FillShape, // 16 FillShape(void *user, BShape *shape) + (void *)_DrawString, // 17 DrawString(void *user, char *string, float deltax, float deltay) + (void *)_DrawPixels, // 18 DrawPixels(void *user, BRect src, BRect dest, int32 width, int32 height, int32 bytesPerRow, int32 pixelFormat, int32 flags, void *data) + (void *)_op19, // 19 *reserved* + (void *)_SetClippingRects, // 20 SetClippingRects(void *user, BRect *rects, uint32 numRects) + (void *)_ClipToPicture, // 21 ClipToPicture(void *user, BPicture *picture, BPoint pt, bool clip_to_inverse_picture) + (void *)_PushState, // 22 PushState(void *user) + (void *)_PopState, // 23 PopState(void *user) + (void *)_EnterStateChange, // 24 EnterStateChange(void *user) + (void *)_ExitStateChange, // 25 ExitStateChange(void *user) + (void *)_EnterFontState, // 26 EnterFontState(void *user) + (void *)_ExitFontState, // 27 ExitFontState(void *user) + (void *)_SetOrigin, // 28 SetOrigin(void *user, BPoint pt) + (void *)_SetPenLocation, // 29 SetPenLocation(void *user, BPoint pt) + (void *)_SetDrawingMode, // 30 SetDrawingMode(void *user, drawing_mode mode) + (void *)_SetLineMode, // 31 SetLineMode(void *user, cap_mode capMode, join_mode joinMode, float miterLimit) + (void *)_SetPenSize, // 32 SetPenSize(void *user, float size) + (void *)_SetForeColor, // 33 SetForeColor(void *user, rgb_color color) + (void *)_SetBackColor, // 34 SetBackColor(void *user, rgb_color color) + (void *)_SetStipplePattern, // 35 SetStipplePattern(void *user, pattern p) + (void *)_SetScale, // 36 SetScale(void *user, float scale) + (void *)_SetFontFamily, // 37 SetFontFamily(void *user, char *family) + (void *)_SetFontStyle, // 38 SetFontStyle(void *user, char *style) + (void *)_SetFontSpacing, // 39 SetFontSpacing(void *user, int32 spacing) + (void *)_SetFontSize, // 40 SetFontSize(void *user, float size) + (void *)_SetFontRotate, // 41 SetFontRotate(void *user, float rotation) + (void *)_SetFontEncoding, // 42 SetFontEncoding(void *user, int32 encoding) + (void *)_SetFontFlags, // 43 SetFontFlags(void *user, int32 flags) + (void *)_SetFontShear, // 44 SetFontShear(void *user, float shear) + (void *)_op45, // 45 *reserved* + (void *)_SetFontFace, // 46 SetFontFace(void *user, int32 flags) + (void *)_op47, + (void *)_op48, + (void *)_op49, NULL }; diff --git a/src/add-ons/print/shared/PicturePrinter.cpp b/src/add-ons/print/shared/PicturePrinter.cpp index ad89abf9af..b90d0f64be 100644 --- a/src/add-ons/print/shared/PicturePrinter.cpp +++ b/src/add-ons/print/shared/PicturePrinter.cpp @@ -391,7 +391,7 @@ void PicturePrinter::SetFontEncoding(int32 encoding) { } #define PRINT_FLAG(flag) \ - if (flags & flag) { f |= flag; Print(##flag); } + if (flags & flag) { f |= flag; Print(#flag); } void PicturePrinter::SetFontFlags(int32 flags) { Indent(); Print("SetFontFlags");