Fix small bug in reading \set_color in lyxrc

[lyx.git] / src / lyx_sendfax_main.C

diff --git a/src/lyx_sendfax_main.C b/src/lyx_sendfax_main.C
index 05f901884aef88000e0de9242e8d9bdb632f8f32..d15b16ca51a96bc0a11e23dd3047defd65ed3566 100644 (file)
--- a/src/lyx_sendfax_main.C
+++ b/src/lyx_sendfax_main.C
@@ -12,6 +12,8 @@
 #include "support/syscall.h"
 #include "gettext.h"
 
+using std::endl;
+
 /* Prototypes */
 
 bool sendfax(string const &fname, string const &sendcmd);
@@ -62,10 +64,10 @@ bool send_fax(string const &fname, string const &sendcmd)
 
     /* init Phone-Book */
     string phone_book_name;
-    if (lyxrc->phone_book.empty()) {
+    if (lyxrc.phone_book.empty()) {
         phone_book_name = "phonebook";
     } else
-        phone_book_name = lyxrc->phone_book;
+        phone_book_name = lyxrc.phone_book;
     phone_book= FileSearch(user_lyxdir, phone_book_name);
     if (phone_book.empty()) 
         phone_book = AddName(user_lyxdir, phone_book_name);
@@ -156,12 +158,12 @@ void cb_select_phoneno(FL_OBJECT *, long)
     char *buf = new char [strlen(line)+1];
 
     strcpy(buf, line);
-    for(i = LEN_PHONE;(i>0) && (buf[i] == ' ');i--)
+    for(i = LEN_PHONE; (i > 0) && (buf[i] == ' '); --i)
         ;
-    buf[i+1] = 0;
-    for(i = LEN_PHONE+LEN_NAME+1;(i>LEN_PHONE) && (buf[i] == ' ');i--)
+    buf[i + 1] = 0;
+    for(i = LEN_PHONE + LEN_NAME + 1; (i > LEN_PHONE) && (buf[i] == ' '); --i)
         ;
-    buf[i+1] = 0;
+    buf[i + 1] = 0;
     fl_set_input(fd_xsendfax->Input_Phone, buf);
     fl_set_input(fd_xsendfax->Input_Name, buf+LEN_PHONE+1);
     fl_set_input(fd_xsendfax->Input_Enterprise, buf+LEN_PHONE+LEN_NAME+2);
@@ -183,7 +185,7 @@ void cb_add_phoneno(FL_OBJECT *, long )
     if (!strlen(phone))
         return;
 
-    char *buf = new char [50+strlen(enterprise)];
+    char * buf = new char [50 + strlen(enterprise)];
 
     sprintf(buf, "%-*.*s %-*.*s %s",
             LEN_PHONE, LEN_PHONE, phone,
@@ -197,7 +199,7 @@ void cb_add_phoneno(FL_OBJECT *, long )
             n = 0;
         }
     }
-    for(i = 1; i <= n; i++) {
+    for(i = 1; i <= n; ++i) {
         line = fl_get_browser_line(fd_phonebook->browser, i);
         if (!strncmp(buf, line, 46))
             break;
@@ -236,7 +238,7 @@ void cb_delete_phoneno(FL_OBJECT *, long )
             n = 0;
         }
     }
-    for(i= 1;i<= n;i++) {
+    for(i = 1; i <= n; ++i) {
         line = fl_get_browser_line(fd_phonebook->browser, i);
         if (!strncmp(buf, line, 46))
             break;
@@ -270,7 +272,7 @@ void cb_save_phoneno(FL_OBJECT *, long )
             n = 0;
         }
     }
-    for(i= 1;i<= n;i++) {
+    for(i = 1; i <= n; ++i) {
         line = fl_get_browser_line(fd_phonebook->browser, i);
         fprintf(fp, "%s\n", line);
     }