Author: matt
Date: 2011-06-20 10:32:26 -0700 (Mon, 20 Jun 2011)
New Revision: 8836
Log:
123: changed va_ prefix to v and position of va_list as discussed.
Modified:
branches/branch-3.0/FL/fl_ask.H
branches/branch-3.0/FL/fl_utf8.h
branches/branch-3.0/fltk3/ask.h
branches/branch-3.0/fltk3/utf8.h
branches/branch-3.0/src/fl_ask.cxx
branches/branch-3.0/src/fl_utf8.cxx
Modified: branches/branch-3.0/FL/fl_ask.H
===================================================================
--- branches/branch-3.0/FL/fl_ask.H 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/FL/fl_ask.H 2011-06-20 17:32:26 UTC (rev 8836)
@@ -51,21 +51,21 @@
void fl_message(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- fltk3::va_message(ap, fmt);
+ fltk3::vmessage(fmt, ap);
va_end(ap);
}
inline void fl_alert(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- fltk3::va_alert(ap, fmt);
+ fltk3::alert(fmt, ap);
va_end(ap);
}
inline int fl_ask(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- int ret = fltk3::va_ask(ap, fmt);
+ int ret = fltk3::vask(fmt, ap);
va_end(ap);
return ret;
}
@@ -73,7 +73,7 @@
inline int fl_choice(const char *q,const char *b0,const char *b1,const char
*b2, ...) {
va_list ap;
va_start(ap, b2);
- int ret = fltk3::va_choice(ap, q, b0, b1, b2);
+ int ret = fltk3::vchoice(q, b0, b1, b2, ap);
va_end(ap);
return ret;
}
@@ -81,7 +81,7 @@
inline const char *fl_input(const char *label, const char *deflt = 0, ...) {
va_list ap;
va_start(ap, deflt);
- const char *ret = fltk3::va_input(ap, label, deflt);
+ const char *ret = fltk3::vinput(label, deflt, ap);
va_end(ap);
return ret;
}
@@ -89,7 +89,7 @@
inline const char *fl_password(const char *label, const char *deflt = 0, ...) {
va_list ap;
va_start(ap, deflt);
- const char *ret = fltk3::va_password(ap, label, deflt);
+ const char *ret = fltk3::vpassword(label, deflt, ap);
va_end(ap);
return ret;
}
Modified: branches/branch-3.0/FL/fl_utf8.h
===================================================================
--- branches/branch-3.0/FL/fl_utf8.h 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/FL/fl_utf8.h 2011-06-20 17:32:26 UTC (rev 8836)
@@ -96,7 +96,7 @@
inline int fl_open(const char* f, int o, ...) {
va_list ap;
va_start(ap, o);
- int ret = fltk3::va_open(ap, f, o);
+ int ret = fltk3::vopen(f, o, ap);
va_end(ap);
return ret;
}
Modified: branches/branch-3.0/fltk3/ask.h
===================================================================
--- branches/branch-3.0/fltk3/ask.h 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/fltk3/ask.h 2011-06-20 17:32:26 UTC (rev 8836)
@@ -56,20 +56,20 @@
FLTK3_EXPORT void beep(int type = BEEP_DEFAULT);
FLTK3_EXPORT void message(const char *,...) __fl_attr((__format__
(__printf__, 1, 2)));
- FLTK3_EXPORT void va_message(va_list, const char *);
+ FLTK3_EXPORT void vmessage(const char *, va_list);
FLTK3_EXPORT void alert(const char *,...) __fl_attr((__format__ (__printf__,
1, 2)));
- FLTK3_EXPORT void va_alert(va_list, const char *);
+ FLTK3_EXPORT void valert(const char *, va_list);
// fltk3::ask() is deprecated since it uses "Yes" and "No" for the buttons,
// which does not conform to the current FLTK Human Interface Guidelines.
// Use fltk3::choice() instead with the appropriate verbs instead.
FLTK3_EXPORT int ask(const char *,...) __fl_attr((__format__ (__printf__, 1,
2), __deprecated__));
- FLTK3_EXPORT int va_ask(va_list, const char *);
+ FLTK3_EXPORT int vask(const char *, va_list);
FLTK3_EXPORT int choice(const char *q,const char *b0,const char *b1,const
char *b2,...) __fl_attr((__format__ (__printf__, 1, 5)));
- FLTK3_EXPORT int va_choice(va_list, const char *, const char *, const char
*, const char *);
+ FLTK3_EXPORT int vchoice(const char *, const char *, const char *, const
char *, va_list);
FLTK3_EXPORT const char *input(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
- FLTK3_EXPORT const char *va_input(va_list, const char *, const char *d=0);
+ FLTK3_EXPORT const char *vinput(const char *, const char *d, va_list);
FLTK3_EXPORT const char *password(const char *label, const char *deflt = 0,
...) __fl_attr((__format__ (__printf__, 1, 3)));
- FLTK3_EXPORT const char *va_password(va_list, const char *, const char *d=0);
+ FLTK3_EXPORT const char *vpassword(const char *, const char *d, va_list);
FLTK3_EXPORT Widget *message_icon();
extern FLTK3_EXPORT Font message_font_;
Modified: branches/branch-3.0/fltk3/utf8.h
===================================================================
--- branches/branch-3.0/fltk3/utf8.h 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/fltk3/utf8.h 2011-06-20 17:32:26 UTC (rev 8836)
@@ -228,7 +228,7 @@
/* OD: Portable UTF8 aware open wrapper */
FLTK3_EXPORT int open(const char* f, int o, ...);
- FLTK3_EXPORT int va_open(va_list, const char* f, int o);
+ FLTK3_EXPORT int vopen(const char* f, int o, va_list);
/* OD: Portable UTF8 aware unlink wrapper */
FLTK3_EXPORT int unlink(const char *f);
Modified: branches/branch-3.0/src/fl_ask.cxx
===================================================================
--- branches/branch-3.0/src/fl_ask.cxx 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/src/fl_ask.cxx 2011-06-20 17:32:26 UTC (rev 8836)
@@ -333,11 +333,11 @@
void fltk3::message(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- va_message(ap, fmt);
+ vmessage(fmt, ap);
va_end(ap);
}
-void fltk3::va_message(va_list ap, const char *fmt) {
+void fltk3::vmessage(const char *fmt, va_list ap) {
if (avoidRecursion) return;
fltk3::beep(fltk3::BEEP_MESSAGE);
iconlabel = "i";
@@ -356,11 +356,11 @@
void fltk3::alert(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- va_alert(ap, fmt);
+ valert(fmt, ap);
va_end(ap);
}
-void fltk3::va_alert(va_list ap, const char *fmt) {
+void fltk3::valert(const char *fmt, va_list ap) {
if (avoidRecursion) return;
fltk3::beep(fltk3::BEEP_ERROR);
iconlabel = "!";
@@ -382,12 +382,12 @@
int fltk3::ask(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt);
- int ret = va_ask(ap, fmt);
+ int ret = vask(fmt, ap);
va_end(ap);
return ret;
}
-int fltk3::va_ask(va_list ap, const char *fmt) {
+int fltk3::vask(const char *fmt, va_list ap) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
int r = innards(fmt, ap, fltk3::no, fltk3::yes, 0);
@@ -412,12 +412,12 @@
int fltk3::choice(const char*fmt,const char *b0,const char *b1,const char
*b2,...) {
va_list ap;
va_start(ap, b2);
- int ret = va_choice(ap, fmt, b0, b1, b2);
+ int ret = vchoice(fmt, b0, b1, b2, ap);
va_end(ap);
return ret;
}
-int fltk3::va_choice(va_list ap, const char*fmt,const char *b0,const char
*b1,const char *b2) {
+int fltk3::vchoice(const char*fmt,const char *b0,const char *b1,const char
*b2, va_list ap) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
int r = innards(fmt, ap, b0, b1, b2);
@@ -459,12 +459,12 @@
const char* fltk3::input(const char *fmt, const char *defstr, ...) {
va_list ap;
va_start(ap, defstr);
- const char *ret = va_input(ap, fmt, defstr);
+ const char *ret = vinput(fmt, defstr, ap);
va_end(ap);
return ret;
}
-const char* fltk3::va_input(va_list ap, const char *fmt, const char *defstr) {
+const char* fltk3::vinput(const char *fmt, const char *defstr, va_list ap) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_QUESTION);
const char* r = input_innards(fmt, ap, defstr, fltk3::NORMAL_INPUT);
@@ -487,12 +487,12 @@
const char *fltk3::password(const char *fmt, const char *defstr, ...) {
va_list ap;
va_start(ap, defstr);
- const char *ret = va_password(ap, fmt, defstr);
+ const char *ret = vpassword(fmt, defstr, ap);
va_end(ap);
return ret;
}
-const char *fltk3::va_password(va_list ap, const char *fmt, const char
*defstr) {
+const char *fltk3::vpassword(const char *fmt, const char *defstr, va_list ap) {
if (avoidRecursion) return 0;
fltk3::beep(fltk3::BEEP_PASSWORD);
const char* r = input_innards(fmt, ap, defstr, fltk3::SECRET_INPUT);
Modified: branches/branch-3.0/src/fl_utf8.cxx
===================================================================
--- branches/branch-3.0/src/fl_utf8.cxx 2011-06-20 14:41:23 UTC (rev 8835)
+++ branches/branch-3.0/src/fl_utf8.cxx 2011-06-20 17:32:26 UTC (rev 8836)
@@ -560,12 +560,12 @@
{
va_list ap;
va_start(ap, oflags);
- int ret = fltk3::va_open(ap, f, oflags);
+ int ret = fltk3::vopen(f, oflags, ap);
va_end(ap);
return ret;
}
-int fltk3::va_open(va_list ap, const char* f, int oflags) {
+int fltk3::vopen(const char* f, int oflags, va_list ap) {
int pmode;
pmode = va_arg(ap, int);
#if defined (WIN32) && !defined(__CYGWIN__)
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
