Skip to content

Commit a8bccd4

Browse files
committed
Merge pull request #36 from JeremyLetang/priv-field
fix change with field struct privacy
2 parents 6152c2c + c3e9f89 commit a8bccd4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+249
-262
lines changed

src/audio/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* 2. Altered source versions must be plainly marked as such, and must not be
2020
* misrepresented as being the original software.
21-
*
21+
*
2222
* 3. This notice may not be removed or altered from any source distribution.
2323
*/
2424

src/audio/music.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use ffi = ffi::audio::music;
5050
*/
5151
pub struct Music {
5252
#[doc(hidden)]
53-
priv music : *ffi::sfMusic
53+
music : *ffi::sfMusic
5454
}
5555

5656
impl Music {

src/audio/sound/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ pub mod rc;
4848
*/
4949
pub struct Sound<'s> {
5050
#[doc(hidden)]
51-
priv sound : *ffi::sfSound,
51+
sound : *ffi::sfSound,
5252
#[doc(hidden)]
53-
priv buffer : Option<&'s SoundBuffer>
53+
buffer : Option<&'s SoundBuffer>
5454
}
5555

5656
impl<'s> Sound<'s> {

src/audio/sound/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ use ffi = ffi::audio::sound;
4848
*/
4949
pub struct Sound {
5050
#[doc(hidden)]
51-
priv sound : *ffi::sfSound,
51+
sound : *ffi::sfSound,
5252
#[doc(hidden)]
53-
priv buffer : Option<Rc<RefCell<SoundBuffer>>>
53+
buffer : Option<Rc<RefCell<SoundBuffer>>>
5454
}
5555

5656
impl Sound {

src/audio/sound_buffer.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ use ffi = ffi::audio::sound_buffer;
4444
*/
4545
pub struct SoundBuffer {
4646
#[doc(hidden)]
47-
priv sound_buffer : *ffi::sfSoundBuffer,
47+
sound_buffer : *ffi::sfSoundBuffer,
4848
#[doc(hidden)]
49-
priv dropable : bool
49+
dropable : bool
5050
}
5151

5252
impl SoundBuffer {

src/audio/sound_buffer_recorder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ use ffi = ffi::audio::sound_buffer_recorder;
4545
*/
4646
pub struct SoundBufferRecorder {
4747
#[doc(hidden)]
48-
priv sound_buffer_recorder : *ffi::sfSoundBufferRecorder
48+
sound_buffer_recorder : *ffi::sfSoundBufferRecorder
4949
}
5050

5151
impl SoundBufferRecorder {

src/ffi/graphics.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ pub mod render_window {
4545
pub struct sfRenderWindow;
4646

4747
pub struct sfEvent {
48-
typeEvent : c_uint,
49-
p1 : c_uint,
50-
p2 : c_uint,
51-
p3 : c_float,
52-
p4 : c_uint,
53-
p5 : c_uint
48+
pub typeEvent : c_uint,
49+
pub p1 : c_uint,
50+
pub p2 : c_uint,
51+
pub p3 : c_float,
52+
pub p4 : c_uint,
53+
pub p5 : c_uint
5454
}
5555

5656
extern "C" {
@@ -353,10 +353,10 @@ pub mod render_states {
353353
use ffi::graphics::texture::sfTexture;
354354

355355
pub struct sfRenderStates {
356-
blendMode : i32,
357-
transform : Transform,
358-
texture : *sfTexture,
359-
shader : *sfShader
356+
pub blendMode : i32,
357+
pub transform : Transform,
358+
pub texture : *sfTexture,
359+
pub shader : *sfShader
360360
}
361361
}
362362

src/ffi/window.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ pub mod window {
3636
}
3737

3838
pub struct sfEvent {
39-
typeEvent : c_uint,
40-
p1 : c_uint,
41-
p2 : c_uint,
42-
p3 : c_float,
43-
p4 : c_uint,
44-
p5 : c_uint
39+
pub typeEvent : c_uint,
40+
pub p1 : c_uint,
41+
pub p2 : c_uint,
42+
pub p3 : c_float,
43+
pub p4 : c_uint,
44+
pub p5 : c_uint
4545
}
4646

4747
pub enum sfEventType {
@@ -154,9 +154,9 @@ pub mod video_mode {
154154
use ffi::sfml_types::SfBool;
155155

156156
pub struct sfVideoMode {
157-
width: c_uint,
158-
height: c_uint,
159-
bits_per_pixel: c_uint
157+
pub width: c_uint,
158+
pub height: c_uint,
159+
pub bits_per_pixel: c_uint
160160
}
161161

162162
impl Clone for sfVideoMode {

src/graphics/circle_shape/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ pub mod rc;
4040
/// Specialized shape representing a circle.
4141
pub struct CircleShape<'s> {
4242
#[doc(hidden)]
43-
priv circle_shape : *ffi::sfCircleShape,
43+
circle_shape : *ffi::sfCircleShape,
4444
#[doc(hidden)]
45-
priv texture : Option<&'s Texture>
45+
texture : Option<&'s Texture>
4646
}
4747

4848
impl<'s> CircleShape<'s> {

src/graphics/circle_shape/rc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ use ffi = ffi::graphics::circle_shape;
4040
/// Specialized shape representing a circle.
4141
pub struct CircleShape {
4242
#[doc(hidden)]
43-
priv circle_shape : *ffi::sfCircleShape,
43+
circle_shape : *ffi::sfCircleShape,
4444
#[doc(hidden)]
45-
priv texture : Option<Rc<RefCell<Texture>>>
45+
texture : Option<Rc<RefCell<Texture>>>
4646
}
4747

4848
impl CircleShape {

0 commit comments

Comments
 (0)