From 3e08208f42a2a881d91cb9eb5f691feb3e4024c3 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Tue, 6 Jul 2010 01:37:34 +0000 Subject: [PATCH] Linux build fix, code cleanup, and compiler warning removal. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5840 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/SConscript | 2 +- Source/Core/InputCommon/Src/UDPWiimote.cpp | 7 ++--- Source/Core/InputCommon/Src/UDPWrapper.cpp | 26 +++++-------------- Source/Core/InputCommon/Src/UDPWrapper.h | 22 +++++++++++----- Source/Core/InputUICommon/Src/ConfigDiag.cpp | 1 - Source/Core/InputUICommon/Src/ConfigDiag.h | 8 +++--- Source/Plugins/Plugin_Wiimote/Src/SConscript | 2 +- .../Plugins/Plugin_WiimoteNew/Src/SConscript | 2 +- 8 files changed, 34 insertions(+), 36 deletions(-) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 92744b1d9a..c34feaf2a1 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -12,7 +12,7 @@ files = [ libs = [ 'core', 'lzo2', 'discio', 'bdisasm', 'videocommon', - 'inputcommon', 'inputuicommon', 'common', 'lua', 'z', 'sfml-network', + 'inputuicommon', 'inputcommon', 'common', 'lua', 'z', 'sfml-network', 'SDL' ] diff --git a/Source/Core/InputCommon/Src/UDPWiimote.cpp b/Source/Core/InputCommon/Src/UDPWiimote.cpp index 943f16f3c9..5b59e4ed5c 100644 --- a/Source/Core/InputCommon/Src/UDPWiimote.cpp +++ b/Source/Core/InputCommon/Src/UDPWiimote.cpp @@ -65,8 +65,9 @@ THREAD_RETURN UDPWiiThread(void* arg) } UDPWiimote::UDPWiimote(const char *_port) : -d(new _d) ,x(0),y(0),z(0),nunX(0),nunY(0), -pointerX(-0.1),pointerY(-0.1),nunMask(0),mask(0),time(0),port(_port) + port(_port), + d(new _d) ,x(0),y(0),z(0),nunX(0),nunY(0), + pointerX(-0.1),pointerY(-0.1),nunMask(0),mask(0),time(0) { #ifdef _WIN32 u_long iMode = 1; @@ -299,4 +300,4 @@ void UDPWiimote::getNunchuck(float &_x, float &_y, u8 &_mask) const char * UDPWiimote::getPort() { return port.c_str(); -} \ No newline at end of file +} diff --git a/Source/Core/InputCommon/Src/UDPWrapper.cpp b/Source/Core/InputCommon/Src/UDPWrapper.cpp index bab0869c18..641bc085e4 100644 --- a/Source/Core/InputCommon/Src/UDPWrapper.cpp +++ b/Source/Core/InputCommon/Src/UDPWrapper.cpp @@ -1,25 +1,13 @@ #include "UDPWrapper.h" -#include "UDPWiimote.h" #include #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - UDPWrapper::UDPWrapper(int indx, const char* const _name) : -updIR(false),updAccel(false), -updButt(false),udpEn(false),inst(NULL), -index(indx),ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII) + ControllerEmu::ControlGroup(_name,GROUP_TYPE_UDPWII), + inst(NULL), index(indx), + updIR(false),updAccel(false), + updButt(false),udpEn(false) { char s[5]; sprintf(s,"%d",4432+index); @@ -114,8 +102,8 @@ public: }; UDPConfigDiag::UDPConfigDiag(wxWindow * const parent, UDPWrapper * _wrp) : - wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), - wrp(_wrp) + wxDialog(parent, -1, wxT("UDP Wiimote"), wxDefaultPosition, wxDefaultSize), + wrp(_wrp) { wxBoxSizer * outer_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer * sizer1 = new wxBoxSizer(wxVERTICAL); @@ -184,4 +172,4 @@ void UDPWrapper::Configure(wxWindow * parent) wxDialog * diag = new UDPConfigDiag(parent,this); diag->ShowModal(); diag->Destroy(); -} \ No newline at end of file +} diff --git a/Source/Core/InputCommon/Src/UDPWrapper.h b/Source/Core/InputCommon/Src/UDPWrapper.h index 7179e08522..43432688d9 100644 --- a/Source/Core/InputCommon/Src/UDPWrapper.h +++ b/Source/Core/InputCommon/Src/UDPWrapper.h @@ -1,14 +1,23 @@ #ifndef UDPWRAPPER_H #define UDPWRAPPER_H -#include +#include "Common.h" #include "ControllerEmu.h" -#include +#include "IniFile.h" #include -class wxWindow; -class UDPWiimote; -class Wiimote; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "UDPWiimote.h" class UDPWrapper : public ControllerEmu::ControlGroup { @@ -22,7 +31,8 @@ public: virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); void Refresh(); - void Configure(wxWindow * parent); virtual ~UDPWrapper(); + void Configure(wxWindow * parent); + virtual ~UDPWrapper(); }; #endif diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.cpp b/Source/Core/InputUICommon/Src/ConfigDiag.cpp index d73f1ac9a0..bb00b57f93 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.cpp +++ b/Source/Core/InputUICommon/Src/ConfigDiag.cpp @@ -16,7 +16,6 @@ // http://code.google.com/p/dolphin-emu/ #include "ConfigDiag.h" -#include "UDPWrapper.h" #define _connect_macro_(b, f, c, s) (b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s) #define WXSTR_FROM_STR(s) (wxString::From8BitData((s).c_str())) diff --git a/Source/Core/InputUICommon/Src/ConfigDiag.h b/Source/Core/InputUICommon/Src/ConfigDiag.h index bf4b83f4e7..831eb54ef4 100644 --- a/Source/Core/InputUICommon/Src/ConfigDiag.h +++ b/Source/Core/InputUICommon/Src/ConfigDiag.h @@ -43,8 +43,7 @@ #include "ControllerEmu.h" #include "InputConfig.h" #include "FileSearch.h" - -class UDPWrapper; +#include "UDPWrapper.h" class PadSetting { @@ -152,8 +151,9 @@ class UDPConfigButton : public wxButton { public: UDPWrapper * wrapper; - UDPConfigButton( wxWindow* const parent, UDPWrapper * udp) : wrapper(udp), - wxButton( parent, -1, wxT("Configure"), wxDefaultPosition ) + UDPConfigButton( wxWindow* const parent, UDPWrapper * udp) : + wxButton( parent, -1, wxT("Configure"), wxDefaultPosition ), + wrapper(udp) {} }; diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript index 625593fceb..d7c3c4e20d 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript @@ -28,7 +28,7 @@ if wmenv['HAVE_WX']: "FillReport.cpp", ] -libs = [ 'common', 'inputcommon', 'inputuicommon', 'SDL' ] +libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ] cxxflags = [ ] diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index ed6a48c771..633e9f0e56 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -21,7 +21,7 @@ files = [ 'WiimoteConfigDiag.cpp', ] -libs = [ 'inputcommon', 'inputuicommon', 'common', 'SDL' ] +libs = [ 'inputuicommon', 'inputcommon', 'common', 'SDL' ] cxxflags = [ ]