Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

window: move some members from protected to private section

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-09-21 01:44:38 +02:00
parent 1a3dcbfe17
commit 14a774b8a3
2 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/window.cpp
View File

@@ -71,20 +71,20 @@ Window::Window(size_t startx,
Border border) Border border)
: itsWindow(0), : itsWindow(0),
itsWinBorder(0), itsWinBorder(0),
itsGetStringHelper(0),
itsStartX(startx), itsStartX(startx),
itsStartY(starty), itsStartY(starty),
itsWidth(width), itsWidth(width),
itsHeight(height), itsHeight(height),
itsWindowTimeout(-1), itsWindowTimeout(-1),
itsX(0),
itsY(0),
itsTitle(title),
itsColor(color), itsColor(color),
itsBgColor(clDefault), itsBgColor(clDefault),
itsBaseColor(color), itsBaseColor(color),
itsBaseBgColor(clDefault), itsBaseBgColor(clDefault),
itsBorder(border), itsBorder(border),
itsGetStringHelper(0),
itsX(0),
itsY(0),
itsTitle(title),
itsHistory(0), itsHistory(0),
itsBoldCounter(0), itsBoldCounter(0),
itsUnderlineCounter(0), itsUnderlineCounter(0),
@@ -121,21 +121,21 @@ Window::Window(size_t startx,
Window::Window(const Window &w) : itsWindow(dupwin(w.itsWindow)), Window::Window(const Window &w) : itsWindow(dupwin(w.itsWindow)),
itsWinBorder(dupwin(w.itsWinBorder)), itsWinBorder(dupwin(w.itsWinBorder)),
itsGetStringHelper(w.itsGetStringHelper),
itsStartX(w.itsStartX), itsStartX(w.itsStartX),
itsStartY(w.itsStartY), itsStartY(w.itsStartY),
itsWidth(w.itsWidth), itsWidth(w.itsWidth),
itsHeight(w.itsHeight), itsHeight(w.itsHeight),
itsWindowTimeout(w.itsWindowTimeout), itsWindowTimeout(w.itsWindowTimeout),
itsX(w.itsX),
itsY(w.itsY),
itsTitle(w.itsTitle),
itsColors(w.itsColors),
itsColor(w.itsColor), itsColor(w.itsColor),
itsBgColor(w.itsBgColor), itsBgColor(w.itsBgColor),
itsBaseColor(w.itsBaseColor), itsBaseColor(w.itsBaseColor),
itsBaseBgColor(w.itsBaseBgColor), itsBaseBgColor(w.itsBaseBgColor),
itsBorder(w.itsBorder), itsBorder(w.itsBorder),
itsGetStringHelper(w.itsGetStringHelper),
itsX(w.itsX),
itsY(w.itsY),
itsTitle(w.itsTitle),
itsColors(w.itsColors),
itsHistory(w.itsHistory), itsHistory(w.itsHistory),
itsBoldCounter(w.itsBoldCounter), itsBoldCounter(w.itsBoldCounter),
itsUnderlineCounter(w.itsUnderlineCounter), itsUnderlineCounter(w.itsUnderlineCounter),

36
src/window.h
View File

@@ -500,11 +500,6 @@ namespace NCurses
WINDOW *itsWindow; WINDOW *itsWindow;
WINDOW *itsWinBorder; WINDOW *itsWinBorder;
/// pointer to helper function used by GetString()
/// @see GetString()
///
GetStringHelper itsGetStringHelper;
/// start points and dimensions /// start points and dimensions
size_t itsStartX; size_t itsStartX;
size_t itsStartY; size_t itsStartY;
@@ -514,19 +509,6 @@ namespace NCurses
/// window timeout /// window timeout
int itsWindowTimeout; int itsWindowTimeout;
/// temporary coordinates
/// @see X()
/// @see Y()
///
int itsX;
int itsY;
/// window's title
std::string itsTitle;
/// stack of colors
std::stack<Colors> itsColors;
/// current colors /// current colors
Color itsColor; Color itsColor;
Color itsBgColor; Color itsBgColor;
@@ -559,6 +541,24 @@ namespace NCurses
/// ///
void AltCharset(bool altcharset_state) const; void AltCharset(bool altcharset_state) const;
/// pointer to helper function used by GetString()
/// @see GetString()
///
GetStringHelper itsGetStringHelper;
/// temporary coordinates
/// @see X()
/// @see Y()
///
int itsX;
int itsY;
/// window's title
std::string itsTitle;
/// stack of colors
std::stack<Colors> itsColors;
/// pointer to container used as history /// pointer to container used as history
std::deque<std::wstring> *itsHistory; std::deque<std::wstring> *itsHistory;