Attachment #82004 for bug #125996

View | Details | Raw Unified | Return to bug 125996
Collapse All | Expand All

Lines 50-56 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/ClockTool.cc (-1 / +1 lines)
50		50
51	class ClockMenuItem: public FbTk::MenuItem {	51	class ClockMenuItem: public FbTk::MenuItem {
52	public:	52	public:
53	explicit ClockMenuItem::ClockMenuItem(ClockTool &tool):	53	explicit ClockMenuItem(ClockTool &tool):
54	FbTk::MenuItem(""), m_tool(tool) {	54	FbTk::MenuItem(""), m_tool(tool) {
55	// determine 12/24 hour format	55	// determine 12/24 hour format
56	_FB_USES_NLS;	56	_FB_USES_NLS;

Lines 49-54 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/IconbarTool.cc (+4 lines)
49	#include <iterator>	49	#include <iterator>
50	using namespace std;	50	using namespace std;
51		51
		52	namespace FbTk {
		53
52	template<>	54	template<>
53	void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {	55	void FbTk::Resource<IconbarTool::Mode>::setFromString(const char *strval) {
54	if (strcasecmp(strval, "None") == 0)	56	if (strcasecmp(strval, "None") == 0)
Lines 191-196 Link Here
191	return string("Icons");	193	return string("Icons");
192	}	194	}
193		195
		196	}
		197
194	namespace {	198	namespace {
195		199
196	class ToolbarModeMenuItem : public FbTk::MenuItem {	200	class ToolbarModeMenuItem : public FbTk::MenuItem {

Lines 26-31 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/MenuTheme.cc (-1 / +3 lines)
26	#include <iostream>	26	#include <iostream>
27	using namespace std;	27	using namespace std;
28		28
		29	namespace FbTk {
		30
29	template <>	31	template <>
30	void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string name, const std::string altname) { }	32	void FbTk::ThemeItem<Shape::ShapePlace>::load(const std::string name, const std::string altname) { }
31		33
Lines 49-55 Link Here
49		51
50	(this) = static_cast<Shape::ShapePlace>(places);	52	(this) = static_cast<Shape::ShapePlace>(places);
51	}	53	}
52		54	} // end namespace FbTk
53	MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),	55	MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num),
54	m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {	56	m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") {
55	*m_shapeplace = Shape::NONE;	57	*m_shapeplace = Shape::NONE;

Lines 36-41 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/Resources.cc (+2 lines)
36	//-----------------------------------------------------------------	36	//-----------------------------------------------------------------
37	//---- accessors for int, bool, and some enums with Resource ------	37	//---- accessors for int, bool, and some enums with Resource ------
38	//-----------------------------------------------------------------	38	//-----------------------------------------------------------------
		39	namespace FbTk {
39		40
40	template<>	41	template<>
41	void FbTk::Resource<int>::	42	void FbTk::Resource<int>::
Lines 250-252 Link Here
250	sprintf(tmpstr, "%ld", m_value);	251	sprintf(tmpstr, "%ld", m_value);
251	return string(tmpstr);	252	return string(tmpstr);
252	}	253	}
		254	} // end namespace FbTk

Lines 21-33 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/ScreenResources.cc (-4 / +5 lines)
21		21
22	// $Id: ScreenResources.cc 4084 2005-07-20 18:29:01Z mathias $	22	// $Id: ScreenResources.cc 4084 2005-07-20 18:29:01Z mathias $
23		23
		24	#include "Screen.hh"
		25	#include <string>
		26	using namespace std;
24		27
		28	namespace FbTk {
25		29
26	// holds screen resource handling	30	// holds screen resource handling
27		31
28	#include "Screen.hh"
29	#include <string>
30	using namespace std;
31		32
32	template <>	33	template <>
33	void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() {	34	void FbTk::Resource<BScreen::PlacementPolicy>::setDefaultValue() {
Lines 357-360 Link Here
357	else	358	else
358	setDefaultValue();	359	setDefaultValue();
359	}	360	}
360		361	} // end namespace FbTk

Lines 80-85 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/Slit.cc (+4 lines)
80	#include <algorithm>	80	#include <algorithm>
81	using namespace std;	81	using namespace std;
82		82
		83	namespace FbTk {
		84
83	template<>	85	template<>
84	void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {	86	void FbTk::Resource<Slit::Placement>::setFromString(const char *strval) {
85	if (strcasecmp(strval, "TopLeft")==0)	87	if (strcasecmp(strval, "TopLeft")==0)
Lines 160-165 Link Here
160	return string("Vertical");	162	return string("Vertical");
161	}	163	}
162		164
		165	}
		166
163	namespace {	167	namespace {
164		168
165	class SlitClientMenuItem: public FbTk::MenuItem{	169	class SlitClientMenuItem: public FbTk::MenuItem{

Lines 73-78 Link Here

(-)/var/tmp/portage/fluxbox-0.9.14/src/Toolbar.cc (+3 lines)
73		73
74	using namespace std;	74	using namespace std;
75		75
		76	namespace FbTk {
		77
76	template<>	78	template<>
77	void FbTk::Resource<Toolbar::Placement>::	79	void FbTk::Resource<Toolbar::Placement>::
78	setFromString(const char *strval) {	80	setFromString(const char *strval) {
Lines 149-154 Link Here
149	return string("BottomCenter");	151	return string("BottomCenter");
150	}	152	}
151		153
		154	}
152		155
153	namespace {	156	namespace {
154	class SetToolbarPlacementCmd: public FbTk::Command {	157	class SetToolbarPlacementCmd: public FbTk::Command {

Return to bug 125996