Skip to content

Commit a1ad6e6

Browse files
aregtecharegtech
committed
fixed demo 17 project
1 parent 1bbffbb commit a1ad6e6

18 files changed

+60
-102
lines changed

‎demo/17_winchat/17_chatter.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<Import Project="$(AregConfigDir)project.props" Label="LocalAppDataPlatform" />
2222
</ImportGroup>
2323
<PropertyGroup Label="UserMacros" />
24+
<PropertyGroup Label="Vcpkg">
25+
<VcpkgEnabled>false</VcpkgEnabled>
26+
</PropertyGroup>
2427
<ItemDefinitionGroup Condition="'$(ConfigShortName)'=='Debug'">
2528
<ClCompile>
2629
<PreprocessorDefinitions>IMPORT_SHARED_SYMBOLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎demo/17_winchat/17_generated.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
<PropertyGroup>
2424
<OutDir>$(OutLibDir)</OutDir>
2525
</PropertyGroup>
26+
<PropertyGroup Label="Vcpkg">
27+
<VcpkgEnabled>false</VcpkgEnabled>
28+
</PropertyGroup>
2629
<ItemDefinitionGroup Condition="'$(ConfigShortName)'=='Debug'">
2730
<ClCompile>
2831
<PreprocessorDefinitions>IMPORT_SHARED_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎demo/17_winchat/17_register.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<Import Project="$(AregConfigDir)project.props" Label="LocalAppDataPlatform" />
2222
</ImportGroup>
2323
<PropertyGroup Label="UserMacros" />
24+
<PropertyGroup Label="Vcpkg">
25+
<VcpkgEnabled>false</VcpkgEnabled>
26+
</PropertyGroup>
2427
<ItemDefinitionGroup Condition="'$(ConfigShortName)'=='Debug'">
2528
<ClCompile>
2629
<PreprocessorDefinitions>IMPORT_SHARED_SYMBOLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

‎demo/17_winchat/chatter/services/ConnectionList.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void ConnectionList::broadcastClientConnected( const NEConnectionManager::sConne
6060
}
6161
}
6262

63-
void ConnectionList::responseRegisterConnection( const NEConnectionManager::sConnection & connection, const NEConnectionManager::ListConnection & connectionList, bool success )
63+
void ConnectionList::responseRegisterConnection( const NEConnectionManager::sConnection & connection, const NEConnectionManager::ListConnections & connectionList, bool success )
6464
{
6565
LOG_SCOPE(chatter_ConnectionList_responseRegisterConnection);
6666
LOG_DBG("[ %s ] to register connection [ %s ]", success ? "SUCCEEDED" : "FAILED", connection.nickName.getString());

‎demo/17_winchat/chatter/services/ConnectionList.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ConnectionList : public ConnectionManagerClientBase
2727
* \param success Flag, indicating whether the request to register connection succeeded or not.
2828
* \see requestRegisterConnection
2929
**/
30-
virtual void responseRegisterConnection( const NEConnectionManager::sConnection & connection, const NEConnectionManager::ListConnection & connectionList, bool success ) override;
30+
virtual void responseRegisterConnection( const NEConnectionManager::sConnection & connection, const NEConnectionManager::ListConnections & connectionList, bool success ) override;
3131
/**
3232
* \brief Broadcast callback.
3333
* Triggered each time when new client connection is accepted

‎demo/17_winchat/chatter/ui/DistributedDialog.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ BOOL DistributedDialog::OnInitDialog()
156156
SetIcon(m_hIcon, FALSE); // Set small icon
157157
ModifyStyle( 0, WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SIZEBOX | WS_TABSTOP, SWP_FRAMECHANGED );
158158

159-
mCaptionInit.LoadString(IDS_APPLICATION_TITLE);
159+
static_cast<void>(mCaptionInit.LoadString(IDS_APPLICATION_TITLE));
160160
mCaption = mCaptionInit;
161161
SetTitle(mCaption);
162162

@@ -376,7 +376,7 @@ LRESULT DistributedDialog::OnCmdClientRegistration( WPARAM wParam, LPARAM lParam
376376
}
377377

378378
DEF_LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdAddConnection);
379-
LRESULT DistributedDialog::OnCmdAddConnection( WPARAM wParam, LPARAM lParam )
379+
LRESULT DistributedDialog::OnCmdAddConnection( WPARAM /*wParam*/, LPARAM lParam)
380380
{
381381
LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdAddConnection);
382382
NEConnectionManager::sConnection * data = reinterpret_cast<NEConnectionManager::sConnection *>(lParam);
@@ -394,7 +394,7 @@ LRESULT DistributedDialog::OnCmdAddConnection( WPARAM wParam, LPARAM lParam )
394394
}
395395

396396
DEF_LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdRemoveConnection);
397-
LRESULT DistributedDialog::OnCmdRemoveConnection( WPARAM wParam, LPARAM lParam )
397+
LRESULT DistributedDialog::OnCmdRemoveConnection( WPARAM /*wParam*/, LPARAM lParam)
398398
{
399399
LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdRemoveConnection);
400400
NEConnectionManager::sConnection * data = reinterpret_cast<NEConnectionManager::sConnection *>(lParam);
@@ -412,7 +412,7 @@ LRESULT DistributedDialog::OnCmdRemoveConnection( WPARAM wParam, LPARAM lParam )
412412
}
413413

414414
DEF_LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdUpdateConnection);
415-
LRESULT DistributedDialog::OnCmdUpdateConnection( WPARAM wParam, LPARAM lParam )
415+
LRESULT DistributedDialog::OnCmdUpdateConnection( WPARAM /*wParam*/, LPARAM lParam)
416416
{
417417
LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdUpdateConnection);
418418
ASSERT(lParam == 0);
@@ -425,7 +425,7 @@ LRESULT DistributedDialog::OnCmdUpdateConnection( WPARAM wParam, LPARAM lParam )
425425
}
426426

427427
DEF_LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdDisconnectTriggered);
428-
LRESULT DistributedDialog::OnCmdDisconnectTriggered( WPARAM wParam, LPARAM lParam )
428+
LRESULT DistributedDialog::OnCmdDisconnectTriggered( WPARAM /*wParam*/, LPARAM lParam)
429429
{
430430
LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdDisconnectTriggered);
431431

@@ -440,7 +440,7 @@ LRESULT DistributedDialog::OnCmdDisconnectTriggered( WPARAM wParam, LPARAM lPara
440440
}
441441

442442
DEF_LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdChatClosed);
443-
LRESULT DistributedDialog::OnCmdChatClosed( WPARAM wParam, LPARAM lParam )
443+
LRESULT DistributedDialog::OnCmdChatClosed( WPARAM /*wParam*/, LPARAM lParam)
444444
{
445445
LOG_SCOPE(chatter_ui_DistributedDialog_OnCmdChatClosed);
446446
PageChat * pageChat = reinterpret_cast<PageChat *>(lParam);

‎demo/17_winchat/chatter/ui/PageChat.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void PageChat::setTabTitle( const String & title )
412412
VERIFY( tab->SetItem( dlg->GetPageIndex( this ), &ti ) );
413413
}
414414

415-
LRESULT PageChat::OnCmdChatMessage( WPARAM wParam, LPARAM lParam )
415+
LRESULT PageChat::OnCmdChatMessage( WPARAM /*wParam*/, LPARAM lParam)
416416
{
417417
NECommon::sMessageData * data = reinterpret_cast<NECommon::sMessageData *>(lParam);
418418
if ( data != nullptr )
@@ -430,7 +430,7 @@ LRESULT PageChat::OnCmdChatMessage( WPARAM wParam, LPARAM lParam )
430430
return 0;
431431
}
432432

433-
LRESULT PageChat::OnCmdChatTyping( WPARAM wParam, LPARAM lParam )
433+
LRESULT PageChat::OnCmdChatTyping( WPARAM /*wParam*/, LPARAM lParam)
434434
{
435435
NECommon::sMessageData * data = reinterpret_cast<NECommon::sMessageData *>(lParam);
436436
if ( data != nullptr )
@@ -441,7 +441,7 @@ LRESULT PageChat::OnCmdChatTyping( WPARAM wParam, LPARAM lParam )
441441
return 0;
442442
}
443443

444-
LRESULT PageChat::OnCmdChatJoined( WPARAM wParam, LPARAM lParam )
444+
LRESULT PageChat::OnCmdChatJoined( WPARAM wParam, LPARAM /*lParam*/ )
445445
{
446446
DirectMessagingClient * client = GetChatClient( );
447447
if ( (wParam == 1) && (client != nullptr) )

‎demo/17_winchat/chatter/ui/PageConnections.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ BEGIN_MESSAGE_MAP(PageConnections, CPropertyPage)
6161
ON_WM_DESTROY( )
6262
END_MESSAGE_MAP()
6363

64-
void PageConnections::OnServiceStartup( bool isStarted, Component * owner )
64+
void PageConnections::OnServiceStartup( bool /*isStarted*/, Component* /*owner*/)
6565
{
6666
// do nothing
6767
}
@@ -139,7 +139,7 @@ void PageConnections::OnClientConnection( bool isConnected, DispatcherThread *di
139139
}
140140
}
141141

142-
void PageConnections::OnClientRegistration( bool isRegistered, DispatcherThread * dispThread )
142+
void PageConnections::OnClientRegistration( bool isRegistered, DispatcherThread * /*dispThread*/)
143143
{
144144
LOG_SCOPE( chatter_ui_PageConnections_OnClientRegistration );
145145
if ( isRegistered )

‎demo/17_winchat/chatter/ui/PageMessaging.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ PageMessaging::~PageMessaging()
4141
cleanService( );
4242
}
4343

44-
void PageMessaging::OnServiceStartup( bool isStarted, Component * owner )
44+
void PageMessaging::OnServiceStartup( bool /*isStarted*/, Component* /*owner*/)
4545
{
4646
// do nothing
4747
}
4848

49-
void PageMessaging::OnServiceNetwork( bool isConnected, DispatcherThread * ownerThread )
49+
void PageMessaging::OnServiceNetwork( bool /*isConnected*/, DispatcherThread* /*ownerThread*/)
5050
{
5151
// do nothing
5252
}
5353

54-
void PageMessaging::OnServiceConnection( bool isConnected, DispatcherThread * ownerThread )
54+
void PageMessaging::OnServiceConnection( bool /*isConnected*/, DispatcherThread* /*ownerThread*/)
5555
{
5656
// do nothing
5757
}
5858

59-
void PageMessaging::OnClientConnection( bool isConnected, DispatcherThread *dispThread )
59+
void PageMessaging::OnClientConnection( bool /*isConnected*/, DispatcherThread* /*dispThread*/)
6060
{
6161
// do nothing
6262
}
@@ -308,17 +308,17 @@ void PageMessaging::OnChangeEditMessageAll( )
308308
}
309309
}
310310

311-
void PageMessaging::OnTypeMessage( uint32_t cookie, NECommon::sMessageData & data )
311+
void PageMessaging::OnTypeMessage( uint32_t /*cookie*/, NECommon::sMessageData& data)
312312
{
313313
outputTyping( CString( data.nickName ), CString( data.message ), static_cast<uint32_t>(data.dataSave) );
314314
}
315315

316-
void PageMessaging::OnSendMessage( uint32_t cookie, NECommon::sMessageData & data )
316+
void PageMessaging::OnSendMessage( uint32_t /*cookie*/, NECommon::sMessageData& data)
317317
{
318318
outputMessage( data.nickName, data.message, data.timeSend, data.timeReceived, static_cast<uint32_t>(data.dataSave) );
319319
}
320320

321-
LRESULT PageMessaging::OnOutputMessage( WPARAM wParam, LPARAM lParam )
321+
LRESULT PageMessaging::OnOutputMessage( WPARAM /*wParam*/, LPARAM lParam)
322322
{
323323
NECommon::sMessageData * data = reinterpret_cast<NECommon::sMessageData *>(lParam);
324324
if ( data != nullptr)

‎demo/17_winchat/chatter/ui/PageNetworkSetup.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void PageNetworkSetup::OnServiceStartup( bool isStarted, Component * owner )
8383
}
8484
}
8585

86-
void PageNetworkSetup::OnServiceNetwork( bool isConnected, DispatcherThread * ownerThread )
86+
void PageNetworkSetup::OnServiceNetwork( bool isConnected, DispatcherThread * /*ownerThread*/)
8787
{
8888
mConnectionHandler.SetConnected( isConnected );
8989
if ( mRegisterPending )
@@ -97,18 +97,18 @@ void PageNetworkSetup::OnServiceNetwork( bool isConnected, DispatcherThread * ow
9797
mConnectPending = isConnected ? false : mConnectPending;
9898
}
9999

100-
void PageNetworkSetup::OnServiceConnection( bool isConnected, DispatcherThread * ownerThread )
100+
void PageNetworkSetup::OnServiceConnection( bool /*isConnected*/, DispatcherThread* /*ownerThread*/)
101101
{
102102
// do nothing
103103
}
104104

105-
void PageNetworkSetup::OnClientConnection( bool isConnected, DispatcherThread *dispThread )
105+
void PageNetworkSetup::OnClientConnection( bool isConnected, DispatcherThread * /*dispThread*/)
106106
{
107107
mConnectPending = isConnected ? false : mConnectPending;
108108
mConnectionHandler.SetConnected(isConnected);
109109
}
110110

111-
void PageNetworkSetup::OnClientRegistration( bool isRegistered, DispatcherThread * dispThread )
111+
void PageNetworkSetup::OnClientRegistration( bool isRegistered, DispatcherThread * /*dispThread*/)
112112
{
113113
mRegisterPending = isRegistered ? false : mRegisterPending;
114114
if ( isRegistered )
@@ -123,12 +123,12 @@ void PageNetworkSetup::OnClientRegistration( bool isRegistered, DispatcherThread
123123
}
124124
}
125125

126-
void PageNetworkSetup::OnAddConnection( NEConnectionManager::sConnection & data )
126+
void PageNetworkSetup::OnAddConnection( NEConnectionManager::sConnection & /*data*/)
127127
{
128128
// do nothing
129129
}
130130

131-
void PageNetworkSetup::OnRemoveConnection( NEConnectionManager::sConnection & data )
131+
void PageNetworkSetup::OnRemoveConnection( NEConnectionManager::sConnection & /*data*/)
132132
{
133133
// do nothing
134134
}

0 commit comments

Comments
 (0)