adium/adium

56f9652ebff0
Parents f180ef3eb520
Children 47db4a69f78e
Remove breaks after returns in switch statements.
--- a/Frameworks/AIUtilities Framework/Source/AISystemNetworkDefaults.m Fri May 24 00:13:49 2013 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AISystemNetworkDefaults.m Sun Jun 02 11:34:28 2013 -0400
@@ -76,7 +76,6 @@
}
default: {
return nil;
- break;
}
}
--- a/Frameworks/Adium Framework/Source/AIStatusIcons.m Fri May 24 00:13:49 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIStatusIcons.m Sun Jun 02 11:34:28 2013 -0400
@@ -80,19 +80,14 @@
switch (statusType) {
case AIAvailableStatusType:
return STATUS_NAME_AVAILABLE;
- break;
case AIAwayStatusType:
return STATUS_NAME_AWAY;
- break;
case AIInvisibleStatusType:
return STATUS_NAME_INVISIBLE;
- break;
case AIOfflineStatusType:
return STATUS_NAME_OFFLINE;
- break;
default:
return STATUS_NAME_OFFLINE;
- break;
}
}
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -194,22 +194,16 @@
{
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
case 1:
return AILocalizedString(@"Screen name sent",nil);
- break;
case 2:
return AILocalizedString(@"Password sent",nil);
- break;
case 3:
return AILocalizedString(@"Received authorization",nil);
- break;
case 4:
return AILocalizedString(@"Connection established",nil);
- break;
case 5:
return AILocalizedString(@"Finalizing connection",nil);
- break;
}
return nil;
--- a/Plugins/Purple Service/ESIRCAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESIRCAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -562,19 +562,15 @@
switch (req) {
case AIRequiresHalfop:
return (anySelected && ((flags & AIGroupChatOp) == AIGroupChatOp || (flags & AIGroupChatHalfOp) == AIGroupChatHalfOp));
- break;
case AIRequiresOp:
return (anySelected && ((flags & AIGroupChatOp) == AIGroupChatOp));
- break;
case AIRequiresNoLevel:
return anySelected;
- break;
default:
return YES;
- break;
}
}
--- a/Plugins/Purple Service/ESPurpleGaduGaduAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleGaduGaduAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -35,22 +35,16 @@
{
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
case 1:
return AILocalizedString(@"Looking up server",nil);
- break;
case 2:
return AILocalizedString(@"Reading data","Connection step");
- break;
case 3:
return AILocalizedString(@"Balancer handshake","Connection step");
- break;
case 4:
return AILocalizedString(@"Reading server key","Connection step");
- break;
case 5:
return AILocalizedString(@"Exchanging key hash","Connection step");
- break;
}
return nil;
}
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -427,22 +427,16 @@
switch (step) {
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
case 1:
return AILocalizedString(@"Initializing Stream",nil);
- break;
case 2:
return AILocalizedString(@"Reading data",nil);
- break;
case 3:
return AILocalizedString(@"Authenticating",nil);
- break;
case 5:
return AILocalizedString(@"Initializing Stream",nil);
- break;
case 6:
return AILocalizedString(@"Authenticating",nil);
- break;
}
return nil;
}
--- a/Plugins/Purple Service/ESPurpleMSNAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -146,31 +146,22 @@
{
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
case 1:
return AILocalizedString(@"Handshaking",nil);
- break;
case 2:
return AILocalizedString(@"Transferring",nil);
- break;
case 3:
return AILocalizedString(@"Handshaking",nil);
- break;
case 4:
return AILocalizedString(@"Starting authentication",nil);
- break;
case 5:
return AILocalizedString(@"Getting Cookie",nil);
- break;
case 6:
return AILocalizedString(@"Authenticating",nil);
- break;
case 7:
return AILocalizedString(@"Sending Cookie",nil);
- break;
case 8:
return AILocalizedString(@"Retrieving buddy list",nil);
- break;
}
return nil;
}
--- a/Plugins/Purple Service/ESPurpleMeanwhileAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleMeanwhileAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -102,34 +102,24 @@
{
case 1:
return AILocalizedString(@"Connecting",nil);
- break;
case 2:
return AILocalizedString(@"Sending Handshake",nil);
- break;
case 3:
return AILocalizedString(@"Waiting for Handshake Acknowledgement",nil);
- break;
case 4:
return AILocalizedString(@"Handshake Acknowledged; Sending Login",nil);
- break;
case 5:
return AILocalizedString(@"Waiting for Login Acknowledgement",nil);
- break;
case 6:
return AILocalizedString(@"Login Redirected",nil);
- break;
case 7:
return AILocalizedString(@"Forcing Login",nil);
- break;
case 8:
return AILocalizedString(@"Login Acknowledged",nil);
- break;
case 9:
return AILocalizedString(@"Starting Services",nil);
- break;
case 10:
return AILocalizedString(@"Connected",nil);
- break;
}
return nil;
--- a/Plugins/Purple Service/ESPurpleNovellAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleNovellAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -34,13 +34,10 @@
{
case 1:
return AILocalizedString(@"Connecting",nil);
- break;
case 2:
return AILocalizedString(@"Authenticating",nil);
- break;
case 3:
return AILocalizedString(@"Waiting for Response",nil);
- break;
}
return nil;
--- a/Plugins/Purple Service/ESPurpleYahooAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/ESPurpleYahooAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -112,7 +112,6 @@
{
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
}
return nil;
}
--- a/Plugins/Purple Service/PurpleMySpaceAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/PurpleMySpaceAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -29,16 +29,12 @@
switch (step) {
case 0:
return AILocalizedString(@"Connecting",nil);
- break;
case 1:
return AILocalizedString(@"Reading challenge", "Description of a step in the connection process for MySpace. This could be translated as something like 'Reading from server'.");
- break;
case 2:
return AILocalizedString(@"Logging in","Connection step");
- break;
case 3:
return AILocalizedString(@"Connected","Connection step");
- break;
}
return nil;
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Sun Jun 02 11:34:28 2013 -0400
@@ -418,13 +418,10 @@
switch(purple_conversation_get_type(conv)) {
case PURPLE_CONV_TYPE_CHAT:
return groupChatLookupFromConv(conv);
- break;
case PURPLE_CONV_TYPE_IM:
return imChatLookupFromConv(conv);
- break;
default:
return existingChatLookupFromConv(conv);
- break;
}
}
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Sun Jun 02 11:34:28 2013 -0400
@@ -366,7 +366,6 @@
group:GROUP_ENCRYPTION])];
}
return YES;
- break;
}
case EncryptedChat_Never:
case EncryptedChat_Manually:
@@ -378,7 +377,6 @@
[menuItem setState:(tag == userPreference)];
}
return YES;
- break;
}
}
} else {
@@ -388,7 +386,6 @@
switch (tag) {
case AISecureMessagingMenu_Root:
return [chat supportsSecureMessagingToggling];
- break;
case AISecureMessagingMenu_Toggle:
// The menu item should indicate what will happen if it is selected.. the opposite of our secure state
@@ -408,22 +405,18 @@
}
return YES;
- break;
case AISecureMessagingMenu_ShowDetails:
case AISecureMessagingMenu_Verify:
//Only enable show details if the chat is secure
return [chat isSecure];
- break;
case AISecureMessagingMenu_Options:
//Only enable options if the chat is with a single person
return ([chat supportsSecureMessagingToggling] && chat.listObject && !chat.isGroupChat);
- break;
case AISecureMessagingMenu_ShowAbout:
return [chat supportsSecureMessagingToggling];
- break;
}
}
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Fri May 24 00:13:49 2013 +0200
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Sun Jun 02 11:34:28 2013 -0400
@@ -1270,44 +1270,36 @@
case 400:
// Bad Request: your request is invalid, and we'll return an error message that tells you why.
return AILocalizedString(@"The request is invalid.", nil);
- break;
case 401:
// Not Authorized: either you need to provide authentication credentials, or the credentials provided aren't valid.
return AILocalizedString(@"Your credentials do not allow you access.", nil);
- break;
case 403:
// Forbidden: we understand your request, but are refusing to fulfill it. An accompanying error message should explain why.
return AILocalizedString(@"Request refused by the server.", nil);
- break;
case 404:
// Not Found: either you're requesting an invalid URI or the resource in question doesn't exist (ex: no such user).
return AILocalizedString(@"Requested resource not found.", nil);
- break;
case 429:
// This is the status code returned if you've exceeded the rate limit.
return AILocalizedString(@"You've exceeded the rate limit.", nil);
- break;
case 500:
// Internal Server Error: we did something wrong. Please post to the group about it and the Twitter team will investigate.
return AILocalizedString(@"The server reported an internal error.", nil);
- break;
case 502:
// Bad Gateway: returned if Twitter is down or being upgraded.
return AILocalizedString(@"The server is currently down.", nil);
- break;
case -1001:
// Timeout
case 503:
// Service Unavailable: the Twitter servers are up, but are overloaded with requests. Try again later.
return AILocalizedString(@"The server is overloaded with requests.", nil);
- break;
}
--- a/Source/AIStatusController.m Fri May 24 00:13:49 2013 +0200
+++ b/Source/AIStatusController.m Sun Jun 02 11:34:28 2013 -0400
@@ -441,16 +441,12 @@
switch (statusType) {
case AIAvailableStatusType:
return STATUS_NAME_AVAILABLE;
- break;
case AIAwayStatusType:
return STATUS_NAME_AWAY;
- break;
case AIInvisibleStatusType:
return STATUS_NAME_INVISIBLE;
- break;
case AIOfflineStatusType:
return STATUS_NAME_OFFLINE;
- break;
}
return nil;
--- a/Source/ESStatusSort.m Fri May 24 00:13:49 2013 +0200
+++ b/Source/ESStatusSort.m Sun Jun 02 11:34:28 2013 -0400
@@ -405,19 +405,15 @@
switch (sortOrder[rowIndex]) {
case Available:
return AVAILABLE;
- break;
case Away:
return AWAY;
- break;
case Idle:
return IDLE;
- break;
case Away_And_Idle:
return AWAY_AND_IDLE;
- break;
case Unavailable:
//Unavailable is always the same sort, but to the user it can be either "Unavailable" or "Other Unavailable"
@@ -425,15 +421,12 @@
return ((!sortIdleTime && (groupUnavailable || !(groupAway || groupIdle || groupIdleAndAway))) ?
UNAVAILABLE :
OTHER_UNAVAILABLE);
- break;
case Online:
return ONLINE;
- break;
case Mobile:
return MOBILE;
- break;
}
return @"";
--- a/Source/XtrasInstaller.m Fri May 24 00:13:49 2013 +0200
+++ b/Source/XtrasInstaller.m Sun Jun 02 11:34:28 2013 -0400
@@ -116,7 +116,7 @@
self.xtraName = [[response allHeaderFields] objectForKey:@"X-Xtraname"];
amountDownloaded = 0;
downloadSize = [response expectedContentLength];
- [progressBar setMaxValue:(long long)downloadSize];
+ [progressBar setMaxValue:downloadSize];
[progressBar setDoubleValue:0.0];
AILogWithSignature(@"Beginning download of %@, which has size %lld", [response allHeaderFields], downloadSize);
[self updateInfoText];