[haiku-commits] r39116 - haiku/trunk/src/apps/codycam
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 24 Oct 2010 05:42:37 +0200 (CEST)
Author: mmadia
Date: 2010-10-24 05:42:36 +0200 (Sun, 24 Oct 2010)
New Revision: 39116
Changeset: http://dev.haiku-os.org/changeset/39116
Modified:
haiku/trunk/src/apps/codycam/CodyCam.cpp
haiku/trunk/src/apps/codycam/CodyCam.h
haiku/trunk/src/apps/codycam/FtpClient.cpp
haiku/trunk/src/apps/codycam/FtpClient.h
haiku/trunk/src/apps/codycam/Settings.cpp
haiku/trunk/src/apps/codycam/Settings.h
haiku/trunk/src/apps/codycam/SettingsHandler.cpp
haiku/trunk/src/apps/codycam/SettingsHandler.h
haiku/trunk/src/apps/codycam/SftpClient.cpp
haiku/trunk/src/apps/codycam/SftpClient.h
haiku/trunk/src/apps/codycam/SpawningUploadClient.cpp
haiku/trunk/src/apps/codycam/VideoConsumer.cpp
haiku/trunk/src/apps/codycam/VideoConsumer.h
haiku/trunk/src/apps/codycam/makefile
Log:
Automatic whitespace cleanup. No functional change.
Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.cpp 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/CodyCam.cpp 2010-10-24 03:42:36 UTC (rev
39116)
@@ -247,7 +247,7 @@
BRect(2 * WINDOW_OFFSET_X +
WINDOW_SIZE_X, WINDOW_OFFSET_Y,
2 * WINDOW_OFFSET_X + WINDOW_SIZE_X +
view->Bounds().right,
WINDOW_OFFSET_Y +
view->Bounds().bottom), view, node);
- fMediaRoster->StartWatching(BMessenger(NULL,
+ fMediaRoster->StartWatching(BMessenger(NULL,
fVideoControlWindow), node,
B_MEDIA_WEB_CHANGED);
fVideoControlWindow->Show();
}
@@ -280,7 +280,7 @@
/* find the media roster */
fMediaRoster = BMediaRoster::Roster(&status);
if (status != B_OK) {
- ErrorAlert(B_TRANSLATE("Cannot find the media roster"), status,
+ ErrorAlert(B_TRANSLATE("Cannot find the media roster"), status,
fWindow);
return status;
}
@@ -302,11 +302,11 @@
}
/* create the video consumer node */
- fVideoConsumer = new VideoConsumer("CodyCam",
+ fVideoConsumer = new VideoConsumer("CodyCam",
((VideoWindow*)fWindow)->VideoView(),
((VideoWindow*)fWindow)->StatusLine(), NULL, 0);
if (!fVideoConsumer) {
- ErrorAlert(B_TRANSLATE("Cannot create a video window"),
B_ERROR,
+ ErrorAlert(B_TRANSLATE("Cannot create a video window"), B_ERROR,
fWindow);
return B_ERROR;
}
@@ -314,7 +314,7 @@
/* register the node */
status = fMediaRoster->RegisterNode(fVideoConsumer);
if (status != B_OK) {
- ErrorAlert(B_TRANSLATE("Cannot register the video window"),
status,
+ ErrorAlert(B_TRANSLATE("Cannot register the video window"),
status,
fWindow);
return status;
}
@@ -322,18 +322,18 @@
/* find free producer output */
int32 cnt = 0;
- status = fMediaRoster->GetFreeOutputsFor(fProducerNode, &fProducerOut,
1,
+ status = fMediaRoster->GetFreeOutputsFor(fProducerNode, &fProducerOut,
1,
&cnt, B_MEDIA_RAW_VIDEO);
if (status != B_OK || cnt < 1) {
status = B_RESOURCE_UNAVAILABLE;
- ErrorAlert(B_TRANSLATE("Cannot find an available video
stream"),
+ ErrorAlert(B_TRANSLATE("Cannot find an available video stream"),
status, fWindow);
return status;
}
/* find free consumer input */
cnt = 0;
- status = fMediaRoster->GetFreeInputsFor(fVideoConsumer->Node(),
+ status = fMediaRoster->GetFreeInputsFor(fVideoConsumer->Node(),
&fConsumerIn, 1, &cnt, B_MEDIA_RAW_VIDEO);
if (status != B_OK || cnt < 1) {
status = B_RESOURCE_UNAVAILABLE;
@@ -350,7 +350,7 @@
format.u.raw_video = vid_format;
/* connect producer to consumer */
- status = fMediaRoster->Connect(fProducerOut.source,
+ status = fMediaRoster->Connect(fProducerOut.source,
fConsumerIn.destination, &format, &fProducerOut, &fConsumerIn);
if (status != B_OK) {
ErrorAlert(B_TRANSLATE("Cannot connect the video source to the
video "
@@ -360,7 +360,7 @@
/* set time sources */
- status = fMediaRoster->SetTimeSourceFor(fProducerNode.node,
+ status = fMediaRoster->SetTimeSourceFor(fProducerNode.node,
fTimeSourceNode.node);
if (status != B_OK) {
ErrorAlert(B_TRANSLATE("Cannot set the time source for the
video "
@@ -368,7 +368,7 @@
return status;
}
- status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(),
+ status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(),
fTimeSourceNode.node);
if (status != B_OK) {
ErrorAlert(B_TRANSLATE("Cannot set the time source for the
video "
@@ -413,7 +413,7 @@
}
}
- bigtime_t perf = timeSource->PerformanceTimeFor(real + latency
+ bigtime_t perf = timeSource->PerformanceTimeFor(real + latency
+ initLatency);
timeSource->Release();
@@ -490,19 +490,19 @@
BMenuItem* menuItem;
BMenu* menu = new BMenu(B_TRANSLATE("File"));
- menuItem = new BMenuItem(B_TRANSLATE("Video settings"),
+ menuItem = new BMenuItem(B_TRANSLATE("Video settings"),
new BMessage(msg_video), 'P');
menuItem->SetTarget(be_app);
menu->AddItem(menuItem);
menu->AddSeparatorItem();
- menuItem = new BMenuItem(B_TRANSLATE("Start video"),
+ menuItem = new BMenuItem(B_TRANSLATE("Start video"),
new BMessage(msg_start), 'A');
menuItem->SetTarget(be_app);
menu->AddItem(menuItem);
- menuItem = new BMenuItem(B_TRANSLATE("Stop video"),
+ menuItem = new BMenuItem(B_TRANSLATE("Stop video"),
new BMessage(msg_stop), 'O');
menuItem->SetTarget(be_app);
menu->AddItem(menuItem);
@@ -516,7 +516,7 @@
menu->AddSeparatorItem();
- menuItem = new BMenuItem(B_TRANSLATE("Quit"),
+ menuItem = new BMenuItem(B_TRANSLATE("Quit"),
new BMessage(B_QUIT_REQUESTED), 'Q');
menuItem->SetTarget(be_app);
menu->AddItem(menuItem);
@@ -812,7 +812,7 @@
fLoginSetting = new StringValueSetting("Login", "loginID",
B_TRANSLATE("login ID expected"));
- fPasswordSetting = new StringValueSetting("Password",
+ fPasswordSetting = new StringValueSetting("Password",
B_TRANSLATE("password"), B_TRANSLATE("password expected"));
fDirectorySetting = new StringValueSetting("Directory", "web/images",
@@ -832,7 +832,7 @@
"unrecognized capture rate specified");
fUploadClientSetting = new EnumeratedStringValueSetting("UploadClient",
- B_TRANSLATE("FTP"), &UploadClientAt,
+ B_TRANSLATE("FTP"), &UploadClientAt,
B_TRANSLATE("upload client name expected"),
B_TRANSLATE("unrecognized upload client specified"));
@@ -883,10 +883,10 @@
// #pragma mark -
-ControlWindow::ControlWindow(const BRect& frame, BView* controls,
+ControlWindow::ControlWindow(const BRect& frame, BView* controls,
media_node node)
:
- BWindow(frame, B_TRANSLATE("Video settings"), B_TITLED_WINDOW,
+ BWindow(frame, B_TRANSLATE("Video settings"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS)
{
fView = controls;
Modified: haiku/trunk/src/apps/codycam/CodyCam.h
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.h 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/CodyCam.h 2010-10-24 03:42:36 UTC (rev
39116)
@@ -36,14 +36,14 @@
msg_directory = 'drct',
msg_passiveftp = 'pasv',
msg_pswrd_text = 'pstx',
-
+
msg_start = 'strt',
msg_stop = 'stop',
msg_about = 'abut',
msg_setup = 'setp',
msg_video = 'vdeo',
-
+
msg_control_win = 'ctlw'
};
Modified: haiku/trunk/src/apps/codycam/FtpClient.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/FtpClient.cpp 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/FtpClient.cpp 2010-10-24 03:42:36 UTC (rev
39116)
@@ -35,7 +35,7 @@
string cmd = "CWD ", replyString;
cmd += dir;
-
+
if (dir.length() == 0)
cmd += '/';
@@ -56,9 +56,9 @@
string cmd, replyString;
int code, codeType, numRead;
char buf[513];
-
+
cmd = "TYPE A";
-
+
if (_SendRequest(cmd))
_GetReply(replyString, code, codeType);
@@ -100,7 +100,7 @@
int code, codeType;
string cmd = "PWD", replyString;
long i;
-
+
if (_SendRequest(cmd) == true) {
if (_GetReply(replyString, code, codeType) == true) {
if (codeType == 2) {
@@ -125,10 +125,10 @@
int code, codeType;
string cmd, replyString;
BNetAddress addr;
-
+
delete fControl;
delete fData;
-
+
fControl = new BNetEndpoint;
if (fControl->InitCheck() != B_NO_ERROR)
@@ -137,7 +137,7 @@
addr.SetTo(server.c_str(), "tcp", "ftp");
if (fControl->Connect(addr) == B_NO_ERROR) {
// read the welcome message, do the login
-
+
if (_GetReply(replyString, code, codeType)) {
if (code != 421 && codeType != 5) {
cmd = "USER ";
@@ -146,8 +146,8 @@
if (_GetReply(replyString, code, codeType)) {
switch (code) {
- case 230:
- case 202:
+ case 230:
+ case 202:
rc = true;
break;
@@ -163,12 +163,12 @@
default:
break;
-
+
}
}
}
}
- }
+ }
if (rc == true)
_SetState(ftp_connected);
@@ -189,7 +189,7 @@
int code, codeType, rlen, slen, i;
BFile infile(local.c_str(), B_READ_ONLY);
char buf[8192], sbuf[16384], *stmp;
-
+
if (infile.InitCheck() != B_NO_ERROR)
return false;
@@ -197,7 +197,7 @@
cmd = "TYPE I";
else
cmd = "TYPE A";
-
+
if (_SendRequest(cmd))
_GetReply(replyString, code, codeType);
@@ -237,7 +237,7 @@
throw "bail";
}
}
-
+
rc = true;
}
}
@@ -247,7 +247,7 @@
}
catch(const char* errorString)
- {
+ {
}
delete fData;
@@ -257,7 +257,7 @@
_GetReply(replyString, code, codeType);
rc = codeType <= 2;
}
-
+
return rc;
}
@@ -286,7 +286,7 @@
if (_OpenDataConnection()) {
cmd = "RETR ";
cmd += remote;
-
+
if (_SendRequest(cmd)) {
if (_GetReply(replyString, code, codeType)) {
if (codeType <= 2) {
@@ -297,7 +297,7 @@
memset(buf, 0,
sizeof(buf));
memset(sbuf, 0,
sizeof(sbuf));
rlen =
fData->Receive(buf, sizeof(buf));
-
+
if (rlen > 0) {
slen = rlen;
@@ -317,7 +317,7 @@
if (slen > 0) {
if
(outfile.Write(stmp, slen) < 0)
-
writeError = true;
+
writeError = true;
}
}
}
@@ -329,8 +329,8 @@
delete fData;
fData = 0;
-
- if (rc) {
+
+ if (rc) {
_GetReply(replyString, code, codeType);
rc = (codeType <= 2 && writeError == false);
}
@@ -378,7 +378,7 @@
cmd += mod;
cmd += " ";
cmd += path;
-
+
if (path.length() == 0)
cmd += '/';
printf(B_TRANSLATE("cmd: '%s'\n"), cmd.c_str());
@@ -429,7 +429,7 @@
{
bool rc = false;
string ccmd = cmd;
-
+
if (fControl != 0) {
if (cmd.find("PASS") != string::npos)
printf(B_TRANSLATE("PASS <suppressed> (real password
sent)\n"));
@@ -440,7 +440,7 @@
if (fControl->Send(ccmd.c_str(), ccmd.length()) >= 0)
rc = true;
}
-
+
return rc;
}
@@ -453,7 +453,7 @@
bool done = false;
line = ""; // Thanks to Stephen van Egmond for catching a bug here
-
+
if (fControl != 0) {
rc = true;
while (done == false && fControl->Receive(&c, 1) > 0) {
@@ -482,12 +482,12 @@
treply[2] = c;
fControl->Send(treply,
3);
break;
-
+
case EOF:
case xEOF:
done = true;
break;
-
+
default:
line += c;
break;
@@ -498,9 +498,9 @@
line += c;
}
}
- }
+ }
}
-
+
return rc;
}
@@ -510,11 +510,11 @@
{
bool rc = false;
string line, tempString;
-
+
//
// comment from the ncftp source:
//
-
+
/* RFC 959 states that a reply may span multiple lines. A single
* line message would have the 3-digit code <space> then the msg.
* A multi-line message would have the code <dash> and the first
@@ -534,10 +534,10 @@
printf(outString.c_str());
tempString = line.substr(0, 3);
outCode = atoi(tempString.c_str());
-
+
if (line[3] == '-') {
while ((rc = _GetReplyLine(line)) == true) {
- outString += line;
+ outString += line;
outString += '\n';
printf(outString.c_str());
// we're done with nnn when we get to a "nnn
blahblahblah"
@@ -546,20 +546,20 @@
}
}
}
-
+
if (!rc && outCode != 421) {
outString += B_TRANSLATE("Remote host has closed the
connection.\n");
outCode = 421;
}
if (outCode == 421) {
- delete fControl;
+ delete fControl;
fControl = 0;
_ClearState(ftp_connected);
}
codeType = outCode / 100;
-
+
return rc;
}
@@ -573,12 +573,12 @@
int i, code, codeType;
bool rc = false;
struct sockaddr_in sa;
-
+
delete fData;
fData = 0;
-
+
fData = new BNetEndpoint;
-
+
if (_TestState(ftp_passive)) {
// Here we send a "pasv" command and connect to the remote
server
// on the port it sends back to us
@@ -597,7 +597,7 @@
replyString = replyString.substr(i,
replyString.find(')') - i);
if (sscanf(replyString.c_str(),
"%d,%d,%d,%d,%d,%d",
- &paddr[0], &paddr[1],
&paddr[2], &paddr[3],
+ &paddr[0], &paddr[1],
&paddr[2], &paddr[3],
&paddr[4], &paddr[5]) != 6) {
// cannot do passive. Do a
little harmless rercursion here
_ClearState(ftp_passive);
@@ -649,7 +649,7 @@
rc = true;
}
}
-
+
return rc;
}
@@ -660,19 +660,19 @@
BNetEndpoint* endPoint;
bool rc = false;
- if (_TestState(ftp_passive) == false) {
+ if (_TestState(ftp_passive) == false) {
if (fData != 0) {
endPoint = fData->Accept();
if (endPoint != 0) {
delete fData;
fData = endPoint;
rc = true;
- }
+ }
}
-
+
}
else
rc = true;
- return rc;
+ return rc;
}
Modified: haiku/trunk/src/apps/codycam/FtpClient.h
===================================================================
--- haiku/trunk/src/apps/codycam/FtpClient.h 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/FtpClient.h 2010-10-24 03:42:36 UTC (rev
39116)
@@ -15,12 +15,12 @@
/*
* Definitions for the TELNET protocol. Snarfed from the BSD source.
*/
-#define IAC 255
-#define DONT 254
-#define DO 253
-#define WONT 252
-#define WILL 251
-#define xEOF 236
+#define IAC 255
+#define DONT 254
+#define DO 253
+#define WONT 252
+#define WILL 251
+#define xEOF 236
class FtpClient : public FileUploadClient {
@@ -44,7 +44,7 @@
bool Chmod(const string& path, const string& mod);
void SetPassive(bool on);
-
+
protected:
enum {
ftp_complete = 1UL,
Modified: haiku/trunk/src/apps/codycam/Settings.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/Settings.cpp 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/Settings.cpp 2010-10-24 03:42:36 UTC (rev
39116)
@@ -35,13 +35,13 @@
}
-void
+void
StringValueSetting::ValueChanged(const char* newValue)
{
if (newValue == fValue)
// guard against self assingment
return;
-
+
free(fValue);
fValue = strdup(newValue);
}
@@ -54,7 +54,7 @@
}
-void
+void
StringValueSetting::SaveSettingValue(Settings* settings)
{
printf("-----StringValueSetting::SaveSettingValue %s %s\n", Name(),
fValue);
@@ -62,7 +62,7 @@
}
-bool
+bool
StringValueSetting::NeedsSaving() const
{
// needs saving if different than default
@@ -73,10 +73,10 @@
const char*
StringValueSetting::Handle(const char *const *argv)
{
- if (!*++argv)
+ if (!*++argv)
return fValueExpectedErrorString;
-
- ValueChanged(*argv);
+
+ ValueChanged(*argv);
return 0;
}
@@ -96,7 +96,7 @@
}
-void
+void
EnumeratedStringValueSetting::ValueChanged(const char* newValue)
{
#if DEBUG
@@ -110,14 +110,14 @@
const char*
EnumeratedStringValueSetting::Handle(const char *const *argv)
{
- if (!*++argv)
+ if (!*++argv)
return fValueExpectedErrorString;
printf("---EnumeratedStringValueSetting::Handle %s %s\n", *(argv-1),
*argv);
if (!_ValidateString(*argv))
return fWrongValueErrorString;
-
- ValueChanged(*argv);
+
+ ValueChanged(*argv);
return 0;
}
@@ -158,7 +158,7 @@
}
-void
+void
ScalarValueSetting::ValueChanged(int32 newValue)
{
ASSERT(newValue > fMin);
@@ -174,7 +174,7 @@
}
-void
+void
ScalarValueSetting::GetValueAsString(char* buffer) const
{
sprintf(buffer, "%ld", fValue);
@@ -184,26 +184,26 @@
const char*
ScalarValueSetting::Handle(const char *const *argv)
{
- if (!*++argv)
+ if (!*++argv)
return fValueExpectedErrorString;
int32 newValue = atoi(*argv);
if (newValue < fMin || newValue > fMax)
return fWrongValueErrorString;
- fValue = newValue;
+ fValue = newValue;
return 0;
}
-void
+void
ScalarValueSetting::SaveSettingValue(Settings* settings)
{
settings->Write("%d", fValue);
}
-bool
+bool
ScalarValueSetting::NeedsSaving() const
{
return fValue != fDefaultValue;
@@ -224,7 +224,7 @@
}
-bool
+bool
BooleanValueSetting::Value() const
{
return fValue;
@@ -252,7 +252,7 @@
}
-void
+void
BooleanValueSetting::SaveSettingValue(Settings* settings)
{
settings->Write(fValue ? "on" : "off");
Modified: haiku/trunk/src/apps/codycam/Settings.h
===================================================================
--- haiku/trunk/src/apps/codycam/Settings.h 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/Settings.h 2010-10-24 03:42:36 UTC (rev
39116)
@@ -10,7 +10,7 @@
// simple string setting
public:
StringValueSetting(const char* name,
- const
char* defaultValue,
+ const
char* defaultValue,
const
char* valueExpectedErrorString,
const
char* wrongValueErrorString = "");
@@ -18,7 +18,7 @@
void ValueChanged(const
char* newValue);
const char* Value() const;
- virtual const char* Handle(const char *const
*argv);
+ virtual const char* Handle(const char *const *argv);
protected:
virtual void SaveSettingValue(Settings*);
@@ -46,7 +46,7 @@
const
char* wrongValueErrorString);
void ValueChanged(const
char* newValue);
- virtual const char* Handle(const char *const
*argv);
+ virtual const char* Handle(const char *const *argv);
private:
bool _ValidateString(const
char* string);
@@ -67,7 +67,7 @@
void ValueChanged(int32
newValue);
int32 Value() const;
void GetValueAsString(char*)
const;
- virtual const char* Handle(const char *const
*argv);
+ virtual const char* Handle(const char *const *argv);
protected:
virtual void SaveSettingValue(Settings*);
@@ -89,7 +89,7 @@
virtual ~BooleanValueSetting();
bool Value() const;
- virtual const char* Handle(const char *const
*argv);
+ virtual const char* Handle(const char *const *argv);
protected:
virtual void SaveSettingValue(Settings *);
Modified: haiku/trunk/src/apps/codycam/SettingsHandler.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/SettingsHandler.cpp 2010-10-24 03:39:19 UTC
(rev 39115)
+++ haiku/trunk/src/apps/codycam/SettingsHandler.cpp 2010-10-24 03:42:36 UTC
(rev 39116)
@@ -82,18 +82,18 @@
}
-void
+void
ArgvParser::MakeArgvEmpty()
{
// done with current argv, free it up
for (int32 index = 0; index < fArgc; index++)
delete fCurrentArgv[index];
-
+
fArgc = 0;
}
-status_t
+status_t
ArgvParser::SendArgv(ArgvHandler argvHandlerFunc, void* passThru)
{
if (fArgc) {
@@ -111,7 +111,7 @@
}
-void
+void
ArgvParser::NextArgv()
{
if (fSawBackslash) {
@@ -120,7 +120,7 @@
}
fCurrentArgs[++fCurrentArgsPos] = '\0';
// terminate current arg pos
-
+
// copy it as a string to the current argv slot
fCurrentArgv[fArgc] = new char [strlen(fCurrentArgs) + 1];
strcpy(fCurrentArgv[fArgc], fCurrentArgs);
@@ -129,7 +129,7 @@
}
-void
+void
ArgvParser::NextArgvIfNotEmpty()
{
if (!fSawBackslash && fCurrentArgsPos < 0)
@@ -139,7 +139,7 @@
}
-char
+char
ArgvParser::GetCh()
{
if (fPos < 0 || fBuffer[fPos] == 0) {
@@ -153,8 +153,8 @@
}
-status_t
-ArgvParser::EachArgv(const char* name, ArgvHandler argvHandlerFunc,
+status_t
+ArgvParser::EachArgv(const char* name, ArgvHandler argvHandlerFunc,
void* passThru)
{
ArgvParser parser(name);
@@ -162,7 +162,7 @@
}
-status_t
+status_t
ArgvParser::EachArgvPrivate(const char* name, ArgvHandler argvHandlerFunc,
void* passThru)
{
@@ -191,7 +191,7 @@
result = B_ERROR;
break;
}
- fLineNo++;
+ fLineNo++;
if (fSawBackslash) {
fSawBackslash = false;
continue;
@@ -202,7 +202,7 @@
break;
continue;
}
-
+
if (fEatComment)
continue;
@@ -260,7 +260,7 @@
}
-void
+void
SettingsArgvDispatcher::SaveSettings(Settings* settings, bool onlyIfNonDefault)
{
if (!onlyIfNonDefault || NeedsSaving()) {
@@ -271,7 +271,7 @@
}
-bool
+bool
SettingsArgvDispatcher::HandleRectValue(BRect &result, const char* const *argv,
bool printError)
{
@@ -303,7 +303,7 @@
}
-void
+void
SettingsArgvDispatcher::WriteRectValue(Settings* setting, BRect rect)
{
setting->Write("%d %d %d %d", (int32)rect.left, (int32)rect.top,
@@ -340,7 +340,7 @@
{
for (int32 index = 0; index < fCount; index++)
delete fList[index];
-
+
free(fList);
}
@@ -410,7 +410,7 @@
}
-void
+void
Settings::SaveSettings(bool onlyIfNonDefault)
{
ASSERT(SettingsHandler());
@@ -418,13 +418,13 @@
}
-void
+void
Settings::_MakeSettingsDirectory(BDirectory *resultingSettingsDir)
{
BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, true) != B_OK)
return;
-
+
// make sure there is a directory
path.Append(fSettingsDir);
mkdir(path.Path(), 0777);
@@ -432,7 +432,7 @@
}
-void
+void
Settings::_SaveCurrentSettings(bool onlyIfNonDefault)
{
BDirectory fSettingsDir;
@@ -445,7 +445,7 @@
// nuke old settings
BEntry entry(&fSettingsDir, fFileName);
entry.Remove();
-
+
BFile prefs(&entry, O_RDWR | O_CREAT);
if (prefs.InitCheck() != B_OK)
return;
@@ -459,7 +459,7 @@
}
-void
+void
Settings::Write(const char* format, ...)
{
va_list args;
@@ -470,7 +470,7 @@
}
-void
+void
Settings::VSWrite(const char* format, va_list arg)
{
char buffer[2048];
Modified: haiku/trunk/src/apps/codycam/SettingsHandler.h
===================================================================
--- haiku/trunk/src/apps/codycam/SettingsHandler.h 2010-10-24 03:39:19 UTC
(rev 39115)
+++ haiku/trunk/src/apps/codycam/SettingsHandler.h 2010-10-24 03:42:36 UTC
(rev 39116)
@@ -75,7 +75,7 @@
virtual ~SettingsArgvDispatcher() {};
void SaveSettings(Settings* settings, bool onlyIfNonDefault);
-
+
const char* Name() const
{
return fName;
@@ -85,7 +85,7 @@
// override this adding an argv parser that reads in the
// values in argv format for this setting
// return a pointer to an error message or null if
parsed OK
-
+
bool HandleRectValue(BRect&, const char* const *argv,
bool printError = true);
Modified: haiku/trunk/src/apps/codycam/SftpClient.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/SftpClient.cpp 2010-10-24 03:39:19 UTC (rev
39115)
+++ haiku/trunk/src/apps/codycam/SftpClient.cpp 2010-10-24 03:42:36 UTC (rev
39116)
@@ -69,7 +69,7 @@
bool
-SftpClient::Connect(const string& server, const string& login,
+SftpClient::Connect(const string& server, const string& login,
const string& passwd)
{
bool rc = false;
@@ -88,7 +88,7 @@
rc = SpawningUploadClient::Connect(server, login, passwd);
BString reply;
ssize_t len;
-
+
if ((len = ReadReply(&reply)) < 0) {
fprintf(stderr, _GetLongReadText(), len);
return false;
[... truncated: 574 lines follow ...]
Other related posts:
- » [haiku-commits] r39116 - haiku/trunk/src/apps/codycam - mattmadia
