diff options
| author | Guillem Jover <guillem@debian.org> | 2012-03-20 09:48:51 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2012-03-27 20:10:09 +0200 |
| commit | c594b0dc8ae68913e8a391feabc77a7a34d91ce3 (patch) | |
| tree | cdca66bb354bf10cf4156915ae102ab6e0d481b2 | |
| parent | 5eca0227ae5d148cc2cbfcbd3404b87c7ad62c52 (diff) | |
| download | dpkg-c594b0dc8ae68913e8a391feabc77a7a34d91ce3.tar.gz | |
dselect: Move gap_width from derived classes to baselist
| -rw-r--r-- | dselect/baselist.cc | 2 | ||||
| -rw-r--r-- | dselect/dselect.h | 1 | ||||
| -rw-r--r-- | dselect/methlist.cc | 1 | ||||
| -rw-r--r-- | dselect/method.h | 2 | ||||
| -rw-r--r-- | dselect/pkgdisplay.cc | 2 | ||||
| -rw-r--r-- | dselect/pkglist.h | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/dselect/baselist.cc b/dselect/baselist.cc index cb876d7ee..0756a7c12 100644 --- a/dselect/baselist.cc +++ b/dselect/baselist.cc @@ -242,6 +242,8 @@ baselist::baselist(keybindings *kb) { bindings= kb; nitems= 0; + gap_width = 1; + xmax= -1; list_height=0; info_height=0; topofscreen= 0; leftofscreen= 0; diff --git a/dselect/dselect.h b/dselect/dselect.h index 1c8589d4c..c25e1e583 100644 --- a/dselect/dselect.h +++ b/dselect/dselect.h @@ -58,6 +58,7 @@ protected: int selstate_attr, selstatesel_attr; int helpscreen_attr; + int gap_width; int total_width; // (n)curses stuff diff --git a/dselect/methlist.cc b/dselect/methlist.cc index c7f3abf37..a4147d347 100644 --- a/dselect/methlist.cc +++ b/dselect/methlist.cc @@ -60,7 +60,6 @@ void methodlist::setwidths() { debug(dbg_general, "methodlist[%p]::setwidths()", this); status_width= 1; - gap_width= 1; name_width= 14; name_column= status_width + gap_width; description_column= name_column + name_width + gap_width; diff --git a/dselect/method.h b/dselect/method.h index a963780b5..aba765697 100644 --- a/dselect/method.h +++ b/dselect/method.h @@ -51,7 +51,7 @@ struct dselect_option { class methodlist : public baselist { protected: - int status_width, gap_width, name_width, description_width; + int status_width, name_width, description_width; int name_column, description_column; // Table of methods diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc index 8c2412e9e..4d8a25706 100644 --- a/dselect/pkgdisplay.cc +++ b/dselect/pkgdisplay.cc @@ -146,8 +146,6 @@ void packagelist::setwidths() { } section_width= 8; - gap_width= 1; - if (sortorder == so_section) { section_column= status_width + gap_width; priority_column= section_column + section_width + gap_width; diff --git a/dselect/pkglist.h b/dselect/pkglist.h index 8c4f321c0..08deb9a4c 100644 --- a/dselect/pkglist.h +++ b/dselect/pkglist.h @@ -86,7 +86,7 @@ struct perpackagestate { class packagelist : public baselist { protected: - int status_width, gap_width, section_width, priority_width; + int status_width, section_width, priority_width; int package_width, versioninstalled_width, versionavailable_width, description_width; int section_column, priority_column, versioninstalled_column; int versionavailable_column, package_column, description_column; |