Commit 427e6a2c authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #7132: InstantMessaging -> instant_messaging

parent e62a4dc9
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "iaxvoiplink.h" #include "iaxvoiplink.h"
#include "iaxcall.h" #include "iaxcall.h"
#include "eventthread.h" #include "eventthread.h"
#include "im/InstantMessaging.h" #include "im/instant_messaging.h"
#include "iaxaccount.h" #include "iaxaccount.h"
#include "manager.h" #include "manager.h"
#include "hooks/urlhook.h" #include "hooks/urlhook.h"
......
...@@ -248,7 +248,7 @@ class IAXVoIPLink : public VoIPLink { ...@@ -248,7 +248,7 @@ class IAXVoIPLink : public VoIPLink {
EventThread* evThread_; EventThread* evThread_;
/** registration session : 0 if not register */ /** registration session : 0 if not register */
struct iax_session* regSession_; iax_session* regSession_;
/** Timestamp of when we should refresh the registration up with /** Timestamp of when we should refresh the registration up with
* the registrar. Values can be: EPOCH timestamp, 0 if we want no registration, 1 * the registrar. Values can be: EPOCH timestamp, 0 if we want no registration, 1
......
SUBDIRS =
include $(top_srcdir)/globals.mak include $(top_srcdir)/globals.mak
noinst_LTLIBRARIES = libim.la noinst_LTLIBRARIES = libim.la
libim_la_SOURCES = \ libim_la_SOURCES = instant_messaging.cpp instant_messaging.h
InstantMessaging.cpp InstantMessaging.h
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
* as that of the covered work. * as that of the covered work.
*/ */
#include "InstantMessaging.h" #include "instant_messaging.h"
#include "logger.h" #include "logger.h"
#include "expat.h" #include "expat.h"
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
* as that of the covered work. * as that of the covered work.
*/ */
#ifndef _INSTANT_MESSAGING_H #ifndef __INSTANT_MESSAGING_H__
#define _INSTANT_MESSAGING_H #define __INSTANT_MESSAGING_H__
#include <string> #include <string>
#include <iostream> #include <iostream>
...@@ -168,4 +168,4 @@ class InstantMessaging { ...@@ -168,4 +168,4 @@ class InstantMessaging {
InstantMessaging& operator= (const InstantMessaging&); //No Assignment Operator InstantMessaging& operator= (const InstantMessaging&); //No Assignment Operator
}; };
} }
#endif // _INSTANT_MESSAGING_H #endif // __INSTANT_MESSAGING_H_
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "dbus/callmanager.h" #include "dbus/callmanager.h"
#include "global.h" #include "global.h"
#include "sip/sipaccount.h" #include "sip/sipaccount.h"
#include "im/InstantMessaging.h" #include "im/instant_messaging.h"
#include "iax/iaxaccount.h" #include "iax/iaxaccount.h"
#include "numbercleaner.h" #include "numbercleaner.h"
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
#include "dbus/callmanager.h" #include "dbus/callmanager.h"
#include "hooks/urlhook.h" #include "hooks/urlhook.h"
#include "im/InstantMessaging.h" #include "im/instant_messaging.h"
#include "audio/audiolayer.h" #include "audio/audiolayer.h"
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <assert.h> #include <assert.h>
// Application import // Application import
#include "im/InstantMessaging.h" #include "im/instant_messaging.h"
/* /*
* @file instantmessagingtest.h * @file instantmessagingtest.h
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment