i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Changed BaseCap ID type from int to int32.

Browse Source 
* Removed unused printer ID from PrinterCap.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39156 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2010-10-26 13:06:29 +00:00
parent ed13a41e18
commit 961e35fb58
4 changed files with 35 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/print/libprint/PrinterCap.h
+18 -21
View File
@@ -20,7 +20,7 @@ struct BaseCap {
BaseCap(const string &label, bool isDefault);
virtual ~BaseCap();
virtual int ID() const = 0;
virtual int32 ID() const = 0;
const char* Key() const;
string fLabel;
@@ -33,7 +33,7 @@ struct PaperCap : public BaseCap {
JobData::Paper paper, const BRect &paperRect,
const BRect &physicalRect);
int ID() const;
int32 ID() const;
JobData::Paper fPaper;
BRect fPaperRect;
@@ -44,18 +44,18 @@ struct PaperSourceCap : public BaseCap {
PaperSourceCap(const string &label, bool isDefault,
JobData::PaperSource paperSource);
int ID() const;
int32 ID() const;
JobData::PaperSource fPaperSource;
};
struct ResolutionCap : public BaseCap {
ResolutionCap(const string &label, bool isDefault,
int id, int xResolution, int yResolution);
int32 id, int xResolution, int yResolution);
int ID() const;
int32 ID() const;
int fID;
int32 fID;
int fXResolution;
int fYResolution;
};
@@ -64,7 +64,7 @@ struct OrientationCap : public BaseCap {
OrientationCap(const string &label, bool isDefault,
JobData::Orientation orientation);
int ID() const;
int32 ID() const;
JobData::Orientation fOrientation;
};
@@ -73,7 +73,7 @@ struct PrintStyleCap : public BaseCap {
PrintStyleCap(const string &label, bool isDefault,
JobData::PrintStyle printStyle);
int ID() const;
int32 ID() const;
JobData::PrintStyle fPrintStyle;
};
@@ -83,7 +83,7 @@ struct BindingLocationCap : public BaseCap {
bool isDefault,
JobData::BindingLocation bindingLocation);
int ID() const;
int32 ID() const;
JobData::BindingLocation fBindingLocation;
};
@@ -92,19 +92,19 @@ struct ColorCap : public BaseCap {
ColorCap(const string &label, bool isDefault,
JobData::Color color);
int ID() const;
int32 ID() const;
JobData::Color fColor;
};
struct ProtocolClassCap : public BaseCap {
ProtocolClassCap(const string &label,
bool isDefault, int protocolClass,
bool isDefault, int32 protocolClass,
const string &description);
int ID() const;
int32 ID() const;
int fProtocolClass;
int32 fProtocolClass;
string fDescription;
};
@@ -117,11 +117,11 @@ struct DriverSpecificCap : public BaseCap {
};
DriverSpecificCap(const string& label,
bool isDefault, int category, Type type);
bool isDefault, int32 category, Type type);
int ID() const;
int32 ID() const;
int fCategory;
int32 fCategory;
Type fType;
};
@@ -161,19 +161,16 @@ public:
const BaseCap* findCap(CapID category, int id) const;
const BaseCap* findCap(CapID category, const char* label) const;
int getPrinterId() const;
int getProtocolClass() const;
protected:
PrinterCap(const PrinterCap &printerCap);
PrinterCap& operator=(const PrinterCap &printerCap);
PrinterCap(const PrinterCap& printerCap);
PrinterCap& operator=(const PrinterCap& printerCap);
const PrinterData* getPrinterData() const;
void setPrinterId(int id);
private:
const PrinterData* fPrinterData;
int fPrinterID;
};