• R/O
  • SSH
  • HTTPS

ppregnessem: 提交


Commit MetaInfo

修订版117 (tree)
时间2010-07-31 09:16:35
作者kamoya

Log Message

def list not implemented yet.

更改概述

差异

--- trunk/StrRsc/src/StrRsc.h (revision 116)
+++ trunk/StrRsc/src/StrRsc.h (revision 117)
@@ -19,7 +19,7 @@
1919 class StrRscMain : public Common::NsmPluginMain
2020 {
2121 private:
22- typedef std::tr1::unordered_map<tstring, tstring> IniFilesTable;
22+ typedef std::unordered_map<tstring, tstring> IniFilesTable;
2323
2424 IniFilesTable IniFiles;
2525 HNsmEvent ChangeLangEvent;
--- trunk/ProfMan/src/Profile.h (revision 116)
+++ trunk/ProfMan/src/Profile.h (revision 117)
@@ -16,7 +16,7 @@
1616 namespace ProfMan
1717 {
1818 class Profile;
19- typedef std::tr1::shared_ptr<Profile> ProfileListSub;
19+ typedef std::shared_ptr<Profile> ProfileListSub;
2020 typedef std::vector<ProfileListSub> ProfileList;
2121
2222 class Profile
--- trunk/ClientSocket/src/NsmClientSocket.h (revision 116)
+++ trunk/ClientSocket/src/NsmClientSocket.h (revision 117)
@@ -15,7 +15,7 @@
1515 {
1616 // ソケットリスト
1717 class NsmClientSocket;
18- typedef std::tr1::shared_ptr<NsmClientSocket> NsmClientSocketListSub;
18+ typedef std::shared_ptr<NsmClientSocket> NsmClientSocketListSub;
1919 typedef std::vector<NsmClientSocketListSub> NsmClientSocketList;
2020
2121 class NsmClientSocket
--- trunk/FileIO/src/FileIO.h (revision 116)
+++ trunk/FileIO/src/FileIO.h (revision 117)
@@ -19,7 +19,7 @@
1919 {
2020 // ファイルIOリスト
2121 class NsmFileIO;
22- typedef std::tr1::shared_ptr<NsmFileIO> NsmFileIOListSub;
22+ typedef std::shared_ptr<NsmFileIO> NsmFileIOListSub;
2323 typedef std::vector<NsmFileIOListSub> NsmFileIOList;
2424
2525 // ファイルIO本体
--- trunk/nsmsgs/src/UNsmPlugin.h (revision 116)
+++ trunk/nsmsgs/src/UNsmPlugin.h (revision 117)
@@ -15,7 +15,7 @@
1515 namespace System
1616 {
1717 class NsmPlugin;
18- typedef std::tr1::shared_ptr<NsmPlugin> NsmPluginListSub;
18+ typedef std::shared_ptr<NsmPlugin> NsmPluginListSub;
1919 typedef std::vector<NsmPluginListSub> NsmPluginList;
2020
2121 // プラグインのラッパー
--- trunk/nsmsgs/src/UNsmConnection.h (revision 116)
+++ trunk/nsmsgs/src/UNsmConnection.h (revision 117)
@@ -14,7 +14,7 @@
1414 {
1515 // コネクションリスト
1616 class NsmConnection;
17- typedef std::tr1::shared_ptr<NsmConnection> NsmConnectionListSub;
17+ typedef std::shared_ptr<NsmConnection> NsmConnectionListSub;
1818 typedef std::vector<NsmConnectionListSub> NsmConnectionList;
1919
2020 // コネクションクラス
--- trunk/nsmsgs/src/UNsmService.h (revision 116)
+++ trunk/nsmsgs/src/UNsmService.h (revision 117)
@@ -17,7 +17,7 @@
1717 {
1818 // サービスリスト
1919 class NsmService;
20- typedef std::tr1::shared_ptr<NsmService> NsmServiceListSub;
20+ typedef std::shared_ptr<NsmService> NsmServiceListSub;
2121 typedef std::map<tstring, NsmServiceListSub> NsmServiceList;
2222
2323 // サービスクラス
--- trunk/nsmsgs/src/UNsmMemberList.h (revision 116)
+++ trunk/nsmsgs/src/UNsmMemberList.h (revision 117)
@@ -69,12 +69,12 @@
6969 };
7070
7171 // メンバリスト
72- typedef std::tr1::shared_ptr<NsmMember> NsmMemberListSub;
73- typedef std::tr1::unordered_map<tstring, NsmMemberListSub> NsmMemberList;
72+ typedef std::shared_ptr<NsmMember> NsmMemberListSub;
73+ typedef std::unordered_map<tstring, NsmMemberListSub> NsmMemberList;
7474
7575 // グループリスト
7676 class NsmGroup;
77- typedef std::tr1::shared_ptr<NsmGroup> NsmGroupListSub;
77+ typedef std::shared_ptr<NsmGroup> NsmGroupListSub;
7878 typedef std::vector<NsmGroupListSub> NsmGroupList;
7979
8080 // グループ
--- trunk/nsmsgs/src/UFrmNsmMain.cpp (revision 116)
+++ trunk/nsmsgs/src/UFrmNsmMain.cpp (revision 117)
@@ -22,20 +22,18 @@
2222 {
2323 NsmMain::NsmMain()
2424 :SystemHandle(CreateMainWindow())
25- {
26- }
25+ {}
2726
2827 NsmMain::~NsmMain()
29- {
30- }
28+ {}
3129
3230 HWND NsmMain::CreateMainWindow()
3331 {
34- WNDCLASSEX wc = {0};
32+ WNDCLASSEX wc = {};
3533 wc.cbSize = sizeof(wc);
3634 wc.lpszClassName = TEXT("NsmMain");
3735 wc.lpfnWndProc = WndProc;
38- wc.hInstance = static_cast<HINSTANCE>(GetModuleHandle(NULL));
36+ wc.hInstance = static_cast<HINSTANCE>(GetModuleHandle(nullptr));
3937
4038 RegisterClassEx(&wc);
4139
--- trunk/nsmsgs/src/UNsmEvent.h (revision 116)
+++ trunk/nsmsgs/src/UNsmEvent.h (revision 117)
@@ -18,7 +18,7 @@
1818 {
1919 // イベントリスト
2020 class NsmEvent;
21- typedef std::tr1::shared_ptr<NsmEvent> NsmEventListSub;
21+ typedef std::shared_ptr<NsmEvent> NsmEventListSub;
2222 typedef std::map<tstring, NsmEventListSub> NsmEventList;
2323
2424 // イベントクラス
--- trunk/nsmsgs/src/UNsmSession.h (revision 116)
+++ trunk/nsmsgs/src/UNsmSession.h (revision 117)
@@ -16,7 +16,7 @@
1616
1717 // セッションリスト
1818 class NsmSession;
19- typedef std::tr1::shared_ptr<NsmSession> NsmSessionListSub;
19+ typedef std::shared_ptr<NsmSession> NsmSessionListSub;
2020 typedef std::vector<NsmSessionListSub> NsmSessionList;
2121
2222 // セッションクラス
--- trunk/nsmsgs/src/UNsmFileSession.h (revision 116)
+++ trunk/nsmsgs/src/UNsmFileSession.h (revision 117)
@@ -18,7 +18,7 @@
1818
1919 // ファイル送受信セッションリスト
2020 class NsmFileSession;
21- typedef std::tr1::shared_ptr<NsmFileSession> NsmFileSessionListSub;
21+ typedef std::shared_ptr<NsmFileSession> NsmFileSessionListSub;
2222 typedef std::vector<NsmFileSessionListSub> NsmFileSessionList;
2323
2424 // ファイル送受信セッションクラス
--- trunk/MSNP10/src/Connection.cpp (revision 116)
+++ trunk/MSNP10/src/Connection.cpp (revision 117)
@@ -111,7 +111,7 @@
111111
112112 User.Status = usFLN;
113113
114- PingTimer.setOnTimer(std::tr1::bind(&MsnConnection::PingTimerProc, this, std::tr1::placeholders::_1));
114+ PingTimer.setOnTimer(std::bind(&MsnConnection::PingTimerProc, this, std::placeholders::_1));
115115 PingTimer.setEnabled(false);
116116 }
117117
--- trunk/MSNP10/src/Connection.h (revision 116)
+++ trunk/MSNP10/src/Connection.h (revision 117)
@@ -18,7 +18,7 @@
1818 class MsnAuthThread;
1919
2020 class MsnConnection;
21- typedef std::tr1::shared_ptr<MsnConnection> MsnConnectionListSub;
21+ typedef std::shared_ptr<MsnConnection> MsnConnectionListSub;
2222 typedef std::vector<MsnConnectionListSub> MsnConnectionList;
2323 typedef Common::TThreadList<MsnConnectionList> MsnThreadConnectionList;
2424
--- trunk/MSNP10/src/MSNP10Types.h (revision 116)
+++ trunk/MSNP10/src/MSNP10Types.h (revision 117)
@@ -70,21 +70,21 @@
7070 class MsnGroup;
7171
7272 // 関数オブジェクトの定義
73- typedef std::tr1::function<void (void*, ListKind, MsnMember*)> MsnListMemberEvent;
74- typedef std::tr1::function<void (void*, ListKind)> MsnListEvent;
75- typedef std::tr1::function<void (void*, MsnMemberBase*)> MsnMemberEvent;
76- typedef std::tr1::function<void (void*, MsnGroup*)> MsnGroupEvent;
77- typedef std::tr1::function<void (void*, MsnMemberBase*, MsnMemberStatus, bool)> MsnStatusChangeEvent;
78- typedef std::tr1::function<void (void*, SignOutType)> MsnSignOutEvent;
79- typedef std::tr1::function<void (MsnLogInfo*)> MsnLogEvent;
80- typedef std::tr1::function<void (void*, ErrorKind, int, std::wstring)> MsnErrorEvent;
81- typedef std::tr1::function<void (void*, std::string, std::string, std::wstring, std::string)> MsnReceiveMessageEvent;
82- typedef std::tr1::function<void (void*, int, std::string, std::string)> MsnSwitchBoardEvent;
83- typedef std::tr1::function<void (void*, std::string, std::string, std::string, std::string, std::wstring)> MsnCalledEvent;
84- typedef std::tr1::function<void (void*, std::string, std::string, int)> MsnUrlEvent;
85- typedef std::tr1::function<void (void*, bool, std::wstring, std::string)> MsnNewMailEvent;
86- typedef std::tr1::function<void (void*, bool)> MsnUnreadMailChangeEvent;
87- typedef std::tr1::function<void (void*, std::string)> MsnSysMsgEvent;
73+ typedef std::function<void (void*, ListKind, MsnMember*)> MsnListMemberEvent;
74+ typedef std::function<void (void*, ListKind)> MsnListEvent;
75+ typedef std::function<void (void*, MsnMemberBase*)> MsnMemberEvent;
76+ typedef std::function<void (void*, MsnGroup*)> MsnGroupEvent;
77+ typedef std::function<void (void*, MsnMemberBase*, MsnMemberStatus, bool)> MsnStatusChangeEvent;
78+ typedef std::function<void (void*, SignOutType)> MsnSignOutEvent;
79+ typedef std::function<void (MsnLogInfo*)> MsnLogEvent;
80+ typedef std::function<void (void*, ErrorKind, int, std::wstring)> MsnErrorEvent;
81+ typedef std::function<void (void*, std::string, std::string, std::wstring, std::string)> MsnReceiveMessageEvent;
82+ typedef std::function<void (void*, int, std::string, std::string)> MsnSwitchBoardEvent;
83+ typedef std::function<void (void*, std::string, std::string, std::string, std::string, std::wstring)> MsnCalledEvent;
84+ typedef std::function<void (void*, std::string, std::string, int)> MsnUrlEvent;
85+ typedef std::function<void (void*, bool, std::wstring, std::string)> MsnNewMailEvent;
86+ typedef std::function<void (void*, bool)> MsnUnreadMailChangeEvent;
87+ typedef std::function<void (void*, std::string)> MsnSysMsgEvent;
8888 }
8989 }
9090 }
--- trunk/MSNP10/src/MemberList.h (revision 116)
+++ trunk/MSNP10/src/MemberList.h (revision 117)
@@ -77,7 +77,7 @@
7777 };
7878
7979 class MsnMember;
80- typedef std::tr1::shared_ptr<MsnMember> MsnMemberListSub;
80+ typedef std::shared_ptr<MsnMember> MsnMemberListSub;
8181 typedef std::vector<MsnMemberListSub> MsnMemberList;
8282
8383 class MsnMember
@@ -120,7 +120,7 @@
120120 };
121121
122122 class MsnGroup;
123- typedef std::tr1::shared_ptr<MsnGroup> MsnGroupListSub;
123+ typedef std::shared_ptr<MsnGroup> MsnGroupListSub;
124124 typedef std::vector<MsnGroupListSub> MsnGroupList;
125125
126126 class MsnGroup
--- trunk/MSNP10/src/DelphiCompat.h (revision 116)
+++ trunk/MSNP10/src/DelphiCompat.h (revision 117)
@@ -14,7 +14,7 @@
1414 namespace DelphiCompatible
1515 {
1616 // DelphiのTNotifyEventのようなもの
17- typedef std::tr1::function<void (void*)> NotifyEvent;
17+ typedef std::function<void (void*)> NotifyEvent;
1818
1919 // DelphiのTThreadクラスのようなもの
2020 class TThread
--- trunk/MSNP10/src/MSNP10.cpp (revision 116)
+++ trunk/MSNP10/src/MSNP10.cpp (revision 117)
@@ -121,33 +121,33 @@
121121
122122 MsnConnectionListSub connection(new MsnConnection());
123123
124- using namespace std::tr1::placeholders;
124+ using namespace std::placeholders;
125125
126126 connection->Handle = handle;
127127 connection->Host = Config.MsnHost;
128128 connection->Port = Config.MsnPort;
129129
130- connection->OnMemberInit = std::tr1::bind(&Msnp10Main::ConMemberInit, this, _1, _2, _3);
131- connection->OnMemberAddition = std::tr1::bind(&Msnp10Main::ConMemberAddition, this, _1, _2, _3);
132- connection->OnMemberDeletion = std::tr1::bind(&Msnp10Main::ConMemberDeletion, this, _1, _2, _3);
133- connection->OnMemberStatusChange = std::tr1::bind(&Msnp10Main::ConMemberStatusChange, this, _1, _2, _3, _4);
134- connection->OnMemberNameChange = std::tr1::bind(&Msnp10Main::ConMemberNameChange, this, _1, _2);
135- connection->OnMemberCommentChange = std::tr1::bind(&Msnp10Main::ConMemberCommentChange, this, _1, _2);
136- connection->OnMemberTileChange = std::tr1::bind(&Msnp10Main::ConMemberTileChange, this, _1, _2);
137- connection->OnMemberGroupChange = std::tr1::bind(&Msnp10Main::ConMemberGroupChange, this, _1, _2);
138- connection->OnGroupAddition = std::tr1::bind(&Msnp10Main::ConGroupAddition, this, _1, _2);
139- connection->OnGroupDeletion = std::tr1::bind(&Msnp10Main::ConGroupDeletion, this, _1, _2);
140- connection->OnGroupNameChange = std::tr1::bind(&Msnp10Main::ConGroupNameChange, this, _1, _2);
141- connection->OnSignIn = std::tr1::bind(&Msnp10Main::ConSignIn, this, _1);
142- connection->OnSignOut = std::tr1::bind(&Msnp10Main::ConSignOut, this, _1, _2);
143- connection->OnLog = std::tr1::bind(&Msnp10Main::DoLog, this, _1);
144- connection->OnError = std::tr1::bind(&Msnp10Main::ConError, this, _1, _2, _3, _4);
145- connection->OnSwitchBoard = std::tr1::bind(&Msnp10Main::ConSwitchBoard, this, _1, _2, _3, _4);
146- connection->OnCalled = std::tr1::bind(&Msnp10Main::ConCalled, this, _1, _2, _3, _4, _5);
147- connection->OnNewMail = std::tr1::bind(&Msnp10Main::ConNewMail, this, _1, _2, _3, _4);
148- connection->OnUnreadMailChange = std::tr1::bind(&Msnp10Main::ConUnreadMailChange, this, _1, _2);
149- connection->OnSystemMessage = std::tr1::bind(&Msnp10Main::ConSystemMessage, this, _1, _2);
150- connection->OnUrl = std::tr1::bind(&Msnp10Main::ConUrl, this, _1, _2, _3, _4);
130+ connection->OnMemberInit = std::bind(&Msnp10Main::ConMemberInit, this, _1, _2, _3);
131+ connection->OnMemberAddition = std::bind(&Msnp10Main::ConMemberAddition, this, _1, _2, _3);
132+ connection->OnMemberDeletion = std::bind(&Msnp10Main::ConMemberDeletion, this, _1, _2, _3);
133+ connection->OnMemberStatusChange = std::bind(&Msnp10Main::ConMemberStatusChange, this, _1, _2, _3, _4);
134+ connection->OnMemberNameChange = std::bind(&Msnp10Main::ConMemberNameChange, this, _1, _2);
135+ connection->OnMemberCommentChange = std::bind(&Msnp10Main::ConMemberCommentChange, this, _1, _2);
136+ connection->OnMemberTileChange = std::bind(&Msnp10Main::ConMemberTileChange, this, _1, _2);
137+ connection->OnMemberGroupChange = std::bind(&Msnp10Main::ConMemberGroupChange, this, _1, _2);
138+ connection->OnGroupAddition = std::bind(&Msnp10Main::ConGroupAddition, this, _1, _2);
139+ connection->OnGroupDeletion = std::bind(&Msnp10Main::ConGroupDeletion, this, _1, _2);
140+ connection->OnGroupNameChange = std::bind(&Msnp10Main::ConGroupNameChange, this, _1, _2);
141+ connection->OnSignIn = std::bind(&Msnp10Main::ConSignIn, this, _1);
142+ connection->OnSignOut = std::bind(&Msnp10Main::ConSignOut, this, _1, _2);
143+ connection->OnLog = std::bind(&Msnp10Main::DoLog, this, _1);
144+ connection->OnError = std::bind(&Msnp10Main::ConError, this, _1, _2, _3, _4);
145+ connection->OnSwitchBoard = std::bind(&Msnp10Main::ConSwitchBoard, this, _1, _2, _3, _4);
146+ connection->OnCalled = std::bind(&Msnp10Main::ConCalled, this, _1, _2, _3, _4, _5);
147+ connection->OnNewMail = std::bind(&Msnp10Main::ConNewMail, this, _1, _2, _3, _4);
148+ connection->OnUnreadMailChange = std::bind(&Msnp10Main::ConUnreadMailChange, this, _1, _2);
149+ connection->OnSystemMessage = std::bind(&Msnp10Main::ConSystemMessage, this, _1, _2);
150+ connection->OnUrl = std::bind(&Msnp10Main::ConUrl, this, _1, _2, _3, _4);
151151
152152 connection->SignIn(LowerCase(info.lpAccount), info.lpPassword, std::wstring()
153153 , static_cast<MsnMemberStatus>(info.nStatus));
@@ -221,21 +221,21 @@
221221
222222 GetSetInfo->SetSessionInfo(sesHandle, NMSI_STATUS, NMCS_CONNECTING);
223223
224- using namespace std::tr1::placeholders;
224+ using namespace std::placeholders;
225225
226226 MsnSessionListSub ses(new MsnSession());
227227 ses->User = (*conIt)->User;
228228 ses->Handle = sesHandle;
229229 ses->RequestID = (*conIt)->SwitchBoardRequest();
230- ses->OnConnect = std::tr1::bind(&Msnp10Main::SesConnect, this, _1);
231- ses->OnDisconnect = std::tr1::bind(&Msnp10Main::SesDisconnect, this, _1);
232- ses->OnJoinMember = std::tr1::bind(&Msnp10Main::SesJoinMember, this, _1, _2);
233- ses->OnByeMember = std::tr1::bind(&Msnp10Main::SesByeMember, this, _1, _2);
234- ses->OnMemberListChange = std::tr1::bind(&Msnp10Main::SesMemberListChange, this, _1);
235- ses->OnReceiveMessage = std::tr1::bind(&Msnp10Main::SesReceiveMessage, this, _1, _2, _3, _4, _5);
236- ses->OnReceiveNAK = std::tr1::bind(&Msnp10Main::SesReceiveNAK, this, _1);
237- ses->OnLog = std::tr1::bind(&Msnp10Main::DoLog, this, _1);
238- ses->OnError = std::tr1::bind(&Msnp10Main::ConError, this, _1, _2, _3, _4);
230+ ses->OnConnect = std::bind(&Msnp10Main::SesConnect, this, _1);
231+ ses->OnDisconnect = std::bind(&Msnp10Main::SesDisconnect, this, _1);
232+ ses->OnJoinMember = std::bind(&Msnp10Main::SesJoinMember, this, _1, _2);
233+ ses->OnByeMember = std::bind(&Msnp10Main::SesByeMember, this, _1, _2);
234+ ses->OnMemberListChange = std::bind(&Msnp10Main::SesMemberListChange, this, _1);
235+ ses->OnReceiveMessage = std::bind(&Msnp10Main::SesReceiveMessage, this, _1, _2, _3, _4, _5);
236+ ses->OnReceiveNAK = std::bind(&Msnp10Main::SesReceiveNAK, this, _1);
237+ ses->OnLog = std::bind(&Msnp10Main::DoLog, this, _1);
238+ ses->OnError = std::bind(&Msnp10Main::ConError, this, _1, _2, _3, _4);
239239
240240 MsnThreadSessionList::AutoLock sesLock(m_Sessions);
241241 sesLock.List().push_back(ses);
--- trunk/MSNP10/src/md5.cpp (revision 116)
+++ trunk/MSNP10/src/md5.cpp (revision 117)
@@ -19,7 +19,7 @@
1919
2020 std::string MD5Print(unsigned char D[16])
2121 {
22- typedef std::tr1::array<char,16*2+1> MD5StringBuff;
22+ typedef std::array<char,16*2+1> MD5StringBuff;
2323
2424 static const char digits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
2525
--- trunk/MSNP10/src/FileSession.h (revision 116)
+++ trunk/MSNP10/src/FileSession.h (revision 117)
@@ -14,7 +14,7 @@
1414 namespace MSNP10
1515 {
1616 class MsnFileSession;
17- typedef std::tr1::shared_ptr<MsnFileSession> MsnFileSessionListSub;
17+ typedef std::shared_ptr<MsnFileSession> MsnFileSessionListSub;
1818 typedef std::vector<MsnFileSessionListSub> MsnFileSessionList;
1919 typedef Common::TThreadList<MsnFileSessionList> MsnThreadFileSessionList;
2020
--- trunk/MSNP10/src/Session.h (revision 116)
+++ trunk/MSNP10/src/Session.h (revision 117)
@@ -16,7 +16,7 @@
1616 typedef std::string utf8string;
1717
1818 class MsnSession;
19- typedef std::tr1::shared_ptr<MsnSession> MsnSessionListSub;
19+ typedef std::shared_ptr<MsnSession> MsnSessionListSub;
2020 typedef std::vector<MsnSessionListSub> MsnSessionList;
2121 typedef Common::TThreadList<MsnSessionList> MsnThreadSessionList;
2222
Show on old repository browser