[haiku-commits] r39140 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 25 Oct 2010 13:44:09 +0200 (CEST)
Author: laplace
Date: 2010-10-25 13:44:09 +0200 (Mon, 25 Oct 2010)
New Revision: 39140
Changeset: http://dev.haiku-os.org/changeset/39140
Modified:
haiku/trunk/headers/libs/print/libprint/PrintProcess.h
haiku/trunk/headers/libs/print/libprint/PrinterData.h
haiku/trunk/headers/libs/print/libprint/Transport.h
haiku/trunk/headers/libs/print/libprint/UIDriver.h
haiku/trunk/src/libs/print/libprint/AboutBox.cpp
haiku/trunk/src/libs/print/libprint/DbgMsg.cpp
haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp
haiku/trunk/src/libs/print/libprint/Halftone.cpp
haiku/trunk/src/libs/print/libprint/PackBits.cpp
haiku/trunk/src/libs/print/libprint/PageSetupDlg.cpp
haiku/trunk/src/libs/print/libprint/PrintProcess.cpp
haiku/trunk/src/libs/print/libprint/SpoolMetaData.cpp
haiku/trunk/src/libs/print/libprint/StatusWindow.cpp
haiku/trunk/src/libs/print/libprint/Transport.cpp
haiku/trunk/src/libs/print/libprint/UIDriver.cpp
haiku/trunk/src/libs/print/libprint/ValidRect.cpp
Log:
* More style changes.
* Removed namespace handling for Metrowerks compiler.
Modified: haiku/trunk/headers/libs/print/libprint/PrintProcess.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/PrintProcess.h 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/headers/libs/print/libprint/PrintProcess.h 2010-10-25
11:44:09 UTC (rev 39140)
@@ -13,12 +13,10 @@
#include <Rect.h>
#include <Point.h>
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
class BFile;
class BPicture;
Modified: haiku/trunk/headers/libs/print/libprint/PrinterData.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/PrinterData.h 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/headers/libs/print/libprint/PrinterData.h 2010-10-25
11:44:09 UTC (rev 39140)
@@ -9,11 +9,7 @@
#include <string>
#include <SerialPort.h>
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
using namespace std;
-#else
-#define std
-#endif
class BNode;
Modified: haiku/trunk/headers/libs/print/libprint/Transport.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/Transport.h 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/headers/libs/print/libprint/Transport.h 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -12,12 +12,10 @@
class BDataIO;
class PrinterData;
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
extern "C" {
typedef BDataIO *(*PFN_init_transport)(BMessage *);
typedef void (*PFN_exit_transport)(void);
Modified: haiku/trunk/headers/libs/print/libprint/UIDriver.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/UIDriver.h 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/headers/libs/print/libprint/UIDriver.h 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -6,11 +6,13 @@
#ifndef __UIDRIVER_H
#define __UIDRIVER_H
+
class BMessage;
class PrinterData;
class PrinterCap;
class JobData;
+
class UIDriver {
public:
UIDriver(BMessage *msg, PrinterData *printer_data, const PrinterCap
*printer_cap);
Modified: haiku/trunk/src/libs/print/libprint/AboutBox.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/AboutBox.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/AboutBox.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -12,12 +12,10 @@
#include "AboutBox.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
enum {
kMsgOK = 'AbOK'
};
Modified: haiku/trunk/src/libs/print/libprint/DbgMsg.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/DbgMsg.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/DbgMsg.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -15,12 +15,10 @@
#ifdef DBG
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
void write_debug_stream(const char *format, ...)
{
va_list ap;
Modified: haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp 2010-10-25
11:44:09 UTC (rev 39140)
@@ -29,12 +29,10 @@
#include "ValidRect.h"
#include "DbgMsg.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
// Measure printJob() time. Either true or false.
#define MEASURE_PRINT_JOB_TIME false
Modified: haiku/trunk/src/libs/print/libprint/Halftone.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/Halftone.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/Halftone.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -12,12 +12,10 @@
#include "ValidRect.h"
#include "DbgMsg.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
#include "Pattern.h"
static uint gray(ColorRGB32 c)
Modified: haiku/trunk/src/libs/print/libprint/PackBits.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/PackBits.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/PackBits.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -13,12 +13,10 @@
#include <string.h>
#include "PackBits.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
#define MAXINBYTES 127
#define CONTROL1(i) -i
#define CONTROL2(i) i
Modified: haiku/trunk/src/libs/print/libprint/PageSetupDlg.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/PageSetupDlg.cpp 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/src/libs/print/libprint/PageSetupDlg.cpp 2010-10-25
11:44:09 UTC (rev 39140)
@@ -43,11 +43,7 @@
#include "PrintUtils.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
using namespace std;
-#else
-#define std
-#endif
enum MSGS {
Modified: haiku/trunk/src/libs/print/libprint/PrintProcess.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/PrintProcess.cpp 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/src/libs/print/libprint/PrintProcess.cpp 2010-10-25
11:44:09 UTC (rev 39140)
@@ -10,6 +10,7 @@
#include "PrintProcess.h"
#include "DbgMsg.h"
+
PictureData::PictureData(BFile *file)
{
DBGMSG(("construct PictureData\n"));
@@ -30,18 +31,19 @@
DBGMSG(("3: current seek position = 0x%x\n", (int)file->Position()));
}
+
PictureData::~PictureData()
{
delete picture;
}
-/*--------------------------------------------------*/
PageData::PageData()
{
fHollow = true;
}
+
PageData::PageData(BFile *file, bool reverse)
{
fFile = file;
@@ -62,7 +64,9 @@
}
}
-bool PageData::startEnum()
+
+bool
+PageData::startEnum()
{
off_t offset;
uchar dummy[40];
@@ -84,7 +88,9 @@
return fPictureCount > 0;
}
-bool PageData::enumObject(PictureData **picture_data)
+
+bool
+PageData::enumObject(PictureData **picture_data)
{
if (fHollow || fPictureCount <= 0) {
*picture_data = NULL;
@@ -97,13 +103,8 @@
return false;
}
-/*--------------------------------------------------*/
-SpoolData::SpoolData(
- BFile *file,
- int page_count,
- int nup,
- bool reverse)
+SpoolData::SpoolData(BFile *file, int page_count, int nup, bool reverse)
{
DBGMSG(("nup = %d\n", nup));
DBGMSG(("page_count = %d\n", page_count));
@@ -138,6 +139,7 @@
}
}
+
SpoolData::~SpoolData()
{
for (fIt = fPages.begin(); fIt != fPages.end(); fIt++) {
@@ -145,13 +147,17 @@
}
}
-bool SpoolData::startEnum()
+
+bool
+SpoolData::startEnum()
{
fIt = fPages.begin();
return true;
}
-bool SpoolData::enumObject(PageData **page_data)
+
+bool
+SpoolData::enumObject(PageData **page_data)
{
*page_data = *fIt++;
if (fIt == fPages.end()) {
Modified: haiku/trunk/src/libs/print/libprint/SpoolMetaData.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/SpoolMetaData.cpp 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/src/libs/print/libprint/SpoolMetaData.cpp 2010-10-25
11:44:09 UTC (rev 39140)
@@ -9,6 +9,7 @@
const char *kSDDescription = "_spool/Description";
const char* kSDMimeType = "_spool/MimeType";
+
SpoolMetaData::SpoolMetaData(BFile* spool_file)
{
BString string;
@@ -24,6 +25,7 @@
}
}
+
SpoolMetaData::~SpoolMetaData()
{
}
Modified: haiku/trunk/src/libs/print/libprint/StatusWindow.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/StatusWindow.cpp 2010-10-25
11:34:31 UTC (rev 39139)
+++ haiku/trunk/src/libs/print/libprint/StatusWindow.cpp 2010-10-25
11:44:09 UTC (rev 39140)
@@ -101,6 +101,7 @@
{
}
+
void
StatusWindow::ResetStatusBar(void)
{
@@ -109,6 +110,7 @@
Unlock();
}
+
bool
StatusWindow::UpdateStatusBar(uint32 page, uint32 copy)
{
@@ -145,6 +147,7 @@
return fCancelBar;
}
+
void
StatusWindow::SetPageCopies(uint32 copies)
{
Modified: haiku/trunk/src/libs/print/libprint/Transport.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/Transport.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/Transport.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -15,12 +15,10 @@
#include "PrinterData.h"
#include "DbgMsg.h"
-#if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+
using namespace std;
-#else
-#define std
-#endif
+
Transport::Transport(const PrinterData *printer_data)
: fImage(-1), fInitTransport(0), fExitTransport(0), fDataStream(0),
fAbort(false)
{
@@ -74,6 +72,7 @@
}
}
+
Transport::~Transport()
{
if (fExitTransport) {
@@ -84,17 +83,23 @@
}
}
-bool Transport::check_abort() const
+
+bool
+Transport::check_abort() const
{
return fDataStream == 0;
}
-const string &Transport::last_error() const
+
+const
+string &Transport::last_error() const
{
return fLastErrorString;
}
-bool Transport::is_print_to_file_canceled() const
+
+bool
+Transport::is_print_to_file_canceled() const
{
// The BeOS "Print To File" transport add-on returns a non-NULL BDataIO
*
// even after user filepanel cancellation!
@@ -102,13 +107,17 @@
return file != NULL && file->InitCheck() != B_OK;
}
-void Transport::set_last_error(const char *e)
+
+void
+Transport::set_last_error(const char *e)
{
fLastErrorString = e;
fAbort = true;
}
-void Transport::write(const void *buffer, size_t size)
throw(TransportException)
+
+void
+Transport::write(const void *buffer, size_t size) throw(TransportException)
{
if (fDataStream) {
if (size == (size_t)fDataStream->Write(buffer, size)) {
Modified: haiku/trunk/src/libs/print/libprint/UIDriver.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/UIDriver.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/UIDriver.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -12,16 +12,20 @@
#include "PageSetupDlg.h"
#include "DbgMsg.h"
+
UIDriver::UIDriver(BMessage *msg, PrinterData *printer_data, const PrinterCap
*printer_cap)
: fMsg(msg), fPrinterData(printer_data), fPrinterCap(printer_cap)
{
}
+
UIDriver::~UIDriver()
{
}
-BMessage *UIDriver::configPage()
+
+BMessage*
+UIDriver::configPage()
{
BMessage *clone_msg = new BMessage(*fMsg);
JobData *job_data = new JobData(clone_msg, fPrinterCap,
JobData::kPageSettings);
@@ -37,7 +41,9 @@
return clone_msg;
}
-BMessage *UIDriver::configJob()
+
+BMessage*
+UIDriver::configJob()
{
BMessage *clone_msg = new BMessage(*fMsg);
JobData *job_data = new JobData(clone_msg, fPrinterCap,
JobData::kJobSettings);
@@ -53,13 +59,17 @@
return clone_msg;
}
-long UIDriver::doPageSetup(JobData *job_data, PrinterData *printer_data, const
PrinterCap *printer_cap)
+
+long
+UIDriver::doPageSetup(JobData *job_data, PrinterData *printer_data, const
PrinterCap *printer_cap)
{
PageSetupDlg *dlg = new PageSetupDlg(job_data, printer_data,
printer_cap);
return dlg->Go();
}
-long UIDriver::doJobSetup(JobData *job_data, PrinterData *printer_data, const
PrinterCap *printer_cap)
+
+long
+UIDriver::doJobSetup(JobData *job_data, PrinterData *printer_data, const
PrinterCap *printer_cap)
{
JobSetupDlg *dlg = new JobSetupDlg(job_data, printer_data, printer_cap);
return dlg->Go();
Modified: haiku/trunk/src/libs/print/libprint/ValidRect.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/ValidRect.cpp 2010-10-25 11:34:31 UTC
(rev 39139)
+++ haiku/trunk/src/libs/print/libprint/ValidRect.cpp 2010-10-25 11:44:09 UTC
(rev 39140)
@@ -41,6 +41,7 @@
INLINE void updateRightBound(const rgb_color *row);
};
+
bool
BoundsCalculator::isEmpty(const rgb_color *pixel)
{
@@ -60,12 +61,14 @@
return true;
}
+
const uchar *
BoundsCalculator::getRow(int x, int y)
{
return fBits + x + fBPR * y;
}
-
+
+
int
BoundsCalculator::getTop()
{
@@ -82,6 +85,7 @@
return top;
}
+
int
BoundsCalculator::getBottom()
{
@@ -98,6 +102,7 @@
return bottom;
}
+
void
BoundsCalculator::updateLeftBound(const rgb_color *row)
{
@@ -110,6 +115,7 @@
}
}
+
void
BoundsCalculator::updateRightBound(const rgb_color *row)
{
@@ -123,6 +129,7 @@
}
}
+
// returns false if the bitmap is empty or has wrong color space.
bool
BoundsCalculator::getValidRect(BBitmap *bitmap, RECT *rect)
@@ -185,12 +192,14 @@
return kRectIsValid;
}
+
bool get_valid_rect(BBitmap *a_bitmap, RECT *rc)
{
BoundsCalculator calculator;
return calculator.getValidRect(a_bitmap, rc);
}
+
int color_space2pixel_depth(color_space cs)
{
int pixel_depth;
Other related posts:
- » [haiku-commits] r39140 - in haiku/trunk: headers/libs/print/libprint src/libs/print/libprint - michael . w . pfeiffer
