diff --git a/SDLWrapper/Font.cpp b/SDLWrapper/Font.cpp index 9929f45..763c954 100644 --- a/SDLWrapper/Font.cpp +++ b/SDLWrapper/Font.cpp @@ -209,7 +209,7 @@ void Font::setFontHint(FontHint hint) TTF_SetFontHinting(_get(),v); } -Rect Font::sizeText(const std::string& Text) const throw (ErrorViewer) +Rect Font::sizeText(const std::string& Text) const { int w=0,h=0; if(TTF_SizeText(_get(),Text.c_str(),&w,&h)!=0) @@ -222,7 +222,7 @@ Rect Font::sizeText(const std::string& Text) const throw (ErrorViewer) return Rect(0,0,w,h); } -Rect Font::sizeUTF8(const std::string& Text) const throw (ErrorViewer) +Rect Font::sizeUTF8(const std::string& Text) const { int w=0,h=0; if(TTF_SizeUTF8(_get(),Text.c_str(),&w,&h)!=0) @@ -235,7 +235,7 @@ Rect Font::sizeUTF8(const std::string& Text) const throw (ErrorViewer) return Rect(0,0,w,h); } -Rect Font::sizeUnicode(const uint16_t* Text) const throw (ErrorViewer) +Rect Font::sizeUnicode(const uint16_t* Text) const { int w=0,h=0; if(TTF_SizeUNICODE(_get(),Text,&w,&h)!=0) diff --git a/SDLWrapper/Font.h b/SDLWrapper/Font.h index 43a317e..e5d5d00 100644 --- a/SDLWrapper/Font.h +++ b/SDLWrapper/Font.h @@ -61,9 +61,9 @@ public: void setFontHint(FontHint hint); - Rect sizeText(const std::string& Text) const throw (ErrorViewer); - Rect sizeUTF8(const std::string& Text) const throw (ErrorViewer); - Rect sizeUnicode(const uint16_t* Text) const throw (ErrorViewer); + Rect sizeText(const std::string& Text) const; + Rect sizeUTF8(const std::string& Text) const; + Rect sizeUnicode(const uint16_t* Text) const; /// Surface Rendering Functions. Surface renderText(const std::string& Text, const RGBA& fg) const; diff --git a/SDLWrapper/Renderer.cpp b/SDLWrapper/Renderer.cpp index 1c72aaf..796defe 100644 --- a/SDLWrapper/Renderer.cpp +++ b/SDLWrapper/Renderer.cpp @@ -54,7 +54,7 @@ Uint32 Renderer::_rendertype_caster(RendererType Type) return 0; } -Renderer::Renderer(Window& wnd,std::initializer_list RendererFlags) throw (ErrorViewer) +Renderer::Renderer(Window& wnd,std::initializer_list RendererFlags) { if(createRenderer(wnd,RendererFlags)!=0) { @@ -64,7 +64,7 @@ Renderer::Renderer(Window& wnd,std::initializer_list RendererFlags } } -Renderer::Renderer(Surface& surf) throw (ErrorViewer) +Renderer::Renderer(Surface& surf) { if(createSoftRenderer(surf)!=0) { diff --git a/SDLWrapper/Renderer.h b/SDLWrapper/Renderer.h index 74b924e..b807312 100644 --- a/SDLWrapper/Renderer.h +++ b/SDLWrapper/Renderer.h @@ -13,9 +13,9 @@ class Renderer public: Renderer() = default; /// Create a Renderer associated with Window - Renderer(Window& wnd,std::initializer_list RendererFlags = { RendererType::Accelerated,RendererType::TargetTexture }) throw (ErrorViewer); + Renderer(Window& wnd,std::initializer_list RendererFlags = { RendererType::Accelerated,RendererType::TargetTexture }); /// Create a software Renderer - Renderer(Surface& surf) throw (ErrorViewer); + Renderer(Surface& surf); ~Renderer() = default; /// If Renderer is current not ready, setRenderer will create Renderer. diff --git a/SDLWrapper/SDLSystem.cpp b/SDLWrapper/SDLSystem.cpp index bb3febe..3562d35 100644 --- a/SDLWrapper/SDLSystem.cpp +++ b/SDLWrapper/SDLSystem.cpp @@ -2,7 +2,7 @@ #include "_caster.h" #include "begin_code.h" // private -void SDLSystem::_init(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf) throw (ErrorViewer) +void SDLSystem::_init(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf) { int ret=SDL_Init(sdl_flag); if(ret!=0) @@ -44,7 +44,7 @@ void SDLSystem::_init(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool in SDLSystem::SDLSystem(const std::initializer_list& flag_sdl, const std::initializer_list& flag_img, const std::initializer_list& flag_mix, - bool init_ttf ) throw (ErrorViewer) + bool init_ttf ) { Uint32 sdl_flag=0; for(auto& v:flag_sdl) @@ -72,7 +72,7 @@ SDLSystem::SDLSystem(const std::initializer_list& flag_sdl, } } -SDLSystem::SDLSystem(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf) throw (ErrorViewer) +SDLSystem::SDLSystem(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf) { try { diff --git a/SDLWrapper/SDLSystem.h b/SDLWrapper/SDLSystem.h index 67ff90e..a82648a 100644 --- a/SDLWrapper/SDLSystem.h +++ b/SDLWrapper/SDLSystem.h @@ -18,9 +18,9 @@ public: SDLSystem(const std::initializer_list& flag_sdl = {SDLInitFlag::All} , const std::initializer_list& flag_img = {IMGInitFlag::JPG,IMGInitFlag::PNG} , const std::initializer_list& flag_mix = {MixInitFlag::MP3} , - bool init_ttf = true ) throw (ErrorViewer); + bool init_ttf = true ); /// Experimental Constructor - SDLSystem(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf) throw (ErrorViewer); + SDLSystem(Uint32 sdl_flag, Uint32 img_flag, Uint32 mix_flag, bool init_ttf); ~SDLSystem(); static void Delay(int ms); @@ -70,7 +70,7 @@ public: }; private: - void _init(Uint32,Uint32,Uint32,bool) throw (ErrorViewer); + void _init(Uint32,Uint32,Uint32,bool); void _quit(); }; #include "end_code.h" diff --git a/SDLWrapper/Sound.cpp b/SDLWrapper/Sound.cpp index 1197ffa..9184525 100644 --- a/SDLWrapper/Sound.cpp +++ b/SDLWrapper/Sound.cpp @@ -57,7 +57,7 @@ Channel::Channel() _id=-1; } -Channel& Channel::playSound(Sound sound, int loops) throw (ErrorViewer) +Channel& Channel::playSound(Sound sound, int loops) { int cret=Mix_PlayChannel(_get(),sound._get(),loops); if(cret==-1) @@ -70,7 +70,7 @@ Channel& Channel::playSound(Sound sound, int loops) throw (ErrorViewer) return *this; } -Channel& Channel::fadeIn(Sound sound, int loops, int ms) throw (ErrorViewer) +Channel& Channel::fadeIn(Sound sound, int loops, int ms) { int cret=Mix_FadeInChannel(_get(),sound._get(),loops,ms); if(cret==-1) diff --git a/SDLWrapper/Sound.h b/SDLWrapper/Sound.h index be8da1a..0cfa621 100644 --- a/SDLWrapper/Sound.h +++ b/SDLWrapper/Sound.h @@ -28,8 +28,8 @@ private: class Channel { public: - Channel& playSound(Sound sound,int loops) throw (ErrorViewer); - Channel& fadeIn(Sound sound,int loops,int ms) throw (ErrorViewer); + Channel& playSound(Sound sound,int loops); + Channel& fadeIn(Sound sound,int loops,int ms); int fadeOut(int ms); void pause();