From 39d57946d90fc0a3c8e311a6daad34095fa0dba6 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Thu, 12 May 2011 22:51:55 +0200 Subject: [PATCH] Move namespaces to namespaces.h and add missing files to Xcode project. --- ObjXMPP.xcodeproj/project.pbxproj | 14 ++++++++++---- src/Makefile | 1 + src/XMPPConnection.h | 10 ---------- src/XMPPConnection.m | 1 + src/XMPPMessage.m | 2 +- src/XMPPPresence.m | 2 +- src/XMPPRoster.m | 1 + src/XMPPStanza.m | 2 +- src/namespaces.h | 31 +++++++++++++++++++++++++++++++ 9 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 src/namespaces.h diff --git a/ObjXMPP.xcodeproj/project.pbxproj b/ObjXMPP.xcodeproj/project.pbxproj index a4a6eea..7e909e4 100644 --- a/ObjXMPP.xcodeproj/project.pbxproj +++ b/ObjXMPP.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 4B01D020137C7E7D005624EA /* namespaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B01D01F137C7E7D005624EA /* namespaces.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B1295EF1337BD5F00154B25 /* test.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B1295EE1337BD5F00154B25 /* test.m */; }; 4B1295F11337C37E00154B25 /* ObjXMPP.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC559911337A65400E345C7 /* ObjXMPP.framework */; }; 4B1295F21337C3CF00154B25 /* ObjFW.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BC559D61337ABD300E345C7 /* ObjFW.framework */; }; @@ -32,9 +33,9 @@ 4BC55A011337AC1800E345C7 /* XMPPStanza.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BC559FE1337AC1800E345C7 /* XMPPStanza.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BC55A021337AC1800E345C7 /* XMPPStanza.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BC559FF1337AC1800E345C7 /* XMPPStanza.m */; }; 4BD0AB16134129B900445289 /* ObjOpenSSL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4BD0AB15134129B900445289 /* ObjOpenSSL.framework */; }; - 4BD9BF59134003F700DAB43A /* XMPPRosterItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD9BF57134003F700DAB43A /* XMPPRosterItem.h */; }; + 4BD9BF59134003F700DAB43A /* XMPPRosterItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BD9BF57134003F700DAB43A /* XMPPRosterItem.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BD9BF5A134003F700DAB43A /* XMPPRosterItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD9BF58134003F700DAB43A /* XMPPRosterItem.m */; }; - 4BDEF8071340B240000156D1 /* XMPPRoster.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDEF8051340B240000156D1 /* XMPPRoster.h */; }; + 4BDEF8071340B240000156D1 /* XMPPRoster.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BDEF8051340B240000156D1 /* XMPPRoster.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4BDEF8081340B240000156D1 /* XMPPRoster.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BDEF8061340B240000156D1 /* XMPPRoster.m */; }; /* End PBXBuildFile section */ @@ -51,6 +52,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 4B01D01C137C7D6E005624EA /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = src/Makefile; sourceTree = SOURCE_ROOT; }; + 4B01D01F137C7E7D005624EA /* namespaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = namespaces.h; path = src/namespaces.h; sourceTree = SOURCE_ROOT; }; 4B1295E01337BD2D00154B25 /* ObjXMPPTests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ObjXMPPTests; sourceTree = BUILT_PRODUCTS_DIR; }; 4B1295EE1337BD5F00154B25 /* test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = test.m; path = tests/test.m; sourceTree = SOURCE_ROOT; }; 4BC559911337A65400E345C7 /* ObjXMPP.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjXMPP.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -169,6 +172,7 @@ 4BC559FD1337AC1800E345C7 /* XMPPSCRAMAuth.m */, 4BC559FE1337AC1800E345C7 /* XMPPStanza.h */, 4BC559FF1337AC1800E345C7 /* XMPPStanza.m */, + 4B01D01F137C7E7D005624EA /* namespaces.h */, ); path = ObjXMPP; sourceTree = ""; @@ -177,6 +181,7 @@ isa = PBXGroup; children = ( 4BC55A051337ADA800E345C7 /* Info.plist */, + 4B01D01C137C7D6E005624EA /* Makefile */, ); name = "Supporting Files"; sourceTree = ""; @@ -196,10 +201,11 @@ 4BC559F61337AC0900E345C7 /* XMPPMessage.h in Headers */, 4BC559F81337AC0900E345C7 /* XMPPPLAINAuth.h in Headers */, 4BC559FA1337AC0900E345C7 /* XMPPPresence.h in Headers */, + 4BDEF8071340B240000156D1 /* XMPPRoster.h in Headers */, + 4BD9BF59134003F700DAB43A /* XMPPRosterItem.h in Headers */, 4BC559FC1337AC0900E345C7 /* XMPPSCRAMAuth.h in Headers */, 4BC55A011337AC1800E345C7 /* XMPPStanza.h in Headers */, - 4BD9BF59134003F700DAB43A /* XMPPRosterItem.h in Headers */, - 4BDEF8071340B240000156D1 /* XMPPRoster.h in Headers */, + 4B01D020137C7E7D005624EA /* namespaces.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/src/Makefile b/src/Makefile index ec69153..500490b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -19,6 +19,7 @@ SRCS = XMPPAuthenticator.m \ XMPPStanza.m INCLUDES = ${SRCS:.m=.h} \ + namespaces.h \ ObjXMPP.h include ../buildsys.mk diff --git a/src/XMPPConnection.h b/src/XMPPConnection.h index 393dabc..bb89f69 100644 --- a/src/XMPPConnection.h +++ b/src/XMPPConnection.h @@ -32,16 +32,6 @@ @class XMPPRoster; @class XMPPRosterItem; -#define XMPP_NS_BIND @"urn:ietf:params:xml:ns:xmpp-bind" -#define XMPP_NS_CLIENT @"jabber:client" -#define XMPP_NS_ROSTER @"jabber:iq:roster" -#define XMPP_NS_SASL @"urn:ietf:params:xml:ns:xmpp-sasl" -#define XMPP_NS_STARTTLS @"urn:ietf:params:xml:ns:xmpp-tls" -#define XMPP_NS_STANZAS @"urn:ietf:params:xml:ns:xmpp-stanzas" -#define XMPP_NS_SESSION @"urn:ietf:params:xml:ns:xmpp-session" -#define XMPP_NS_XMPP_STREAM @"urn:ietf:params:xml:ns:xmpp-streams" -#define XMPP_NS_STREAM @"http://etherx.jabber.org/streams" - @protocol XMPPConnectionDelegate #ifndef XMPP_CONNECTION_M diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m index 4d98100..fc5a280 100644 --- a/src/XMPPConnection.m +++ b/src/XMPPConnection.m @@ -41,6 +41,7 @@ #import "XMPPRoster.h" #import "XMPPRosterItem.h" #import "XMPPExceptions.h" +#import "namespaces.h" @implementation XMPPConnection + connection diff --git a/src/XMPPMessage.m b/src/XMPPMessage.m index 67b3bd1..31495c5 100644 --- a/src/XMPPMessage.m +++ b/src/XMPPMessage.m @@ -22,7 +22,7 @@ */ #import "XMPPMessage.h" -#import "XMPPConnection.h" +#import "namespaces.h" @implementation XMPPMessage + message diff --git a/src/XMPPPresence.m b/src/XMPPPresence.m index da4f2a8..cd49476 100644 --- a/src/XMPPPresence.m +++ b/src/XMPPPresence.m @@ -22,7 +22,7 @@ */ #import "XMPPPresence.h" -#import "XMPPConnection.h" +#import "namespaces.h" @implementation XMPPPresence + presence diff --git a/src/XMPPRoster.m b/src/XMPPRoster.m index 01adc9b..1da2ffc 100644 --- a/src/XMPPRoster.m +++ b/src/XMPPRoster.m @@ -27,6 +27,7 @@ #import "XMPPConnection.h" #import "XMPPIQ.h" #import "XMPPJID.h" +#import "namespaces.h" @implementation XMPPRoster - initWithConnection: (XMPPConnection*)conn diff --git a/src/XMPPStanza.m b/src/XMPPStanza.m index 6886b27..9396f46 100644 --- a/src/XMPPStanza.m +++ b/src/XMPPStanza.m @@ -21,9 +21,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "XMPPConnection.h" #import "XMPPStanza.h" #import "XMPPJID.h" +#import "namespaces.h" @implementation XMPPStanza + stanzaWithName: (OFString*)name diff --git a/src/namespaces.h b/src/namespaces.h new file mode 100644 index 0000000..58ce329 --- /dev/null +++ b/src/namespaces.h @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2011, Jonathan Schleifer + * + * https://webkeks.org/hg/objxmpp/ + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice is present in all copies. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#define XMPP_NS_BIND @"urn:ietf:params:xml:ns:xmpp-bind" +#define XMPP_NS_CLIENT @"jabber:client" +#define XMPP_NS_ROSTER @"jabber:iq:roster" +#define XMPP_NS_SASL @"urn:ietf:params:xml:ns:xmpp-sasl" +#define XMPP_NS_STARTTLS @"urn:ietf:params:xml:ns:xmpp-tls" +#define XMPP_NS_STANZAS @"urn:ietf:params:xml:ns:xmpp-stanzas" +#define XMPP_NS_SESSION @"urn:ietf:params:xml:ns:xmpp-session" +#define XMPP_NS_XMPP_STREAM @"urn:ietf:params:xml:ns:xmpp-streams" +#define XMPP_NS_STREAM @"http://etherx.jabber.org/streams"