adium 2093:d470a05e220b: I see no reason to not use #import for ...
commits at adium.im
commits at adium.im
Tue May 5 08:40:25 UTC 2009
details: http://hg.adium.im/adium/rev/d470a05e220b
revision: 2093:d470a05e220b
author: David Smith <catfish.man at gmail.com>
date: Tue May 05 01:40:16 2009 -0700
I see no reason to not use #import for everything. Apple's compiler supports it fine in .c files, and it doesn't seem to have any downsides vs #include unless you're playing silly multiple inclusion tricks
diffstat:
Frameworks/AIUtilities Framework/Source/AIColorAdditions.m | 2 +-
Frameworks/AIUtilities Framework/Source/AIFileManagerAdditions.m | 4 +-
Frameworks/AIUtilities Framework/Source/AIFunctions.m | 8 +-
Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m | 6 +-
Frameworks/AIUtilities Framework/Source/AIKeychain.h | 2 +-
Frameworks/AIUtilities Framework/Source/AIKeychain.m | 6 +-
Frameworks/AIUtilities Framework/Source/AIPlasticButtonCell.m | 2 +-
Frameworks/AIUtilities Framework/Source/AIStringAdditions.m | 6 +-
Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m | 4 +-
Frameworks/Adium Framework/Source/AIHTMLDecoder.m | 2 +-
Frameworks/Adium Framework/Source/AIListContact.m | 2 +-
Frameworks/Adium Framework/Source/AILocalizationButton.m | 2 +-
Frameworks/Adium Framework/Source/AILocalizationButtonCell.m | 2 +-
Frameworks/Adium Framework/Source/AILocalizationTextField.m | 2 +-
Frameworks/Adium Framework/Source/ESDebugAILog.m | 4 +-
Other/Adium Spotlight Importer/AdiumSpotlightImporter.h | 4 +-
Other/Adium Spotlight Importer/GetMetadataForFile.m | 4 +-
Other/Adium Spotlight Importer/main.c | 6 +-
Plugins/Bonjour/libezv/Classes/AWEzvContact.m | 8 +-
Plugins/Bonjour/libezv/Other Sources/AWEzvSupportRoutines.m | 4 +-
Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h | 4 +-
Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m | 8 +-
Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m | 28 +++---
Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.h | 2 +-
Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m | 2 +-
Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.h | 4 +-
Plugins/Purple Service/AMPurpleJabberAdHocServer.m | 2 +-
Plugins/Purple Service/AMPurpleJabberFormGenerator.h | 4 +-
Plugins/Purple Service/AMPurpleJabberNode.h | 2 +-
Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowsing.m | 2 +-
Plugins/Purple Service/AMXMLConsoleController.m | 2 +-
Plugins/Purple Service/ESPurpleJabberAccount.m | 6 +-
Plugins/Purple Service/ESPurpleJabberAccountViewController.m | 2 +-
Plugins/Purple Service/ESPurpleMSNAccount.h | 2 +-
Plugins/Purple Service/PurpleCommon.h | 2 +-
Plugins/Purple Service/SLPurpleCocoaAdapter.h | 2 +-
Plugins/Purple Service/SLPurpleCocoaAdapter.m | 10 +-
Plugins/Purple Service/adiumPurpleCertificateTrustWarning.h | 4 +-
Plugins/Purple Service/adiumPurpleDnsRequest.m | 6 +-
Plugins/Purple Service/adiumPurpleEventloop.m | 8 +-
Plugins/Purple Service/adiumPurpleRequest.m | 2 +-
Plugins/Purple Service/libpurple_extensions/oscar-adium.h | 38 ++++----
Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c | 16 ++--
Plugins/Purple Service/libpurple_extensions/ssl-openssl.c | 14 +-
Plugins/Purple Service/libpurple_extensions/ssl.c | 10 +-
Source/AIXMLAppender.m | 2 +-
Source/AdiumOTREncryption.m | 2 +-
Source/ESDebugController.m | 8 +-
Source/GBApplescriptFiltersPlugin.m | 4 +-
Source/PTKeyCodeTranslator.h | 2 +-
UnitTests/TestRichTextCoercion.m | 6 +-
51 files changed, 143 insertions(+), 143 deletions(-)
diffs (824 lines):
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIColorAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIColorAdditions.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIColorAdditions.m Tue May 05 01:40:16 2009 -0700
@@ -19,7 +19,7 @@
#import "AIColorAdditions.h"
#import "AIStringAdditions.h"
-#include <string.h>
+#import <string.h>
static const float ONE_THIRD = 1.0/3.0;
static const float ONE_SIXTH = 1.0/6.0;
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIFileManagerAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIFileManagerAdditions.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIFileManagerAdditions.m Tue May 05 01:40:16 2009 -0700
@@ -15,8 +15,8 @@
#import "AIFileManagerAdditions.h"
#import "AIStringAdditions.h"
-#include <sys/types.h>
-#include <unistd.h>
+#import <sys/types.h>
+#import <unistd.h>
#warning This wants modernizing: take NSURLs, provide NSErrors
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIFunctions.m
--- a/Frameworks/AIUtilities Framework/Source/AIFunctions.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIFunctions.m Tue May 05 01:40:16 2009 -0700
@@ -14,10 +14,10 @@
\------------------------------------------------------------------------------------------------------ */
#import "AIFunctions.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <malloc/malloc.h>
-#include <stdlib.h>
+#import <sys/types.h>
+#import <sys/mman.h>
+#import <malloc/malloc.h>
+#import <stdlib.h>
BOOL AIGetSurrogates(UTF32Char in, UTF16Char *outHigh, UTF16Char *outLow)
{
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m
--- a/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIHostReachabilityMonitor.m Tue May 05 01:40:16 2009 -0700
@@ -8,9 +8,9 @@
#import "AIHostReachabilityMonitor.h"
#import "AISleepNotification.h"
#import <SystemConfiguration/SystemConfiguration.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <netinet/in.h>
+#import <arpa/inet.h>
+#import <netdb.h>
+#import <netinet/in.h>
#define CONNECTIVITY_DEBUG FALSE
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIKeychain.h
--- a/Frameworks/AIUtilities Framework/Source/AIKeychain.h Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.h Tue May 05 01:40:16 2009 -0700
@@ -13,7 +13,7 @@
| write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
\------------------------------------------------------------------------------------------------------ */
-#include <Security/Security.h>
+#import <Security/Security.h>
#pragma mark AIKeychain errors
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIKeychain.m
--- a/Frameworks/AIUtilities Framework/Source/AIKeychain.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.m Tue May 05 01:40:16 2009 -0700
@@ -19,9 +19,9 @@
#import "AIKeychain.h"
#import "AIStringAdditions.h"
-#include <CoreServices/CoreServices.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Security/Security.h>
+#import <CoreServices/CoreServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <Security/Security.h>
static AIKeychain *lastKnownDefaultKeychain = nil;
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIPlasticButtonCell.m
--- a/Frameworks/AIUtilities Framework/Source/AIPlasticButtonCell.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIPlasticButtonCell.m Tue May 05 01:40:16 2009 -0700
@@ -9,7 +9,7 @@
#import "AIPlasticButtonCell.h"
#import "AIImageAdditions.h"
-#include <Carbon/Carbon.h>
+#import <Carbon/Carbon.h>
#define LABEL_OFFSET_X 1
#define LABEL_OFFSET_Y -1
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/AIStringAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Tue May 05 01:40:16 2009 -0700
@@ -22,8 +22,8 @@
#import "AIFunctions.h"
#import "AIApplicationAdditions.h"
-#include <unistd.h>
-#include <limits.h>
+#import <unistd.h>
+#import <limits.h>
#endif //ndef BSD_LICENSE_ONLY
@@ -38,7 +38,7 @@
numberOfLineBreakCharacters = 6U
};
-#include <wctype.h>
+#import <wctype.h>
@implementation NSString (AIStringAdditions)
diff -r 348494de6c9d -r d470a05e220b Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m
--- a/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/AIUtilities Framework/Source/NSCalendarDate+ISO8601Parsing.m Tue May 05 01:40:16 2009 -0700
@@ -4,8 +4,8 @@
*Copyright 2006 Peter Hosey. All rights reserved.
*/
-#include <ctype.h>
-#include <string.h>
+#import <ctype.h>
+#import <string.h>
#import "NSCalendarDate+ISO8601Parsing.h"
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m Tue May 05 01:40:16 2009 -0700
@@ -35,7 +35,7 @@
#import <FriBidi/NSString-FBAdditions.h>
-#include <CoreServices/CoreServices.h>
+#import <CoreServices/CoreServices.h>
int HTMLEquivalentForFontSize(int fontSize);
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/AIListContact.m
--- a/Frameworks/Adium Framework/Source/AIListContact.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AIListContact.m Tue May 05 01:40:16 2009 -0700
@@ -32,7 +32,7 @@
#import <AIUtilities/AIMutableOwnerArray.h>
#import <AIUtilities/AIMutableStringAdditions.h>
-#include <AvailabilityMacros.h>
+#import <AvailabilityMacros.h>
#import "AIAddressBookController.h"
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/AILocalizationButton.m
--- a/Frameworks/Adium Framework/Source/AILocalizationButton.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AILocalizationButton.m Tue May 05 01:40:16 2009 -0700
@@ -53,7 +53,7 @@
return self;
}
-#include "AILocalizationControl.m"
+#import "AILocalizationControl.m"
- (void)setFrame:(NSRect)inFrame
{
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/AILocalizationButtonCell.m
--- a/Frameworks/Adium Framework/Source/AILocalizationButtonCell.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AILocalizationButtonCell.m Tue May 05 01:40:16 2009 -0700
@@ -42,7 +42,7 @@
[self _handleSizingWithOldFrame:oldFrame stringValue:inTitle];
}
-#include "AILocalizationControl.m"
+#import "AILocalizationControl.m"
@end
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/AILocalizationTextField.m
--- a/Frameworks/Adium Framework/Source/AILocalizationTextField.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/AILocalizationTextField.m Tue May 05 01:40:16 2009 -0700
@@ -58,7 +58,7 @@
return self;
}
-#include "AILocalizationControl.m"
+#import "AILocalizationControl.m"
- (void)setFrame:(NSRect)inFrame
{
diff -r 348494de6c9d -r d470a05e220b Frameworks/Adium Framework/Source/ESDebugAILog.m
--- a/Frameworks/Adium Framework/Source/ESDebugAILog.m Tue May 05 01:33:18 2009 -0700
+++ b/Frameworks/Adium Framework/Source/ESDebugAILog.m Tue May 05 01:40:16 2009 -0700
@@ -15,8 +15,8 @@
*/
#import <Adium/AIDebugControllerProtocol.h>
-#include <stdarg.h>
-#include <execinfo.h>
+#import <stdarg.h>
+#import <execinfo.h>
#ifdef DEBUG_BUILD
BOOL AIDebugLoggingEnabled = YES;
diff -r 348494de6c9d -r d470a05e220b Other/Adium Spotlight Importer/AdiumSpotlightImporter.h
--- a/Other/Adium Spotlight Importer/AdiumSpotlightImporter.h Tue May 05 01:33:18 2009 -0700
+++ b/Other/Adium Spotlight Importer/AdiumSpotlightImporter.h Tue May 05 01:40:16 2009 -0700
@@ -1,5 +1,5 @@
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreServices/CoreServices.h>
CFStringRef CopyTextContentForFile(CFStringRef contentTypeUTI,
CFStringRef pathToFile);
diff -r 348494de6c9d -r d470a05e220b Other/Adium Spotlight Importer/GetMetadataForFile.m
--- a/Other/Adium Spotlight Importer/GetMetadataForFile.m Tue May 05 01:33:18 2009 -0700
+++ b/Other/Adium Spotlight Importer/GetMetadataForFile.m Tue May 05 01:40:16 2009 -0700
@@ -1,5 +1,5 @@
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreServices/CoreServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreServices/CoreServices.h>
#import "GetMetadataForHTMLLog.h"
#import "NSCalendarDate+ISO8601Parsing.h"
diff -r 348494de6c9d -r d470a05e220b Other/Adium Spotlight Importer/main.c
--- a/Other/Adium Spotlight Importer/main.c Tue May 05 01:33:18 2009 -0700
+++ b/Other/Adium Spotlight Importer/main.c Tue May 05 01:40:16 2009 -0700
@@ -23,9 +23,9 @@
-#include <CoreFoundation/CoreFoundation.h>
-#include <CoreFoundation/CFPlugInCOM.h>
-#include <CoreServices/CoreServices.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <CoreFoundation/CFPlugInCOM.h>
+#import <CoreServices/CoreServices.h>
// -----------------------------------------------------------------------------
// constants
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Classes/AWEzvContact.m
--- a/Plugins/Bonjour/libezv/Classes/AWEzvContact.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Classes/AWEzvContact.m Tue May 05 01:40:16 2009 -0700
@@ -41,10 +41,10 @@
#import "EKEzvFileTransfer.h"
#import "EKEzvIncomingFileTransfer.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#import <sys/types.h>
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <arpa/inet.h>
@implementation AWEzvContact
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Other Sources/AWEzvSupportRoutines.m
--- a/Plugins/Bonjour/libezv/Other Sources/AWEzvSupportRoutines.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Other Sources/AWEzvSupportRoutines.m Tue May 05 01:40:16 2009 -0700
@@ -30,8 +30,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "AWEzvSupportRoutines.h"
-#include <stdarg.h>
+#import "AWEzvSupportRoutines.h"
+#import <stdarg.h>
void AWEzvLog (NSString *format, ...) {
va_list ap;
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManager.h Tue May 05 01:40:16 2009 -0700
@@ -30,8 +30,8 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
-#include <dns_sd.h>
+#import <DNSServiceDiscovery/DNSServiceDiscovery.h>
+#import <dns_sd.h>
@class AWEzv, AWEzvContact, AWEzvRendezvousData, ServiceController;
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m Tue May 05 01:40:16 2009 -0700
@@ -37,10 +37,10 @@
#import "AWEzv.h"
/* socket functions */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <arpa/inet.h>
+#import <unistd.h>
#define MAXBACKLOG 5
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerRendezvous.m Tue May 05 01:40:16 2009 -0700
@@ -40,9 +40,9 @@
#import "AWEzvSupportRoutines.h"
-#include <dns_sd.h>
+#import <dns_sd.h>
-#include <openssl/sha.h>
+#import <openssl/sha.h>
/* One of the stupidest things I've ever met. Doing DNS lookups using the standard
* functions does not for mDNS records work unless you're in BIND 8 compatibility
@@ -51,19 +51,19 @@
* have to implement our own DNS packet parser. What were people thinking here?
*/
#define BIND_8_COMPAT 1
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
+#import <sys/types.h>
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <arpa/nameser.h>
+#import <arpa/inet.h>
+#import <netdb.h>
+#import <resolv.h>
+#import <errno.h>
+#import <ctype.h>
+#import <string.h>
+#import <stdlib.h>
-#include <SystemConfiguration/SystemConfiguration.h>
+#import <SystemConfiguration/SystemConfiguration.h>
// The ServiceController manages cleanup of DNSServiceRef & runloop info for an outstanding request
@interface ServiceController : NSObject
{
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.h
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.h Tue May 05 01:40:16 2009 -0700
@@ -31,7 +31,7 @@
*/
#define XMLCALL
-#include <expat.h>
+#import <expat.h>
@class AWEzvStack, AWEzvXMLNode, AWEzvContactManager;
@protocol AWEzvXMLStreamProtocol;
diff -r 348494de6c9d -r d470a05e220b Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m Tue May 05 01:40:16 2009 -0700
@@ -39,7 +39,7 @@
#import "AWEzvContactManager.h"
#define XMLCALL
-#include <expat.h>
+#import <expat.h>
/* XML Function prototypes */
void xml_start_element (void *userData,
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.h
--- a/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.h Tue May 05 01:40:16 2009 -0700
@@ -7,8 +7,8 @@
//
#import <Adium/AIAccount.h>
-#include <Security/SecTrust.h>
-#include <libpurple/libpurple.h>
+#import <Security/SecTrust.h>
+#import <libpurple/libpurple.h>
@interface AIPurpleCertificateTrustWarningAlert : NSObject {
CFArrayRef certificates;
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AMPurpleJabberAdHocServer.m
--- a/Plugins/Purple Service/AMPurpleJabberAdHocServer.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AMPurpleJabberAdHocServer.m Tue May 05 01:40:16 2009 -0700
@@ -2,7 +2,7 @@
#import "ESPurpleJabberAccount.h"
#import "AMPurpleJabberFormGenerator.h"
#import "AMPurpleJabberAdHocCommand.h"
-#include <libpurple/jabber.h>
+#import <libpurple/jabber.h>
@interface AMPurpleJabberAdHocServer ()
- (BOOL)receivedCommand:(xmlnode*)command from:(NSString*)jid iqid:(NSString*)iqid;
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AMPurpleJabberFormGenerator.h
--- a/Plugins/Purple Service/AMPurpleJabberFormGenerator.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AMPurpleJabberFormGenerator.h Tue May 05 01:40:16 2009 -0700
@@ -6,8 +6,8 @@
// Copyright 2007 Andreas Monitzer. All rights reserved.
//
-#include "glib.h"
-#include "xmlnode.h"
+#import "glib.h"
+#import "xmlnode.h"
enum AMPurpleJabberFormType {
form = 0,
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AMPurpleJabberNode.h
--- a/Plugins/Purple Service/AMPurpleJabberNode.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AMPurpleJabberNode.h Tue May 05 01:40:16 2009 -0700
@@ -5,7 +5,7 @@
// Created by Evan Schoenberg on 9/5/07.
//
-#include <libpurple/libpurple.h>
+#import <libpurple/libpurple.h>
@class AMPurpleJabberNode;
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowsing.m
--- a/Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowsing.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AMPurpleJabberServiceDiscoveryBrowsing.m Tue May 05 01:40:16 2009 -0700
@@ -11,7 +11,7 @@
#import "AMPurpleJabberServiceDiscoveryBrowserController.h"
#import <Adium/AIAccount.h>
-#include <libpurple/jabber.h>
+#import <libpurple/jabber.h>
#import "AIAdium.h"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/AMXMLConsoleController.m
--- a/Plugins/Purple Service/AMXMLConsoleController.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/AMXMLConsoleController.m Tue May 05 01:40:16 2009 -0700
@@ -7,7 +7,7 @@
//
#import "AMXMLConsoleController.h"
-#include <libpurple/jabber.h>
+#import <libpurple/jabber.h>
#import <AIUtilities/AIAutoScrollView.h>
#define XML_PREFIX @"<?xml version='1.0' encoding='UTF-8' ?>\n"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m Tue May 05 01:40:16 2009 -0700
@@ -32,9 +32,9 @@
#import <AIUtilities/AIAttributedStringAdditions.h>
#import <AIUtilities/AIDictionaryAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
-#include <libpurple/presence.h>
-#include <libpurple/si.h>
-#include <SystemConfiguration/SystemConfiguration.h>
+#import <libpurple/presence.h>
+#import <libpurple/si.h>
+#import <SystemConfiguration/SystemConfiguration.h>
#import "AMXMLConsoleController.h"
#import "AMPurpleJabberServiceDiscoveryBrowsing.h"
#import "ESPurpleJabberAccountViewController.h"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/ESPurpleJabberAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Tue May 05 01:40:16 2009 -0700
@@ -19,7 +19,7 @@
#import <Adium/AIContactControllerProtocol.h>
#import <Adium/AIService.h>
#import <Adium/AIContactList.h>
-#include <SystemConfiguration/SystemConfiguration.h>
+#import <SystemConfiguration/SystemConfiguration.h>
#define SERVERFEEDRSSURL @"http://www.jabber.org/full_servers.xml"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/ESPurpleMSNAccount.h
--- a/Plugins/Purple Service/ESPurpleMSNAccount.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.h Tue May 05 01:40:16 2009 -0700
@@ -16,7 +16,7 @@
#import "CBPurpleAccount.h"
#import "ESMSNService.h"
-#include <libpurple/msn.h>
+#import <libpurple/msn.h>
#define KEY_MSN_HTTP_CONNECT_METHOD @"MSN:HTTP Connect Method"
#define KEY_MSN_DISPLAY_NAMED_CHANGED @"MSN:Display Name Changed"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/PurpleCommon.h
--- a/Plugins/Purple Service/PurpleCommon.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/PurpleCommon.h Tue May 05 01:40:16 2009 -0700
@@ -25,7 +25,7 @@
//#define MEANWHILE_NOT_AVAILABLE
//Purple includes
-#include <libpurple/libpurple.h>
+#import <libpurple/libpurple.h>
#define PACKAGE "pidgin"
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/SLPurpleCocoaAdapter.h
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.h Tue May 05 01:40:16 2009 -0700
@@ -14,7 +14,7 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include <libpurple/libpurple.h>
+#import <libpurple/libpurple.h>
#import <Adium/AIContentTyping.h>
#import <Adium/AIContentNotification.h>
#import <AdiumLibpurple/PurpleCommon.h>
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m Tue May 05 01:40:16 2009 -0700
@@ -35,9 +35,9 @@
#import <AIUtilities/AIImageAdditions.h>
#import <CoreFoundation/CoreFoundation.h>
-#include <libpurple/libpurple.h>
-#include <glib.h>
-#include <stdlib.h>
+#import <libpurple/libpurple.h>
+#import <glib.h>
+#import <stdlib.h>
#import "ESPurpleAIMAccount.h"
#import "CBPurpleOscarAccount.h"
@@ -47,9 +47,9 @@
#import "adiumPurpleAccounts.h"
//Purple slash command interface
-#include <libpurple/cmds.h>
+#import <libpurple/cmds.h>
-#include "libpurple_extensions/oscar-adium.h"
+#import "libpurple_extensions/oscar-adium.h"
@interface SLPurpleCocoaAdapter ()
- (void)initLibPurple;
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/adiumPurpleCertificateTrustWarning.h
--- a/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/adiumPurpleCertificateTrustWarning.h Tue May 05 01:40:16 2009 -0700
@@ -7,7 +7,7 @@
*
*/
-#include <CoreFoundation/CoreFoundation.h>
-#include <libpurple/libpurple.h>
+#import <CoreFoundation/CoreFoundation.h>
+#import <libpurple/libpurple.h>
void adium_query_cert_chain(PurpleSslConnection *gsc, const char *hostname, CFArrayRef certs, void (*query_cert_cb)(gboolean trusted, void *userdata), void *userdata);
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/adiumPurpleDnsRequest.m
--- a/Plugins/Purple Service/adiumPurpleDnsRequest.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/adiumPurpleDnsRequest.m Tue May 05 01:40:16 2009 -0700
@@ -7,10 +7,10 @@
#import "adiumPurpleDnsRequest.h"
-#include <libpurple/internal.h>
+#import <libpurple/internal.h>
-#include <sys/socket.h>
-#include <netdb.h>
+#import <sys/socket.h>
+#import <netdb.h>
@interface AdiumPurpleDnsRequest : NSObject {
PurpleDnsQueryData *query_data;
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m Tue May 05 01:40:16 2009 -0700
@@ -16,10 +16,10 @@
#import "adiumPurpleEventloop.h"
#import <AIUtilities/AIApplicationAdditions.h>
-#include <poll.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/select.h>
+#import <poll.h>
+#import <unistd.h>
+#import <sys/socket.h>
+#import <sys/select.h>
//#define PURPLE_SOCKET_DEBUG
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/adiumPurpleRequest.m Tue May 05 01:40:16 2009 -0700
@@ -40,7 +40,7 @@
*/
//Jabber registration
-#include <libpurple/jabber.h>
+#import <libpurple/jabber.h>
/* resolved id for Meanwhile */
struct resolved_id {
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/libpurple_extensions/oscar-adium.h
--- a/Plugins/Purple Service/libpurple_extensions/oscar-adium.h Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/libpurple_extensions/oscar-adium.h Tue May 05 01:40:16 2009 -0700
@@ -1,23 +1,23 @@
-#include <libpurple/internal.h>
+#import <libpurple/internal.h>
-#include <libpurple/account.h>
-#include <libpurple/accountopt.h>
-#include <libpurple/buddyicon.h>
-#include <libpurple/cipher.h>
-#include <libpurple/conversation.h>
-#include <libpurple/core.h>
-#include <libpurple/debug.h>
-#include <libpurple/ft.h>
-#include <libpurple/imgstore.h>
-#include <libpurple/network.h>
-#include <libpurple/notify.h>
-#include <libpurple/privacy.h>
-#include <libpurple/prpl.h>
-#include <libpurple/proxy.h>
-#include <libpurple/request.h>
-#include <libpurple/util.h>
-#include <libpurple/version.h>
+#import <libpurple/account.h>
+#import <libpurple/accountopt.h>
+#import <libpurple/buddyicon.h>
+#import <libpurple/cipher.h>
+#import <libpurple/conversation.h>
+#import <libpurple/core.h>
+#import <libpurple/debug.h>
+#import <libpurple/ft.h>
+#import <libpurple/imgstore.h>
+#import <libpurple/network.h>
+#import <libpurple/notify.h>
+#import <libpurple/privacy.h>
+#import <libpurple/prpl.h>
+#import <libpurple/proxy.h>
+#import <libpurple/request.h>
+#import <libpurple/util.h>
+#import <libpurple/version.h>
-#include <libpurple/oscar.h>
+#import <libpurple/oscar.h>
void oscar_reformat_screenname(PurpleConnection *gc, const char *nick);
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue May 05 01:40:16 2009 -0700
@@ -16,12 +16,12 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <libpurple/internal.h>
-#include <libpurple/debug.h>
-#include <libpurple/plugin.h>
-#include <libpurple/sslconn.h>
-#include <libpurple/version.h>
-#include <libpurple/signals.h>
+#import <libpurple/internal.h>
+#import <libpurple/debug.h>
+#import <libpurple/plugin.h>
+#import <libpurple/sslconn.h>
+#import <libpurple/version.h>
+#import <libpurple/signals.h>
#define SSL_CDSA_PLUGIN_ID "ssl-cdsa"
@@ -29,8 +29,8 @@
//#define CDSA_DEBUG
-#include <Security/Security.h>
-#include <unistd.h>
+#import <Security/Security.h>
+#import <unistd.h>
typedef struct
{
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/libpurple_extensions/ssl-openssl.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-openssl.c Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-openssl.c Tue May 05 01:40:16 2009 -0700
@@ -17,18 +17,18 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <libpurple/internal.h>
-#include <libpurple/debug.h>
-#include <libpurple/plugin.h>
-#include <libpurple/sslconn.h>
-#include <libpurple/version.h>
+#import <libpurple/internal.h>
+#import <libpurple/debug.h>
+#import <libpurple/plugin.h>
+#import <libpurple/sslconn.h>
+#import <libpurple/version.h>
#define SSL_OPENSSL_PLUGIN_ID "ssl-openssl"
#ifdef HAVE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
+#import <openssl/ssl.h>
+#import <openssl/err.h>
typedef struct
{
diff -r 348494de6c9d -r d470a05e220b Plugins/Purple Service/libpurple_extensions/ssl.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl.c Tue May 05 01:33:18 2009 -0700
+++ b/Plugins/Purple Service/libpurple_extensions/ssl.c Tue May 05 01:40:16 2009 -0700
@@ -19,11 +19,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include <libpurple/internal.h>
-#include <libpurple/debug.h>
-#include <libpurple/plugin.h>
-#include <libpurple/sslconn.h>
-#include <libpurple/version.h>
+#import <libpurple/internal.h>
+#import <libpurple/debug.h>
+#import <libpurple/plugin.h>
+#import <libpurple/sslconn.h>
+#import <libpurple/version.h>
#define SSL_PLUGIN_ID "core-ssl"
diff -r 348494de6c9d -r d470a05e220b Source/AIXMLAppender.m
--- a/Source/AIXMLAppender.m Tue May 05 01:33:18 2009 -0700
+++ b/Source/AIXMLAppender.m Tue May 05 01:40:16 2009 -0700
@@ -50,7 +50,7 @@
#define BSD_LICENSE_ONLY 1
#import <AIUtilities/AIStringAdditions.h>
#import <sys/stat.h>
-#include <unistd.h>
+#import <unistd.h>
#define XML_APPENDER_BLOCK_SIZE 4096
diff -r 348494de6c9d -r d470a05e220b Source/AdiumOTREncryption.m
--- a/Source/AdiumOTREncryption.m Tue May 05 01:33:18 2009 -0700
+++ b/Source/AdiumOTREncryption.m Tue May 05 01:40:16 2009 -0700
@@ -28,7 +28,7 @@
#import "ESOTRUnknownFingerprintController.h"
#import "OTRCommon.h"
-#include <stdlib.h>
+#import <stdlib.h>
#define PRIVKEY_PATH [[[adium.loginController userDirectory] stringByAppendingPathComponent:@"otr.private_key"] UTF8String]
#define STORE_PATH [[[adium.loginController userDirectory] stringByAppendingPathComponent:@"otr.fingerprints"] UTF8String]
diff -r 348494de6c9d -r d470a05e220b Source/ESDebugController.m
--- a/Source/ESDebugController.m Tue May 05 01:33:18 2009 -0700
+++ b/Source/ESDebugController.m Tue May 05 01:40:16 2009 -0700
@@ -19,10 +19,10 @@
#import <Adium/AIMenuControllerProtocol.h>
#import <AIUtilities/AIMenuAdditions.h>
-#include <fcntl.h> //open(2)
-#include <unistd.h> //close(2)
-#include <errno.h> //errno
-#include <string.h> //strerror(3)
+#import <fcntl.h> //open(2)
+#import <unistd.h> //close(2)
+#import <errno.h> //errno
+#import <string.h> //strerror(3)
#import <objc/objc-runtime.h>
diff -r 348494de6c9d -r d470a05e220b Source/GBApplescriptFiltersPlugin.m
--- a/Source/GBApplescriptFiltersPlugin.m Tue May 05 01:33:18 2009 -0700
+++ b/Source/GBApplescriptFiltersPlugin.m Tue May 05 01:40:16 2009 -0700
@@ -26,8 +26,8 @@
#import <Adium/AIContentObject.h>
#import <Adium/AIHTMLDecoder.h>
-#include <sys/errno.h>
-#include <string.h>
+#import <sys/errno.h>
+#import <string.h>
#define TITLE_INSERT_SCRIPT AILocalizedString(@"Insert Script",nil)
#define SCRIPT_BUNDLE_EXTENSION @"AdiumScripts"
diff -r 348494de6c9d -r d470a05e220b Source/PTKeyCodeTranslator.h
--- a/Source/PTKeyCodeTranslator.h Tue May 05 01:33:18 2009 -0700
+++ b/Source/PTKeyCodeTranslator.h Tue May 05 01:40:16 2009 -0700
@@ -6,7 +6,7 @@
// Copyright (c) 2003 Cliché Software. All rights reserved.
//
-#include <Carbon/Carbon.h>
+#import <Carbon/Carbon.h>
@interface PTKeyCodeTranslator : NSObject
{
diff -r 348494de6c9d -r d470a05e220b UnitTests/TestRichTextCoercion.m
--- a/UnitTests/TestRichTextCoercion.m Tue May 05 01:33:18 2009 -0700
+++ b/UnitTests/TestRichTextCoercion.m Tue May 05 01:40:16 2009 -0700
@@ -4,9 +4,9 @@
#import <AIUtilities/AIFileManagerAdditions.h>
#import <AIUtilities/AIRichTextCoercer.h>
-#include <unistd.h>
-#include <sysexits.h>
-#include <sys/wait.h>
+#import <unistd.h>
+#import <sysexits.h>
+#import <sys/wait.h>
@implementation TestRichTextCoercion
More information about the commits
mailing list