• R/O
  • SSH
  • HTTPS

qrobosdk: コミット


コミットメタ情報

リビジョン1760 (tree)
日時2010-04-10 21:20:02
作者satofumi

ログメッセージ

header file の 宣言の順番を修正

変更サマリ

差分

--- trunk/libs/gui/CallbackEvent.h (revision 1759)
+++ trunk/libs/gui/CallbackEvent.h (revision 1760)
@@ -21,17 +21,9 @@
2121 typedef boost::signal<void (void)> EventCallback;
2222
2323
24- /*!
25- \brief イベント保持クラス
26- */
24+ //! イベント保持クラス
2725 class CallbackEvent : public Event
2826 {
29- CallbackEvent(const Event& rhs);
30- CallbackEvent& operator = (const Event& rhs);
31-
32- struct pImpl;
33- std::auto_ptr<pImpl> pimpl;
34-
3527 public:
3628 CallbackEvent(void);
3729 ~CallbackEvent(void);
@@ -54,6 +46,13 @@
5446
5547 bool isActive(void);
5648 void setCallback(const EventCallback::slot_type& callback);
49+
50+ private:
51+ CallbackEvent(const Event& rhs);
52+ CallbackEvent& operator = (const Event& rhs);
53+
54+ struct pImpl;
55+ std::auto_ptr<pImpl> pimpl;
5756 };
5857 }
5958
--- trunk/libs/gui/FillSurface.h (nonexistent)
+++ trunk/libs/gui/FillSurface.h (revision 1760)
@@ -0,0 +1,41 @@
1+#ifndef QRK_FILL_SURFACE_H
2+#define QRK_FILL_SURFACE_H
3+
4+/*!
5+ \brief 塗りつぶしサーフェス
6+
7+ \author Satofumi KAMIMURA
8+
9+ $Id$
10+*/
11+
12+#include "Surface.h"
13+#include <memory>
14+
15+
16+namespace qrk
17+{
18+ //! 単色サーフェス
19+ class FillSurface : public Surface
20+ {
21+ public:
22+ explicit FillSurface(const Rect<long>& rect, Surface& surface);
23+ ~FillSurface(void);
24+
25+ bool isValid(void) const;
26+ Rect<long> rect(void) const;
27+ void setAlpha(float alpha);
28+ float alpha(void) const;
29+ void setRotateAngle(const Angle& angle);
30+ void draw(const Rect<long>* src, const Rect<long>* dest);
31+
32+ private:
33+ FillSurface(const FillSurface& rhs);
34+ FillSurface& operator = (const FillSurface& rhs);
35+
36+ struct pImpl;
37+ std::auto_ptr<pImpl> pimpl;
38+ };
39+}
40+
41+#endif /* !QRK_FILL_SURFACE_H */
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/gui/Menu.h (revision 1759)
+++ trunk/libs/gui/Menu.h (revision 1760)
@@ -20,18 +20,9 @@
2020 typedef boost::signal<void (size_t)> ButtonIdCallback;
2121
2222
23- /*!
24- \brief メニュー
25- */
23+ //! メニュー
2624 class Menu : public Component
2725 {
28- Menu(void);
29- Menu(const Menu& rhs);
30- Menu& operator = (const Menu& rhs);
31-
32- struct pImpl;
33- std::auto_ptr<pImpl> pimpl;
34-
3526 public:
3627 enum {
3728 InvalidIndex = -1,
@@ -83,6 +74,14 @@
8374 void setIconOffset(const Point<long>& offset);
8475
8576 void connectPressedEvent(ButtonIdCallback::slot_type& slot);
77+
78+ private:
79+ Menu(void);
80+ Menu(const Menu& rhs);
81+ Menu& operator = (const Menu& rhs);
82+
83+ struct pImpl;
84+ std::auto_ptr<pImpl> pimpl;
8685 };
8786 }
8887
--- trunk/libs/gui/TextInput.h (revision 1759)
+++ trunk/libs/gui/TextInput.h (revision 1760)
@@ -19,11 +19,22 @@
1919 class CallbackEvent;
2020
2121
22- /*!
23- \brief 入力文字の取得
24- */
22+ //! 入力文字の取得
2523 class TextInput : public Event
2624 {
25+ public:
26+ TextInput(void);
27+ ~TextInput(void);
28+
29+ void clear(void);
30+ bool empty(void) const;
31+ const char* text(void) const;
32+ bool isChanged(void) const;
33+
34+ void setBackspaceEvent(CallbackEvent* event);
35+ void setDecideEvent(CallbackEvent* event);
36+
37+ private:
2738 friend class LayerManager;
2839
2940 TextInput(const Event& rhs);
@@ -39,18 +50,6 @@
3950 void checkEnterCursor(const Point<long>& current,
4051 const Point<long>& previous);
4152 void cursorMoved(void);
42-
43- public:
44- TextInput(void);
45- ~TextInput(void);
46-
47- void clear(void);
48- bool empty(void) const;
49- const char* text(void) const;
50- bool isChanged(void) const;
51-
52- void setBackspaceEvent(CallbackEvent* event);
53- void setDecideEvent(CallbackEvent* event);
5453 };
5554 }
5655
--- trunk/libs/gui/LayerManager.h (revision 1759)
+++ trunk/libs/gui/LayerManager.h (revision 1760)
@@ -19,17 +19,9 @@
1919 class Event;
2020
2121
22- /*!
23- \brief レイヤー管理
24- */
22+ //! レイヤー管理
2523 class LayerManager
2624 {
27- LayerManager(const LayerManager& rhs);
28- LayerManager& operator = (const LayerManager& rhs);
29-
30- struct pImpl;
31- pImpl* pimpl;
32-
3325 public:
3426 LayerManager(void);
3527 ~LayerManager(void);
@@ -48,6 +40,13 @@
4840 void remove(LayerInterface* layer);
4941
5042 static Point<long> cursor(void);
43+
44+ private:
45+ LayerManager(const LayerManager& rhs);
46+ LayerManager& operator = (const LayerManager& rhs);
47+
48+ struct pImpl;
49+ pImpl* pimpl;
5150 };
5251 }
5352
--- trunk/libs/gui/Screen.cpp (revision 1759)
+++ trunk/libs/gui/Screen.cpp (revision 1760)
@@ -10,7 +10,9 @@
1010 #include "Screen.h"
1111 #include "SdlVideoInit.h"
1212 #include "Color.h"
13+#if ! defined(NO_OPENGL)
1314 #include <SDL_opengl.h>
15+#endif
1416 #include <string>
1517
1618 using namespace qrk;
@@ -25,6 +27,7 @@
2527 };
2628
2729
30+#if ! defined(NO_OPENGL)
2831 void initializeOpenGl(void)
2932 {
3033 int bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel;
@@ -81,6 +84,7 @@
8184 glDepthFunc(GL_LESS);
8285 glShadeModel(GL_SMOOTH);
8386 }
87+#endif
8488 }
8589
8690 struct Screen::pImpl
@@ -134,7 +138,9 @@
134138 }
135139
136140 if (flags & SDL_OPENGL) {
141+#if ! defined(NO_OPENGL)
137142 initializeOpenGl();
143+#endif
138144 }
139145
140146 scr_ = SDL_SetVideoMode(next_rect_.w, next_rect_.h,
@@ -146,11 +152,13 @@
146152 is_fullscreen_ = (flags & SDL_FULLSCREEN) ? true : false;
147153
148154 if (flags & SDL_OPENGL) {
155+#if ! defined(NO_OPENGL)
149156 // OpenGL 設定の初期化
150157 setupOpenGlView();
151158
152159 // デフォルトで 2D 描画とする
153160 enter2D();
161+#endif
154162 }
155163 }
156164
@@ -281,6 +289,7 @@
281289 }
282290
283291
292+#if ! defined(NO_OPENGL)
284293 void Screen::clear(void)
285294 {
286295 if (pimpl->scr_->flags & SDL_OPENGL) {
@@ -366,3 +375,4 @@
366375 glDisable(GL_CLIP_PLANE2);
367376 glDisable(GL_CLIP_PLANE3);
368377 }
378+#endif
--- trunk/libs/gui/Layer.h (revision 1759)
+++ trunk/libs/gui/Layer.h (revision 1760)
@@ -19,17 +19,9 @@
1919 class Component;
2020
2121
22- /*!
23- \brief 描画レイヤー
24- */
22+ //! 描画レイヤー
2523 class Layer : public LayerInterface
2624 {
27- Layer(const Layer& rhs);
28- Layer& operator = (const Layer& rhs);
29-
30- struct pImpl;
31- std::auto_ptr<pImpl> pimpl;
32-
3325 public:
3426 Layer(void);
3527 ~Layer(void);
@@ -40,6 +32,13 @@
4032 void remove(Component* component);
4133 void setAlpha(float alpha);
4234 void draw(void);
35+
36+ private:
37+ Layer(const Layer& rhs);
38+ Layer& operator = (const Layer& rhs);
39+
40+ struct pImpl;
41+ std::auto_ptr<pImpl> pimpl;
4342 };
4443 }
4544
--- trunk/libs/gui/Event.h (revision 1759)
+++ trunk/libs/gui/Event.h (revision 1760)
@@ -16,9 +16,7 @@
1616
1717 namespace qrk
1818 {
19- /*!
20- \brief イベント・インターフェース
21- */
19+ //! イベント・インターフェース
2220 class Event
2321 {
2422 public:
--- trunk/libs/gui/SdlTtfInit.h (revision 1759)
+++ trunk/libs/gui/SdlTtfInit.h (revision 1760)
@@ -20,15 +20,16 @@
2020 */
2121 class SdlTtfInit
2222 {
23+ public:
24+ SdlTtfInit(void);
25+ ~SdlTtfInit(void);
26+
27+ private:
2328 SdlTtfInit(const SdlTtfInit& rhs);
2429 SdlTtfInit& operator = (const SdlTtfInit& rhs);
2530
2631 struct pImpl;
2732 const std::auto_ptr<pImpl> pimpl;
28-
29- public:
30- SdlTtfInit(void);
31- ~SdlTtfInit(void);
3233 };
3334 }
3435
--- trunk/libs/gui/Makefile (revision 1759)
+++ trunk/libs/gui/Makefile (revision 1760)
@@ -34,6 +34,7 @@
3434 $(GUI_LIB)(SDL_GL_Texture.o) \
3535 $(GUI_LIB)(TextSurface.o) \
3636 $(GUI_LIB)(ColorSurface.o) \
37+ $(GUI_LIB)(FillSurface.o) \
3738 $(GUI_LIB)(SwitchSurface.o) \
3839 $(GUI_LIB)(MultiSurface.o) \
3940 $(GUI_LIB)(ImageSurface.o) \
--- trunk/libs/gui/Surface.h (revision 1759)
+++ trunk/libs/gui/Surface.h (revision 1760)
@@ -32,8 +32,6 @@
3232 virtual float alpha(void) const = 0;
3333 virtual void setRotateAngle(const Angle& angle) = 0;
3434 virtual void draw(const Rect<long>* src, const Rect<long>* dest) = 0;
35-
36- // !!!
3735 };
3836 }
3937
--- trunk/libs/gui/FillSurface.cpp (nonexistent)
+++ trunk/libs/gui/FillSurface.cpp (revision 1760)
@@ -0,0 +1,78 @@
1+/*!
2+ \brief 塗りつぶしサーフェス
3+
4+ \author Satofumi KAMIMURA
5+
6+ $Id$
7+*/
8+
9+#include "FillSurface.h"
10+
11+using namespace qrk;
12+
13+
14+struct FillSurface::pImpl
15+{
16+ Rect<long> rect_;
17+
18+
19+ pImpl(const Rect<long>& rect, Surface& surface)
20+ : rect_(rect)
21+ {
22+ (void)surface;
23+ // !!!
24+ }
25+};
26+
27+
28+FillSurface::FillSurface(const Rect<long>& rect, Surface& surface)
29+ : pimpl(new pImpl(rect, surface))
30+{
31+}
32+
33+
34+FillSurface::~FillSurface(void)
35+{
36+}
37+
38+
39+bool FillSurface::isValid(void) const
40+{
41+ // !!!
42+ return true;
43+}
44+
45+
46+Rect<long> FillSurface::rect(void) const
47+{
48+ return pimpl->rect_;
49+}
50+
51+
52+void FillSurface::setAlpha(float alpha)
53+{
54+ (void)alpha;
55+ // !!!
56+}
57+
58+
59+float FillSurface::alpha(void) const
60+{
61+ // !!!
62+ return 1.0;
63+}
64+
65+
66+void FillSurface::setRotateAngle(const Angle& angle)
67+{
68+ (void)angle;
69+ // !!!
70+}
71+
72+
73+void FillSurface::draw(const Rect<long>* src, const Rect<long>* dest)
74+{
75+ (void)src;
76+ (void)dest;
77+ // !!!
78+}
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
--- trunk/libs/gui/ImageSurface.h (revision 1759)
+++ trunk/libs/gui/ImageSurface.h (revision 1760)
@@ -19,12 +19,6 @@
1919 //! 画像サーフェスの作成
2020 class ImageSurface : public Surface
2121 {
22- ImageSurface(const ImageSurface& rhs);
23- ImageSurface& operator = (const ImageSurface& rhs);
24-
25- struct pImpl;
26- std::auto_ptr<pImpl> pimpl;
27-
2822 public:
2923 explicit ImageSurface(const char* file, bool transparent = false);
3024 ~ImageSurface(void);
@@ -35,6 +29,13 @@
3529 float alpha(void) const;
3630 void setRotateAngle(const Angle& angle);
3731 void draw(const Rect<long>* src, const Rect<long>* dest);
32+
33+ private:
34+ ImageSurface(const ImageSurface& rhs);
35+ ImageSurface& operator = (const ImageSurface& rhs);
36+
37+ struct pImpl;
38+ std::auto_ptr<pImpl> pimpl;
3839 };
3940 }
4041
--- trunk/libs/gui/TextSurface.h (revision 1759)
+++ trunk/libs/gui/TextSurface.h (revision 1760)
@@ -19,18 +19,9 @@
1919 class Font;
2020
2121
22- /*!
23- \brief 文字列サーフェス
24- */
22+ //! 文字列サーフェス
2523 class TextSurface : public Surface
2624 {
27- TextSurface(void);
28- TextSurface(const TextSurface& rhs);
29- TextSurface& operator = (const TextSurface& rhs);
30-
31- struct pImpl;
32- std::auto_ptr<pImpl> pimpl;
33-
3425 public:
3526 explicit TextSurface(const Font& font, const char* text);
3627 ~TextSurface(void);
@@ -43,6 +34,14 @@
4334 void draw(const Rect<long>* src, const Rect<long>* dest);
4435
4536 static Rect<long> surfaceSize(Font& font, const char* text);
37+
38+ private:
39+ TextSurface(void);
40+ TextSurface(const TextSurface& rhs);
41+ TextSurface& operator = (const TextSurface& rhs);
42+
43+ struct pImpl;
44+ std::auto_ptr<pImpl> pimpl;
4645 };
4746 }
4847
--- trunk/libs/gui/SdlVideoInit.h (revision 1759)
+++ trunk/libs/gui/SdlVideoInit.h (revision 1760)
@@ -20,12 +20,6 @@
2020 */
2121 class SdlVideoInit
2222 {
23- SdlVideoInit(const SdlVideoInit& rhs);
24- SdlVideoInit& operator = (const SdlVideoInit& rhs);
25-
26- struct pImpl;
27- const std::auto_ptr<pImpl> pimpl;
28-
2923 public:
3024 SdlVideoInit(void);
3125 ~SdlVideoInit(void);
@@ -41,6 +35,14 @@
4135 \brief システムの終了
4236 */
4337 void terminate(void);
38+
39+
40+ private:
41+ SdlVideoInit(const SdlVideoInit& rhs);
42+ SdlVideoInit& operator = (const SdlVideoInit& rhs);
43+
44+ struct pImpl;
45+ const std::auto_ptr<pImpl> pimpl;
4446 };
4547 }
4648
--- trunk/libs/gui/Component.h (revision 1759)
+++ trunk/libs/gui/Component.h (revision 1760)
@@ -19,14 +19,9 @@
1919 class Angle;
2020
2121
22- /*!
23- \brief コンポーネントのインターフェース定義
24- */
22+ //! コンポーネントのインターフェース定義
2523 class Component
2624 {
27- Point<long> position_;
28-
29-
3025 public:
3126 virtual ~Component(void)
3227 {
@@ -50,6 +45,9 @@
5045 virtual void setAlpha(float alpha) = 0;
5146 virtual void setRotateAngle(const Angle& angle) = 0;
5247 virtual void draw(const Rect<long>& area) = 0;
48+
49+ private:
50+ Point<long> position_;
5351 };
5452 }
5553
--- trunk/libs/gui/MultiSurface.h (revision 1759)
+++ trunk/libs/gui/MultiSurface.h (revision 1760)
@@ -18,13 +18,6 @@
1818 {
1919 class MultiSurface : public Surface
2020 {
21- MultiSurface(void);
22- MultiSurface(const MultiSurface& rhs);
23- MultiSurface& operator = (const MultiSurface& rhs);
24-
25- struct pImpl;
26- std::auto_ptr<pImpl> pimpl;
27-
2821 public:
2922 explicit MultiSurface(Surface& base_surface);
3023 ~MultiSurface(void);
@@ -37,6 +30,14 @@
3730 void draw(const Rect<long>* src, const Rect<long>* dest);
3831
3932 void push_front(Surface& surface, const Point<long>& offset);
33+
34+ private:
35+ MultiSurface(void);
36+ MultiSurface(const MultiSurface& rhs);
37+ MultiSurface& operator = (const MultiSurface& rhs);
38+
39+ struct pImpl;
40+ std::auto_ptr<pImpl> pimpl;
4041 };
4142 }
4243
--- trunk/libs/gui/Font.h (revision 1759)
+++ trunk/libs/gui/Font.h (revision 1760)
@@ -17,17 +17,9 @@
1717
1818 namespace qrk
1919 {
20- /*!
21- \brief フォント資源クラス
22- */
20+ //! フォント資源クラス
2321 class Font
2422 {
25- Font(void);
26- Font& operator = (const Font& rhs);
27-
28- struct pImpl;
29- std::auto_ptr<pImpl> pimpl;
30-
3123 public:
3224 enum {
3325 DefaultSize = 16, //!< [pixel]
@@ -62,6 +54,13 @@
6254
6355 void setTransparent(bool on = true);
6456 bool transparent(void) const;
57+
58+ private:
59+ Font(void);
60+ Font& operator = (const Font& rhs);
61+
62+ struct pImpl;
63+ std::auto_ptr<pImpl> pimpl;
6564 };
6665 }
6766
--- trunk/libs/gui/SwitchSurface.h (revision 1759)
+++ trunk/libs/gui/SwitchSurface.h (revision 1760)
@@ -18,12 +18,6 @@
1818 {
1919 class SwitchSurface : public Surface
2020 {
21- SwitchSurface(const SwitchSurface& rhs);
22- SwitchSurface& operator = (const SwitchSurface& rhs);
23-
24- struct pImpl;
25- std::auto_ptr<pImpl> pimpl;
26-
2721 public:
2822 SwitchSurface(void);
2923 ~SwitchSurface(void);
@@ -39,6 +33,13 @@
3933 void removeSurface(size_t id);
4034 void setDrawSurface(size_t id);
4135 size_t currentSurfaceId(void);
36+
37+ private:
38+ SwitchSurface(const SwitchSurface& rhs);
39+ SwitchSurface& operator = (const SwitchSurface& rhs);
40+
41+ struct pImpl;
42+ std::auto_ptr<pImpl> pimpl;
4243 };
4344 }
4445
--- trunk/libs/gui/Button.h (revision 1759)
+++ trunk/libs/gui/Button.h (revision 1760)
@@ -23,18 +23,9 @@
2323 class CallbackEvent;
2424
2525
26- /*!
27- \brief ボタン
28- */
26+ //! ボタン
2927 class Button : public Component
3028 {
31- Button(void);
32- Button(const Button& rhs);
33- Button& operator = (const Button& rhs);
34-
35- struct pImpl;
36- std::auto_ptr<pImpl> pimpl;
37-
3829 public:
3930 typedef enum {
4031 Normal = 0,
@@ -100,6 +91,15 @@
10091
10192 // フォーカス時のイベント
10293 void connectFocusedEvent(const ButtonCallback::slot_type& slot);
94+
95+
96+ private:
97+ Button(void);
98+ Button(const Button& rhs);
99+ Button& operator = (const Button& rhs);
100+
101+ struct pImpl;
102+ std::auto_ptr<pImpl> pimpl;
103103 };
104104 }
105105
--- trunk/libs/gui/EventManager.h (revision 1759)
+++ trunk/libs/gui/EventManager.h (revision 1760)
@@ -20,17 +20,9 @@
2020 class Event;
2121
2222
23- /*!
24- \brief イベント管理
25- */
23+ //! イベント管理
2624 class EventManager
2725 {
28- EventManager(const EventManager& rhs);
29- EventManager& operator = (const EventManager& rhs);
30-
31- struct pImpl;
32- std::auto_ptr<pImpl> pimpl;
33-
3426 public:
3527 EventManager(void);
3628 ~EventManager(void);
@@ -44,6 +36,13 @@
4436 void checkEnterCursor(const Point<long>& current,
4537 const Point<long>& previous);
4638 void cursorMoved(void);
39+
40+ private:
41+ EventManager(const EventManager& rhs);
42+ EventManager& operator = (const EventManager& rhs);
43+
44+ struct pImpl;
45+ std::auto_ptr<pImpl> pimpl;
4746 };
4847 }
4948
--- trunk/libs/gui/Label.h (revision 1759)
+++ trunk/libs/gui/Label.h (revision 1760)
@@ -20,17 +20,9 @@
2020 class Surface;
2121
2222
23- /*!
24- \brief ラベル
25- */
23+ //! ラベル
2624 class Label : public Component
2725 {
28- Label(const Label& rhs);
29- Label& operator = (Label& rhs);
30-
31- struct pImpl;
32- std::auto_ptr<pImpl> pimpl;
33-
3426 public:
3527 explicit Label(Surface& surface);
3628 ~Label(void);
@@ -40,6 +32,13 @@
4032 void setAlpha(float alpha);
4133 void setRotateAngle(const Angle& angle);
4234 void draw(const Rect<long>& area);
35+
36+ private:
37+ Label(const Label& rhs);
38+ Label& operator = (Label& rhs);
39+
40+ struct pImpl;
41+ std::auto_ptr<pImpl> pimpl;
4342 };
4443 }
4544
--- trunk/libs/gui/Screen.h (revision 1759)
+++ trunk/libs/gui/Screen.h (revision 1760)
@@ -23,6 +23,8 @@
2323 class Screen
2424 {
2525 public:
26+ static const Uint32 OpenGL = SDL_OPENGL;
27+
2628 Screen(void);
2729 ~Screen(void);
2830
@@ -50,6 +52,7 @@
5052
5153 void setClearColor(const Color& color);
5254
55+#if ! defined(NO_OPENGL)
5356 //! SDL_OPENGL が指定されていないと動作しない
5457 void clear(void);
5558
@@ -58,6 +61,7 @@
5861
5962 static void setClipArea(const Rect<long>& area);
6063 static void disableClipArea(void);
64+#endif
6165
6266 private:
6367 Screen(const Screen& rhs);
--- trunk/libs/gui/ChatMessage.h (revision 1759)
+++ trunk/libs/gui/ChatMessage.h (revision 1760)
@@ -20,18 +20,9 @@
2020 {
2121 class Font;
2222
23- /*!
24- \brief チャット等のメッセージ表示用
25- */
23+ //! チャット等のメッセージ表示用
2624 class ChatMessage : public Component
2725 {
28- ChatMessage(void);
29- ChatMessage(const ChatMessage& rhs);
30- ChatMessage& operator = (ChatMessage& rhs);
31-
32- struct pImpl;
33- std::auto_ptr<pImpl> pimpl;
34-
3526 public:
3627 explicit ChatMessage(Font& font, const Rect<long>& rect);
3728 ~ChatMessage(void);
@@ -49,6 +40,14 @@
4940 void clear(void);
5041 void print(const char* text);
5142 void newline(void);
43+
44+ private:
45+ ChatMessage(void);
46+ ChatMessage(const ChatMessage& rhs);
47+ ChatMessage& operator = (ChatMessage& rhs);
48+
49+ struct pImpl;
50+ std::auto_ptr<pImpl> pimpl;
5251 };
5352 }
5453
--- trunk/libs/gui/SDL_GL_Texture.h (revision 1759)
+++ trunk/libs/gui/SDL_GL_Texture.h (revision 1760)
@@ -25,10 +25,7 @@
2525 //! SDL + OpenGL 環境でのサーフェス描画
2626 class SDL_GL_Texture
2727 {
28- SDL_GL_Texture(void);
29- SDL_GL_Texture(const SDL_GL_Texture& rhs);
30- SDL_GL_Texture& operator = (const SDL_GL_Texture& rhs);
31-
28+ private:
3229 struct pImpl;
3330 std::auto_ptr<pImpl> pimpl;
3431
@@ -66,6 +63,11 @@
6663
6764 static void deleteTextures(void);
6865 static void recreateTextures(void);
66+
67+ private:
68+ SDL_GL_Texture(void);
69+ SDL_GL_Texture(const SDL_GL_Texture& rhs);
70+ SDL_GL_Texture& operator = (const SDL_GL_Texture& rhs);
6971 };
7072 }
7173
--- trunk/libs/gui/ColorSurface.h (revision 1759)
+++ trunk/libs/gui/ColorSurface.h (revision 1760)
@@ -19,17 +19,9 @@
1919 class Color;
2020
2121
22- /*!
23- \brief 単色サーフェス
24- */
22+ //! 単色サーフェス
2523 class ColorSurface : public Surface
2624 {
27- ColorSurface(const ColorSurface& rhs);
28- ColorSurface& operator = (const ColorSurface& rhs);
29-
30- struct pImpl;
31- std::auto_ptr<pImpl> pimpl;
32-
3325 public:
3426 explicit ColorSurface(const Rect<long>& rect, const Color& color);
3527 ~ColorSurface(void);
@@ -40,6 +32,13 @@
4032 float alpha(void) const;
4133 void setRotateAngle(const Angle& angle);
4234 void draw(const Rect<long>* src, const Rect<long>* dest);
35+
36+ private:
37+ ColorSurface(const ColorSurface& rhs);
38+ ColorSurface& operator = (const ColorSurface& rhs);
39+
40+ struct pImpl;
41+ std::auto_ptr<pImpl> pimpl;
4342 };
4443 }
4544
旧リポジトリブラウザで表示