Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Renamed method PrinterCap::IsSupport() to Supports().

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39798 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer 2010-12-10 07:26:14 +00:00
parent a4943027ae
commit 331c922016
20 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/libs/print/libprint/PrinterCap.h
View File

@ -263,8 +263,9 @@ public:
};
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;

2
src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp
View File

@ -147,7 +147,7 @@ BaseCap **Lips3Cap::GetCaps(CapID capid) const
bool
Lips3Cap::IsSupport(CapID capid) const
Lips3Cap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:

2
src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h
View File

@ -13,7 +13,7 @@ class Lips3Cap : public PrinterCap {
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;
};

2
src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp
View File

@ -210,7 +210,7 @@ Lips4Cap::GetCaps(CapID capid) const
bool
Lips4Cap::IsSupport(CapID capid) const
Lips4Cap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:

2
src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h
View File

@ -14,7 +14,7 @@ public:
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;
};

2
src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp
View File

@ -82,7 +82,7 @@ GPCapabilities::GetCaps(CapID category) const
bool
GPCapabilities::IsSupport(CapID category) const
GPCapabilities::Supports(CapID category) const
{
switch (category) {
case kPaper:

2
src/add-ons/print/drivers/gutenprint/GPCapabilities.h
View File

@ -26,7 +26,7 @@ public:
~GPCapabilities();
virtual int CountCap(CapID) const;
virtual bool IsSupport(CapID) const;
virtual bool Supports(CapID) const;
virtual const BaseCap **GetCaps(CapID) const;
private:

12
src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp
View File

@ -51,7 +51,7 @@ GPCapabilityExtractor::BeginParameter(const char* name, const char* displayName,
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 @@ GPCapabilityExtractor::BooleanParameter(const char* name,
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 @@ GPCapabilityExtractor::DoubleParameter(const char* name,
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 @@ GPCapabilityExtractor::IntParameter(const char* name, 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,
@ -261,7 +261,7 @@ GPCapabilityExtractor::DimensionParameter(const char* name,
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 @@ GPCapabilityExtractor::EndVisit()
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;

2
src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h
View File

@ -57,7 +57,7 @@ public:
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,

2
src/add-ons/print/drivers/gutenprint/GPDriver.cpp
View File

@ -65,7 +65,7 @@ GPDriver::StartDocument()
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());

2
src/add-ons/print/drivers/pcl5/PCL5Cap.cpp
View File

@ -145,7 +145,7 @@ PCL5Cap::GetCaps(CapID capid) const
bool
PCL5Cap::IsSupport(CapID capid) const
PCL5Cap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:

2
src/add-ons/print/drivers/pcl5/PCL5Cap.h
View File

@ -13,7 +13,7 @@ class PCL5Cap : public PrinterCap {
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;
};

2
src/add-ons/print/drivers/pcl6/PCL6Cap.cpp
View File

@ -325,7 +325,7 @@ PCL6Cap::GetCaps(CapID capid) const
bool
PCL6Cap::IsSupport(CapID capid) const
PCL6Cap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:

2
src/add-ons/print/drivers/pcl6/PCL6Cap.h
View File

@ -13,7 +13,7 @@ class PCL6Cap : public PrinterCap {
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;
};

2
src/add-ons/print/drivers/postscript/PSCap.cpp
View File

@ -144,7 +144,7 @@ PSCap::GetCaps(CapID capid) const
bool
PSCap::IsSupport(CapID capid) const
PSCap::Supports(CapID capid) const
{
switch (capid) {
case kPaper:

2
src/add-ons/print/drivers/postscript/PSCap.h
View File

@ -13,7 +13,7 @@ class PSCap : public PrinterCap {
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;
};

4
src/libs/print/libprint/GraphicsDriver.cpp
View File

@ -506,7 +506,7 @@ GraphicsDriver::_PrintDocument(SpoolData* spoolData)
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 @@ GraphicsDriver::_PrintDocument(SpoolData* spoolData)
#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)) {

18
src/libs/print/libprint/JobData.cpp
View File

@ -266,7 +266,7 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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 @@ JobData::Load(BMessage* message, const PrinterCap* printerCap,
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

8
src/libs/print/libprint/JobSetupDlg.cpp
View File

@ -273,7 +273,7 @@ JobSetupView::AttachedToWindow()
"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 @@ JobSetupView::AttachedToWindow()
bool
JobSetupView::IsHalftoneConfigurationNeeded()
{
return fPrinterCap->IsSupport(PrinterCap::kHalftone);
return fPrinterCap->Supports(PrinterCap::kHalftone);
}
@ -514,7 +514,7 @@ JobSetupView::CreateHalftoneConfigurationUI()
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 @@ JobSetupView::UpdateJobData()
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);
}

2
src/libs/print/libprint/PrinterDriver.cpp
View File

@ -89,7 +89,7 @@ PrinterDriver::AddPrinter(char* printerName)
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);