From 30ab6ceb71842f003f649b3d62b89af010cf40d1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Jun 2012 17:00:14 +0000 Subject: - direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call; - obsolete structure SKINSOUNDDESC removed - dynamically translated hot keys; - checked correct LPGEN'ing of the sounds creation; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@500 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/chat.cpp | 10 +++++----- protocols/Twitter/connection.cpp | 18 +++++++++--------- protocols/Twitter/contacts.cpp | 16 ++++++++-------- protocols/Twitter/http.cpp | 2 +- protocols/Twitter/main.cpp | 4 ++-- protocols/Twitter/proto.cpp | 10 +++++----- protocols/Twitter/theme.cpp | 2 +- protocols/Twitter/twitter.cpp | 18 +++++++++--------- protocols/Twitter/twitter.h | 2 +- protocols/Twitter/ui.cpp | 24 ++++++++++++------------ protocols/Twitter/utility.cpp | 4 ++-- 11 files changed, 55 insertions(+), 55 deletions(-) (limited to 'protocols/Twitter') diff --git a/protocols/Twitter/chat.cpp b/protocols/Twitter/chat.cpp index d00261b41d..f430bdf5d0 100644 --- a/protocols/Twitter/chat.cpp +++ b/protocols/Twitter/chat.cpp @@ -44,7 +44,7 @@ void TwitterProto::UpdateChat(const twitter_user &update) DBVARIANT nick; HANDLE hContact = UsernameToHContact(update.username.c_str()); - if(hContact && !DBGetContactSettingString(hContact,"CList","MyHandle",&nick) ) + if(hContact && !DBGetContactSettingString(hContact,"CList","MyHandle",&nick)) { gce.ptszNick = mir_a2t(nick.pszVal); DBFreeVariant(&nick); @@ -88,7 +88,7 @@ int TwitterProto::OnChatOutgoing(WPARAM wParam,LPARAM lParam) case GC_USER_PRIVMESS: text = mir_t2a(hook->ptszUID); CallService(MS_MSG_SENDMESSAGE,reinterpret_cast( - UsernameToHContact(text) ),0); + UsernameToHContact(text)),0); mir_free(text); break; } @@ -205,16 +205,16 @@ void TwitterProto::SetChatStatus(int status) // Add all friends to contact list for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0) ) + hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) { if(!IsMyContact(hContact)) continue; DBVARIANT uid,nick; - if( DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&uid) ) + if( DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&uid)) continue; - if( !DBGetContactSettingString(hContact,"CList","MyHandle",&nick) ) + if( !DBGetContactSettingString(hContact,"CList","MyHandle",&nick)) AddChatContact(uid.pszVal,nick.pszVal); else AddChatContact(uid.pszVal); diff --git a/protocols/Twitter/connection.cpp b/protocols/Twitter/connection.cpp index 02d2244081..3a91be3243 100644 --- a/protocols/Twitter/connection.cpp +++ b/protocols/Twitter/connection.cpp @@ -135,7 +135,7 @@ bool TwitterProto::NegotiateConnection() } - if((oauthToken.size() <= 1) || (oauthTokenSecret.size() <= 1) ) { + if((oauthToken.size() <= 1) || (oauthTokenSecret.size() <= 1)) { // first, reset all the keys so we can start fresh resetOAuthKeys(); LOG( _T("**NegotiateConnection - Reset OAuth Keys")); @@ -294,7 +294,7 @@ bool TwitterProto::NegotiateConnection() } } -/* if( !DBGetContactSettingString(0,m_szModuleName,TWITTER_KEY_PASS,&dbv) ) { +/* if( !DBGetContactSettingString(0,m_szModuleName,TWITTER_KEY_PASS,&dbv)) { CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1, reinterpret_cast(dbv.pszVal)); pass = dbv.pszVal; @@ -305,7 +305,7 @@ bool TwitterProto::NegotiateConnection() return false; }*/ - if( !DBGetContactSettingString(0,m_szModuleName,TWITTER_KEY_BASEURL,&dbv) ) + if( !DBGetContactSettingString(0,m_szModuleName,TWITTER_KEY_BASEURL,&dbv)) { ScopedLock s(twitter_lock_); twit_.set_base_url(dbv.pszVal); @@ -423,7 +423,7 @@ void TwitterProto::UpdateAvatarWorker(void *p) { if(p == 0) return; - std::auto_ptr data( static_cast(p) ); + std::auto_ptr data( static_cast(p)); DBVARIANT dbv; if(DBGetContactSettingTString(data->hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) @@ -472,7 +472,7 @@ void TwitterProto::UpdateAvatar(HANDLE hContact,const std::string &url,bool forc if( !force && ( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_AV_URL,&dbv) && - url == dbv.pszVal) ) + url == dbv.pszVal)) { LOG( _T("***** Avatar already up-to-date: %s"), url.c_str()); } @@ -527,7 +527,7 @@ void TwitterProto::UpdateFriends() catch(const std::exception &e) { ShowPopup( (std::string("While updating friends list, an error occurred: ") - +e.what()).c_str() ); + +e.what()).c_str()); LOG( _T("***** Error updating friends list: %s"), e.what()); } @@ -554,7 +554,7 @@ void TwitterProto::ShowContactPopup(HANDLE hContact,const std::string &text) DBVARIANT dbv; if( !DBGetContactSettingString(hContact,"CList","MyHandle",&dbv) || - !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { mbcs_to_tcs(CP_UTF8,dbv.pszVal,popup.lptzContactName,MAX_CONTACTNAME); DBFreeVariant(&dbv); @@ -623,7 +623,7 @@ void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg) catch(const std::exception &e) { ShowPopup( (std::string("While updating status messages, an error occurred: ") - +e.what()).c_str() ); + +e.what()).c_str()); LOG( _T("***** Error updating status messages: %s"), e.what()); } } @@ -675,7 +675,7 @@ void TwitterProto::UpdateMessages(bool pre_read) catch(const std::exception &e) { ShowPopup( (std::string("While updating direct messages, an error occurred: ") - +e.what()).c_str() ); + +e.what()).c_str()); LOG( _T("***** Error updating direct messages: %s"), e.what()); } } diff --git a/protocols/Twitter/contacts.cpp b/protocols/Twitter/contacts.cpp index a2245c021a..ec75795694 100644 --- a/protocols/Twitter/contacts.cpp +++ b/protocols/Twitter/contacts.cpp @@ -61,7 +61,7 @@ void TwitterProto::UpdateInfoWorker(void *hContact) std::string username; DBVARIANT dbv; - if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { username = dbv.pszVal; DBFreeVariant(&dbv); @@ -129,7 +129,7 @@ void TwitterProto::DoSearch(void *p) catch(const std::exception &e) { ShowPopup( (std::string("While searching for contacts, an error occurred: ") - +e.what()).c_str() ); + +e.what()).c_str()); LOG( _T("***** Error searching for contacts: %s"), e.what()); } @@ -195,7 +195,7 @@ int TwitterProto::OnContactDeleted(WPARAM wParam,LPARAM lParam) return 0; DBVARIANT dbv; - if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { if(in_chat_) DeleteChatContact(dbv.pszVal); @@ -212,7 +212,7 @@ int TwitterProto::OnContactDeleted(WPARAM wParam,LPARAM lParam) bool TwitterProto::IsMyContact(HANDLE hContact,bool include_chat) { const char *proto = reinterpret_cast( CallService(MS_PROTO_GETCONTACTBASEPROTO, - reinterpret_cast(hContact),0) ); + reinterpret_cast(hContact),0)); if(proto && strcmp(m_szModuleName,proto) == 0) { @@ -229,13 +229,13 @@ HANDLE TwitterProto::UsernameToHContact(const char *name) { for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0) ) + hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) { if(!IsMyContact(hContact)) continue; DBVARIANT dbv; - if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { if(strcmp(name,dbv.pszVal) == 0) { @@ -274,7 +274,7 @@ HANDLE TwitterProto::AddToClientList(const char *name,const char *status) DBWriteContactSettingString (hContact,m_szModuleName,"Homepage",url.c_str()); DBVARIANT dbv; - if( !DBGetContactSettingTString(NULL,m_szModuleName,TWITTER_KEY_GROUP,&dbv) ) + if( !DBGetContactSettingTString(NULL,m_szModuleName,TWITTER_KEY_GROUP,&dbv)) { DBWriteContactSettingTString(hContact,"CList","Group",dbv.ptszVal); DBFreeVariant(&dbv); @@ -294,7 +294,7 @@ void TwitterProto::SetAllContactStatuses(int status) { for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0) ) + hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) { if(!IsMyContact(hContact)) continue; diff --git a/protocols/Twitter/http.cpp b/protocols/Twitter/http.cpp index ef295f4ab0..877399cc11 100644 --- a/protocols/Twitter/http.cpp +++ b/protocols/Twitter/http.cpp @@ -24,7 +24,7 @@ along with this program. If not, see . std::string http::url_encode(const std::string &s) { char *encoded = reinterpret_cast(CallService( MS_NETLIB_URLENCODE, - 0,reinterpret_cast(s.c_str()) )); + 0,reinterpret_cast(s.c_str()))); std::string ret = encoded; HeapFree(GetProcessHeap(),0,encoded); diff --git a/protocols/Twitter/main.cpp b/protocols/Twitter/main.cpp index 1aeac73b83..2c3c663156 100644 --- a/protocols/Twitter/main.cpp +++ b/protocols/Twitter/main.cpp @@ -109,7 +109,7 @@ int OnModulesLoaded(WPARAM,LPARAM) upd.cpbBetaVersionPrefix = (int)strlen(reinterpret_cast(upd.pbBetaVersionPrefix)); upd.szBetaUpdateURL = "http://twosx.net/mim/twitter/updater/twitter.zip"; - upd.pbVersion = reinterpret_cast( CreateVersionStringPluginEx(&pluginInfo,curr_version) ); + upd.pbVersion = reinterpret_cast( CreateVersionStringPluginEx(&pluginInfo,curr_version)); upd.cpbVersion = (int)strlen(reinterpret_cast(upd.pbVersion)); CallService(MS_UPDATE_REGISTER,0,(LPARAM)&upd); } @@ -129,7 +129,7 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) mir_getLP(&pluginInfo); pcli = reinterpret_cast( CallService( - MS_CLIST_RETRIEVE_INTERFACE,0,reinterpret_cast(g_hInstance)) ); + MS_CLIST_RETRIEVE_INTERFACE,0,reinterpret_cast(g_hInstance))); PROTOCOLDESCRIPTOR pd = {sizeof(pd)}; pd.szName = "Twitter"; diff --git a/protocols/Twitter/proto.cpp b/protocols/Twitter/proto.cpp index 60f802d77c..d81fe8163c 100644 --- a/protocols/Twitter/proto.cpp +++ b/protocols/Twitter/proto.cpp @@ -167,7 +167,7 @@ void TwitterProto::SendSuccess(void *p) send_direct *data = static_cast(p); DBVARIANT dbv; - if( !DBGetContactSettingString(data->hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(data->hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { ScopedLock s(twitter_lock_); twit_.send_direct(dbv.pszVal,data->msg); @@ -283,7 +283,7 @@ int TwitterProto::ReplyToTweet(WPARAM wParam,LPARAM lParam) (HWND)0,tweet_proc,reinterpret_cast(this)); DBVARIANT dbv; - if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { SendMessage(hDlg,WM_SETREPLY,reinterpret_cast(dbv.pszVal),0); DBFreeVariant(&dbv); @@ -299,7 +299,7 @@ int TwitterProto::VisitHomepage(WPARAM wParam,LPARAM lParam) HANDLE hContact = reinterpret_cast(wParam); DBVARIANT dbv; - if( !DBGetContactSettingString(hContact,m_szModuleName,"Homepage",&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,"Homepage",&dbv)) { CallService(MS_UTILS_OPENURL,1,reinterpret_cast(dbv.pszVal)); DBFreeVariant(&dbv); @@ -307,7 +307,7 @@ int TwitterProto::VisitHomepage(WPARAM wParam,LPARAM lParam) else { // TODO: remove this - if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(hContact,m_szModuleName,TWITTER_KEY_UN,&dbv)) { std::string url = profile_base_url(twit_.get_base_url())+ http::url_encode(dbv.pszVal); @@ -560,7 +560,7 @@ void TwitterProto::UpdateSettings() for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0); hContact; - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0) ) + hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0)) { if(!IsMyContact(hContact,true)) continue; diff --git a/protocols/Twitter/theme.cpp b/protocols/Twitter/theme.cpp index d6f0be38bb..f17e7d700a 100644 --- a/protocols/Twitter/theme.cpp +++ b/protocols/Twitter/theme.cpp @@ -104,7 +104,7 @@ static HANDLE g_hMenuEvts[3]; static TwitterProto * GetInstanceByHContact(HANDLE hContact) { char *proto = reinterpret_cast( CallService(MS_PROTO_GETCONTACTBASEPROTO, - reinterpret_cast(hContact),0) ); + reinterpret_cast(hContact),0)); if(!proto) return 0; diff --git a/protocols/Twitter/twitter.cpp b/protocols/Twitter/twitter.cpp index ff260f9fbd..b9a6c7242b 100644 --- a/protocols/Twitter/twitter.cpp +++ b/protocols/Twitter/twitter.cpp @@ -65,14 +65,14 @@ static T retrieve(const js::object &o,const std::string &key,bool allow_null = f js::object::const_iterator i = o.find(key); if(i == o.end()) - throw std::exception( ("unable to retrieve key '"+key+"'").c_str() ); + throw std::exception( ("unable to retrieve key '"+key+"'").c_str()); try { return cast_and_decode(*i->second,allow_null); } catch(const boost::bad_any_cast &) { - throw std::exception( ("unable to cast key '"+key+"' to target type").c_str() ); + throw std::exception( ("unable to cast key '"+key+"' to target type").c_str()); } } @@ -128,7 +128,7 @@ std::vector twitter::get_friends() if(resp.code != 200) throw bad_response(); - const js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + const js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() != typeid(js::array)) throw std::exception("unable to parse response"); @@ -173,7 +173,7 @@ bool twitter::get_info(const std::string &name,twitter_user *info) if(resp.code != 200) throw bad_response(); - const js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + const js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() == typeid(js::object)) { const js::object &user_info = boost::any_cast(*var); @@ -201,7 +201,7 @@ bool twitter::get_info_by_email(const std::string &email,twitter_user *info) if(resp.code != 200) throw bad_response(); - js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() == typeid(js::object)) { const js::object &user_info = boost::any_cast(*var); @@ -227,7 +227,7 @@ twitter_user twitter::add_friend(const std::string &name) if(resp.code != 200) throw bad_response(); - js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() != typeid(js::object)) throw std::exception("unable to parse response"); @@ -293,7 +293,7 @@ std::vector twitter::get_statuses(int count,twitter_id id) if(resp.code != 200) throw bad_response(); - js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() != typeid(js::array)) throw std::exception("unable to parse response"); @@ -347,7 +347,7 @@ std::vector twitter::get_direct(twitter_id id) if(resp.code != 200) throw bad_response(); - js::variant var = json::parse( resp.data.begin(),resp.data.end() ); + js::variant var = json::parse( resp.data.begin(),resp.data.end()); if(var->type() != typeid(js::array)) throw std::exception("unable to parse response"); @@ -392,7 +392,7 @@ string twitter::urlencode(const string &c) else { escaped.append("%"); - escaped.append( char2hex(c[i]) );//converts char 255 to string "FF" + escaped.append( char2hex(c[i]));//converts char 255 to string "FF" } } return escaped; diff --git a/protocols/Twitter/twitter.h b/protocols/Twitter/twitter.h index 54baa768f7..10c1115967 100644 --- a/protocols/Twitter/twitter.h +++ b/protocols/Twitter/twitter.h @@ -101,7 +101,7 @@ public: protected: virtual http::response slurp(const std::string &,http::method, - OAuthParameters postParams = OAuthParameters() ) = 0; + OAuthParameters postParams = OAuthParameters()) = 0; std::string username_; std::string password_; diff --git a/protocols/Twitter/ui.cpp b/protocols/Twitter/ui.cpp index 872d5feb1e..149c0b2780 100644 --- a/protocols/Twitter/ui.cpp +++ b/protocols/Twitter/ui.cpp @@ -42,7 +42,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPa DBVARIANT dbv; - if( !DBGetContactSettingTString(0,proto->ModuleName(),TWITTER_KEY_GROUP,&dbv) ) + if( !DBGetContactSettingTString(0,proto->ModuleName(),TWITTER_KEY_GROUP,&dbv)) { SetDlgItemText(hwndDlg,IDC_GROUP,dbv.ptszVal); DBFreeVariant(&dbv); @@ -52,13 +52,13 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPa SetDlgItemText(hwndDlg,IDC_GROUP,L"Twitter"); } - if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_UN,&dbv)) { SetDlgItemTextA(hwndDlg,IDC_USERNAME,dbv.pszVal); DBFreeVariant(&dbv); } - /*if ( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_PASS,&dbv) ) + /*if ( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_PASS,&dbv)) { CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1, reinterpret_cast(dbv.pszVal)); @@ -71,7 +71,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPa SendDlgItemMessage(hwndDlg,IDC_SERVER,CB_ADDSTRING,0, reinterpret_cast(sites[i])); } - if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_BASEURL,&dbv) ) + if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_BASEURL,&dbv)) { SetDlgItemTextA(hwndDlg,IDC_SERVER,dbv.pszVal); DBFreeVariant(&dbv); @@ -86,7 +86,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPa if(LOWORD(wParam) == IDC_NEWACCOUNTLINK) { CallService(MS_UTILS_OPENURL,1,reinterpret_cast - ("http://twitter.com/signup") ); + ("http://twitter.com/signup")); return true; } @@ -218,13 +218,13 @@ INT_PTR CALLBACK options_proc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) proto = reinterpret_cast(lParam); DBVARIANT dbv; - if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_UN,&dbv) ) + if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_UN,&dbv)) { SetDlgItemTextA(hwndDlg,IDC_UN,dbv.pszVal); DBFreeVariant(&dbv); } - /*if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_PASS,&dbv) ) + /*if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_PASS,&dbv)) { CallService(MS_DB_CRYPT_DECODESTRING,strlen(dbv.pszVal)+1, reinterpret_cast(dbv.pszVal)); @@ -241,7 +241,7 @@ INT_PTR CALLBACK options_proc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) reinterpret_cast(sites[i])); } - if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_BASEURL,&dbv) ) + if( !DBGetContactSettingString(0,proto->ModuleName(),TWITTER_KEY_BASEURL,&dbv)) { SetDlgItemTextA(hwndDlg,IDC_BASEURL,dbv.pszVal); DBFreeVariant(&dbv); @@ -253,7 +253,7 @@ INT_PTR CALLBACK options_proc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) char pollrate_str[32]; mir_snprintf(pollrate_str,sizeof(pollrate_str),"%d", - DBGetContactSettingDword(0,proto->ModuleName(),TWITTER_KEY_POLLRATE,80) ); + DBGetContactSettingDword(0,proto->ModuleName(),TWITTER_KEY_POLLRATE,80)); SetDlgItemTextA(hwndDlg,IDC_POLLRATE,pollrate_str); CheckDlgButton(hwndDlg,IDC_TWEET_MSG,DBGetContactSettingByte(0, @@ -440,9 +440,9 @@ INT_PTR CALLBACK popup_options_proc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l proto = reinterpret_cast(lParam); CheckAndUpdateDlgButton(hwndDlg,IDC_SHOWPOPUPS, - db_byte_get(0,proto->ModuleName(),TWITTER_KEY_POPUP_SHOW,0) ); + db_byte_get(0,proto->ModuleName(),TWITTER_KEY_POPUP_SHOW,0)); CheckDlgButton(hwndDlg,IDC_NOSIGNONPOPUPS, - !db_byte_get(0,proto->ModuleName(),TWITTER_KEY_POPUP_SIGNON,0) ); + !db_byte_get(0,proto->ModuleName(),TWITTER_KEY_POPUP_SIGNON,0)); // ***** Get color information @@ -491,7 +491,7 @@ INT_PTR CALLBACK popup_options_proc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM l { case IDC_SHOWPOPUPS: EnableWindow(GetDlgItem(hwndDlg,IDC_NOSIGNONPOPUPS), - IsDlgButtonChecked(hwndDlg,IDC_SHOWPOPUPS) ); + IsDlgButtonChecked(hwndDlg,IDC_SHOWPOPUPS)); break; case IDC_COL_CUSTOM: diff --git a/protocols/Twitter/utility.cpp b/protocols/Twitter/utility.cpp index 3b98944bba..090bfebf09 100644 --- a/protocols/Twitter/utility.cpp +++ b/protocols/Twitter/utility.cpp @@ -132,7 +132,7 @@ http::response mir_twitter::slurp(const std::string &url,http::method meth, http::response resp_data; LOG("**SLURP - just before calling HTTPTRANSACTION"); resp = reinterpret_cast(CallService( MS_NETLIB_HTTPTRANSACTION, - reinterpret_cast(handle_), reinterpret_cast(&req) )); + reinterpret_cast(handle_), reinterpret_cast(&req))); LOG("**SLURP - HTTPTRANSACTION complete."); if(resp) { @@ -182,7 +182,7 @@ bool save_url(HANDLE hNetlib,const std::string &url,const std::tstring &filename req.szUrl = const_cast(url.c_str()); resp = reinterpret_cast(CallService( MS_NETLIB_HTTPTRANSACTION, - reinterpret_cast(hNetlib), reinterpret_cast(&req) )); + reinterpret_cast(hNetlib), reinterpret_cast(&req))); if (resp) { -- cgit v1.2.3