Skip to content

Commit

Permalink
Some style fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackburton79
jackburton79 committed Dec 31, 2012
1 parent 8cd10c7 commit 1797be0
Show file tree
Hide file tree
Showing 4 changed files with 113 additions and 87 deletions.
49 changes: 30 additions & 19 deletions src/servers/print/Printer.cpp
View file
Expand Up @@ -29,14 +29,16 @@
#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)
{
}


// 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)
&& job->IsValid() && job->IsWaiting()) {
Expand All @@ -61,45 +63,51 @@ BObjectList<Printer> Printer::sPrinters;
// Returns:
// 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
for (int32 idx=0; idx < sPrinters.CountItems(); idx++) {
// Look in list to find printer definition
for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) {
if (name == sPrinters.ItemAt(idx)->Name())
return sPrinters.ItemAt(idx);
}
return NULL;
}


Printer* Printer::Find(node_ref* node)
Printer*
Printer::Find(node_ref* node)
{
node_ref n;
// Look in list to find printer definition
// Look in list to find printer definition
for (int32 idx = 0; idx < sPrinters.CountItems(); idx++) {
Printer* printer = sPrinters.ItemAt(idx);
printer->SpoolDir()->GetNodeRef(&n);
if (n == *node)
return printer;
}

// None found, so return NULL
// None found, so return NULL
return NULL;
}


Printer* Printer::At(int32 idx)
Printer*
Printer::At(int32 idx)
{
return sPrinters.ItemAt(idx);
}


void Printer::Remove(Printer* printer)
void
Printer::Remove(Printer* printer)
{
sPrinters.RemoveItem(printer);
}

int32 Printer::CountPrinters()

int32
Printer::CountPrinters()
{
return sPrinters.CountItems();
}
Expand Down Expand Up @@ -144,7 +152,8 @@ Printer::~Printer()
}


void Printer::MessageReceived(BMessage* msg)
void
Printer::MessageReceived(BMessage* msg)
{
switch(msg->what) {
case B_GET_PROPERTY:
Expand All @@ -163,12 +172,13 @@ void Printer::MessageReceived(BMessage* msg)


// Remove printer spooler directory
status_t Printer::Remove()
status_t
Printer::Remove()
{
status_t rc = B_OK;
BPath path;

if ((rc=::find_directory(B_USER_PRINTERS_DIRECTORY, &path)) == B_OK) {
if ((rc = ::find_directory(B_USER_PRINTERS_DIRECTORY, &path)) == B_OK) {
path.Append(Name());
rc = rmdir(path.Path());
}
Expand Down Expand Up @@ -196,7 +206,8 @@ Printer::FindPathToDriver(const char* driverName, BPath* path)
// Returns:
// B_OK if successful or errorcode otherwise.
// ---------------------------------------------------------------
status_t Printer::ConfigurePrinter(const char* driverName,
status_t
Printer::ConfigurePrinter(const char* driverName,
const char* printerName)
{
PrintAddOnServer addOn(driverName);
Expand Down Expand Up @@ -257,9 +268,9 @@ Printer::ConfigureJob(BMessage& settings)

PrintAddOnServer addOn(driver.String());
result = addOn.ConfigJob(SpoolDir(), &settings);
if (result == B_OK) {
if (result == B_OK)
AddCurrentPrinter(settings);
}

return result;
}

Expand Down Expand Up @@ -301,9 +312,9 @@ Printer::GetDefaultSettings(BMessage& settings)

PrintAddOnServer addOn(driver.String());
result = addOn.DefaultSettings(SpoolDir(), &settings);
if (result == B_OK) {
if (result == B_OK)
AddCurrentPrinter(settings);
}

return result;
}

Expand Down
104 changes: 60 additions & 44 deletions src/servers/print/Settings.cpp
View file
Expand Up @@ -15,23 +15,27 @@
AppSettings::AppSettings(const char* mimetype, const char* printer)
: fMimeType(mimetype)
{
if (printer) fPrinter = printer;
if (printer != NULL)
fPrinter = printer;
}


// Implementation of PrinterSettings

PrinterSettings::PrinterSettings(const char* printer, BMessage* pageSettings, BMessage* jobSettings)
PrinterSettings::PrinterSettings(const char* printer,
BMessage* pageSettings, BMessage* jobSettings)
: fPrinter(printer)
{
if (pageSettings) fPageSettings = *pageSettings;
if (jobSettings) fJobSettings = *jobSettings;
if (pageSettings != NULL)
fPageSettings = *pageSettings;
if (jobSettings != NULL)
fJobSettings = *jobSettings;
}


// Implementation of Settings

Settings* Settings::fSingleton = NULL;
Settings* Settings::sSingleton = NULL;

static const BRect kConfigWindowFrame(30, 30, 220, 120);

Expand All @@ -44,33 +48,39 @@ Settings::Settings()
}


Settings::~Settings() {
fSingleton = NULL;
Settings::~Settings()
{
sSingleton = NULL;
}


Settings*
Settings::GetSettings() {
if (fSingleton == NULL) fSingleton = new Settings();
return fSingleton;
Settings::GetSettings()
{
if (sSingleton == NULL)
sSingleton = new Settings();
return sSingleton;
}


void
Settings::RemoveAppSettings(int i) {
Settings::RemoveAppSettings(int i)
{
delete fApps.RemoveItemAt(i);
}


void
Settings::RemovePrinterSettings(int i) {
Settings::RemovePrinterSettings(int i)
{
delete fPrinters.RemoveItemAt(i);
}


AppSettings*
Settings::FindAppSettings(const char* mimeType) {
for (int i = AppSettingsCount()-1; i >= 0; i --) {
Settings::FindAppSettings(const char* mimeType)
{
for (int i = AppSettingsCount() - 1; i >= 0; i --) {
if (strcmp(AppSettingsAt(i)->GetMimeType(), mimeType) == 0)
return AppSettingsAt(i);
}
Expand All @@ -79,8 +89,9 @@ Settings::FindAppSettings(const char* mimeType) {


PrinterSettings*
Settings::FindPrinterSettings(const char* printer) {
for (int i = PrinterSettingsCount()-1; i >= 0; i --) {
Settings::FindPrinterSettings(const char* printer)
{
for (int i = PrinterSettingsCount() - 1; i >= 0; i --) {
if (strcmp(PrinterSettingsAt(i)->GetPrinter(), printer) == 0)
return PrinterSettingsAt(i);
}
Expand All @@ -89,54 +100,59 @@ Settings::FindPrinterSettings(const char* printer) {


void
Settings::Save(BFile* file) {
BMessage m;
// store application settings
Settings::Save(BFile* file)
{
BMessage message;
// store application settings
for (int i = 0; i < AppSettingsCount(); i++) {
AppSettings* app = AppSettingsAt(i);
m.AddString("m", app->GetMimeType());
m.AddString("p", app->GetPrinter());
message.AddString("message", app->GetMimeType());
message.AddString("p", app->GetPrinter());
}
// store printer settings
// store printer settings
for (int i = 0; i < PrinterSettingsCount(); i++) {
PrinterSettings* p = PrinterSettingsAt(i);
m.AddString("P", p->GetPrinter());
m.AddMessage("S", p->GetPageSettings());
m.AddMessage("J", p->GetJobSettings());
message.AddString("P", p->GetPrinter());
message.AddMessage("S", p->GetPageSettings());
message.AddMessage("J", p->GetJobSettings());
}

m.AddBool("UseConfigWindow", fUseConfigWindow);
m.AddRect("ConfigWindowFrame", fConfigWindowFrame);
m.AddString("DefaultPrinter", fDefaultPrinter);
m.Flatten(file);
message.AddBool("UseConfigWindow", fUseConfigWindow);
message.AddRect("ConfigWindowFrame", fConfigWindowFrame);
message.AddString("DefaultPrinter", fDefaultPrinter);
message.Flatten(file);
}


void
Settings::Load(BFile* file) {
BMessage m;
if (m.Unflatten(file) == B_OK) {
// restore application settings
BString mimetype, printer;
for (int i = 0; m.FindString("m", i, &mimetype) == B_OK &&
m.FindString("p", i, &printer ) == B_OK; i ++) {
Settings::Load(BFile* file)
{
BMessage message;
if (message.Unflatten(file) == B_OK) {
// restore application settings
BString mimetype;
BString printer;
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()));
}
// restore printer settings
BMessage page, job;
for (int i = 0; m.FindString("P", i, &printer) == B_OK &&
m.FindMessage("S", i, &page) == B_OK &&
m.FindMessage("J", i, &job) == B_OK; i ++) {

// restore printer settings
BMessage page;
BMessage job;
for (int i = 0; message.FindString("P", i, &printer) == B_OK &&
message.FindMessage("S", i, &page) == B_OK &&
message.FindMessage("J", i, &job) == B_OK; i ++) {
AddPrinterSettings(new PrinterSettings(printer.String(), &page, &job));
}

if (m.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK)
if (message.FindBool("UseConfigWindow", &fUseConfigWindow) != B_OK)
fUseConfigWindow = true;

if (m.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK)
if (message.FindRect("ConfigWindowFrame", &fConfigWindowFrame) != B_OK)
fConfigWindowFrame = BRect(kConfigWindowFrame);

if (m.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK)
if (message.FindString("DefaultPrinter", &fDefaultPrinter) != B_OK)
fDefaultPrinter = "";
}
}
2 changes: 1 addition & 1 deletion src/servers/print/Settings.h
View file
Expand Up @@ -55,7 +55,7 @@ class Settings {
BRect fConfigWindowFrame;
BString fDefaultPrinter;

static Settings* fSingleton;
static Settings* sSingleton;
Settings();

public:
Expand Down

0 comments on commit 1797be0

Please sign in to comment.