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

Some style fixes.

Browse Source
This commit is contained in:
Stefano Ceccherini
2012-12-31 12:21:25 +01:00
parent 8cd10c710f
commit 1797be0dc6
4 changed files with 113 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/print/Printer.cpp
+25 -14
View File
@@ -29,14 +29,16 @@
#include <SupportDefs.h> #include <SupportDefs.h>
SpoolFolder::SpoolFolder(BLocker*locker, BLooper* looper, const BDirectory& spoolDir) SpoolFolder::SpoolFolder(BLocker* locker, BLooper* looper,
const BDirectory& spoolDir)
: Folder(locker, looper, spoolDir) : Folder(locker, looper, spoolDir)
{ {
} }
// Notify print_server that there is a job file waiting for printing // Notify print_server that there is a job file waiting for printing
void SpoolFolder::Notify(Job* job, int kind) void
SpoolFolder::Notify(Job* job, int kind)
{ {
if ((kind == kJobAdded || kind == kJobAttrChanged) if ((kind == kJobAdded || kind == kJobAttrChanged)
&& job->IsValid() && job->IsWaiting()) { && job->IsValid() && job->IsWaiting()) {
@@ -61,7 +63,8 @@ BObjectList<Printer> Printer::sPrinters;
// Returns: // Returns:
// Pointer to Printer object, or NULL if not found. // Pointer to Printer object, or NULL if not found.
// --------------------------------------------------------------- // ---------------------------------------------------------------
Printer* Printer::Find(const BString& name) Printer*
Printer::Find(const BString& name)
{ {
// Look in list to find printer definition // Look in list to find printer definition
for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) { for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) {
@@ -72,7 +75,8 @@ Printer* Printer::Find(const BString& name)
} }
Printer* Printer::Find(node_ref* node) Printer*
Printer::Find(node_ref* node)
{ {
node_ref n; node_ref n;
// Look in list to find printer definition // Look in list to find printer definition
@@ -88,18 +92,22 @@ Printer* Printer::Find(node_ref* node)
} }
Printer* Printer::At(int32 idx) Printer*
Printer::At(int32 idx)
{ {
return sPrinters.ItemAt(idx); return sPrinters.ItemAt(idx);
} }
void Printer::Remove(Printer* printer) void
Printer::Remove(Printer* printer)
{ {
sPrinters.RemoveItem(printer); sPrinters.RemoveItem(printer);
} }
int32 Printer::CountPrinters()
int32
Printer::CountPrinters()
{ {
return sPrinters.CountItems(); return sPrinters.CountItems();
} }
@@ -144,7 +152,8 @@ Printer::~Printer()
} }
void Printer::MessageReceived(BMessage* msg) void
Printer::MessageReceived(BMessage* msg)
{ {
switch(msg->what) { switch(msg->what) {
case B_GET_PROPERTY: case B_GET_PROPERTY:
@@ -163,7 +172,8 @@ void Printer::MessageReceived(BMessage* msg)
// Remove printer spooler directory // Remove printer spooler directory
status_t Printer::Remove() status_t
Printer::Remove()
{ {
status_t rc = B_OK; status_t rc = B_OK;
BPath path; BPath path;
@@ -196,7 +206,8 @@ Printer::FindPathToDriver(const char* driverName, BPath* path)
// Returns: // Returns:
// B_OK if successful or errorcode otherwise. // B_OK if successful or errorcode otherwise.
// --------------------------------------------------------------- // ---------------------------------------------------------------
status_t Printer::ConfigurePrinter(const char* driverName, status_t
Printer::ConfigurePrinter(const char* driverName,
const char* printerName) const char* printerName)
{ {
PrintAddOnServer addOn(driverName); PrintAddOnServer addOn(driverName);
@@ -257,9 +268,9 @@ Printer::ConfigureJob(BMessage& settings)
PrintAddOnServer addOn(driver.String()); PrintAddOnServer addOn(driver.String());
result = addOn.ConfigJob(SpoolDir(), &settings); result = addOn.ConfigJob(SpoolDir(), &settings);
if (result == B_OK) { if (result == B_OK)
AddCurrentPrinter(settings); AddCurrentPrinter(settings);
}
return result; return result;
} }
@@ -301,9 +312,9 @@ Printer::GetDefaultSettings(BMessage& settings)
PrintAddOnServer addOn(driver.String()); PrintAddOnServer addOn(driver.String());
result = addOn.DefaultSettings(SpoolDir(), &settings); result = addOn.DefaultSettings(SpoolDir(), &settings);
if (result == B_OK) { if (result == B_OK)
AddCurrentPrinter(settings); AddCurrentPrinter(settings);
}
return result; return result;
} }
src/servers/print/Settings.cpp
+54 -38
View File
@@ -15,23 +15,27 @@
AppSettings::AppSettings(const char* mimetype, const char* printer) AppSettings::AppSettings(const char* mimetype, const char* printer)
: fMimeType(mimetype) : fMimeType(mimetype)
{ {
if (printer) fPrinter = printer; if (printer != NULL)
fPrinter = printer;
} }
// Implementation of PrinterSettings // Implementation of PrinterSettings
PrinterSettings::PrinterSettings(const char* printer, BMessage* pageSettings, BMessage* jobSettings) PrinterSettings::PrinterSettings(const char* printer,
BMessage* pageSettings, BMessage* jobSettings)
: fPrinter(printer) : fPrinter(printer)
{ {
if (pageSettings) fPageSettings = *pageSettings; if (pageSettings != NULL)
if (jobSettings) fJobSettings = *jobSettings; fPageSettings = *pageSettings;
if (jobSettings != NULL)
fJobSettings = *jobSettings;
} }
// Implementation of Settings // Implementation of Settings
Settings* Settings::fSingleton = NULL; Settings* Settings::sSingleton = NULL;
static const BRect kConfigWindowFrame(30, 30, 220, 120); static const BRect kConfigWindowFrame(30, 30, 220, 120);
@@ -44,32 +48,38 @@ Settings::Settings()
} }
Settings::~Settings() { Settings::~Settings()
fSingleton = NULL; {
sSingleton = NULL;
} }
Settings* Settings*
Settings::GetSettings() { Settings::GetSettings()
if (fSingleton == NULL) fSingleton = new Settings(); {
return fSingleton; if (sSingleton == NULL)
sSingleton = new Settings();
return sSingleton;
} }
void void
Settings::RemoveAppSettings(int i) { Settings::RemoveAppSettings(int i)
{
delete fApps.RemoveItemAt(i); delete fApps.RemoveItemAt(i);
} }
void void
Settings::RemovePrinterSettings(int i) { Settings::RemovePrinterSettings(int i)
{
delete fPrinters.RemoveItemAt(i); delete fPrinters.RemoveItemAt(i);
} }
AppSettings* AppSettings*
Settings::FindAppSettings(const char* mimeType) { Settings::FindAppSettings(const char* mimeType)
{
for (int i = AppSettingsCount() - 1; i >= 0; i --) { for (int i = AppSettingsCount() - 1; i >= 0; i --) {
if (strcmp(AppSettingsAt(i)->GetMimeType(), mimeType) == 0) if (strcmp(AppSettingsAt(i)->GetMimeType(), mimeType) == 0)
return AppSettingsAt(i); return AppSettingsAt(i);
@@ -79,7 +89,8 @@ Settings::FindAppSettings(const char* mimeType) {
PrinterSettings* PrinterSettings*
Settings::FindPrinterSettings(const char* printer) { Settings::FindPrinterSettings(const char* printer)
{
for (int i = PrinterSettingsCount() - 1; i >= 0; i --) { for (int i = PrinterSettingsCount() - 1; i >= 0; i --) {
if (strcmp(PrinterSettingsAt(i)->GetPrinter(), printer) == 0) if (strcmp(PrinterSettingsAt(i)->GetPrinter(), printer) == 0)
return PrinterSettingsAt(i); return PrinterSettingsAt(i);
@@ -89,54 +100,59 @@ Settings::FindPrinterSettings(const char* printer) {
void void
Settings::Save(BFile* file) { Settings::Save(BFile* file)
BMessage m; {
BMessage message;
// store application settings // store application settings
for (int i = 0; i < AppSettingsCount(); i++) { for (int i = 0; i < AppSettingsCount(); i++) {
AppSettings* app = AppSettingsAt(i); AppSettings* app = AppSettingsAt(i);
m.AddString("m", app->GetMimeType()); message.AddString("message", app->GetMimeType());
m.AddString("p", app->GetPrinter()); message.AddString("p", app->GetPrinter());
} }
// store printer settings // store printer settings
for (int i = 0; i < PrinterSettingsCount(); i++) { for (int i = 0; i < PrinterSettingsCount(); i++) {
PrinterSettings* p = PrinterSettingsAt(i); PrinterSettings* p = PrinterSettingsAt(i);
m.AddString("P", p->GetPrinter()); message.AddString("P", p->GetPrinter());
m.AddMessage("S", p->GetPageSettings()); message.AddMessage("S", p->GetPageSettings());
m.AddMessage("J", p->GetJobSettings()); message.AddMessage("J", p->GetJobSettings());
} }
m.AddBool("UseConfigWindow", fUseConfigWindow); message.AddBool("UseConfigWindow", fUseConfigWindow);
m.AddRect("ConfigWindowFrame", fConfigWindowFrame); message.AddRect("ConfigWindowFrame", fConfigWindowFrame);
m.AddString("DefaultPrinter", fDefaultPrinter); message.AddString("DefaultPrinter", fDefaultPrinter);
m.Flatten(file); message.Flatten(file);
} }
void void
Settings::Load(BFile* file) { Settings::Load(BFile* file)
BMessage m; {
if (m.Unflatten(file) == B_OK) { BMessage message;
if (message.Unflatten(file) == B_OK) {
// restore application settings // restore application settings
BString mimetype, printer; BString mimetype;
for (int i = 0; m.FindString("m", i, &mimetype) == B_OK && BString printer;
m.FindString("p", i, &printer ) == B_OK; i ++) { for (int i = 0; message.FindString("message", i, &mimetype) == B_OK &&
message.FindString("p", i, &printer ) == B_OK; i ++) {
AddAppSettings(new AppSettings(mimetype.String(), printer.String())); AddAppSettings(new AppSettings(mimetype.String(), printer.String()));
} }
// restore printer settings // restore printer settings
BMessage page, job; BMessage page;
for (int i = 0; m.FindString("P", i, &printer) == B_OK && BMessage job;
m.FindMessage("S", i, &page) == B_OK && for (int i = 0; message.FindString("P", i, &printer) == B_OK &&
m.FindMessage("J", i, &job) == B_OK; i ++) { message.FindMessage("S", i, &page) == B_OK &&
message.FindMessage("J", i, &job) == B_OK; i ++) {
AddPrinterSettings(new PrinterSettings(printer.String(), &page, &job)); AddPrinterSettings(new PrinterSettings(printer.String(), &page, &job));
} }
if (m.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK) if (message.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK)
fUseConfigWindow = true; fUseConfigWindow = true;
if (m.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK) if (message.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK)
fConfigWindowFrame = BRect(kConfigWindowFrame); fConfigWindowFrame = BRect(kConfigWindowFrame);
if (m.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK) if (message.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK)
fDefaultPrinter = ""; fDefaultPrinter = "";
} }
} }
src/servers/print/Settings.h
+1 -1
View File
@@ -55,7 +55,7 @@ private:
BRect fConfigWindowFrame; BRect fConfigWindowFrame;
BString fDefaultPrinter; BString fDefaultPrinter;
static Settings* fSingleton; static Settings* sSingleton;
Settings(); Settings();
public: public:
src/servers/print/Transport.cpp
+20 -21
View File
@@ -34,10 +34,9 @@ Transport*
Transport::Find(const BString& name) Transport::Find(const BString& name)
{ {
// Look in list to find printer definition // Look in list to find printer definition
for (int32 idx=0; idx < sTransports.CountItems(); idx++) { for (int32 index = 0; index < sTransports.CountItems(); index++) {
if (name == sTransports.ItemAt(idx)->Name()) { if (name == sTransports.ItemAt(index)->Name())
return sTransports.ItemAt(idx); return sTransports.ItemAt(index);
}
} }
// None found, so return NULL // None found, so return NULL
@@ -46,9 +45,9 @@ Transport::Find(const BString& name)
Transport* Transport*
Transport::At(int32 idx) Transport::At(int32 index)
{ {
return sTransports.ItemAt(idx); return sTransports.ItemAt(index);
} }
@@ -69,19 +68,19 @@ Transport::CountTransports()
status_t status_t
Transport::Scan(directory_which which) Transport::Scan(directory_which which)
{ {
BDirectory dir; status_t result;
status_t rc;
BPath path; BPath path;
// Try to find specified transport addon directory // Try to find specified transport addon directory
if ((rc=find_directory(which,&path)) != B_OK) if ((result = find_directory(which, &path)) != B_OK)
return rc; return result;
if ((rc=path.Append("Print/transport")) != B_OK) if ((result = path.Append("Print/transport")) != B_OK)
return rc; return result;
if ((rc=dir.SetTo(path.Path())) != B_OK) BDirectory dir;
return rc; if ((result = dir.SetTo(path.Path())) != B_OK)
return result;
// Walk over all entries in directory // Walk over all entries in directory
BEntry entry; BEntry entry;
@@ -101,7 +100,6 @@ Transport::Scan(directory_which which)
} }
return B_OK; return B_OK;
} }
@@ -130,20 +128,21 @@ Transport::Transport(const BPath& path)
// Find transport_features symbol, to determine if we need to keep // Find transport_features symbol, to determine if we need to keep
// this transport loaded // this transport loaded
int* transport_features_ptr; int* transportFeaturesPointer;
if (get_image_symbol(id, B_TRANSPORT_FEATURES_SYMBOL, if (get_image_symbol(id, B_TRANSPORT_FEATURES_SYMBOL,
B_SYMBOL_TYPE_DATA, (void**)&transport_features_ptr) != B_OK) { B_SYMBOL_TYPE_DATA, (void**)&transportFeaturesPointer) != B_OK) {
unload_add_on(id); unload_add_on(id);
} else { } else {
fFeatures = *transport_features_ptr; fFeatures = *transportFeaturesPointer;
if (*transport_features_ptr & B_TRANSPORT_IS_HOTPLUG) { if (fFeatures & B_TRANSPORT_IS_HOTPLUG) {
// We are hotpluggable; so keep us loaded! // We are hotpluggable; so keep us loaded!
fImageID = id; fImageID = id;
} } else {
else // No extended Transport support; so no need to keep loaded // No extended Transport support; so no need to keep loaded
::unload_add_on(id); ::unload_add_on(id);
} }
}
sTransports.AddItem(this); sTransports.AddItem(this);
} }