* #7132: InstantMessaging -> instant_messaging

daemon/src/iax/iaxvoiplink.cpp

@@ -31,7 +31,7 @@
 #include "iaxvoiplink.h"
 #include "iaxcall.h"
 #include "eventthread.h"
-#include "im/InstantMessaging.h"
+#include "im/instant_messaging.h"
 #include "iaxaccount.h"
 #include "manager.h"
 #include "hooks/urlhook.h"

daemon/src/iax/iaxvoiplink.h

@@ -248,7 +248,7 @@ class IAXVoIPLink : public VoIPLink {
         EventThread* evThread_;
 
         /** registration session : 0 if not register */
-        struct iax_session* regSession_;
+        iax_session* regSession_;
 
         /** Timestamp of when we should refresh the registration up with
          * the registrar.  Values can be: EPOCH timestamp, 0 if we want no registration, 1

daemon/src/im/Makefile.am

-SUBDIRS = 
-
 include $(top_srcdir)/globals.mak
 
 noinst_LTLIBRARIES = libim.la
 
-libim_la_SOURCES = \
-	InstantMessaging.cpp InstantMessaging.h
+libim_la_SOURCES = instant_messaging.cpp instant_messaging.h

daemon/src/im/InstantMessaging.cpp → daemon/src/im/instant_messaging.cpp

@@ -29,7 +29,7 @@
  *  as that of the covered work.
  */
 
-#include "InstantMessaging.h"
+#include "instant_messaging.h"
 #include "logger.h"
 #include "expat.h"
 

daemon/src/im/InstantMessaging.h → daemon/src/im/instant_messaging.h

@@ -29,8 +29,8 @@
  *  as that of the covered work.
  */
 
-#ifndef _INSTANT_MESSAGING_H
-#define _INSTANT_MESSAGING_H
+#ifndef __INSTANT_MESSAGING_H__
+#define __INSTANT_MESSAGING_H__
 
 #include <string>
 #include <iostream>
@@ -168,4 +168,4 @@ class InstantMessaging {
         InstantMessaging& operator= (const InstantMessaging&); //No Assignment Operator
 };
 }
-#endif // _INSTANT_MESSAGING_H
+#endif // __INSTANT_MESSAGING_H_

daemon/src/managerimpl.cpp

@@ -40,7 +40,7 @@
 #include "dbus/callmanager.h"
 #include "global.h"
 #include "sip/sipaccount.h"
-#include "im/InstantMessaging.h"
+#include "im/instant_messaging.h"
 #include "iax/iaxaccount.h"
 #include "numbercleaner.h"
 

daemon/src/sip/sipvoiplink.cpp

@@ -50,7 +50,7 @@
 #include "dbus/callmanager.h"
 
 #include "hooks/urlhook.h"
-#include "im/InstantMessaging.h"
+#include "im/instant_messaging.h"
 
 #include "audio/audiolayer.h"
 

daemon/test/instantmessagingtest.h

@@ -37,7 +37,7 @@
 #include <assert.h>
 
 // Application import
-#include "im/InstantMessaging.h"
+#include "im/instant_messaging.h"
 
 /*
  * @file instantmessagingtest.h