From 331c922016dbd43c36016819fdff52db2a0e4e6d Mon Sep 17 00:00:00 2001 From: Michael Pfeiffer Date: Fri, 10 Dec 2010 07:26:14 +0000 Subject: [PATCH] * Renamed method PrinterCap::IsSupport() to Supports(). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39798 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/libs/print/libprint/PrinterCap.h | 3 ++- .../drivers/canon_lips/lips3/Lips3Cap.cpp | 2 +- .../print/drivers/canon_lips/lips3/Lips3Cap.h | 2 +- .../drivers/canon_lips/lips4/Lips4Cap.cpp | 2 +- .../print/drivers/canon_lips/lips4/Lips4Cap.h | 2 +- .../drivers/gutenprint/GPCapabilities.cpp | 2 +- .../print/drivers/gutenprint/GPCapabilities.h | 2 +- .../gutenprint/GPCapabilityExtractor.cpp | 12 ++++++------ .../drivers/gutenprint/GPCapabilityExtractor.h | 2 +- .../print/drivers/gutenprint/GPDriver.cpp | 2 +- src/add-ons/print/drivers/pcl5/PCL5Cap.cpp | 2 +- src/add-ons/print/drivers/pcl5/PCL5Cap.h | 2 +- src/add-ons/print/drivers/pcl6/PCL6Cap.cpp | 2 +- src/add-ons/print/drivers/pcl6/PCL6Cap.h | 2 +- src/add-ons/print/drivers/postscript/PSCap.cpp | 2 +- src/add-ons/print/drivers/postscript/PSCap.h | 2 +- src/libs/print/libprint/GraphicsDriver.cpp | 4 ++-- src/libs/print/libprint/JobData.cpp | 18 +++++++++--------- src/libs/print/libprint/JobSetupDlg.cpp | 8 ++++---- src/libs/print/libprint/PrinterDriver.cpp | 2 +- 20 files changed, 38 insertions(+), 37 deletions(-) diff --git a/headers/libs/print/libprint/PrinterCap.h b/headers/libs/print/libprint/PrinterCap.h index c90d1a993d..22abecd951 100644 --- a/headers/libs/print/libprint/PrinterCap.h +++ b/headers/libs/print/libprint/PrinterCap.h @@ -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; diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp index ea83c29264..cd4abe8c06 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.cpp @@ -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: diff --git a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h index 22bb9a58a8..a906562fae 100644 --- a/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h +++ b/src/add-ons/print/drivers/canon_lips/lips3/Lips3Cap.h @@ -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; }; diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp index 9aee48022d..fc17042ddc 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp +++ b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.cpp @@ -210,7 +210,7 @@ Lips4Cap::GetCaps(CapID capid) const bool -Lips4Cap::IsSupport(CapID capid) const +Lips4Cap::Supports(CapID capid) const { switch (capid) { case kPaper: diff --git a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h index 627f58f4b9..b5334a535a 100644 --- a/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h +++ b/src/add-ons/print/drivers/canon_lips/lips4/Lips4Cap.h @@ -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; }; diff --git a/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp b/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp index 0ecd279b76..2b4d9be8b1 100644 --- a/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp +++ b/src/add-ons/print/drivers/gutenprint/GPCapabilities.cpp @@ -82,7 +82,7 @@ GPCapabilities::GetCaps(CapID category) const bool -GPCapabilities::IsSupport(CapID category) const +GPCapabilities::Supports(CapID category) const { switch (category) { case kPaper: diff --git a/src/add-ons/print/drivers/gutenprint/GPCapabilities.h b/src/add-ons/print/drivers/gutenprint/GPCapabilities.h index 448a46b135..f8677bec9e 100644 --- a/src/add-ons/print/drivers/gutenprint/GPCapabilities.h +++ b/src/add-ons/print/drivers/gutenprint/GPCapabilities.h @@ -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: diff --git a/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp b/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp index e3d8258edb..ffc47645e6 100644 --- a/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp +++ b/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.cpp @@ -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; diff --git a/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h b/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h index 45a31c7660..568a4e273b 100644 --- a/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h +++ b/src/add-ons/print/drivers/gutenprint/GPCapabilityExtractor.h @@ -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& array, EnumCap* capability, diff --git a/src/add-ons/print/drivers/gutenprint/GPDriver.cpp b/src/add-ons/print/drivers/gutenprint/GPDriver.cpp index 66e178e23b..434467a428 100644 --- a/src/add-ons/print/drivers/gutenprint/GPDriver.cpp +++ b/src/add-ons/print/drivers/gutenprint/GPDriver.cpp @@ -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()); diff --git a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp index 392d973b7f..8fd358d87f 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp +++ b/src/add-ons/print/drivers/pcl5/PCL5Cap.cpp @@ -145,7 +145,7 @@ PCL5Cap::GetCaps(CapID capid) const bool -PCL5Cap::IsSupport(CapID capid) const +PCL5Cap::Supports(CapID capid) const { switch (capid) { case kPaper: diff --git a/src/add-ons/print/drivers/pcl5/PCL5Cap.h b/src/add-ons/print/drivers/pcl5/PCL5Cap.h index fc62e1d6ec..1c30889f9f 100644 --- a/src/add-ons/print/drivers/pcl5/PCL5Cap.h +++ b/src/add-ons/print/drivers/pcl5/PCL5Cap.h @@ -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; }; diff --git a/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp b/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp index 0c67e71b00..b66faa87ec 100644 --- a/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp +++ b/src/add-ons/print/drivers/pcl6/PCL6Cap.cpp @@ -325,7 +325,7 @@ PCL6Cap::GetCaps(CapID capid) const bool -PCL6Cap::IsSupport(CapID capid) const +PCL6Cap::Supports(CapID capid) const { switch (capid) { case kPaper: diff --git a/src/add-ons/print/drivers/pcl6/PCL6Cap.h b/src/add-ons/print/drivers/pcl6/PCL6Cap.h index 45cf9d8da8..39f376dac2 100644 --- a/src/add-ons/print/drivers/pcl6/PCL6Cap.h +++ b/src/add-ons/print/drivers/pcl6/PCL6Cap.h @@ -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; }; diff --git a/src/add-ons/print/drivers/postscript/PSCap.cpp b/src/add-ons/print/drivers/postscript/PSCap.cpp index 4c5737daef..daba46e4f7 100644 --- a/src/add-ons/print/drivers/postscript/PSCap.cpp +++ b/src/add-ons/print/drivers/postscript/PSCap.cpp @@ -144,7 +144,7 @@ PSCap::GetCaps(CapID capid) const bool -PSCap::IsSupport(CapID capid) const +PSCap::Supports(CapID capid) const { switch (capid) { case kPaper: diff --git a/src/add-ons/print/drivers/postscript/PSCap.h b/src/add-ons/print/drivers/postscript/PSCap.h index aec7031ca8..01799d6fa8 100644 --- a/src/add-ons/print/drivers/postscript/PSCap.h +++ b/src/add-ons/print/drivers/postscript/PSCap.h @@ -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; }; diff --git a/src/libs/print/libprint/GraphicsDriver.cpp b/src/libs/print/libprint/GraphicsDriver.cpp index dfea32fe57..97c9a70f70 100644 --- a/src/libs/print/libprint/GraphicsDriver.cpp +++ b/src/libs/print/libprint/GraphicsDriver.cpp @@ -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)) { diff --git a/src/libs/print/libprint/JobData.cpp b/src/libs/print/libprint/JobData.cpp index c774d0860f..13de2bfbc0 100644 --- a/src/libs/print/libprint/JobData.cpp +++ b/src/libs/print/libprint/JobData.cpp @@ -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 diff --git a/src/libs/print/libprint/JobSetupDlg.cpp b/src/libs/print/libprint/JobSetupDlg.cpp index 8d66a43e36..3f05156f71 100644 --- a/src/libs/print/libprint/JobSetupDlg.cpp +++ b/src/libs/print/libprint/JobSetupDlg.cpp @@ -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); } diff --git a/src/libs/print/libprint/PrinterDriver.cpp b/src/libs/print/libprint/PrinterDriver.cpp index f8b114d153..a0dda2328f 100644 --- a/src/libs/print/libprint/PrinterDriver.cpp +++ b/src/libs/print/libprint/PrinterDriver.cpp @@ -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);