Author: laplace Date: 2010-12-08 20:09:44 +0100 (Wed, 08 Dec 2010) New Revision: 39770 Changeset: http://dev.haiku-os.org/changeset/39770 Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.cpp haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.h haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp haiku/trunk/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5.cpp haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.h haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Rasterizer.cpp haiku/trunk/src/add-ons/print/drivers/postscript/PS.cpp haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.cpp haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.h haiku/trunk/src/add-ons/print/drivers/postscript/PSData.cpp haiku/trunk/src/add-ons/print/drivers/postscript/PSData.h haiku/trunk/src/add-ons/print/drivers/postscript/SelectPPDDlg.cpp haiku/trunk/src/libs/print/libprint/AddPrinterDlg.cpp haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp haiku/trunk/src/libs/print/libprint/Halftone.cpp haiku/trunk/src/libs/print/libprint/HalftoneView.cpp haiku/trunk/src/libs/print/libprint/JobData.cpp haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp haiku/trunk/src/libs/print/libprint/PackBits.cpp haiku/trunk/src/libs/print/libprint/PageSetupDlg.cpp haiku/trunk/src/libs/print/libprint/PagesView.cpp haiku/trunk/src/libs/print/libprint/PrintJobReader.cpp haiku/trunk/src/libs/print/libprint/PrinterCap.cpp haiku/trunk/src/libs/print/libprint/PrinterData.cpp haiku/trunk/src/libs/print/libprint/PrinterDriver.cpp haiku/trunk/src/libs/print/libprint/SpoolMetaData.cpp haiku/trunk/src/libs/print/libprint/Transport.cpp haiku/trunk/src/libs/print/libprint/UIDriver.cpp Log: * Code style changes Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -44,9 +44,9 @@ _PaperFeedMode(); _DisableAutoFF(); _SetNumberOfCopies(); - fHalftone = new Halftone(GetJobData()->getSurfaceType(), - GetJobData()->getGamma(), GetJobData()->getInkDensity(), - GetJobData()->getDitherType()); + fHalftone = new Halftone(GetJobData()->GetSurfaceType(), + GetJobData()->GetGamma(), GetJobData()->GetInkDensity(), + GetJobData()->GetDitherType()); return true; } catch (TransportException& err) { @@ -151,12 +151,12 @@ DBGMSG(("in_size = %d\n", in_size)); DBGMSG(("out_size = %d\n", out_size)); DBGMSG(("delta = %d\n", delta)); - DBGMSG(("renderobj->get_pixel_depth() = %d\n", - fHalftone->getPixelDepth())); + DBGMSG(("renderobj->Get_pixel_depth() = %d\n", + fHalftone->GetPixelDepth())); uchar* ptr = static_cast<uchar*>(bitmap->Bits()) + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; + + (rc.left * fHalftone->GetPixelDepth()) / 8; int compressionMethod; int compressedSize; @@ -175,7 +175,7 @@ _Move(x, y); for (int i = rc.top; i <= rc.bottom; i++) { - fHalftone->dither(ptr2, ptr, x, y, width); + fHalftone->Dither(ptr2, ptr, x, y, width); ptr += delta; ptr2 += widthByte; y++; @@ -223,7 +223,7 @@ return true; } catch (TransportException& err) { - BAlert* alert = new BAlert("", err.what(), "OK"); + BAlert* alert = new BAlert("", err.What(), "OK"); alert->Go(); return false; } @@ -272,7 +272,7 @@ int width = 0; int height = 0; - switch (GetJobData()->getPaper()) { + switch (GetJobData()->GetPaper()) { case JobData::kA3: i = 12; break; @@ -319,12 +319,12 @@ // default: i = 80; - width = GetJobData()->getPaperRect().IntegerWidth(); - height = GetJobData()->getPaperRect().IntegerHeight(); + width = GetJobData()->GetPaperRect().IntegerWidth(); + height = GetJobData()->GetPaperRect().IntegerHeight(); break; } - if (JobData::kLandscape == GetJobData()->getOrientation()) + if (JobData::kLandscape == GetJobData()->GetOrientation()) i++; if (i < 80) @@ -354,7 +354,7 @@ int i; - switch (GetJobData()->getPaperSource()) { + switch (GetJobData()->GetPaperSource()) { case JobData::kManual: i = 1; break; @@ -384,7 +384,7 @@ void LIPS3Driver::_SetNumberOfCopies() { - WriteSpoolString("\033[%ldv", GetJobData()->getCopies()); + WriteSpoolString("\033[%ldv", GetJobData()->GetCopies()); } @@ -423,7 +423,7 @@ // 0 RAW // 9 compress-3 WriteSpoolString("\033[%d;%d;%d;%d;%d.r", compressionSize, widthbyte, - GetJobData()->getXres(), compressionMethod, height); + GetJobData()->GetXres(), compressionMethod, height); WriteSpoolData(buffer, compressionSize); } Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -111,7 +111,7 @@ int -Lips3Cap::countCap(CapID capid) const +Lips3Cap::CountCap(CapID capid) const { switch (capid) { case kPaper: @@ -129,7 +129,7 @@ const -BaseCap **Lips3Cap::enumCap(CapID capid) const +BaseCap **Lips3Cap::GetCaps(CapID capid) const { switch (capid) { case kPaper: @@ -147,7 +147,7 @@ bool -Lips3Cap::isSupport(CapID capid) const +Lips3Cap::IsSupport(CapID capid) const { switch (capid) { case kPaper: Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -12,9 +12,9 @@ class Lips3Cap : public PrinterCap { public: Lips3Cap(const PrinterData* printer_data); - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap **enumCap(CapID) const; + virtual int CountCap(CapID) const; + virtual bool IsSupport(CapID) const; + virtual const BaseCap **GetCaps(CapID) const; }; #endif // __LIPS3CAP_H Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -46,9 +46,9 @@ _SetNumberOfCopies(); _SidePrintingControl(); _SetBindingMargin(); - fHalftone = new Halftone(GetJobData()->getSurfaceType(), - GetJobData()->getGamma(), GetJobData()->getInkDensity(), - GetJobData()->getDitherType()); + fHalftone = new Halftone(GetJobData()->GetSurfaceType(), + GetJobData()->GetGamma(), GetJobData()->GetInkDensity(), + GetJobData()->GetDitherType()); return true; } catch (TransportException& err) { @@ -161,12 +161,12 @@ DBGMSG(("in_size = %d\n", in_size)); DBGMSG(("out_size = %d\n", out_size)); DBGMSG(("delta = %d\n", delta)); - DBGMSG(("fHalftone_engine->get_pixel_depth() = %d\n", - fHalftone->getPixelDepth())); + DBGMSG(("fHalftone_engine->Get_pixel_depth() = %d\n", + fHalftone->GetPixelDepth())); uchar* ptr = static_cast<uchar*>(bitmap->Bits()) + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; + + (rc.left * fHalftone->GetPixelDepth()) / 8; int compression_method; int compressed_size; @@ -185,7 +185,7 @@ _Move(x, y); for (int i = rc.top; i <= rc.bottom; i++) { - fHalftone->dither(ptr2, ptr, x, y, width); + fHalftone->Dither(ptr2, ptr, x, y, width); ptr += delta; ptr2 += widthByte; y++; @@ -233,7 +233,7 @@ return true; } catch (TransportException& err) { - BAlert* alert = new BAlert("", err.what(), "OK"); + BAlert* alert = new BAlert("", err.What(), "OK"); alert->Go(); return false; } @@ -250,7 +250,7 @@ void LIPS4Driver::_JobStart() { - WriteSpoolString("\033P41;%d;1J\033\\", GetJobData()->getXres()); + WriteSpoolString("\033P41;%d;1J\033\\", GetJobData()->GetXres()); } @@ -281,7 +281,7 @@ void LIPS4Driver::_SelectSizeUnit() { - WriteSpoolString("\033[?7;%d I", GetJobData()->getXres()); + WriteSpoolString("\033[?7;%d I", GetJobData()->GetXres()); } @@ -305,7 +305,7 @@ int i; - switch (GetJobData()->getPaperSource()) { + switch (GetJobData()->GetPaperSource()) { case JobData::kManual: i = 10; break; @@ -333,7 +333,7 @@ { int i; - switch (GetJobData()->getPaper()) { + switch (GetJobData()->GetPaper()) { case JobData::kA3: i = 12; break; @@ -383,7 +383,7 @@ break; } - if (JobData::kLandscape == GetJobData()->getOrientation()) + if (JobData::kLandscape == GetJobData()->GetOrientation()) i++; WriteSpoolString("\033[%d;;p", i); @@ -400,14 +400,14 @@ void LIPS4Driver::_SetNumberOfCopies() { - WriteSpoolString("\033[%ldv", GetJobData()->getCopies()); + WriteSpoolString("\033[%ldv", GetJobData()->GetCopies()); } void LIPS4Driver::_SidePrintingControl() { - if (GetJobData()->getPrintStyle() == JobData::kSimplex) + if (GetJobData()->GetPrintStyle() == JobData::kSimplex) WriteSpoolString("\033[0#x"); else WriteSpoolString("\033[2;0#x"); @@ -417,7 +417,7 @@ void LIPS4Driver::_SetBindingMargin() { - if (GetJobData()->getPrintStyle() == JobData::kDuplex) { + if (GetJobData()->GetPrintStyle() == JobData::kDuplex) { int i; // switch (job_data()->binding_location()) { // case kLongEdgeLeft: @@ -478,7 +478,7 @@ "\033[%ld;%ld;%d;%ld;%ld.r", compression_size, widthbyte, - GetJobData()->getXres(), + GetJobData()->GetXres(), compression_method, height); Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -166,7 +166,7 @@ int -Lips4Cap::countCap(CapID capid) const +Lips4Cap::CountCap(CapID capid) const { switch (capid) { case kPaper: @@ -188,7 +188,7 @@ const BaseCap** -Lips4Cap::enumCap(CapID capid) const +Lips4Cap::GetCaps(CapID capid) const { switch (capid) { case kPaper: @@ -210,7 +210,7 @@ bool -Lips4Cap::isSupport(CapID capid) const +Lips4Cap::IsSupport(CapID capid) const { switch (capid) { case kPaper: Modified: haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -13,9 +13,9 @@ public: Lips4Cap(const PrinterData* printer_data) : PrinterCap(printer_data) {} - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap** enumCap(CapID) const; + virtual int CountCap(CapID) const; + virtual bool IsSupport(CapID) const; + virtual const BaseCap** GetCaps(CapID) const; }; #endif // __LIPS4CAP_H Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -29,7 +29,7 @@ } int -GPCapabilities::countCap(CapID category) const +GPCapabilities::CountCap(CapID category) const { const GPArray<struct BaseCap>* capabilities; @@ -55,7 +55,7 @@ const BaseCap** -GPCapabilities::enumCap(CapID category) const +GPCapabilities::GetCaps(CapID category) const { typedef const BaseCap** ArrayType; const GPArray<struct BaseCap>* capabilities; @@ -82,7 +82,7 @@ bool -GPCapabilities::isSupport(CapID category) const +GPCapabilities::IsSupport(CapID category) const { switch (category) { case kPaper: @@ -92,14 +92,14 @@ return true; default: - return countCap(category) > 0; + return CountCap(category) > 0; } } void GPCapabilities::InitCapabilitiesFromGutenprint() { - const GPData* data = dynamic_cast<const GPData*>(getPrinterData()); + const GPData* data = dynamic_cast<const GPData*>(GetPrinterData()); ASSERT(data != NULL); // capabilities are available only after printer model // has been selected Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -25,9 +25,9 @@ GPCapabilities(const PrinterData* printer_data); ~GPCapabilities(); - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap **enumCap(CapID) const; + virtual int CountCap(CapID) const; + virtual bool IsSupport(CapID) const; + virtual const BaseCap **GetCaps(CapID) const; private: void InitCapabilitiesFromGutenprint(); Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -15,18 +15,18 @@ void -GPData::load() +GPData::Load() { - PrinterData::load(); + PrinterData::Load(); fNode->ReadAttrString(PD_PRINTER_DRIVER_ATTRIBUTE, &fGutenprintDriverName); } void -GPData::save() +GPData::Save() { - PrinterData::save(); + PrinterData::Save(); fNode->WriteAttrString(PD_PRINTER_DRIVER_ATTRIBUTE, &fGutenprintDriverName); } Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPData.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -27,8 +27,8 @@ } // PrinterData overrides - virtual void load(); - virtual void save(); + virtual void Load(); + virtual void Save(); BString fGutenprintDriverName; }; Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -51,21 +51,21 @@ fConfiguration.fDriver = data->fGutenprintDriverName; SetParameter(fConfiguration.fPageSize, PrinterCap::kPaper, - GetJobData()->getPaper()); + GetJobData()->GetPaper()); SetParameter(fConfiguration.fResolution, PrinterCap::kResolution, - GetJobData()->getResolutionID()); + GetJobData()->GetResolutionID()); - fConfiguration.fXDPI = GetJobData()->getXres(); - fConfiguration.fYDPI = GetJobData()->getYres(); + fConfiguration.fXDPI = GetJobData()->GetXres(); + fConfiguration.fYDPI = GetJobData()->GetYres(); SetParameter(fConfiguration.fInputSlot, PrinterCap::kPaperSource, - GetJobData()->getPaperSource()); + GetJobData()->GetPaperSource()); SetParameter(fConfiguration.fPrintingMode, PrinterCap::kColor, - GetJobData()->getColor()); + GetJobData()->GetColor()); - if (GetPrinterCap()->isSupport(PrinterCap::kDriverSpecificCapabilities)) + if (GetPrinterCap()->IsSupport(PrinterCap::kDriverSpecificCapabilities)) SetDriverSpecificSettings(); fprintf(stderr, "Driver: %s\n", fConfiguration.fDriver.String()); @@ -87,7 +87,7 @@ int value) { const EnumCap* capability; - capability = GetPrinterCap()->findCap(category, value); + capability = GetPrinterCap()->FindCap(category, value); if (capability != NULL && capability->fKey != "") parameter = capability->Key(); } @@ -97,8 +97,8 @@ GPDriver::SetDriverSpecificSettings() { PrinterCap::CapID category = PrinterCap::kDriverSpecificCapabilities; - int count = GetPrinterCap()->countCap(category); - const BaseCap** capabilities = GetPrinterCap()->enumCap(category); + int count = GetPrinterCap()->CountCap(category); + const BaseCap** capabilities = GetPrinterCap()->GetCaps(category); for (int i = 0; i < count; i++) { const DriverSpecificCap* capability = dynamic_cast<const DriverSpecificCap*>(capabilities[i]); @@ -137,13 +137,13 @@ if (GetJobData()->Settings().HasString(key)) { const string& value = GetJobData()->Settings().GetString(key); - capability = GetPrinterCap()->findCapWithKey(category, value.c_str()); + capability = GetPrinterCap()->FindCapWithKey(category, value.c_str()); } if (capability == NULL) { // job data should contain a value; // try to use the default value anyway - capability = GetPrinterCap()->getDefaultCap(category); + capability = GetPrinterCap()->GetDefaultCap(category); } if (capability == NULL) { @@ -207,7 +207,7 @@ return true; } catch (TransportException& err) { - ShowError(err.what()); + ShowError(err.What()); return false; } } @@ -221,7 +221,7 @@ return true; } catch (TransportException& err) { - ShowError(err.what()); + ShowError(err.What()); return false; } } @@ -294,7 +294,7 @@ return true; } catch (TransportException& err) { - ShowError(err.what()); + ShowError(err.What()); return false; } } Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/gutenprint/SelectPrinterDialog.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -166,7 +166,7 @@ { BString driverName = GetSelectedItemValue(fPrintersListView); fData->fGutenprintDriverName = driverName; - fData->save(); + fData->Save(); } Modified: haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -38,9 +38,9 @@ { try { _JobStart(); - fHalftone = new Halftone(GetJobData()->getSurfaceType(), - GetJobData()->getGamma(), GetJobData()->getInkDensity(), - GetJobData()->getDitherType()); + fHalftone = new Halftone(GetJobData()->GetSurfaceType(), + GetJobData()->GetGamma(), GetJobData()->GetInkDensity(), + GetJobData()->GetDitherType()); return true; } catch (TransportException& err) { @@ -138,11 +138,11 @@ DBGMSG(("in_size = %d\n", in_size)); DBGMSG(("out_size = %d\n", out_size)); DBGMSG(("delta = %d\n", delta)); - DBGMSG(("renderobj->get_pixel_depth() = %d\n", fHalftone->getPixelDepth())); + DBGMSG(("renderobj->Get_pixel_depth() = %d\n", fHalftone->GetPixelDepth())); uchar* ptr = static_cast<uchar*>(bitmap->Bits()) + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; + + (rc.left * fHalftone->GetPixelDepth()) / 8; int compressionMethod; int compressedSize; @@ -159,19 +159,19 @@ _Move(x, y); _StartRasterGraphics(width, height); - const bool color = GetJobData()->getColor() == JobData::kColor; + const bool color = GetJobData()->GetColor() == JobData::kColor; const int num_planes = color ? 3 : 1; if (color) { - fHalftone->setPlanes(Halftone::kPlaneRGB1); - fHalftone->setBlackValue(Halftone::kLowValueMeansBlack); + fHalftone->SetPlanes(Halftone::kPlaneRGB1); + fHalftone->SetBlackValue(Halftone::kLowValueMeansBlack); } for (int i = rc.top; i <= rc.bottom; i++) { for (int plane = 0; plane < num_planes; plane ++) { - fHalftone->dither(in_buffer, ptr, x, y, width); + fHalftone->Dither(in_buffer, ptr, x, y, width); compressedSize = pack_bits(out_buffer, in_buffer, in_size); @@ -212,7 +212,7 @@ return true; } catch (TransportException& err) { - BAlert* alert = new BAlert("", err.what(), "OK"); + BAlert* alert = new BAlert("", err.What(), "OK"); alert->Go(); return false; } @@ -222,15 +222,15 @@ void PCL5Driver::_JobStart() { - const bool color = GetJobData()->getColor() == JobData::kColor; + const bool color = GetJobData()->GetColor() == JobData::kColor; // enter PCL5 WriteSpoolString("\033%%-12345X@PJL ENTER LANGUAGE=PCL\n"); // reset WriteSpoolString("\033E"); // dpi - WriteSpoolString("\033*t%dR", GetJobData()->getXres()); + WriteSpoolString("\033*t%dR", GetJobData()->GetXres()); // unit of measure - WriteSpoolString("\033&u%dD", GetJobData()->getXres()); + WriteSpoolString("\033&u%dD", GetJobData()->GetXres()); // page size WriteSpoolString("\033&l0A"); // page orientation @@ -246,7 +246,7 @@ // clear horizontal margins WriteSpoolString("\0339"); // number of copies - // WriteSpoolString("\033&l%ldL", GetJobData()->getCopies()); + // WriteSpoolString("\033&l%ldL", GetJobData()->GetCopies()); } Modified: haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -109,7 +109,7 @@ int -PCL5Cap::countCap(CapID capid) const +PCL5Cap::CountCap(CapID capid) const { switch (capid) { case kPaper: @@ -127,7 +127,7 @@ const BaseCap** -PCL5Cap::enumCap(CapID capid) const +PCL5Cap::GetCaps(CapID capid) const { switch (capid) { case kPaper: @@ -145,7 +145,7 @@ bool -PCL5Cap::isSupport(CapID capid) const +PCL5Cap::IsSupport(CapID capid) const { switch (capid) { case kPaper: Modified: haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -12,9 +12,9 @@ class PCL5Cap : public PrinterCap { public: PCL5Cap(const PrinterData* printer_data); - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap **enumCap(CapID) const; + virtual int CountCap(CapID) const; + virtual bool IsSupport(CapID) const; + virtual const BaseCap **GetCaps(CapID) const; }; #endif // __PCL5CAP_H Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -72,9 +72,9 @@ { try { _JobStart(); - fHalftone = new Halftone(GetJobData()->getSurfaceType(), - GetJobData()->getGamma(), GetJobData()->getInkDensity(), - GetJobData()->getDitherType()); + fHalftone = new Halftone(GetJobData()->GetSurfaceType(), + GetJobData()->GetGamma(), GetJobData()->GetInkDensity(), + GetJobData()->GetDitherType()); return true; } catch (TransportException& err) { @@ -175,7 +175,7 @@ return true; } catch (TransportException& err) { - BAlert* alert = new BAlert("", err.what(), "OK"); + BAlert* alert = new BAlert("", err.What(), "OK"); alert->Go(); return false; } @@ -240,9 +240,9 @@ fWriter = new PCL6Writer(this); PCL6Writer::ProtocolClass pc = (PCL6Writer::ProtocolClass)GetProtocolClass(); - fWriter->PJLHeader(pc, GetJobData()->getXres(), + fWriter->PJLHeader(pc, GetJobData()->GetXres(), "Copyright (c) 2003 - 2010 Haiku"); - fWriter->BeginSession(GetJobData()->getXres(), GetJobData()->getYres(), + fWriter->BeginSession(GetJobData()->GetXres(), GetJobData()->GetYres(), PCL6Writer::kInch, PCL6Writer::kBackChAndErrPage); fWriter->OpenDataSource(); fMediaSide = PCL6Writer::kFrontMediaSide; @@ -253,17 +253,17 @@ PCL6Driver::StartPage(int) { PCL6Writer::Orientation orientation = PCL6Writer::kPortrait; - if (GetJobData()->getOrientation() == JobData::kLandscape) { + if (GetJobData()->GetOrientation() == JobData::kLandscape) { orientation = PCL6Writer::kLandscape; } PCL6Writer::MediaSize mediaSize = - _MediaSize(GetJobData()->getPaper()); + _MediaSize(GetJobData()->GetPaper()); PCL6Writer::MediaSource mediaSource = - _MediaSource(GetJobData()->getPaperSource()); - if (GetJobData()->getPrintStyle() == JobData::kSimplex) { + _MediaSource(GetJobData()->GetPaperSource()); + if (GetJobData()->GetPrintStyle() == JobData::kSimplex) { fWriter->BeginPage(orientation, mediaSize, mediaSource); - } else if (GetJobData()->getPrintStyle() == JobData::kDuplex) { + } else if (GetJobData()->GetPrintStyle() == JobData::kDuplex) { // TODO move duplex binding option to UI fWriter->BeginPage(orientation, mediaSize, mediaSource, PCL6Writer::kDuplexVerticalBinding, fMediaSide); @@ -276,8 +276,8 @@ return false; // PageOrigin from Windows NT printer driver - int x = 142 * GetJobData()->getXres() / 600; - int y = 100 * GetJobData()->getYres() / 600; + int x = 142 * GetJobData()->GetXres() / 600; + int y = 100 * GetJobData()->GetYres() / 600; fWriter->SetPageOrigin(x, y); fWriter->SetColorSpace(_UseColorMode() ? PCL6Writer::kRGB : PCL6Writer::kGray); @@ -363,7 +363,7 @@ PCL6Driver::EndPage(int) { try { - fWriter->EndPage(GetJobData()->getCopies()); + fWriter->EndPage(GetJobData()->GetCopies()); return true; } catch (TransportException& err) { @@ -394,7 +394,7 @@ bool PCL6Driver::_SupportsRLECompression() { - return GetJobData()->getColor() != JobData::kColorCompressionDisabled; + return GetJobData()->GetColor() != JobData::kColorCompressionDisabled; } @@ -402,14 +402,14 @@ PCL6Driver::_SupportsDeltaRowCompression() { return GetProtocolClass() >= PCL6Writer::kProtocolClass2_1 - && GetJobData()->getColor() != JobData::kColorCompressionDisabled; + && GetJobData()->GetColor() != JobData::kColorCompressionDisabled; } bool PCL6Driver::_UseColorMode() { - return GetJobData()->getColor() != JobData::kMonochrome; + return GetJobData()->GetColor() != JobData::kMonochrome; } Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -273,15 +273,15 @@ int -PCL6Cap::countCap(CapID capid) const +PCL6Cap::CountCap(CapID capid) const { switch (capid) { case kPaper: - if (getProtocolClass() >= PCL6Writer::kProtocolClass2_1) + if (GetProtocolClass() >= PCL6Writer::kProtocolClass2_1) return sizeof(papers2_1) / sizeof(papers2_1[0]); return sizeof(papers1_1) / sizeof(papers1_1[0]); case kPaperSource: - if (getProtocolClass() >= PCL6Writer::kProtocolClass2_0) + if (GetProtocolClass() >= PCL6Writer::kProtocolClass2_0) return sizeof(paperSources2_0) / sizeof(paperSources2_0[0]); return sizeof(paperSources1_1) / sizeof(paperSources1_1[0]); case kResolution: @@ -299,15 +299,15 @@ const BaseCap** -PCL6Cap::enumCap(CapID capid) const +PCL6Cap::GetCaps(CapID capid) const { switch (capid) { case kPaper: - if (getProtocolClass() >= PCL6Writer::kProtocolClass2_1) + if (GetProtocolClass() >= PCL6Writer::kProtocolClass2_1) return (const BaseCap **)papers2_1; return (const BaseCap**)papers1_1; case kPaperSource: - if (getProtocolClass() >= PCL6Writer::kProtocolClass2_0) + if (GetProtocolClass() >= PCL6Writer::kProtocolClass2_0) return (const BaseCap **)paperSources2_0; return (const BaseCap**)paperSources1_1; case kResolution: @@ -325,7 +325,7 @@ bool -PCL6Cap::isSupport(CapID capid) const +PCL6Cap::IsSupport(CapID capid) const { switch (capid) { case kPaper: Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h 2010-12-08 19:09:44 UTC (rev 39770) @@ -12,9 +12,9 @@ class PCL6Cap : public PrinterCap { public: PCL6Cap(const PrinterData* printer_data); - virtual int countCap(CapID) const; - virtual bool isSupport(CapID) const; - virtual const BaseCap **enumCap(CapID) const; + virtual int CountCap(CapID) const; + virtual bool IsSupport(CapID) const; + virtual const BaseCap **GetCaps(CapID) const; }; #endif // __PCL6CAP_H Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Rasterizer.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Rasterizer.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Rasterizer.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -54,7 +54,7 @@ MonochromeRasterizer::RasterizeLine(int x, int y, const ColorRGB32Little* source) { - GetHalftone()->dither(fCurrentLine, (const uchar*)source, x, y, GetWidth()); + GetHalftone()->Dither(fCurrentLine, (const uchar*)source, x, y, GetWidth()); uchar* out = fCurrentLine; @@ -127,8 +127,8 @@ for (int plane = 0; plane < 3; plane ++) fPlaneBuffers[plane] = NULL; - halftone->setPlanes(Halftone::kPlaneRGB1); - halftone->setBlackValue(Halftone::kLowValueMeansBlack); + halftone->SetPlanes(Halftone::kPlaneRGB1); + halftone->SetBlackValue(Halftone::kLowValueMeansBlack); } @@ -173,7 +173,7 @@ // dither each color component for (int plane = 0; plane < 3; plane ++) - GetHalftone()->dither(fPlaneBuffers[plane], (const uchar*)source, x, y, + GetHalftone()->Dither(fPlaneBuffers[plane], (const uchar*)source, x, y, GetWidth()); DUMP_BITS((stderr, "red "), fPlaneBuffers[0], fPlaneBufferSize); Modified: haiku/trunk/src/add-ons/print/drivers/postscript/PS.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/postscript/PS.cpp 2010-12-08 18:41:16 UTC (rev 39769) +++ haiku/trunk/src/add-ons/print/drivers/postscript/PS.cpp 2010-12-08 19:09:44 UTC (rev 39770) @@ -113,9 +113,9 @@ _StartFilterIfNeeded(); _JobStart(); - fHalftone = new Halftone(GetJobData()->getSurfaceType(), - GetJobData()->getGamma(), GetJobData()->getInkDensity(), - GetJobData()->getDitherType()); + fHalftone = new Halftone(GetJobData()->GetSurfaceType(), + GetJobData()->GetGamma(), GetJobData()->GetInkDensity(), + GetJobData()->GetDitherType()); return true; } catch (TransportException& err) { @@ -156,13 +156,13 @@ void PSDriver::_SetupCTM() { - const float leftMargin = GetJobData()->getPrintableRect().left; - const float topMargin = GetJobData()->getPrintableRect().top; - if (GetJobData()->getOrientation() == JobData::kPortrait) { + const float leftMargin = GetJobData()->GetPrintableRect().left; + const float topMargin = GetJobData()->GetPrintableRect().top; + if (GetJobData()->GetOrientation() == JobData::kPortrait) { // move origin from bottom left to top left // and set margin _WritePSString("%f %f translate\n", leftMargin, - GetJobData()->getPaperRect().Height()-topMargin); + GetJobData()->GetPaperRect().Height()-topMargin); } else { // landscape: // move origin from bottom left to margin top and left @@ -172,8 +172,8 @@ } // y values increase from top to bottom // units of measure is dpi - _WritePSString("72 %d div 72 -%d div scale\n", GetJobData()->getXres(), - GetJobData()->getYres()); + _WritePSString("72 %d div 72 -%d div scale\n", GetJobData()->GetXres(), + GetJobData()->GetYres()); } @@ -241,7 +241,7 @@ x = rc.left; y += rc.top; - bool color = GetJobData()->getColor() == JobData::kColor; + bool color = GetJobData()->GetColor() == JobData::kColor; int width = rc.right - rc.left + 1; int widthByte = (width + 7) / 8; // byte boundary @@ -255,12 +255,12 @@ DBGMSG(("height = %d\n", height)); DBGMSG(("out_size = %d\n", out_size)); DBGMSG(("delta = %d\n", delta)); - DBGMSG(("renderobj->get_pixel_depth() = %d\n", - fHalftone->getPixelDepth())); + DBGMSG(("renderobj->Get_pixel_depth() = %d\n", + fHalftone->GetPixelDepth())); uchar* ptr = static_cast<uchar*>(bitmap->Bits()) + rc.top * delta - + (rc.left * fHalftone->getPixelDepth()) / 8; + + (rc.left * fHalftone->GetPixelDepth()) / 8; int compression_method; int compressed_size; @@ -293,7 +293,7 @@ in += 4; } } else { - fHalftone->dither(in_buffer, ptr, x, y, width); + fHalftone->Dither(in_buffer, ptr, x, y, width); uchar* in = in_buffer; uchar* out = out_buffer; @@ -335,7 +335,7 @@ return true; } catch (TransportException& err) { - BAlert* alert = new BAlert("", err.what(), "OK"); + BAlert* alert = new BAlert("", err.What(), "OK"); alert->Go(); [... truncated: 2841 lines follow ...]