Simplify default arguments

This commit is contained in:
Markus Gans 2015-09-27 16:45:28 +02:00
parent 2a44a415f3
commit 69e30eae49
30 changed files with 104 additions and 106 deletions

View File

@ -153,7 +153,7 @@ class FApplication : public FWidget
int exec(); // run
int enter_loop();
void exit_loop();
static void exit (int retcode=0);
static void exit (int = 0);
void quit();
bool isQuit();
static bool sendEvent (FObject*, FEvent*);

View File

@ -61,8 +61,8 @@ class FButton : public FWidget
friend class FDialog;
public:
explicit FButton (FWidget* parent=0); // constructor
FButton (const FString&, FWidget* parent=0); // constructor
explicit FButton (FWidget* = 0); // constructor
FButton (const FString&, FWidget* = 0); // constructor
virtual ~FButton(); // destructor
const char* getClassName() const;

View File

@ -57,8 +57,8 @@ class FButtonGroup : public FWidget
void drawLabel();
public:
explicit FButtonGroup (FWidget* parent=0); // constructor
FButtonGroup (const FString&, FWidget* parent=0); // constructor
explicit FButtonGroup (FWidget* = 0); // constructor
FButtonGroup (const FString&, FWidget* = 0); // constructor
virtual ~FButtonGroup(); // destructor
const char* getClassName() const;

View File

@ -48,8 +48,8 @@ class FCheckBox : public FToggleButton
void drawCheckButton();
public:
explicit FCheckBox (FWidget* parent=0); // constructor
FCheckBox (const FString&, FWidget* parent=0); // constructor
explicit FCheckBox (FWidget* = 0); // constructor
FCheckBox (const FString&, FWidget* = 0); // constructor
virtual ~FCheckBox(); // destructor
const char* getClassName() const;
};

View File

@ -70,8 +70,8 @@ class FDialog : public FWindow
virtual void onClose (FCloseEvent*);
public:
explicit FDialog (FWidget* parent=0); // constructor
FDialog (const FString&, FWidget* parent=0); // constructor
explicit FDialog (FWidget* = 0); // constructor
FDialog (const FString&, FWidget* = 0); // constructor
virtual ~FDialog(); // destructor
virtual const char* getClassName() const;
@ -91,11 +91,11 @@ class FDialog : public FWindow
int exec();
void move (const FPoint&);
void move (int, int);
void setWidth (int, bool adjust=true);
void setHeight (int, bool adjust=true);
void setWidth (int, bool = true);
void setHeight (int, bool = true);
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
FWidget* getFocusWidget() const;
void setFocusWidget (FWidget*);
bool setFocus(bool);

View File

@ -112,12 +112,12 @@ class FFileDialog : public FDialog
void adjustSize();
public:
explicit FFileDialog (FWidget* parent=0);
explicit FFileDialog (FWidget* = 0);
FFileDialog (const FFileDialog&); // copy constructor
FFileDialog ( const FString&
, const FString&
, DialogType type = FFileDialog::Open
, FWidget* parent=0 );
, DialogType = FFileDialog::Open
, FWidget* = 0 );
~FFileDialog();
FFileDialog& operator = (const FFileDialog&); // assignment
const char* getClassName() const;

View File

@ -26,7 +26,6 @@
#include "fwidget.h"
#define NO_EMPHASIS 0x00000000
#define EMPHASIS 0x00000001
@ -60,12 +59,12 @@ class FLabel : public FWidget
int getHotkeyPos (wchar_t*&, wchar_t*&, uInt);
void setHotkeyAccelerator();
int getXOffset (int);
void printLine (wchar_t*&, uInt, int, int xoffset=0);
void printLine (wchar_t*&, uInt, int, int = 0);
void draw();
public:
explicit FLabel (FWidget* parent=0); // constructor
FLabel (const FString&, FWidget* parent=0); // constructor
explicit FLabel (FWidget* = 0); // constructor
FLabel (const FString&, FWidget* = 0); // constructor
virtual ~FLabel(); // destructor
const char* getClassName() const;
@ -73,7 +72,7 @@ class FLabel : public FWidget
void onMouseDown (FMouseEvent*);
void onAccel (FAccelEvent*);
void cb_accel_widget_destroyed (FWidget*, void*);
void setAccelWidget (FWidget* widget=0);
void setAccelWidget (FWidget* = 0);
FTerm* getAccelWidget();
void setAlignment(uInt);
uInt getAlignment();

View File

@ -76,8 +76,8 @@ class FLineEdit : public FWidget
void adjustSize();
public:
explicit FLineEdit (FWidget* parent=0); // constructor
FLineEdit (const FString&, FWidget* parent=0); // constructor
explicit FLineEdit (FWidget* = 0); // constructor
FLineEdit (const FString&, FWidget* = 0); // constructor
virtual ~FLineEdit(); // destructor
const char* getClassName() const;

View File

@ -131,7 +131,7 @@ class FListBox : public FWidget
void adjustSize();
public:
explicit FListBox (FWidget* parent=0); // constructor
explicit FListBox (FWidget* = 0); // constructor
~FListBox(); // destructor
const char* getClassName() const;
@ -161,7 +161,7 @@ class FListBox : public FWidget
bool hasBrackets(int) const;
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
void setMultiSelection (bool);
void setMultiSelection ();
@ -180,11 +180,11 @@ class FListBox : public FWidget
bool hasShadow();
void insert ( FString
, fc::brackets_type b = fc::NoBrackets
, bool s = false );
, fc::brackets_type = fc::NoBrackets
, bool = false );
void insert ( long
, fc::brackets_type b = fc::NoBrackets
, bool s = false );
, fc::brackets_type = fc::NoBrackets
, bool = false );
void remove ( int);
void clear();

View File

@ -68,10 +68,10 @@ class FMenu : public FWindow, public FMenuList
void processActivate();
public:
explicit FMenu (FWidget* parent=0); // constructor
FMenu (FString&, FWidget* parent=0);
FMenu (const std::string&, FWidget* parent=0);
FMenu (const char*, FWidget* parent=0);
explicit FMenu (FWidget* = 0); // constructor
FMenu (FString&, FWidget* = 0);
FMenu (const std::string&, FWidget* = 0);
FMenu (const char*, FWidget* = 0);
virtual ~FMenu(); // destructor
virtual const char* getClassName() const;
@ -81,7 +81,7 @@ class FMenu : public FWindow, public FMenuList
void hide();
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
FMenuItem* getItem() const;
void onAccel (FAccelEvent*);

View File

@ -59,7 +59,7 @@ class FMenuBar : public FWindow, public FMenuList
void adjustSize();
public:
explicit FMenuBar (FWidget* parent=0); // constructor
explicit FMenuBar (FWidget* = 0); // constructor
virtual ~FMenuBar(); // destructor
virtual const char* getClassName() const;
@ -69,7 +69,7 @@ class FMenuBar : public FWindow, public FMenuList
void hide();
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
void cb_item_activated (FWidget*, void*);
};
#pragma pack(pop)

View File

@ -67,10 +67,10 @@ class FMenuItem : public FWidget
void processClicked();
public:
explicit FMenuItem (FWidget* parent=0);
FMenuItem (FString&, FWidget* parent=0);
FMenuItem (const std::string&, FWidget* parent=0);
FMenuItem (const char*, FWidget* parent=0);
explicit FMenuItem (FWidget* = 0);
FMenuItem (FString&, FWidget* = 0);
FMenuItem (const std::string&, FWidget* = 0);
FMenuItem (const char*, FWidget* = 0);
virtual ~FMenuItem();
void onAccel (FAccelEvent*);

View File

@ -87,11 +87,11 @@ class FMessageBox : public FDialog
void cb_processClick (FWidget*, void*);
public:
explicit FMessageBox (FWidget* parent=0);
explicit FMessageBox (FWidget* = 0);
FMessageBox (const FMessageBox&); // copy constructor
FMessageBox ( const FString&, const FString&
, int, int, int
, FWidget* parent=0 );
, FWidget* = 0 );
~FMessageBox();
FMessageBox& operator = (const FMessageBox&); // assignment
const char* getClassName() const;
@ -116,22 +116,22 @@ class FMessageBox : public FDialog
static int info ( FWidget*
, const FString&
, const FString&
, int button0 = FMessageBox::Ok
, int button1=0
, int button2=0 );
, int = FMessageBox::Ok
, int = 0
, int = 0 );
static int info ( FWidget*
, const FString&
, int
, int button0 = FMessageBox::Ok
, int button1=0
, int button2=0 );
, int = FMessageBox::Ok
, int = 0
, int = 0 );
static int error ( FWidget*
, const FString&
, int button0 = FMessageBox::Ok
, int button1=0
, int button2=0 );
, int = FMessageBox::Ok
, int = 0
, int = 0 );
};
#pragma pack(pop)

View File

@ -68,7 +68,7 @@ class FObject
friend class FApplication;
public:
explicit FObject (FObject* parent=0);
explicit FObject (FObject* = 0);
virtual ~FObject();
virtual const char* getClassName() const;

View File

@ -23,7 +23,6 @@
#include <cstring>
// value for a long capability waiting time
#define LONG_DURATION 9999999
@ -86,8 +85,8 @@ class FOptiMove
bool isWideMove (int, int, int, int);
public:
explicit FOptiMove(int baud=0); // constructor
~FOptiMove(); // destructor
explicit FOptiMove (int = 0); // constructor
~FOptiMove(); // destructor
void setBaudRate (int);
void setTabStop (int);

View File

@ -47,7 +47,7 @@ class FProgressbar : public FWidget
virtual void draw();
public:
explicit FProgressbar(FWidget* parent=0); // constructor
explicit FProgressbar(FWidget* = 0); // constructor
virtual ~FProgressbar();
const char* getClassName() const;
@ -58,7 +58,7 @@ class FProgressbar : public FWidget
void reset();
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
bool setEnable (bool);
bool setEnable();
bool unsetEnable();

View File

@ -48,8 +48,8 @@ class FRadioButton : public FToggleButton
void drawRadioButton();
public:
explicit FRadioButton (FWidget* parent=0); // constructor
FRadioButton (const FString&, FWidget* parent=0); // constructor
explicit FRadioButton (FWidget* = 0); // constructor
FRadioButton (const FString&, FWidget* = 0); // constructor
virtual ~FRadioButton(); // destructor
const char* getClassName() const;
};

View File

@ -79,8 +79,8 @@ class FScrollbar : public FWidget
void processScroll();
public:
explicit FScrollbar(FWidget* parent=0); // constructor
FScrollbar(int o=fc::vertical, FWidget* parent=0); // constructor
explicit FScrollbar(FWidget* = 0); // constructor
FScrollbar(int = fc::vertical, FWidget* = 0); // constructor
virtual ~FScrollbar();
const char* getClassName() const;
@ -103,7 +103,7 @@ class FScrollbar : public FWidget
void setOrientation (int);
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
void drawButtons();
void drawBar();
int getScrollType() const;

View File

@ -61,10 +61,10 @@ class FStatusKey : public FWidget
void setStatusbar (FStatusBar*);
public:
explicit FStatusKey (FWidget* parent=0);
FStatusKey (int, FString&, FWidget* parent=0);
FStatusKey (int, const std::string&, FWidget* parent=0);
FStatusKey (int, const char*, FWidget* parent=0);
explicit FStatusKey (FWidget* = 0);
FStatusKey (int, FString&, FWidget* = 0);
FStatusKey (int, const std::string&, FWidget* = 0);
FStatusKey (int, const char*, FWidget* = 0);
virtual ~FStatusKey();
void onAccel (FAccelEvent*);
@ -161,7 +161,7 @@ class FStatusBar : public FWindow
void adjustSize();
public:
explicit FStatusBar (FWidget* parent=0); // constructor
explicit FStatusBar (FWidget* = 0); // constructor
virtual ~FStatusBar(); // destructor
virtual const char* getClassName() const;
@ -171,7 +171,7 @@ class FStatusBar : public FWindow
void hide();
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
uInt count() const;
FStatusKey* key (int) const;

View File

@ -158,16 +158,16 @@ class FString
FString& setNumber (uInt);
FString& setNumber (long);
FString& setNumber (uLong);
FString& setNumber (float, int precision=8);
FString& setNumber (double, int precision=11);
FString& setNumber (lDouble, int precision=11);
FString& setNumber (float, int = 8);
FString& setNumber (double, int = 11);
FString& setNumber (lDouble, int = 11);
FString& setFormatedNumber (sInt16, char separator='.');
FString& setFormatedNumber (uInt16, char separator='.');
FString& setFormatedNumber (int, char separator='.');
FString& setFormatedNumber (uInt, char separator='.');
FString& setFormatedNumber (long, char separator='.');
FString& setFormatedNumber (uLong, char separator='.');
FString& setFormatedNumber (sInt16, char = '.');
FString& setFormatedNumber (uInt16, char = '.');
FString& setFormatedNumber (int, char = '.');
FString& setFormatedNumber (uInt, char = '.');
FString& setFormatedNumber (long, char = '.');
FString& setFormatedNumber (uLong, char = '.');
friend std::ostream& operator << (std::ostream& outstr, const FString& s);
friend std::istream& operator >> (std::istream& instr, FString& s);
@ -278,7 +278,7 @@ class FString
FString replace (const char, const char);
FString replaceControlCodes() const;
FString expandTabs (uInt tabsize=8) const;
FString expandTabs (uInt = 8) const;
FString removeDel() const;
FString removeBackspaces() const;

View File

@ -51,8 +51,8 @@ class FSwitch : public FToggleButton
void drawCheckButton();
public:
explicit FSwitch (FWidget* parent=0); // constructor
FSwitch (const FString&, FWidget* parent=0); // constructor
explicit FSwitch (FWidget* = 0); // constructor
FSwitch (const FString&, FWidget* = 0); // constructor
virtual ~FSwitch(); // destructor
const char* getClassName() const;
void onKeyPress (FKeyEvent*);

View File

@ -232,7 +232,7 @@ class FTerm
static int closeConsole();
static int isConsole();
static int getScreenFont();
static int setScreenFont (uChar*, uInt, uInt, uInt, bool direct=false);
static int setScreenFont (uChar*, uInt, uInt, uInt, bool = false);
static int setUnicodeMap (struct unimapdesc*);
static int getUnicodeMap ();
static int setLightBackgroundColors (bool);

View File

@ -64,7 +64,7 @@ class FTextView : public FWidget
void adjustSize();
public:
explicit FTextView (FWidget* parent=0); // constructor
explicit FTextView (FWidget* = 0); // constructor
~FTextView(); // destructor
const char* getClassName() const;
@ -77,7 +77,7 @@ class FTextView : public FWidget
void onFocusOut (FFocusEvent*);
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
uInt getColumns() const;
uInt getRows() const;
void setPosition (int);

View File

@ -67,15 +67,15 @@ class FToggleButton : public FWidget
virtual void onKeyPress (FKeyEvent*);
public:
explicit FToggleButton (FWidget* parent=0); // constructor
FToggleButton (const FString&, FWidget* parent=0); // constructor
explicit FToggleButton (FWidget* = 0); // constructor
FToggleButton (const FString&, FWidget* = 0); // constructor
virtual ~FToggleButton(); // destructor
virtual const char* getClassName() const;
void hide();
// make every setGeometry from FWidget available
using FWidget::setGeometry;
void setGeometry (int, int, int, int, bool adjust=true);
void setGeometry (int, int, int, int, bool = true);
void onMouseDown (FMouseEvent*);
void onMouseUp (FMouseEvent*);

View File

@ -314,7 +314,7 @@ class FWidget : public FObject, public FTerm
virtual bool focusPrevChild (void);
public:
explicit FWidget (FWidget* parent=0); // constructor
explicit FWidget (FWidget* = 0); // constructor
~FWidget(); // destructor
const char* getClassName() const;
@ -341,11 +341,11 @@ class FWidget : public FObject, public FTerm
void addCallback ( FString
, FCallback
, void* data = null );
, void* = null );
void addCallback ( FString
, FWidget*
, FMemberCallback
, void* data = null );
, void* = null );
void delCallback (FCallback);
void delCallback (FWidget*);
void emitCallback (FString);
@ -411,20 +411,20 @@ class FWidget : public FObject, public FTerm
FPoint globalToLocalPos(const FPoint&);
void setForegroundColor (int);
void setBackgroundColor (int);
void setX (int, bool adjust=true);
void setY (int, bool adjust=true);
void setPos (const FPoint&, bool adjust=true);
void setPos (int, int, bool adjust=true);
void setWidth (int, bool adjust=true);
void setHeight (int, bool adjust=true);
void setTopPadding (int, bool adjust=true);
void setLeftPadding (int, bool adjust=true);
void setBottomPadding (int, bool adjust=true);
void setRightPadding (int, bool adjust=true);
void setX (int, bool = true);
void setY (int, bool = true);
void setPos (const FPoint&, bool = true);
void setPos (int, int, bool = true);
void setWidth (int, bool = true);
void setHeight (int, bool = true);
void setTopPadding (int, bool = true);
void setLeftPadding (int, bool = true);
void setBottomPadding (int, bool = true);
void setRightPadding (int, bool = true);
void getTermGeometry();
void setTermGeometry (int, int);
virtual void setGeometry (const FRect&, bool adjust=true);
virtual void setGeometry (int, int, int, int, bool adjust=true);
virtual void setGeometry (const FRect&, bool = true);
virtual void setGeometry (int, int, int, int, bool = true);
virtual void move (const FPoint&);
virtual void move (int x, int y);
int getFlags() const;
@ -458,7 +458,7 @@ class FWidget : public FObject, public FTerm
void clearShadow();
void drawFlatBorder();
void clearFlatBorder();
void setDoubleFlatLine(int, bool bit=true);
void setDoubleFlatLine(int, bool = true);
void unsetDoubleFlatLine(int);
std::vector<bool>& doubleFlatLine_ref(int);
virtual void drawBorder();

View File

@ -58,7 +58,7 @@ class FWindow : public FWidget
virtual void onWindowLowered (FEvent*);
public:
explicit FWindow (FWidget* parent=0); // constructor
explicit FWindow (FWidget* = 0); // constructor
~FWindow (); // destructor
const char* getClassName() const;

View File

@ -28,7 +28,7 @@ class Button : public FButton
private:
bool checked;
public:
explicit Button (FWidget* parent=0); // constructor
explicit Button (FWidget* = 0); // constructor
void setChecked(bool);
void onKeyPress (FKeyEvent*);
};

View File

@ -17,7 +17,7 @@ class Mandelbrot : public FDialog
virtual void draw();
public:
explicit Mandelbrot (FWidget* parent=0); // constructor
explicit Mandelbrot (FWidget* = 0); // constructor
~Mandelbrot(); // destructor
void onAccel (FAccelEvent*);
void onClose (FCloseEvent*);

View File

@ -9,7 +9,7 @@
class timer : public FWidget
{
public:
explicit timer (FWidget* parent = 0);
explicit timer (FWidget* = 0);
protected:
virtual void draw();
void onTimer (FTimerEvent*);

View File

@ -31,7 +31,7 @@ class watch : public FDialog
watch& operator = (const watch&); // and operator '='
public:
explicit watch (FWidget* parent=0); // constructor
explicit watch (FWidget* = 0); // constructor
~watch(); // destructor
void printTime();
void onTimer (FTimerEvent*);