Skip to content
This repository was archived by the owner on Oct 29, 2021. It is now read-only.

Commit 1092447

Browse files
pasispasis
committed
Fix spacing in c++ files
1 parent d2c1daf commit 1092447

3 files changed

Lines changed: 100 additions & 103 deletions

File tree

‎src/oocontext.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* oocontext.cpp
22
** strophe XMPP client library -- C++ context implementation
3-
**
4-
** Copyright (C) 2005-2009 Collecta, Inc.
3+
**
4+
** Copyright (C) 2005-2009 Collecta, Inc.
55
**
66
** This software is provided AS-IS with no warranty, either express
77
** or implied.
@@ -14,7 +14,7 @@
1414
#include "strophe.h"
1515
#include "strophepp.h"
1616

17-
XMPP::Context::Context()
17+
XMPP::Context::Context()
1818
{
1919
m_mem.alloc = callAlloc;
2020
m_mem.realloc = callRealloc;
@@ -48,8 +48,8 @@ void XMPP::Context::free(void *p)
4848
}
4949

5050
void XMPP::Context::log(const xmpp_log_level_t level,
51-
const char * const area,
52-
const char * const msg)
51+
const char * const area,
52+
const char * const msg)
5353
{
5454
/* do nothing by default */
5555
}
@@ -65,7 +65,7 @@ void *XMPP::Context::callAlloc(const size_t size, void * const userdata)
6565
}
6666

6767
void *XMPP::Context::callRealloc(void *p, const size_t size,
68-
void * const userdata)
68+
void * const userdata)
6969
{
7070
return reinterpret_cast<Context *>(userdata)->realloc(p, size);
7171
}
@@ -76,10 +76,9 @@ void XMPP::Context::callFree(void *p, void * const userdata)
7676
}
7777

7878
void XMPP::Context::callLog(void * const userdata,
79-
const xmpp_log_level_t level,
80-
const char * const area,
81-
const char * const msg)
79+
const xmpp_log_level_t level,
80+
const char * const area,
81+
const char * const msg)
8282
{
8383
reinterpret_cast<Context *>(userdata)->log(level, area, msg);
8484
}
85-

‎src/oostanza.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* oostanza.cpp
22
** strophe XMPP client library -- C++ context implementation
3-
**
4-
** Copyright (C) 2005-2009 Collecta, Inc.
3+
**
4+
** Copyright (C) 2005-2009 Collecta, Inc.
55
**
66
** This software is provided AS-IS with no warranty, either express
77
** or implied.
@@ -28,8 +28,8 @@ void *Stanza::operator new(size_t size, Context *ctx)
2828
if (!p) return p;
2929

3030
*reinterpret_cast<Context **>(p) = ctx;
31-
p = reinterpret_cast<void *>(reinterpret_cast<char *>(p) +
32-
sizeof(Context *));
31+
p = reinterpret_cast<void *>(reinterpret_cast<char *>(p) +
32+
sizeof(Context *));
3333

3434
return p;
3535
}
@@ -61,7 +61,7 @@ Stanza *Stanza::create(Context *ctx)
6161
void Stanza::release()
6262
{
6363
if (::xmpp_stanza_release(m_stanza))
64-
delete this;
64+
delete this;
6565
}
6666

6767
Stanza *Stanza::clone()
@@ -75,5 +75,3 @@ Stanza *Stanza::copy()
7575
// TODO
7676
return NULL;
7777
}
78-
79-

‎strophepp.h‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
**
66
** This software is provided AS-IS with no warranty, either express or
77
** implied.
8-
**
8+
**
99
** This program is dual licensed under the MIT and GPLv3 licenses.
1010
*/
1111

@@ -21,112 +21,112 @@
2121
namespace XMPP {
2222
class Context {
2323
private:
24-
xmpp_mem_t m_mem;
25-
xmpp_log_t m_log;
26-
xmpp_ctx_t *m_ctx;
24+
xmpp_mem_t m_mem;
25+
xmpp_log_t m_log;
26+
xmpp_ctx_t *m_ctx;
2727

2828
public:
29-
Context();
30-
virtual ~Context();
29+
Context();
30+
virtual ~Context();
3131

32-
virtual void *alloc(const size_t size);
33-
virtual void *realloc(void *p, const size_t size);
34-
virtual void free(void *p);
35-
virtual void log(const xmpp_log_level_t level,
36-
const char * const area,
37-
const char * const msg);
32+
virtual void *alloc(const size_t size);
33+
virtual void *realloc(void *p, const size_t size);
34+
virtual void free(void *p);
35+
virtual void log(const xmpp_log_level_t level,
36+
const char * const area,
37+
const char * const msg);
3838

39-
xmpp_ctx_t *getContext();
39+
xmpp_ctx_t *getContext();
4040

4141
private:
42-
static void *callAlloc(const size_t size, void * const userdata);
43-
static void *callRealloc(void *p, const size_t size,
44-
void * const userdata);
45-
static void callFree(void *p, void * const userdata);
46-
static void callLog(void * const userdata,
47-
const xmpp_log_level_t level,
48-
const char * const area,
49-
const char * const msg);
42+
static void *callAlloc(const size_t size, void * const userdata);
43+
static void *callRealloc(void *p, const size_t size,
44+
void * const userdata);
45+
static void callFree(void *p, void * const userdata);
46+
static void callLog(void * const userdata,
47+
const xmpp_log_level_t level,
48+
const char * const area,
49+
const char * const msg);
5050
};
5151

5252
class Stanza {
5353
private:
54-
Context *m_ctx;
55-
xmpp_stanza_t *m_stanza;
54+
Context *m_ctx;
55+
xmpp_stanza_t *m_stanza;
5656

57-
void *operator new(size_t size, Context *ctx);
58-
void operator delete(void *p);
59-
Stanza(Context *ctx);
60-
virtual ~Stanza();
57+
void *operator new(size_t size, Context *ctx);
58+
void operator delete(void *p);
59+
Stanza(Context *ctx);
60+
virtual ~Stanza();
6161

6262
public:
63-
static Stanza *create(Context *ctx);
64-
void release();
65-
Stanza *clone();
66-
Stanza *copy();
67-
68-
int toText(const char ** const buf, size_t * const buflen);
69-
Stanza *getChildren();
70-
Stanza *getChildByName(const char * const name);
71-
Stanza *getNext();
63+
static Stanza *create(Context *ctx);
64+
void release();
65+
Stanza *clone();
66+
Stanza *copy();
67+
68+
int toText(const char ** const buf, size_t * const buflen);
69+
Stanza *getChildren();
70+
Stanza *getChildByName(const char * const name);
71+
Stanza *getNext();
7272
char *getAttribute(const char * const name);
73-
char *getNamespace();
74-
char *getText();
75-
char *getName();
76-
void addChild(Stanza *child);
77-
void setNamespace(const char * const ns);
78-
void setAttribute(const char * const key, const char * const value);
79-
void setName(const char * const name);
80-
void setText(const char * const text);
81-
void setText(const char * const text, const size_t size);
82-
char *getType();
83-
char *getId();
84-
char *getTo();
85-
char *getFrom();
86-
void setType(const char * const type);
87-
void setId(const char * const id);
88-
void setTo(const char * const to);
89-
void setFrom(const char * const from);
73+
char *getNamespace();
74+
char *getText();
75+
char *getName();
76+
void addChild(Stanza *child);
77+
void setNamespace(const char * const ns);
78+
void setAttribute(const char * const key, const char * const value);
79+
void setName(const char * const name);
80+
void setText(const char * const text);
81+
void setText(const char * const text, const size_t size);
82+
char *getType();
83+
char *getId();
84+
char *getTo();
85+
char *getFrom();
86+
void setType(const char * const type);
87+
void setId(const char * const id);
88+
void setTo(const char * const to);
89+
void setFrom(const char * const from);
9090
};
9191

9292
class Connection {
9393
private:
94-
Context *m_ctx;
95-
xmpp_conn_t *conn;
94+
Context *m_ctx;
95+
xmpp_conn_t *conn;
9696

97-
void *operator new(size_t size, Context *ctx);
98-
Connection(Context *ctx);
97+
void *operator new(size_t size, Context *ctx);
98+
Connection(Context *ctx);
9999

100100
public:
101-
static Connection *create(Context *ctx);
102-
virtual ~Connection();
103-
Connection *clone();
104-
void operator delete(void *p);
105-
106-
const char *getJID();
107-
void setJID(const char * const jid);
108-
const char *getPass();
109-
void setPass(const char * const pass);
110-
bool connectClient(const char * const domain,
111-
xmpp_conn_handler callback,
112-
void * const userdata);
113-
void disconnect();
114-
void send(Stanza *stanza);
115-
116-
void addTimedHandler(xmpp_timed_handler handler,
117-
const unsigned long perdio,
118-
void * const userdata);
119-
void deleteTimedHandler(xmpp_timed_handler handler);
120-
void addHandler(xmpp_handler handler,
121-
const char * const ns,
122-
const char * const name,
123-
const char * const type,
124-
void * const userdata);
125-
void deleteHandler(xmpp_handler handler);
126-
void addIdHandler(xmpp_handler handler,
127-
const char * const id,
128-
void * const userdata);
129-
void deleteIdHandler(xmpp_handler handler);
101+
static Connection *create(Context *ctx);
102+
virtual ~Connection();
103+
Connection *clone();
104+
void operator delete(void *p);
105+
106+
const char *getJID();
107+
void setJID(const char * const jid);
108+
const char *getPass();
109+
void setPass(const char * const pass);
110+
bool connectClient(const char * const domain,
111+
xmpp_conn_handler callback,
112+
void * const userdata);
113+
void disconnect();
114+
void send(Stanza *stanza);
115+
116+
void addTimedHandler(xmpp_timed_handler handler,
117+
const unsigned long perdio,
118+
void * const userdata);
119+
void deleteTimedHandler(xmpp_timed_handler handler);
120+
void addHandler(xmpp_handler handler,
121+
const char * const ns,
122+
const char * const name,
123+
const char * const type,
124+
void * const userdata);
125+
void deleteHandler(xmpp_handler handler);
126+
void addIdHandler(xmpp_handler handler,
127+
const char * const id,
128+
void * const userdata);
129+
void deleteIdHandler(xmpp_handler handler);
130130
};
131131
}
132132

0 commit comments

Comments
 (0)