[nemiver/el6-branch] Replace NULL symbol with 0



commit aa8a654e03e9f6c91397e8f488f431fff3f5924c
Author: Fabien Parent <parent f gmail com>
Date:   Sat Jul 30 15:38:55 2011 +0200

    Replace NULL symbol with 0
    
    	* src/common/nmv-buffer.h (Buffer::Buffer): Replace NULL symbol with 0
    	* src/common/nmv-conf-manager.cc (Config::~Config): Likewise
    	* src/common/nmv-connection.cc
    	(ConnectionPriv::ConnectionPriv): Likewise
    	(Connection::~Connection): Likewise
    	* src/common/nmv-date-utils.cc (get_current_datetime): Likewise
    	* src/common/nmv-delete-statement.cc
    	(DeleteStatement::~DeleteStatement): Likewise
    	* src/common/nmv-dynamic-module.cc
    	(DynamicModule::Loader::create_dynamic_module_instance): Likewise
    	(DynamicModule::Priv::Priv): Likewise
    	* src/common/nmv-insert-statement.cc
    	(InsertStatement::~InsertStatement): Likewise
    	* src/common/nmv-log-stream.cc
    	(OfstreamLogSink::OfstreamLogSink): Likewise
    	* src/common/nmv-proc-mgr.cc
    	(ProcMgr::get_all_process_list): Likewise
    	(ProcMgr::get_process_from_pid): Likewise
    	* src/common/nmv-proc-utils.cc (launch_program): Likewise
    	* src/common/nmv-safe-ptr.h
    	(SafePtr::~SafePtr): Likewise
    	(SafePtr::release): Likewise
    	* src/common/nmv-scope-logger.cc
    	(ScopeLoggerPriv::ScopeLoggerPriv): Likewise
    	(ScopeLoggerPriv::~ScopeLoggerPriv): Likewise
    	* src/common/nmv-sql-statement.cc (SQLStatement::~SQLStatement): Likewise
    	* src/common/nmv-str-utils.cc (hexa_to_int): Likewise
    	* src/common/nmv-transaction.cc (Transaction::~Transaction): Likewise
    	* src/common/nmv-ustring.cc (UString::hexa_to_int): Likewise
    	* src/confmgr/nmv-gconf-mgr.cc
    	(GConfMgr::register_namespace): Likewise
    	(GConfMgr::get_key_value): Likewise
    	(GConfMgr::set_key_value): Likewise
    	* src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc
    	(SqliteCnxDrv::Priv::Priv): Likewise
    	(SqliteCnxDrv::Priv::step_cur_statement): Likewise
    	(SqliteCnxDrv::get_last_error): Likewise
    	(SqliteCnxDrv::execute_statement): Likewise
    	(SqliteCnxDrv::close): Likewise
    	* src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc
    	(SqliteCnxMgrDrv::~SqliteCnxMgrDrv): Likewise
    	(SqliteCnxMgrDrv::connect_to_db): Likewise
    	* src/langs/nmv-cpp-lexer.cc
    	(Lexer::~Lexer): Likewise
    	* src/main.cc (parse_command_line): Likewise
    	* src/persp/dbgperspective/nmv-breakpoints-view.cc
    	(BreakpointsView::Priv::on_breakpoints_view_button_press_signal): Likewise
    	* src/persp/dbgperspective/nmv-dbg-perspective.cc
    	(DBGPerspective::SlotedButton::SlotedButton): Likewise
    	(DBGPerspective::Priv::Priv): Likewise
    	(DBGPerspective::get_current_source_editor): Likewise
    	(DBGPerspective::update_file_maps): Likewise
    	(ScrollTextViewToEndClosure::ScrollTextViewToEndClosure): Likewise
    	* src/uicommon/nmv-terminal.cc (Terminal::Priv::init_pty): Likewise
    	* src/workbench/nmv-workbench.cc
    	(Workbench::on_contents_menu_item_action): Likewise
    	(Workbench::get_perspective): Likewise

 src/common/nmv-buffer.h                          |    2 +-
 src/common/nmv-conf-manager.cc                   |    2 +-
 src/common/nmv-connection.cc                     |    4 +-
 src/common/nmv-date-utils.cc                     |    2 +-
 src/common/nmv-delete-statement.cc               |    2 +-
 src/common/nmv-dynamic-module.cc                 |    6 ++--
 src/common/nmv-insert-statement.cc               |    2 +-
 src/common/nmv-log-stream.cc                     |    4 +-
 src/common/nmv-proc-mgr.cc                       |    8 +++---
 src/common/nmv-proc-utils.cc                     |    2 +-
 src/common/nmv-safe-ptr.h                        |    4 +-
 src/common/nmv-scope-logger.cc                   |    4 +-
 src/common/nmv-sql-statement.cc                  |    2 +-
 src/common/nmv-str-utils.cc                      |    2 +-
 src/common/nmv-transaction.cc                    |    2 +-
 src/common/nmv-ustring.cc                        |    2 +-
 src/confmgr/nmv-gconf-mgr.cc                     |   30 +++++++++++-----------
 src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc         |   18 ++++++------
 src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc     |    4 +-
 src/langs/nmv-cpp-lexer.cc                       |    2 +-
 src/main.cc                                      |   18 ++++++------
 src/persp/dbgperspective/nmv-breakpoints-view.cc |    2 +-
 src/persp/dbgperspective/nmv-dbg-perspective.cc  |   16 ++++++------
 src/uicommon/nmv-terminal.cc                     |    2 +-
 src/workbench/nmv-workbench.cc                   |    4 +-
 25 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/src/common/nmv-buffer.h b/src/common/nmv-buffer.h
index 0115c63..b94d042 100644
--- a/src/common/nmv-buffer.h
+++ b/src/common/nmv-buffer.h
@@ -37,7 +37,7 @@ class NEMIVER_API Buffer {
 
 public:
 
-    Buffer (): m_data (NULL), m_len (0)
+    Buffer (): m_data (0), m_len (0)
     {}
 
     Buffer (const char *a_buf, unsigned long a_len)
diff --git a/src/common/nmv-conf-manager.cc b/src/common/nmv-conf-manager.cc
index 9406e4a..be9d3d5 100644
--- a/src/common/nmv-conf-manager.cc
+++ b/src/common/nmv-conf-manager.cc
@@ -89,7 +89,7 @@ Config::~Config ()
 {
     if (m_priv) {
         delete m_priv;
-        m_priv = NULL;
+        m_priv = 0;
     }
 }
 
diff --git a/src/common/nmv-connection.cc b/src/common/nmv-connection.cc
index 3a57155..50d96d1 100644
--- a/src/common/nmv-connection.cc
+++ b/src/common/nmv-connection.cc
@@ -39,7 +39,7 @@ struct ConnectionPriv {
     Glib::Mutex mutex;
 
     ConnectionPriv () :
-            driver_iface (NULL), initialized (false)
+            driver_iface (0), initialized (false)
     {}
 
     common::IConnectionDriver&
@@ -108,7 +108,7 @@ Connection::~Connection ()
     }
     close ();
     delete m_priv;
-    m_priv = NULL;
+    m_priv = 0;
 }
 
 const char*
diff --git a/src/common/nmv-date-utils.cc b/src/common/nmv-date-utils.cc
index 66013c4..78ec977 100644
--- a/src/common/nmv-date-utils.cc
+++ b/src/common/nmv-date-utils.cc
@@ -40,7 +40,7 @@ get_current_datetime ()
 {
     struct timeval tv;
     memset (&tv, 0, sizeof (tv));
-    gettimeofday (&tv, NULL);
+    gettimeofday (&tv, 0);
     return tv.tv_sec;
 }
 
diff --git a/src/common/nmv-delete-statement.cc b/src/common/nmv-delete-statement.cc
index 445d9c8..578e62b 100644
--- a/src/common/nmv-delete-statement.cc
+++ b/src/common/nmv-delete-statement.cc
@@ -58,7 +58,7 @@ DeleteStatement::~DeleteStatement ()
 {
     if (m_priv) {
         delete m_priv;
-        m_priv = NULL;
+        m_priv = 0;
     }
 }
 
diff --git a/src/common/nmv-dynamic-module.cc b/src/common/nmv-dynamic-module.cc
index 3535d68..180be4e 100644
--- a/src/common/nmv-dynamic-module.cc
+++ b/src/common/nmv-dynamic-module.cc
@@ -315,7 +315,7 @@ DynamicModule::Loader::create_dynamic_module_instance (GModule *a_module)
     //get a pointer on the factory function exposes by
     //the module.
     //***********************************************
-    gpointer factory_function = NULL;
+    gpointer factory_function = 0;
     if (!g_module_symbol (a_module,
                 "nemiver_common_create_dynamic_module_instance",
                 &factory_function) || !factory_function) {
@@ -329,7 +329,7 @@ DynamicModule::Loader::create_dynamic_module_instance (GModule *a_module)
     //call the factory function to create an intance of
     //nemiver::common::DynamicModule
     //**************************************************
-    DynamicModule *loadable_module (NULL);
+    DynamicModule *loadable_module (0);
     ((bool (*) (void**)) factory_function) ((void**) &loadable_module);
 
     if (!loadable_module) {
@@ -401,7 +401,7 @@ struct DynamicModule::Priv {
     DynamicModule::Loader *loader;
 
     Priv () :
-        loader (NULL)
+        loader (0)
     {}
 };//end struct DynamicModule::Priv
 
diff --git a/src/common/nmv-insert-statement.cc b/src/common/nmv-insert-statement.cc
index e61ac63..7f2e7c9 100644
--- a/src/common/nmv-insert-statement.cc
+++ b/src/common/nmv-insert-statement.cc
@@ -52,7 +52,7 @@ InsertStatement::~InsertStatement ()
 {
     if (m_priv) {
         delete m_priv;
-        m_priv = NULL;
+        m_priv = 0;
     }
 }
 
diff --git a/src/common/nmv-log-stream.cc b/src/common/nmv-log-stream.cc
index 91b3eae..123e315 100644
--- a/src/common/nmv-log-stream.cc
+++ b/src/common/nmv-log-stream.cc
@@ -191,12 +191,12 @@ class OfstreamLogSink : public LogSink {
     }
 
 public:
-    OfstreamLogSink (const UString &a_file_path) : LogSink (NULL)
+    OfstreamLogSink (const UString &a_file_path) : LogSink (0)
     {
         init_from_path (a_file_path);
     }
 
-    OfstreamLogSink () : LogSink (NULL)
+    OfstreamLogSink () : LogSink (0)
     {
         vector<string> path_elems;
         path_elems.push_back (Glib::get_current_dir ());
diff --git a/src/common/nmv-proc-mgr.cc b/src/common/nmv-proc-mgr.cc
index cb9292a..e732d0e 100644
--- a/src/common/nmv-proc-mgr.cc
+++ b/src/common/nmv-proc-mgr.cc
@@ -85,7 +85,7 @@ ProcMgr::get_all_process_list () const
 {
     glibtop_proclist buf_desc;
     memset (&buf_desc, 0, sizeof (buf_desc));
-    pid_t *pids=NULL;
+    pid_t *pids=0;
 
     m_process_list.clear ();
 
@@ -109,7 +109,7 @@ ProcMgr::get_all_process_list () const
     }
     if (pids) {
         g_free (pids);
-        pids=NULL;
+        pids=0;
     }
     return m_process_list;
 }
@@ -142,7 +142,7 @@ ProcMgr::get_process_from_pid (pid_t a_pid,
     }
     if (argv) {
         g_strfreev (argv);
-        argv=NULL;
+        argv=0;
     } else {
         LOG_DD ("got null process args, "
                 "it means there is no process with pid: '"
@@ -157,7 +157,7 @@ ProcMgr::get_process_from_pid (pid_t a_pid,
     process.ppid (proc_info.ppid);
     process.uid (proc_info.uid);
     process.euid (proc_info.uid);
-    struct passwd *passwd_info=NULL;
+    struct passwd *passwd_info=0;
     passwd_info = getpwuid (process.uid ());
     if (passwd_info) {
         process.user_name (passwd_info->pw_name);
diff --git a/src/common/nmv-proc-utils.cc b/src/common/nmv-proc-utils.cc
index 32e70b6..1d88e43 100644
--- a/src/common/nmv-proc-utils.cc
+++ b/src/common/nmv-proc-utils.cc
@@ -85,7 +85,7 @@ launch_program (const std::vector<UString> &a_args,
     //RETURN_VAL_IF_FAIL (pipe (stdin_pipes) == 0, false);
 
     char pts_name[256]={0};
-    int pid  = forkpty (&master_pty_fd, pts_name, NULL, NULL);
+    int pid  = forkpty (&master_pty_fd, pts_name, 0, 0);
     LOG_DD ("process forked. pts_name: '"
             << pts_name << "', pid: '" << pid << "'");
 
diff --git a/src/common/nmv-safe-ptr.h b/src/common/nmv-safe-ptr.h
index a27a023..88cb6ef 100644
--- a/src/common/nmv-safe-ptr.h
+++ b/src/common/nmv-safe-ptr.h
@@ -98,7 +98,7 @@ public:
     ~SafePtr ()
     {
         unreference ();
-        m_pointer = NULL;
+        m_pointer = 0;
     }
 
     SafePtr<PointerType, ReferenceFunctor, UnreferenceFunctor>&
@@ -223,7 +223,7 @@ public:
     release ()
     {
         PointerType* pointer = m_pointer;
-        m_pointer = NULL;
+        m_pointer = 0;
         return  pointer;
     }
 
diff --git a/src/common/nmv-scope-logger.cc b/src/common/nmv-scope-logger.cc
index c6a5e01..f76fd37 100644
--- a/src/common/nmv-scope-logger.cc
+++ b/src/common/nmv-scope-logger.cc
@@ -50,7 +50,7 @@ struct ScopeLoggerPriv
                      enum LogStream::LogLevel a_level,
                      const UString &a_log_domain,
                      bool a_use_default_log_stream) :
-        out (NULL), can_free (false)
+        out (0), can_free (false)
     {
         if (!a_use_default_log_stream) {
             out = new LogStream (a_level);
@@ -85,7 +85,7 @@ struct ScopeLoggerPriv
                 delete out;
             }
         }
-        out = NULL;
+        out = 0;
     }
 };
 
diff --git a/src/common/nmv-sql-statement.cc b/src/common/nmv-sql-statement.cc
index 4309ebb..35c27f2 100644
--- a/src/common/nmv-sql-statement.cc
+++ b/src/common/nmv-sql-statement.cc
@@ -109,7 +109,7 @@ SQLStatement::~SQLStatement ()
     if (!m_priv)
         return;
     delete m_priv;
-    m_priv = NULL;
+    m_priv = 0;
 }
 
 SQLStatement::operator const char* () const
diff --git a/src/common/nmv-str-utils.cc b/src/common/nmv-str-utils.cc
index d54b124..c08d84c 100644
--- a/src/common/nmv-str-utils.cc
+++ b/src/common/nmv-str-utils.cc
@@ -130,7 +130,7 @@ parse_host_and_port (const std::string &a_str,
 size_t
 hexa_to_int (const string &a_hexa_str)
 {
-    return strtoll (a_hexa_str.c_str (), NULL, 16);
+    return strtoll (a_hexa_str.c_str (), 0, 16);
 }
 
 std::string
diff --git a/src/common/nmv-transaction.cc b/src/common/nmv-transaction.cc
index 2820379..935b534 100644
--- a/src/common/nmv-transaction.cc
+++ b/src/common/nmv-transaction.cc
@@ -101,7 +101,7 @@ Transaction::~Transaction ()
     rollback ();
     if (m_priv) {
         delete m_priv;
-        m_priv = NULL;
+        m_priv = 0;
     }
 }
 
diff --git a/src/common/nmv-ustring.cc b/src/common/nmv-ustring.cc
index 4e2d5d6..8945961 100644
--- a/src/common/nmv-ustring.cc
+++ b/src/common/nmv-ustring.cc
@@ -63,7 +63,7 @@ UString::from_int (long long an_int)
 size_t
 UString::hexa_to_int (const string &a_hexa_str)
 {
-    return strtoll (a_hexa_str.c_str (), NULL, 16);
+    return strtoll (a_hexa_str.c_str (), 0, 16);
 }
 
 UString::UString ()
diff --git a/src/confmgr/nmv-gconf-mgr.cc b/src/confmgr/nmv-gconf-mgr.cc
index ffa3c6f..fd7ff1c 100644
--- a/src/confmgr/nmv-gconf-mgr.cc
+++ b/src/confmgr/nmv-gconf-mgr.cc
@@ -170,7 +170,7 @@ GConfMgr::register_namespace (const UString &a_name)
                              name.c_str (),
                              (GConfClientNotifyFunc) client_notify_add_func,
                              this,
-                             NULL,
+                             0,
                              &err);
     error.reset (err);
     THROW_IF_FAIL2 (!error, error->message);
@@ -202,7 +202,7 @@ GConfMgr::get_key_value (const UString &a_key,
 {
     THROW_IF_FAIL (m_gconf_client);
 
-    GError *err=NULL;
+    GError *err=0;
     GCharSafePtr value (gconf_client_get_string (m_gconf_client,
                                                  a_key.c_str (),
                                                  &err));
@@ -221,7 +221,7 @@ GConfMgr::set_key_value (const UString &a_key,
                          const UString &)
 {
     THROW_IF_FAIL (m_gconf_client);
-    GError *err=NULL;
+    GError *err=0;
 
     gconf_client_set_string (m_gconf_client,
                              a_key.c_str (),
@@ -240,7 +240,7 @@ GConfMgr::get_key_value (const UString &a_key,
 {
     THROW_IF_FAIL (m_gconf_client);
 
-    GError *err=NULL;
+    GError *err=0;
     bool value = gconf_client_get_bool (m_gconf_client,
                                         a_key.c_str (),
                                         &err);
@@ -259,7 +259,7 @@ GConfMgr::set_key_value (const UString &a_key,
                          const UString &)
 {
     THROW_IF_FAIL (m_gconf_client);
-    GError *err=NULL;
+    GError *err=0;
 
     gconf_client_set_bool (m_gconf_client,
                            a_key.c_str (),
@@ -278,7 +278,7 @@ GConfMgr::get_key_value (const UString &a_key,
 {
     THROW_IF_FAIL (m_gconf_client);
 
-    GError *err=NULL;
+    GError *err=0;
     int value = gconf_client_get_int (m_gconf_client,
                                       a_key.c_str (),
                                       &err);
@@ -297,7 +297,7 @@ GConfMgr::set_key_value (const UString &a_key,
                          const UString &)
 {
     THROW_IF_FAIL (m_gconf_client);
-    GError *err=NULL;
+    GError *err=0;
 
     gconf_client_set_int (m_gconf_client,
                           a_key.c_str (),
@@ -316,7 +316,7 @@ GConfMgr::get_key_value (const UString &a_key,
 {
     THROW_IF_FAIL (m_gconf_client);
 
-    GError *err=NULL;
+    GError *err=0;
     double value = gconf_client_get_float (m_gconf_client,
                                            a_key.c_str (),
                                            &err);
@@ -335,7 +335,7 @@ GConfMgr::set_key_value (const UString &a_key,
                          const UString &)
 {
     THROW_IF_FAIL (m_gconf_client);
-    GError *err=NULL;
+    GError *err=0;
 
     gconf_client_set_float (m_gconf_client,
                             a_key.c_str (),
@@ -355,8 +355,8 @@ GConfMgr::get_key_value (const UString &a_key,
     bool result=false;
     THROW_IF_FAIL (m_gconf_client);
 
-    GError *err=NULL;
-    GSList *list=NULL;
+    GError *err=0;
+    GSList *list=0;
     list = gconf_client_get_list (m_gconf_client,
                                   a_key.c_str (),
                                   GCONF_VALUE_STRING,
@@ -377,7 +377,7 @@ out:
             g_free (cur->data);
         }
         g_slist_free (list);
-        list = NULL;
+        list = 0;
     }
     return result;
 }
@@ -390,7 +390,7 @@ GConfMgr::set_key_value (const UString &a_key,
     if (a_value.empty ())
         return;
     THROW_IF_FAIL (m_gconf_client);
-    GSList *list=NULL;
+    GSList *list=0;
     std::list<UString>::const_iterator it;
     for (it = a_value.begin (); it != a_value.end (); ++it) {
         list = g_slist_prepend (list, g_strdup (it->c_str ()));
@@ -399,7 +399,7 @@ GConfMgr::set_key_value (const UString &a_key,
     list = g_slist_reverse (list);
     THROW_IF_FAIL (list);
 
-    GError *err=NULL;
+    GError *err=0;
     gconf_client_set_list (m_gconf_client, a_key.c_str (),
                            GCONF_VALUE_STRING,
                            list, &err);
@@ -407,7 +407,7 @@ GConfMgr::set_key_value (const UString &a_key,
         g_free (cur->data);
     }
     g_slist_free (list);
-    list = NULL;
+    list = 0;
     GErrorSafePtr error (err);
     if (error) {
         THROW (error->message);
diff --git a/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc b/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc
index 23153c1..33e9aa8 100644
--- a/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc
+++ b/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.cc
@@ -69,8 +69,8 @@ struct SqliteCnxDrv::Priv {
     int last_execution_result;
 
     Priv ():
-        sqlite (NULL),
-        cur_stmt (NULL),
+        sqlite (0),
+        cur_stmt (0),
         last_execution_result (-333)
      {
      }
@@ -116,7 +116,7 @@ decide:
                  << sqlite3_errmsg (sqlite.get ()));
             if (cur_stmt) {
                 sqlite3_finalize (cur_stmt);
-                cur_stmt = NULL;
+                cur_stmt = 0;
             }
             result = false;
             break;
@@ -124,7 +124,7 @@ decide:
             LOG_ERROR ("seems like sqlite3_step() has been called too much ...");
             if (cur_stmt) {
                 sqlite3_finalize (cur_stmt);
-                cur_stmt = NULL;
+                cur_stmt = 0;
             }
             result = false;
             break;
@@ -132,7 +132,7 @@ decide:
             LOG_ERROR ("got an unknown error code from sqlite3_step");
             if (cur_stmt) {
                 sqlite3_finalize (cur_stmt);
-                cur_stmt = NULL;
+                cur_stmt = 0;
             }
             result = false;
             break;
@@ -168,7 +168,7 @@ SqliteCnxDrv::get_last_error () const
     if (m_priv && m_priv->sqlite) {
         return sqlite3_errmsg (m_priv->sqlite.get ());
     }
-    return NULL;
+    return 0;
 }
 
 bool
@@ -208,7 +208,7 @@ SqliteCnxDrv::execute_statement (const SQLStatement &a_statement)
     //we go forward.
     if (m_priv->cur_stmt) {
         sqlite3_finalize (m_priv->cur_stmt);
-        m_priv->cur_stmt = NULL;
+        m_priv->cur_stmt = 0;
         m_priv->last_execution_result = SQLITE_OK;
     }
 
@@ -219,7 +219,7 @@ SqliteCnxDrv::execute_statement (const SQLStatement &a_statement)
                                   a_statement.to_string ().c_str (),
                                   a_statement.to_string ().bytes (),
                                   &m_priv->cur_stmt,
-                                  NULL);
+                                  0);
     if (status != SQLITE_OK) {
         LOG_ERROR ("sqlite3_prepare() failed, returning: "
              << status << ":" << get_last_error ()
@@ -400,7 +400,7 @@ SqliteCnxDrv::close ()
     if (m_priv->sqlite) {
         if (m_priv->cur_stmt) {
             sqlite3_finalize (m_priv->cur_stmt);
-            m_priv->cur_stmt = NULL;
+            m_priv->cur_stmt = 0;
         }
     }
 }
diff --git a/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc b/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc
index 348d7c9..488fbc2 100644
--- a/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc
+++ b/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.cc
@@ -58,7 +58,7 @@ SqliteCnxMgrDrv::~SqliteCnxMgrDrv ()
     }
 
     delete m_priv;
-    m_priv = NULL;
+    m_priv = 0;
 }
 
 
@@ -70,7 +70,7 @@ SqliteCnxMgrDrv::connect_to_db (const DBDesc &a_db_desc,
 
     if (a_user == "") {}
     if (a_pass == "") {}
-    sqlite3 *sqlite (NULL);
+    sqlite3 *sqlite (0);
 
     //HACK. As we are using sqlite, make sure to use a db file
     //that is in $HOME/.nemiver/db/sqlite
diff --git a/src/langs/nmv-cpp-lexer.cc b/src/langs/nmv-cpp-lexer.cc
index 714047f..304724c 100644
--- a/src/langs/nmv-cpp-lexer.cc
+++ b/src/langs/nmv-cpp-lexer.cc
@@ -101,7 +101,7 @@ Lexer::~Lexer ()
 {
     if (m_priv) {
         delete m_priv;
-        m_priv = NULL;
+        m_priv = 0;
     }
 }
 
diff --git a/src/main.cc b/src/main.cc
index ec09d2e..de6927b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -89,7 +89,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_list_sessions,
       _("List the saved debugging sessions"),
-      NULL
+      0
     },
     { "purge-sessions",
       0,
@@ -97,7 +97,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_purge_sessions,
       _("Erase the saved debugging sessions"),
-      NULL
+      0
     },
     { "session",
       0,
@@ -113,7 +113,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_last_session,
       _("Execute the last session"),
-      NULL
+      0
     },
     { "log-domains",
       0,
@@ -129,7 +129,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_log_debugger_output,
       _("Log the debugger output"),
-      NULL
+      0
     },
     { "use-launch-terminal",
       0,
@@ -137,7 +137,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_use_launch_terminal,
       _("Use this terminal as the debugee's terminal"),
-      NULL
+      0
     },
     {
       "remote",
@@ -164,7 +164,7 @@ static GOptionEntry entries[] =
       G_OPTION_ARG_NONE,
       &gv_show_version,
       _("Show the version number of nemiver"),
-      NULL
+      0
     },
     {0, 0, 0, (GOptionArg) 0, 0, 0, 0}
 };
@@ -295,7 +295,7 @@ parse_command_line (int& a_argc,
     }
     nmv_argv = a_argv;
     inf_argv = a_argv + i;
-    GError *error = NULL;
+    GError *error = 0;
     if (g_option_context_parse (context.get (),
                                 &nmv_argc,
                                 &nmv_argv,
@@ -308,7 +308,7 @@ parse_command_line (int& a_argc,
 
         GCharSafePtr help_message;
         help_message.reset (g_option_context_get_help (context.get (),
-                                                       true, NULL));
+                                                       true, 0));
         cerr << help_message.get () << std::endl;
         return false;
     }
@@ -334,7 +334,7 @@ parse_command_line (int& a_argc,
             cerr << _("Otherwise, find below the full set of nemiver options.\n");
             GCharSafePtr help_message;
             help_message.reset (g_option_context_get_help (context.get (),
-                                                           true, NULL));
+                                                           true, 0));
             cerr << help_message.get () << std::endl;
             return false;
         }
diff --git a/src/persp/dbgperspective/nmv-breakpoints-view.cc b/src/persp/dbgperspective/nmv-breakpoints-view.cc
index cffb97e..c271a25 100644
--- a/src/persp/dbgperspective/nmv-breakpoints-view.cc
+++ b/src/persp/dbgperspective/nmv-breakpoints-view.cc
@@ -554,7 +554,7 @@ public:
                 // only pop up a context menu if there's a valid item at the
                 // point where the user clicked
                 Gtk::TreeModel::Path path;
-                Gtk::TreeViewColumn* p_column = NULL;
+                Gtk::TreeViewColumn* p_column = 0;
                 int cell_x=0, cell_y=0;
                 if (tree_view->get_path_at_pos (
                             static_cast<int>(a_event->x),
diff --git a/src/persp/dbgperspective/nmv-dbg-perspective.cc b/src/persp/dbgperspective/nmv-dbg-perspective.cc
index a0996c7..6e5acd1 100644
--- a/src/persp/dbgperspective/nmv-dbg-perspective.cc
+++ b/src/persp/dbgperspective/nmv-dbg-perspective.cc
@@ -195,12 +195,12 @@ private:
 
         SlotedButton () :
             Gtk::Button (),
-            perspective (NULL)
+            perspective (0)
         {}
 
         SlotedButton (const Gtk::StockID &a_id) :
             Gtk::Button (a_id),
-            perspective (NULL)
+            perspective (0)
         {}
 
         void on_clicked ()
@@ -1049,8 +1049,8 @@ struct DBGPerspective::Priv {
 #ifdef WITH_MEMORYVIEW
         memory_view_is_visible (false),
 #endif // WITH_MEMORYVIEW
-        sourceviews_notebook (NULL),
-        statuses_notebook (NULL),
+        sourceviews_notebook (0),
+        statuses_notebook (0),
         current_page_num (0),
         show_dbg_errors (false),
         use_system_font (true),
@@ -4423,7 +4423,7 @@ DBGPerspective::get_current_source_editor (bool a_load_if_nil)
 
     if (!m_priv->sourceviews_notebook) {
         LOG_ERROR ("NULL m_priv->sourceviews_notebook");
-        return NULL;
+        return 0;
     }
 
     if (a_load_if_nil
@@ -4445,7 +4445,7 @@ DBGPerspective::get_current_source_editor (bool a_load_if_nil)
     if (iter == nil) {
         LOG_ERROR ("Could not find page num: "
                    << m_priv->current_page_num);
-        return NULL;
+        return 0;
     }
 
     return iter->second;
@@ -6076,7 +6076,7 @@ DBGPerspective::update_file_maps ()
     m_priv->pagenum_2_source_editor_map.clear ();
     m_priv->pagenum_2_path_map.clear ();
 
-    SourceEditor *se = NULL;
+    SourceEditor *se = 0;
     UString path, basename;
     int nb_pages = m_priv->sourceviews_notebook->get_n_pages ();
 
@@ -8841,7 +8841,7 @@ DBGPerspective::set_show_memory_view (bool a_show)
 struct ScrollTextViewToEndClosure {
     Gtk::TextView* text_view;
 
-    ScrollTextViewToEndClosure (Gtk::TextView *a_view=NULL) :
+    ScrollTextViewToEndClosure (Gtk::TextView *a_view=0) :
         text_view (a_view)
     {
     }
diff --git a/src/uicommon/nmv-terminal.cc b/src/uicommon/nmv-terminal.cc
index e704ee3..c2fdff1 100644
--- a/src/uicommon/nmv-terminal.cc
+++ b/src/uicommon/nmv-terminal.cc
@@ -109,7 +109,7 @@ struct Terminal::Priv {
 
     bool init_pty ()
     {
-        if (openpty (&master_pty, &slave_pty, NULL, NULL, NULL)) {
+        if (openpty (&master_pty, &slave_pty, 0, 0, 0)) {
             LOG_ERROR ("oops");
             return false;
         }
diff --git a/src/workbench/nmv-workbench.cc b/src/workbench/nmv-workbench.cc
index 1de9ca3..d42ed71 100644
--- a/src/workbench/nmv-workbench.cc
+++ b/src/workbench/nmv-workbench.cc
@@ -252,7 +252,7 @@ Workbench::on_contents_menu_item_action ()
     UString cmd_line ("yelp " + path_to_help);
     LOG_DD ("going to spawn: " << cmd_line);
     bool is_ok = g_spawn_command_line_async (Glib::locale_from_utf8
-                                             (cmd_line).c_str (), NULL);
+                                             (cmd_line).c_str (), 0);
     if (!is_ok) {
         LOG_ERROR ("failed to spawn " << is_ok);
     }
@@ -527,7 +527,7 @@ Workbench::get_perspective (const UString &a_name)
         }
     }
     LOG_ERROR ("could not find perspective: '" << a_name << "'");
-    return NULL;
+    return 0;
 }
 
 /// Set the configuration manager



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]