diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-16 18:08:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-16 18:08:37 +0000 |
| commit | 253783569bef2320d04fe1d310709c64c64fd3a1 (patch) | |
| tree | 55181ccfc8d93cd78aa8ded73bc7ab289e6ec8b9 /protocols/IcqOscarJ/src/utilities.cpp | |
| parent | b3783bb50a312fa59d302aeede929377c18a6ec1 (diff) | |
- custom list of time zones removed;
- adaptation of ICQ for new Time API;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@8140 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ/src/utilities.cpp')
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 521a64f4fe..29e88eb9e2 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -122,47 +122,47 @@ WORD MirandaStatusToIcq(int nMirandaStatus) WORD nIcqStatus;
switch (nMirandaStatus) {
-case ID_STATUS_ONLINE:
- nIcqStatus = ICQ_STATUS_ONLINE;
- break;
-
-case ID_STATUS_AWAY:
- nIcqStatus = ICQ_STATUS_AWAY;
- break;
-
-case ID_STATUS_OUTTOLUNCH:
-case ID_STATUS_NA:
- nIcqStatus = ICQ_STATUS_NA;
- break;
-
-case ID_STATUS_ONTHEPHONE:
-case ID_STATUS_OCCUPIED:
- nIcqStatus = ICQ_STATUS_OCCUPIED;
- break;
-
-case ID_STATUS_DND:
- nIcqStatus = ICQ_STATUS_DND;
- break;
-
-case ID_STATUS_INVISIBLE:
- nIcqStatus = ICQ_STATUS_INVISIBLE;
- break;
-
-case ID_STATUS_FREECHAT:
- nIcqStatus = ICQ_STATUS_FFC;
- break;
-
-case ID_STATUS_OFFLINE:
- // Oscar doesnt have anything that maps to this status. This should never happen.
- _ASSERTE(nMirandaStatus != ID_STATUS_OFFLINE);
- nIcqStatus = 0;
- break;
-
-default:
- // Online seems to be a good default.
- // Since it cant be offline, it must be a new type of online status.
- nIcqStatus = ICQ_STATUS_ONLINE;
- break;
+ case ID_STATUS_ONLINE:
+ nIcqStatus = ICQ_STATUS_ONLINE;
+ break;
+
+ case ID_STATUS_AWAY:
+ nIcqStatus = ICQ_STATUS_AWAY;
+ break;
+
+ case ID_STATUS_OUTTOLUNCH:
+ case ID_STATUS_NA:
+ nIcqStatus = ICQ_STATUS_NA;
+ break;
+
+ case ID_STATUS_ONTHEPHONE:
+ case ID_STATUS_OCCUPIED:
+ nIcqStatus = ICQ_STATUS_OCCUPIED;
+ break;
+
+ case ID_STATUS_DND:
+ nIcqStatus = ICQ_STATUS_DND;
+ break;
+
+ case ID_STATUS_INVISIBLE:
+ nIcqStatus = ICQ_STATUS_INVISIBLE;
+ break;
+
+ case ID_STATUS_FREECHAT:
+ nIcqStatus = ICQ_STATUS_FFC;
+ break;
+
+ case ID_STATUS_OFFLINE:
+ // Oscar doesnt have anything that maps to this status. This should never happen.
+ _ASSERTE(nMirandaStatus != ID_STATUS_OFFLINE);
+ nIcqStatus = 0;
+ break;
+
+ default:
+ // Online seems to be a good default.
+ // Since it cant be offline, it must be a new type of online status.
+ nIcqStatus = ICQ_STATUS_ONLINE;
+ break;
}
return nIcqStatus;
@@ -175,36 +175,36 @@ int MirandaStatusToSupported(int nMirandaStatus) switch (nMirandaStatus) {
// These status mode does not need any mapping
-case ID_STATUS_ONLINE:
-case ID_STATUS_AWAY:
-case ID_STATUS_NA:
-case ID_STATUS_OCCUPIED:
-case ID_STATUS_DND:
-case ID_STATUS_INVISIBLE:
-case ID_STATUS_OFFLINE:
- nSupportedStatus = nMirandaStatus;
- break;
-
-case ID_STATUS_FREECHAT:
- nSupportedStatus = ID_STATUS_ONLINE;
- break;
-
- // This mode is not support and must be mapped to something else
-case ID_STATUS_OUTTOLUNCH:
- nSupportedStatus = ID_STATUS_NA;
- break;
-
- // This mode is not support and must be mapped to something else
-case ID_STATUS_ONTHEPHONE:
- nSupportedStatus = ID_STATUS_OCCUPIED;
- break;
-
- // This is not supposed to happen.
-default:
- _ASSERTE(0);
- // Online seems to be a good default.
- nSupportedStatus = ID_STATUS_ONLINE;
- break;
+ case ID_STATUS_ONLINE:
+ case ID_STATUS_AWAY:
+ case ID_STATUS_NA:
+ case ID_STATUS_OCCUPIED:
+ case ID_STATUS_DND:
+ case ID_STATUS_INVISIBLE:
+ case ID_STATUS_OFFLINE:
+ nSupportedStatus = nMirandaStatus;
+ break;
+
+ case ID_STATUS_FREECHAT:
+ nSupportedStatus = ID_STATUS_ONLINE;
+ break;
+
+ // This mode is not support and must be mapped to something else
+ case ID_STATUS_OUTTOLUNCH:
+ nSupportedStatus = ID_STATUS_NA;
+ break;
+
+ // This mode is not support and must be mapped to something else
+ case ID_STATUS_ONTHEPHONE:
+ nSupportedStatus = ID_STATUS_OCCUPIED;
+ break;
+
+ // This is not supposed to happen.
+ default:
+ _ASSERTE(0);
+ // Online seems to be a good default.
+ nSupportedStatus = ID_STATUS_ONLINE;
+ break;
}
return nSupportedStatus;
@@ -212,7 +212,7 @@ default: char* MirandaStatusToStringUtf(int mirandaStatus)
{ // return miranda status description in utf-8, use unicode service is possible
- return tchar_to_utf8( pcli->pfnGetStatusModeDescription(mirandaStatus, 0));
+ return tchar_to_utf8(pcli->pfnGetStatusModeDescription(mirandaStatus, 0));
}
char** CIcqProto::MirandaStatusToAwayMsg(int nStatus)
|