From 05d7641afd10c5af6cb8b5bef34a5e86a001c2d2 Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Sun, 20 Oct 2013 19:32:54 +0000 Subject: Xfire: spelling corrections git-svn-id: http://svn.miranda-ng.org/main/trunk@6562 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Xfire/src/Xfire_gamelist.cpp | 2 +- protocols/Xfire/src/Xfire_gamelist.h | 2 +- protocols/Xfire/src/addgamedialog.cpp | 8 ++++---- protocols/Xfire/src/all_statusmsg.cpp | 2 +- protocols/Xfire/src/buddylist.cpp | 4 ++-- protocols/Xfire/src/client.cpp | 12 ++++++------ protocols/Xfire/src/main.cpp | 32 ++++++++++++++++---------------- protocols/Xfire/src/packetreader.cpp | 4 ++-- protocols/Xfire/src/searching4games.cpp | 4 ++-- protocols/Xfire/src/tools.cpp | 2 +- protocols/Xfire/src/xfirepacket.cpp | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) (limited to 'protocols/Xfire/src') diff --git a/protocols/Xfire/src/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp index 61cca456a5..7298ff5e91 100644 --- a/protocols/Xfire/src/Xfire_gamelist.cpp +++ b/protocols/Xfire/src/Xfire_gamelist.cpp @@ -248,7 +248,7 @@ void Xfire_gamelist::createDummyMenuItem() { CLISTMENUITEM mi = { sizeof(mi) }; mi.position = 500090001; - mi.pszName = Translate("Please wait ..."); + mi.pszName = Translate("Please wait..."); mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.popupPosition = 500084000; mi.pszPopupName = Translate("Start game"); diff --git a/protocols/Xfire/src/Xfire_gamelist.h b/protocols/Xfire/src/Xfire_gamelist.h index 632d8f3829..2d134bbb9a 100644 --- a/protocols/Xfire/src/Xfire_gamelist.h +++ b/protocols/Xfire/src/Xfire_gamelist.h @@ -26,7 +26,7 @@ /* Klasse soll die Gameliste verwalten. Dazu gehört das dynamische Einfügen/Löschen/Verändern von Games. - Erstellen/Sortieren der Menüpunkte ... + Erstellen/Sortieren der Menüpunkte... */ #ifndef _XFIRE_GAMELIST diff --git a/protocols/Xfire/src/addgamedialog.cpp b/protocols/Xfire/src/addgamedialog.cpp index 600dcf38ce..53e8519c9b 100644 --- a/protocols/Xfire/src/addgamedialog.cpp +++ b/protocols/Xfire/src/addgamedialog.cpp @@ -322,7 +322,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, { //nicht schließen, wenn noch der thread läuft if(dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, gameini will be currently parsed ..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } return SendMessage(GetParent(hwndDlg),WM_CLOSE,0,0); @@ -509,7 +509,7 @@ INT_PTR CALLBACK DlgAddGameProc (HWND hwndDlg, case WM_CLOSE: //nicht schließen, wenn noch der thread läuft if(dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, gameini will be currently parsed ..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } //hauptfenster schließen @@ -608,7 +608,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, { //nicht schließen, wenn noch der thread läuft if(dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, gameini will be currently parsed ..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBoxA(hwndDlg, Translate("Please wait, game.ini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } return SendMessage(GetParent(hwndDlg),WM_CLOSE,0,0); @@ -619,7 +619,7 @@ INT_PTR CALLBACK DlgAddGameProc2 (HWND hwndDlg, //fillgames sucht noch if(dontClose) { - MessageBoxA(hwndDlg, Translate("Please wait, gameini will be currently parsed ..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); + MessageBoxA(hwndDlg, Translate("Please wait, gameþini will be currently parsed..."), Translate("XFire Options"), MB_OK|MB_ICONEXCLAMATION); return FALSE; } diff --git a/protocols/Xfire/src/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp index 20b474ea3d..7f349b8261 100644 --- a/protocols/Xfire/src/all_statusmsg.cpp +++ b/protocols/Xfire/src/all_statusmsg.cpp @@ -28,7 +28,7 @@ BOOL BackupStatusMsg() { statustype=db_get_b(NULL,protocolname,"statuschgtype",0); - XFireLog("Backup Status Message ..."); + XFireLog("Backup Status Message..."); //alten vector löschen if(olstatusmsg!=NULL) diff --git a/protocols/Xfire/src/buddylist.cpp b/protocols/Xfire/src/buddylist.cpp index 6106834065..a1ebd36ebe 100644 --- a/protocols/Xfire/src/buddylist.cpp +++ b/protocols/Xfire/src/buddylist.cpp @@ -214,10 +214,10 @@ namespace xfirelib { entry->game2 = buddiesGames->gameids->at(i); delete entry->game2Obj; entry->game2Obj = NULL; } - XDEBUG(( "Resolving Game ... \n" )); + XDEBUG(( "Resolving Game... \n" )); XFireGameResolver *resolver = client->getGameResolver(); if(resolver) { - XDEBUG(( "Resolving Game ... \n" )); + XDEBUG(( "Resolving Game... \n" )); if(isFirst) entry->gameObj = resolver->resolveGame( entry->game, i, buddiesGames ); else diff --git a/protocols/Xfire/src/client.cpp b/protocols/Xfire/src/client.cpp index 336ab6b720..e878345f07 100644 --- a/protocols/Xfire/src/client.cpp +++ b/protocols/Xfire/src/client.cpp @@ -60,7 +60,7 @@ namespace xfirelib { using namespace std; Client::Client() { - XDEBUG(("Client constructor ...\n")); + XDEBUG(("Client constructor...\n")); gameResolver = NULL; packetReader = new PacketReader(NULL); packetReader->addPacketListener( this ); @@ -73,7 +73,7 @@ using namespace std; } Client::~Client(){ - XDEBUG(("Client destructor ...\n")); + XDEBUG(("Client destructor...\n")); delete username; delete password; delete buddyList; @@ -212,17 +212,17 @@ using namespace std; if(this->packetReader!=NULL) this->packetReader->setSocket(NULL); - XDEBUG( "cancelling readthread ... \n"); + XDEBUG( "cancelling readthread... \n"); #ifndef NO_PTHREAD if(readthread.p!=NULL) pthread_cancel (readthread); readthread.p=NULL; - XDEBUG( "cancelling sendpingthread ... \n"); + XDEBUG( "cancelling sendpingthread... \n"); if(sendpingthread.p!=NULL) pthread_cancel (sendpingthread); sendpingthread.p=NULL; #endif - XDEBUG( "deleting socket ...\n" ); + XDEBUG( "deleting socket...\n" ); if(socket){ delete socket; socket = NULL; @@ -288,7 +288,7 @@ using namespace std; } default: - //cout << "Nothing here ... " << endl; + //cout << "Nothing here... " << endl; break; } diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index 3c1a1f02ab..c76e364f38 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -1191,7 +1191,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.position = 500090000; mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.pszContactOwner=protocolname; - mi.ptszName = LPGENT("Join &Game ..."); + mi.ptszName = LPGENT("Join &Game..."); joingame=Menu_AddContactMenuItem(&mi); //joinmenüpunkt @@ -1202,7 +1202,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.position = 500090000; mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.pszContactOwner=protocolname; - mi.ptszName = LPGENT("Play this Game ..."); + mi.ptszName = LPGENT("Play this game..."); startthisgame=Menu_AddContactMenuItem(&mi); //remove friend @@ -1213,7 +1213,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.position = 2000070000; mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.pszContactOwner=protocolname; - mi.ptszName = LPGENT("Remove F&riend ..."); + mi.ptszName = LPGENT("Remove F&riend..."); removefriend=Menu_AddContactMenuItem(&mi); //block user @@ -1224,7 +1224,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.position = 2000070000; mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.pszContactOwner=protocolname; - mi.ptszName = LPGENT("Block U&ser ..."); + mi.ptszName = LPGENT("Block U&ser..."); blockfriend=Menu_AddContactMenuItem(&mi); //my fire profile @@ -1257,7 +1257,7 @@ extern "C" __declspec(dllexport) int Load(void) mi.position = 500090000; mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP)); mi.pszContactOwner=protocolname; - mi.ptszName = LPGENT("&Rescan my Games ..."); + mi.ptszName = LPGENT("&Rescan my games..."); Menu_AddMainMenuItem(&mi); strcpy(servicefunction, protocolname); @@ -2243,12 +2243,12 @@ void gamedetectiont(LPVOID lparam) DWORD lowpids=db_get_b(NULL,protocolname,"skiplowpid",100); - //XFireLog("XFire Gamedetectionthread started ...",""); + //XFireLog("XFire Gamedetectionthread started...",""); while(1) { //Sleep(12000); - //XFireLog("12 Sek warten ...",""); + //XFireLog("12 Sek warten...",""); if(mySleep(12000,hGameDetection)) { #ifndef NO_PTHREAD @@ -2268,7 +2268,7 @@ void gamedetectiont(LPVOID lparam) if(myClient!=NULL) if(!myClient->client->connected) { - //XFireLog("PID und TSPID resett ...",""); + //XFireLog("PID und TSPID resett...",""); ts2pid=pid=0; //voicechat internen status zurücksetzen voicechat.resetCurrentvoicestatus(); @@ -2277,14 +2277,14 @@ void gamedetectiont(LPVOID lparam) else*/ { //erstmal nach TS2 suchen - //XFireLog("Teamspeak detection ...",""); + //XFireLog("Teamspeak detection...",""); if(db_get_b(NULL,protocolname,"ts2detection",0)) { SendGameStatus2Packet *packet = new SendGameStatus2Packet(); if(voicechat.checkVoicechat(packet)) { if(myClient!=NULL) { - XFireLog("Send voicechat infos ..."); + XFireLog("Send voicechat infos..."); myClient->client->send( packet ); } } @@ -2402,7 +2402,7 @@ void gamedetectiont(LPVOID lparam) if(currentgame!=NULL) { - //XFireLog("XFire Gamedetection - Game still running ...",""); + //XFireLog("XFire Gamedetection - Game still running...",""); //prüf ob das spiel noch offen ec=0; @@ -2484,7 +2484,7 @@ void gamedetectiont(LPVOID lparam) } else //noch offen { - //XFireLog("Spiel noch offen ...",""); + //XFireLog("Spiel noch offen...",""); //nur nwspiele nach ip/port scannen if(db_get_b(NULL,protocolname,"ipportdetec",0)) if(currentgame->networkparams!=NULL&¤tgame->send_gameid>0) @@ -2492,7 +2492,7 @@ void gamedetectiont(LPVOID lparam) SendGameStatusPacket *packet = new SendGameStatusPacket(); //verscueh serverip und port zu scannen - XFireLog("IPPort detection ...",""); + XFireLog("IPPort detection...",""); if(GetServerIPPort(pid,myClient->client->localaddr,myClient->client->llocaladdr,&packet->ip[3],&packet->ip[2],&packet->ip[1],&packet->ip[0],&packet->port)) { @@ -2519,7 +2519,7 @@ void gamedetectiont(LPVOID lparam) } delete packet; } - //XFireLog("fertig ...",""); + //XFireLog("fertig...",""); //packet->=xf[currentgame].gameid2; } @@ -2527,13 +2527,13 @@ void gamedetectiont(LPVOID lparam) } else { - //XFireLog("nach spiel suchen ...",""); + //XFireLog("nach spiel suchen...",""); //hardcoded game detection HANDLE hSnapShot = CreateToolhelp32Snapshot ( TH32CS_SNAPALL, 0); PROCESSENTRY32* processInfo = new PROCESSENTRY32; processInfo->dwSize = sizeof ( PROCESSENTRY32); - XFireLog("XFire Gamedetection - Suche laufende Spiele ..."); + XFireLog("XFire Gamedetection - Suche laufende Spiele..."); //gamelist blocken xgamelist.Block(TRUE); diff --git a/protocols/Xfire/src/packetreader.cpp b/protocols/Xfire/src/packetreader.cpp index d06c480a6e..54ad9d1e23 100644 --- a/protocols/Xfire/src/packetreader.cpp +++ b/protocols/Xfire/src/packetreader.cpp @@ -122,12 +122,12 @@ namespace xfirelib { void PacketReader::run() { // start receiving on socket... - XDEBUG(("Starting run() method .... \n")); + XDEBUG(("Starting run() method... \n")); while(socket != NULL) { string str; //int b = socket->recv(str); XFirePacket *packet = new XFirePacket(this); - XDEBUG(("Waiting for next packet ... \n")); + XDEBUG(("Waiting for next packet... \n")); if(packet==NULL) continue; packet->recvPacket( socket ); XINFO(("Received packet\n")); diff --git a/protocols/Xfire/src/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp index 4ef543cf08..6a5289511b 100644 --- a/protocols/Xfire/src/searching4games.cpp +++ b/protocols/Xfire/src/searching4games.cpp @@ -263,7 +263,7 @@ void Scan4Games( LPVOID lparam ) //letztes ergeniss sichern last_gpps=gpps; - //las ma mal suchen .... + //las ma mal suchen... gpps=xfire_GetPrivateProfileString(temp, "LongName", "", gamename, 255, inipath); char entrytype[100]=""; @@ -711,7 +711,7 @@ void Scan4Games( LPVOID lparam ) } } - if(hwnd)SetDlgItemTextA(hwnd,IDC_CURRENTGAME,Translate("Write to database ...")); + if(hwnd)SetDlgItemTextA(hwnd,IDC_CURRENTGAME,Translate("Write to database...")); //gefundene games in db eintragen xgamelist.writeDatabase(); diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 74e1a68780..80dde35cc5 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -264,7 +264,7 @@ BOOL FindTeamSpeak(DWORD*pid,int*vid) { PROCESSENTRY32* processInfo = new PROCESSENTRY32; processInfo->dwSize = sizeof ( PROCESSENTRY32); -// XFireLog("Scanning for voiceprograms ..."); +// XFireLog("Scanning for voiceprograms..."); while ( Process32Next ( hSnapShot,processInfo ) != FALSE) diff --git a/protocols/Xfire/src/xfirepacket.cpp b/protocols/Xfire/src/xfirepacket.cpp index 955881863f..09632137da 100644 --- a/protocols/Xfire/src/xfirepacket.cpp +++ b/protocols/Xfire/src/xfirepacket.cpp @@ -65,7 +65,7 @@ namespace xfirelib { XERROR2("Returned less than 5 ?!: %d\n",r); throw SocketException("Connection Closed ?"); } - XDEBUG2("Read %d bytes ...\n", r ); + XDEBUG2("Read %d bytes...\n", r ); unsigned int len = ((unsigned char)buf[0]) + (((unsigned char)buf[1]) * 256); int packetid = buf[2]; -- cgit v1.2.3