[haiku-commits] r39798 - in haiku/trunk: headers/libs/print/libprint src/add-ons/print/drivers/canon_lips/lips3 src/add-ons/print/drivers/canon_lips/lips4 src/add-ons/print/drivers/gutenprint src/add-ons/print/drivers/pcl5 ...
- From: michael.w.pfeiffer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 10 Dec 2010 08:26:14 +0100 (CET)
Author: laplace
Date: 2010-12-10 08:26:14 +0100 (Fri, 10 Dec 2010)
New Revision: 39798
Changeset: http://dev.haiku-os.org/changeset/39798
Modified:
haiku/trunk/headers/libs/print/libprint/PrinterCap.h
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/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/GPCapabilityExtractor.cpp
haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h
haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.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/PCL6Cap.cpp
haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h
haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.cpp
haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.h
haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp
haiku/trunk/src/libs/print/libprint/JobData.cpp
haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp
haiku/trunk/src/libs/print/libprint/PrinterDriver.cpp
Log:
* Renamed method PrinterCap::IsSupport() to Supports().
Modified: haiku/trunk/headers/libs/print/libprint/PrinterCap.h
===================================================================
--- haiku/trunk/headers/libs/print/libprint/PrinterCap.h 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/headers/libs/print/libprint/PrinterCap.h 2010-12-10
07:26:14 UTC (rev 39798)
@@ -263,8 +263,9 @@
};
virtual int CountCap(CapID category) const
= 0;
- virtual bool IsSupport(CapID category) const = 0;
+ virtual bool Supports(CapID category) const = 0;
virtual const BaseCap** GetCaps(CapID category) const = 0;
+
const EnumCap* GetDefaultCap(CapID category) const;
const EnumCap* FindCap(CapID category, int id) const;
const BaseCap* FindCap(CapID category, const char*
label) const;
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-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp
2010-12-10 07:26:14 UTC (rev 39798)
@@ -147,7 +147,7 @@
bool
-Lips3Cap::IsSupport(CapID capid) const
+Lips3Cap::Supports(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-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h
2010-12-10 07:26:14 UTC (rev 39798)
@@ -13,7 +13,7 @@
public:
Lips3Cap(const PrinterData*
printer_data);
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
};
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-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp
2010-12-10 07:26:14 UTC (rev 39798)
@@ -210,7 +210,7 @@
bool
-Lips4Cap::IsSupport(CapID capid) const
+Lips4Cap::Supports(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-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h
2010-12-10 07:26:14 UTC (rev 39798)
@@ -14,7 +14,7 @@
Lips4Cap(const PrinterData*
printer_data)
: PrinterCap(printer_data) {}
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap** GetCaps(CapID) const;
};
Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp
2010-12-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp
2010-12-10 07:26:14 UTC (rev 39798)
@@ -82,7 +82,7 @@
bool
-GPCapabilities::IsSupport(CapID category) const
+GPCapabilities::Supports(CapID category) const
{
switch (category) {
case kPaper:
Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h
2010-12-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilities.h
2010-12-10 07:26:14 UTC (rev 39798)
@@ -26,7 +26,7 @@
~GPCapabilities();
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
private:
Modified:
haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp
2010-12-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp
2010-12-10 07:26:14 UTC (rev 39798)
@@ -51,7 +51,7 @@
fState = kExtractPrintingModeParameter;
} else {
GP_PRINT("Parameter: %s - %s\n", name, displayName);
- if (!IsSupported(parameterClass))
+ if (!Supportsed(parameterClass))
return false;
fState = kExtractParameter;
@@ -217,7 +217,7 @@
const char* displayName, bool defaultValue,
stp_parameter_class_t parameterClass)
{
- if (!IsSupported(parameterClass))
+ if (!Supportsed(parameterClass))
return;
BooleanCap* capability = new BooleanCap(displayName, defaultValue);
@@ -231,7 +231,7 @@
const char* displayName, double lower, double upper, double
defaultValue,
stp_parameter_class_t parameterClass)
{
- if (!IsSupported(parameterClass))
+ if (!Supportsed(parameterClass))
return;
DoubleRangeCap* capability = new DoubleRangeCap(displayName, lower,
upper,
@@ -246,7 +246,7 @@
int lower, int upper, int defaultValue,
stp_parameter_class_t parameterClass)
{
- if (!IsSupported(parameterClass))
+ if (!Supportsed(parameterClass))
return;
IntRangeCap* capability = new IntRangeCap(displayName, lower, upper,
@@ -261,7 +261,7 @@
const char* displayName, int lower, int upper, int defaultValue,
stp_parameter_class_t parameterClass)
{
- if (!IsSupported(parameterClass))
+ if (!Supportsed(parameterClass))
return;
IntRangeCap* capability = new IntRangeCap(displayName, lower, upper,
@@ -281,7 +281,7 @@
bool
-GPCapabilityExtractor::IsSupported(stp_parameter_class_t parameterClass)
+GPCapabilityExtractor::Supportsed(stp_parameter_class_t parameterClass)
{
return parameterClass == STP_PARAMETER_CLASS_FEATURE
|| parameterClass == STP_PARAMETER_CLASS_OUTPUT;
Modified:
haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h
2010-12-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h
2010-12-10 07:26:14 UTC (rev 39798)
@@ -57,7 +57,7 @@
void EndVisit();
protected:
- bool IsSupported(stp_parameter_class_t parameterClass);
+ bool Supportsed(stp_parameter_class_t parameterClass);
void AddDefaultInputSlot();
void SetDriverSpecificCategories();
void AddCapability(GPArray<struct BaseCap>& array, EnumCap*
capability,
Modified: haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
2010-12-10 01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/gutenprint/GPDriver.cpp
2010-12-10 07:26:14 UTC (rev 39798)
@@ -65,7 +65,7 @@
SetParameter(fConfiguration.fPrintingMode, PrinterCap::kColor,
GetJobData()->GetColor());
- if
(GetPrinterCap()->IsSupport(PrinterCap::kDriverSpecificCapabilities))
+ if
(GetPrinterCap()->Supports(PrinterCap::kDriverSpecificCapabilities))
SetDriverSpecificSettings();
fprintf(stderr, "Driver: %s\n",
fConfiguration.fDriver.String());
Modified: haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp 2010-12-10
07:26:14 UTC (rev 39798)
@@ -145,7 +145,7 @@
bool
-PCL5Cap::IsSupport(CapID capid) const
+PCL5Cap::Supports(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-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/pcl5/PCL5Cap.h 2010-12-10
07:26:14 UTC (rev 39798)
@@ -13,7 +13,7 @@
public:
PCL5Cap(const PrinterData*
printer_data);
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
};
Modified: haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp 2010-12-10
07:26:14 UTC (rev 39798)
@@ -325,7 +325,7 @@
bool
-PCL6Cap::IsSupport(CapID capid) const
+PCL6Cap::Supports(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-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/pcl6/PCL6Cap.h 2010-12-10
07:26:14 UTC (rev 39798)
@@ -13,7 +13,7 @@
public:
PCL6Cap(const PrinterData*
printer_data);
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
};
Modified: haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.cpp
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.cpp 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.cpp 2010-12-10
07:26:14 UTC (rev 39798)
@@ -144,7 +144,7 @@
bool
-PSCap::IsSupport(CapID capid) const
+PSCap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:
Modified: haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.h
===================================================================
--- haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.h 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/add-ons/print/drivers/postscript/PSCap.h 2010-12-10
07:26:14 UTC (rev 39798)
@@ -13,7 +13,7 @@
public:
PSCap(const PrinterData* printer_data);
virtual int CountCap(CapID) const;
- virtual bool IsSupport(CapID) const;
+ virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
};
Modified: haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/libs/print/libprint/GraphicsDriver.cpp 2010-12-10
07:26:14 UTC (rev 39798)
@@ -506,7 +506,7 @@
success = true;
page_index = 0;
- if (fPrinterCap->IsSupport(PrinterCap::kCopyCommand))
+ if (fPrinterCap->Supports(PrinterCap::kCopyCommand))
// let the printer perform the copy operation
copies = 1;
else
@@ -569,7 +569,7 @@
#ifndef USE_PREVIEW_FOR_DEBUG
if (success
- && fPrinterCap->IsSupport(PrinterCap::kPrintStyle)
+ && fPrinterCap->Supports(PrinterCap::kPrintStyle)
&& (fOrgJobData->GetPrintStyle() != JobData::kSimplex)
&& (((page_index + fOrgJobData->GetNup() - 1) /
fOrgJobData->GetNup())
% 2)) {
Modified: haiku/trunk/src/libs/print/libprint/JobData.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/JobData.cpp 2010-12-10 01:02:04 UTC
(rev 39797)
+++ haiku/trunk/src/libs/print/libprint/JobData.cpp 2010-12-10 07:26:14 UTC
(rev 39798)
@@ -266,7 +266,7 @@
if (message->HasInt32(kJDPaper))
fPaper = (Paper)message->FindInt32(kJDPaper);
- else if (printerCap->IsSupport(PrinterCap::kPaper)) {
+ else if (printerCap->Supports(PrinterCap::kPaper)) {
paperCap = (const PaperCap *)printerCap->GetDefaultCap(
PrinterCap::kPaper);
fPaper = paperCap->fPaper;
@@ -275,7 +275,7 @@
if (message->HasInt32(kJDResolution)) {
message->FindInt32(kJDResolution, &fResolutionID);
- } else if (printerCap->IsSupport(PrinterCap::kResolution)) {
+ } else if (printerCap->Supports(PrinterCap::kResolution)) {
fResolutionID =
printerCap->GetDefaultCap(PrinterCap::kResolution)
->ID();
} else {
@@ -287,7 +287,7 @@
int64 xres64;
message->FindInt64(kJDXRes, &xres64);
fXRes = xres64;
- } else if (printerCap->IsSupport(PrinterCap::kResolution)) {
+ } else if (printerCap->Supports(PrinterCap::kResolution)) {
fXRes = ((const ResolutionCap *)printerCap->GetDefaultCap(
PrinterCap::kResolution))->fXResolution;
} else {
@@ -298,7 +298,7 @@
int64 yres64;
message->FindInt64(kJDYRes, &yres64);
fYRes = yres64;
- } else if (printerCap->IsSupport(PrinterCap::kResolution)) {
+ } else if (printerCap->Supports(PrinterCap::kResolution)) {
fYRes = ((const ResolutionCap *)printerCap->GetDefaultCap(
PrinterCap::kResolution))->fYResolution;
} else {
@@ -307,7 +307,7 @@
if (message->HasInt32(kJDOrientation))
fOrientation = (Orientation)message->FindInt32(kJDOrientation);
- else if (printerCap->IsSupport(PrinterCap::kOrientation))
+ else if (printerCap->Supports(PrinterCap::kOrientation))
fOrientation = ((const OrientationCap
*)printerCap->GetDefaultCap(
PrinterCap::kOrientation))->fOrientation;
else
@@ -381,7 +381,7 @@
if (message->HasInt32(kJDPaperSource))
fPaperSource = (PaperSource)fMsg->FindInt32(kJDPaperSource);
- else if (printerCap->IsSupport(PrinterCap::kPaperSource))
+ else if (printerCap->Supports(PrinterCap::kPaperSource))
fPaperSource = ((const PaperSourceCap
*)printerCap->GetDefaultCap(
PrinterCap::kPaperSource))->fPaperSource;
else
@@ -404,7 +404,7 @@
if (message->HasInt32(kJDPrintStyle))
fPrintStyle = (PrintStyle)message->FindInt32(kJDPrintStyle);
- else if (printerCap->IsSupport(PrinterCap::kPrintStyle))
+ else if (printerCap->Supports(PrinterCap::kPrintStyle))
fPrintStyle = ((const PrintStyleCap *)printerCap->GetDefaultCap(
PrinterCap::kPrintStyle))->fPrintStyle;
else
@@ -413,7 +413,7 @@
if (message->HasInt32(kJDBindingLocation))
fBindingLocation = (BindingLocation)message->FindInt32(
kJDBindingLocation);
- else if (printerCap->IsSupport(PrinterCap::kBindingLocation))
+ else if (printerCap->Supports(PrinterCap::kBindingLocation))
fBindingLocation = ((const BindingLocationCap *)printerCap->
GetDefaultCap(PrinterCap::kBindingLocation))->fBindingLocation;
else
@@ -426,7 +426,7 @@
if (message->HasInt32(kJDColor))
fColor = (Color)message->FindInt32(kJDColor);
- else if (printerCap->IsSupport(PrinterCap::kColor))
+ else if (printerCap->Supports(PrinterCap::kColor))
fColor = ((const ColorCap *)printerCap->GetDefaultCap(
PrinterCap::kColor))->fColor;
else
Modified: haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp 2010-12-10 01:02:04 UTC
(rev 39797)
+++ haiku/trunk/src/libs/print/libprint/JobSetupDlg.cpp 2010-12-10 07:26:14 UTC
(rev 39798)
@@ -273,7 +273,7 @@
"Pages Per Sheet:", fNup);
// duplex
- if (fPrinterCap->IsSupport(PrinterCap::kPrintStyle)) {
+ if (fPrinterCap->Supports(PrinterCap::kPrintStyle)) {
fDuplex = new BCheckBox("duplex", "Duplex",
new BMessage(kMsgDuplexChanged));
if (fJobData->GetPrintStyle() != JobData::kSimplex) {
@@ -458,7 +458,7 @@
bool
JobSetupView::IsHalftoneConfigurationNeeded()
{
- return fPrinterCap->IsSupport(PrinterCap::kHalftone);
+ return fPrinterCap->Supports(PrinterCap::kHalftone);
}
@@ -514,7 +514,7 @@
void
JobSetupView::AddDriverSpecificSettings(BGridLayout* gridLayout, int row)
{
- if (!fPrinterCap->IsSupport(PrinterCap::kDriverSpecificCapabilities))
+ if (!fPrinterCap->Supports(PrinterCap::kDriverSpecificCapabilities))
return;
int count =
fPrinterCap->CountCap(PrinterCap::kDriverSpecificCapabilities);
@@ -950,7 +950,7 @@
fJobData->SetNup(GetID(gNups, sizeof(gNups) / sizeof(gNups[0]),
fNup->FindMarked()->Label(), 1));
- if (fPrinterCap->IsSupport(PrinterCap::kPrintStyle)) {
+ if (fPrinterCap->Supports(PrinterCap::kPrintStyle)) {
fJobData->SetPrintStyle((B_CONTROL_ON == fDuplex->Value())
? JobData::kDuplex : JobData::kSimplex);
}
Modified: haiku/trunk/src/libs/print/libprint/PrinterDriver.cpp
===================================================================
--- haiku/trunk/src/libs/print/libprint/PrinterDriver.cpp 2010-12-10
01:02:04 UTC (rev 39797)
+++ haiku/trunk/src/libs/print/libprint/PrinterDriver.cpp 2010-12-10
07:26:14 UTC (rev 39798)
@@ -89,7 +89,7 @@
DBGMSG(("\tprinter_name: %s\n", printerName));
DBGMSG(("<%s: add_printer\n", GetDriverName()));
- if (fPrinterCap->IsSupport(PrinterCap::kProtocolClass)) {
+ if (fPrinterCap->Supports(PrinterCap::kProtocolClass)) {
if (fPrinterCap->CountCap(PrinterCap::kProtocolClass) > 1) {
AddPrinterDlg *dialog;
dialog = new AddPrinterDlg(fPrinterData, fPrinterCap);
Other related posts:
- » [haiku-commits] r39798 - in haiku/trunk: headers/libs/print/libprint src/add-ons/print/drivers/canon_lips/lips3 src/add-ons/print/drivers/canon_lips/lips4 src/add-ons/print/drivers/gutenprint src/add-ons/print/drivers/pcl5 ... - michael . w . pfeiffer
