Attachment #94355 for bug #139435

Lines 54-60 Link Here

(-)jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreeffects.h (-2 / +2 lines)
54	NOT_A_CATEGORY	54	NOT_A_CATEGORY
55	};	55	};
56		56
57	static std::string& EffectInfo::getEffectCategoryName(EFFECT_CATEGORY category);	57	static std::string& getEffectCategoryName(EFFECT_CATEGORY category);
58		58
59	// Should replace the FxCategory above	59	// Should replace the FxCategory above
60	enum EFFECT_TYPE	60	enum EFFECT_TYPE
Lines 96-102 Link Here
96	NOT_A_TYPE	96	NOT_A_TYPE
97	};	97	};
98		98
99	static std::string& EffectInfo::getEffectTypeName(EFFECT_TYPE type);	99	static std::string& getEffectTypeName(EFFECT_TYPE type);
100		100
101	protected:	101	protected:
102	EFFECT_TYPE m_type;	102	EFFECT_TYPE m_type;

Lines 42-49 Link Here

(-)jahshaka-old/source/Jahshaka/JahCore/jahobjects/coreobject.h (-2 / +2 lines)
42	bool isChromaKeyLayer() { return m_is_chroma_key_layer; }	42	bool isChromaKeyLayer() { return m_is_chroma_key_layer; }
43	void setCategory(ObjectCategory::TYPE category) { objtype = category; }	43	void setCategory(ObjectCategory::TYPE category) { objtype = category; }
44	ObjectCategory::TYPE getCategory() { return objtype; }	44	ObjectCategory::TYPE getCategory() { return objtype; }
45	EffectInfo::EFFECT_CATEGORY JahLayer::getEffectCategory();	45	EffectInfo::EFFECT_CATEGORY getEffectCategory();
46	EffectInfo::EFFECT_CATEGORY JahLayer::getPluginEffectCategory();	46	EffectInfo::EFFECT_CATEGORY getPluginEffectCategory();
47		47
48	void setIsChromaKeyLayer(bool flag);	48	void setIsChromaKeyLayer(bool flag);
49	int getEnabledEffectCount();	49	int getEnabledEffectCount();

Lines 163-170 Link Here

(-)jahshaka-old/source/Jahshaka/JahCore/jahworld/glworld.h (-2 / +2 lines)
163		163
164	//////////////////////////////////////////////////////////////	164	//////////////////////////////////////////////////////////////
165	//for xml scene save	165	//for xml scene save
166	void GLWorld::SaveAll( std::string const & a_save_filename, bool const a_status );	166	void SaveAll( std::string const & a_save_filename, bool const a_status );
167	void GLWorld::SaveAllData( std::fstream & ai_fstream );	167	void SaveAllData( std::fstream & ai_fstream );
168	void saveSceneFile( std::string const & a_save_filename, bool const a_status = 0 );	168	void saveSceneFile( std::string const & a_save_filename, bool const a_status = 0 );
169	void saveAllLayers( std::fstream & ai_strstream );	169	void saveAllLayers( std::fstream & ai_strstream );
170	void SaveNodes( std::fstream & ai_fstream , JahLayer* jah_layer );	170	void SaveNodes( std::fstream & ai_fstream , JahLayer* jah_layer );

Lines 53-59 Link Here

(-)jahshaka-old/source/Jahshaka/JahWidgets/interfaceobjs/widget.h (-1 / +1 lines)
53	// Lifted from QToolButton	53	// Lifted from QToolButton
54	// only sizes the size of the content, not any button border.	54	// only sizes the size of the content, not any button border.
55	//	55	//
56	QSize JahToolButton::sizeHint() const	56	QSize sizeHint() const
57	{	57	{
58		58
59	int w = 0, h = 0;	59	int w = 0, h = 0;

Lines 51-57 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/colorize/color.h (-1 / +1 lines)
51		51
52	};	52	};
53		53
54	GLColorize::~GLColorize() { }	54	~GLColorize() { }
55		55
56	//object and variable initialization routines	56	//object and variable initialization routines
57	void initializeVariables(void);	57	void initializeVariables(void);

Lines 52-58 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/keyer/keyer.h (-2 / +2 lines)
52	void setHsvRange(float4& value) { m_hsv_range = value; }	52	void setHsvRange(float4& value) { m_hsv_range = value; }
53	float4& getRgbaRange() { return m_rgba_range; }	53	float4& getRgbaRange() { return m_rgba_range; }
54	void setRgbaRange(float4& value) { m_rgba_range = value; }	54	void setRgbaRange(float4& value) { m_rgba_range = value; }
55	void GLKeyer::setRgbaValues();	55	void setRgbaValues();
56		56
57	KeyerColorWidget* getKeyerColorWidget() { return m_keyer_color_widget; }	57	KeyerColorWidget* getKeyerColorWidget() { return m_keyer_color_widget; }
58	void setKeyerColorWidget(KeyerColorWidget* widget) { m_keyer_color_widget = widget; }	58	void setKeyerColorWidget(KeyerColorWidget* widget) { m_keyer_color_widget = widget; }
Lines 71-77 Link Here
71		71
72	};	72	};
73		73
74	GLKeyer::~GLKeyer() { }	74	~GLKeyer() { }
75		75
76	//object and variable initialization routines	76	//object and variable initialization routines
77	void initializeVariables(void);	77	void initializeVariables(void);

Lines 38-44 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/animation/anime.h (-1 / +1 lines)
38	initializeObjects();	38	initializeObjects();
39	};	39	};
40		40
41	GLAnime::~GLAnime() { }	41	~GLAnime() { }
42		42
43	void buildInterface( QHBox* qtinterface);	43	void buildInterface( QHBox* qtinterface);
44	void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );	44	void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );

Lines 51-57 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/effect/effect.h (-1 / +1 lines)
51	initializeObjects();	51	initializeObjects();
52	};	52	};
53		53
54	GLEffect::~GLEffect() { }	54	~GLEffect() { }
55		55
56	//object and variable initialization routines	56	//object and variable initialization routines
57	void initializeVariables(void);	57	void initializeVariables(void);

Lines 36-42 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/painter/paint.h (-1 / +1 lines)
36	initializeObjects();	36	initializeObjects();
37	};	37	};
38		38
39	GLPaint::~GLPaint() { }	39	~GLPaint() { }
40		40
41		41
42	void buildInterface( QHBox* qtinterface);	42	void buildInterface( QHBox* qtinterface);

Lines 30-36 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/text/character.h (-1 / +1 lines)
30	initializeObjects();	30	initializeObjects();
31	};	31	};
32		32
33	GLChar::~GLChar() { }	33	~GLChar() { }
34		34
35	void buildInterface( QHBox* qtinterface);	35	void buildInterface( QHBox* qtinterface);
36	void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );	36	void buildInterfaceMenus( QHBox* leftcontroller, QHBox* rightcontroller );

Lines 113-119 Link Here

(-)jahshaka-old/source/Jahshaka/JahModules/tracker/tracker.h (-1 / +1 lines)
113	};	113	};
114		114
115		115
116	GLTracker::~GLTracker() { }	116	~GLTracker() { }
117		117
118		118
119		119

Return to bug 139435