[PATCH] Uniformize the header guard name.



>From 46497c37c18345a1ca2623b8a5f904c018c8bca9 Mon Sep 17 00:00:00 2001
From: Fabien Parent <parent f gmail com>
Date: Wed, 8 Jun 2011 22:17:20 +0200
Subject: [PATCH] Uniformize the header guard name.

	* src/common/nmv-address.h: use the file name as header guard name.
	* src/common/nmv-api-macros.h: Likewise
	* src/common/nmv-asm-instr.h: Likewise
	* src/common/nmv-asm-utils.h: Likewise
	* src/common/nmv-buffer.h: Likewise
	* src/common/nmv-conf-manager.h: Likewise
	* src/common/nmv-connection-manager.h: Likewise
	* src/common/nmv-connection.h: Likewise
	* src/common/nmv-date-utils.h: Likewise
	* src/common/nmv-delete-statement.h: Likewise
	* src/common/nmv-dynamic-module.h: Likewise
	* src/common/nmv-env.h: Likewise
	* src/common/nmv-exception.h: Likewise
	* src/common/nmv-i-connection-driver.h: Likewise
	* src/common/nmv-i-connection-manager-driver.h: Likewise
	* src/common/nmv-i-input-stream.h: Likewise
	* src/common/nmv-initializer.h: Likewise
	* src/common/nmv-insert-statement.h: Likewise
	* src/common/nmv-loc.h: Likewise
	* src/common/nmv-parsing-utils.h: Likewise
	* src/common/nmv-plugin.h: Likewise
	* src/common/nmv-range.h: Likewise
	* src/common/nmv-safe-ptr.h: Likewise
	* src/common/nmv-scope-logger.h: Likewise
	* src/common/nmv-sequence.h: Likewise
	* src/common/nmv-sql-statement.h: Likewise
	* src/common/nmv-tools.h: Likewise
	* src/common/nmv-transaction.h: Likewise
	* src/common/nmv-ustring.h: Likewise
	* src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h: Likewise
	* src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h: Likewise
	* src/dbgengine/nmv-i-debugger.h: Likewise
	* src/langs/nmv-cpp-ast.h: Likewise
	* src/langs/nmv-cpp-lexer-utils.h: Likewise
	* src/langs/nmv-cpp-lexer.h: Likewise
	* src/persp/dbgperspective/nmv-call-function-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-load-core-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-open-file-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-run-program-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-saved-sessions-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-set-breakpoint-dialog.h: Likewise
	* src/persp/dbgperspective/nmv-set-jump-to-dialog.h: Likewise
	* src/persp/nmv-i-perspective.h: Likewise
	* src/uicommon/nmv-dialog.h: Likewise
	* src/uicommon/nmv-locate-file-dialog.h: Likewise
	* src/uicommon/nmv-source-editor.h: Likewise
	* src/uicommon/nmv-ui-utils.h: Likewise
---
 src/common/nmv-address.h                           |    6 +++---
 src/common/nmv-api-macros.h                        |    4 ++--
 src/common/nmv-asm-instr.h                         |    6 +++---
 src/common/nmv-asm-utils.h                         |    6 +++---
 src/common/nmv-buffer.h                            |    6 +++---
 src/common/nmv-conf-manager.h                      |    6 +++---
 src/common/nmv-connection-manager.h                |    6 +++---
 src/common/nmv-connection.h                        |    6 +++---
 src/common/nmv-date-utils.h                        |    6 +++---
 src/common/nmv-delete-statement.h                  |    6 +++---
 src/common/nmv-dynamic-module.h                    |    6 +++---
 src/common/nmv-env.h                               |    6 +++---
 src/common/nmv-exception.h                         |    6 +++---
 src/common/nmv-i-connection-driver.h               |    6 +++---
 src/common/nmv-i-connection-manager-driver.h       |    6 +++---
 src/common/nmv-i-input-stream.h                    |    6 +++---
 src/common/nmv-initializer.h                       |    6 +++---
 src/common/nmv-insert-statement.h                  |    6 +++---
 src/common/nmv-loc.h                               |    6 +++---
 src/common/nmv-parsing-utils.h                     |    6 +++---
 src/common/nmv-plugin.h                            |    2 +-
 src/common/nmv-range.h                             |    4 ++--
 src/common/nmv-safe-ptr.h                          |    6 +++---
 src/common/nmv-scope-logger.h                      |    4 ++--
 src/common/nmv-sequence.h                          |    6 +++---
 src/common/nmv-sql-statement.h                     |    6 +++---
 src/common/nmv-tools.h                             |    6 +++---
 src/common/nmv-transaction.h                       |    6 +++---
 src/common/nmv-ustring.h                           |    4 ++--
 src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h            |    6 +++---
 src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h        |    6 +++---
 src/dbgengine/nmv-i-debugger.h                     |    6 +++---
 src/langs/nmv-cpp-ast.h                            |    6 +++---
 src/langs/nmv-cpp-lexer-utils.h                    |    6 +++---
 src/langs/nmv-cpp-lexer.h                          |    6 +++---
 .../dbgperspective/nmv-call-function-dialog.h      |    6 +++---
 src/persp/dbgperspective/nmv-load-core-dialog.h    |    6 +++---
 src/persp/dbgperspective/nmv-open-file-dialog.h    |    6 +++---
 src/persp/dbgperspective/nmv-run-program-dialog.h  |    6 +++---
 .../dbgperspective/nmv-saved-sessions-dialog.h     |    6 +++---
 .../dbgperspective/nmv-set-breakpoint-dialog.h     |    6 +++---
 src/persp/dbgperspective/nmv-set-jump-to-dialog.h  |    6 +++---
 src/persp/nmv-i-perspective.h                      |    6 +++---
 src/uicommon/nmv-dialog.h                          |    6 +++---
 src/uicommon/nmv-locate-file-dialog.h              |    6 +++---
 src/uicommon/nmv-source-editor.h                   |    6 +++---
 src/uicommon/nmv-ui-utils.h                        |    6 +++---
 47 files changed, 135 insertions(+), 135 deletions(-)

diff --git a/src/common/nmv-address.h b/src/common/nmv-address.h
index f4fa61a..d101ca4 100644
--- a/src/common/nmv-address.h
+++ b/src/common/nmv-address.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_ADDRESS_H__
-#define __NEMIVER_ADDRESS_H__
+#ifndef __NMV_ADDRESS_H__
+#define __NMV_ADDRESS_H__
 #include <string>
 #include "nmv-namespace.h"
 #include "nmv-api-macros.h"
@@ -67,4 +67,4 @@ operator<< (Stream &a_os, const Address &a)
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif // __NEMIVER_ADDRESS_H__
+#endif // __NMV_ADDRESS_H__
diff --git a/src/common/nmv-api-macros.h b/src/common/nmv-api-macros.h
index c76a912..db06ab5 100644
--- a/src/common/nmv-api-macros.h
+++ b/src/common/nmv-api-macros.h
@@ -26,8 +26,8 @@
  *
  */
 #include "config.h"
-#ifndef __NEMIVER_API_MACROS_H__
-#define __NEMIVER_API_MACROS_H__
+#ifndef __NMV_API_MACROS_H__
+#define __NMV_API_MACROS_H__

 # ifdef HAS_GCC_VISIBILITY_SUPPORT
 #  ifndef DSO_EXPORTED
diff --git a/src/common/nmv-asm-instr.h b/src/common/nmv-asm-instr.h
index 673132c..869b598 100644
--- a/src/common/nmv-asm-instr.h
+++ b/src/common/nmv-asm-instr.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_ASM_INSTR_H__
-#define __NEMIVER_ASM_INSTR_H__
+#ifndef __NMV_ASM_INSTR_H__
+#define __NMV_ASM_INSTR_H__

 #include <list>
 #include <boost/variant.hpp>
@@ -230,4 +230,4 @@ class DisassembleInfo {
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif // __NEMIVER_ASM_INSTR_H__
+#endif // __NMV_ASM_INSTR_H__
diff --git a/src/common/nmv-asm-utils.h b/src/common/nmv-asm-utils.h
index d0e2dcf..0cac127 100644
--- a/src/common/nmv-asm-utils.h
+++ b/src/common/nmv-asm-utils.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_ASM_UTILS_H__
-#define __NEMIVER_ASM_UTILS_H__
+#ifndef __NMV_ASM_UTILS_H__
+#define __NMV_ASM_UTILS_H__

 #include "nmv-asm-instr.h"

@@ -137,4 +137,4 @@ bool write_asm_instr (const common::Asm &a_asm,
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif // __NEMIVER_ASM_UTILS_H__
+#endif // __NMV_ASM_UTILS_H__
diff --git a/src/common/nmv-buffer.h b/src/common/nmv-buffer.h
index 8115433..0115c63 100644
--- a/src/common/nmv-buffer.h
+++ b/src/common/nmv-buffer.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_BUFFER_H__
-#define __NEMIVER_BUFFER_H__
+#ifndef __NMV_BUFFER_H__
+#define __NMV_BUFFER_H__

 #include "nmv-api-macros.h"

@@ -78,5 +78,5 @@ public:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_BUFFER_H__
+#endif //__NMV_BUFFER_H__

diff --git a/src/common/nmv-conf-manager.h b/src/common/nmv-conf-manager.h
index be56262..6511e6c 100644
--- a/src/common/nmv-conf-manager.h
+++ b/src/common/nmv-conf-manager.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CONF_MANAGER_H__
-#define __NEMIVER_CONF_MANAGER_H__
+#ifndef __NMV_CONF_MANAGER_H__
+#define __NMV_CONF_MANAGER_H__

 #include "nmv-object.h"
 #include "nmv-safe-ptr-utils.h"
@@ -92,5 +92,5 @@ public:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_CONF_MANAGER_H__
+#endif //__NMV_CONF_MANAGER_H__

diff --git a/src/common/nmv-connection-manager.h
b/src/common/nmv-connection-manager.h
index de588da..50b4120 100644
--- a/src/common/nmv-connection-manager.h
+++ b/src/common/nmv-connection-manager.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CONNECTION_MANAGER_H__
-#define __NEMIVER_CONNECTION_MANAGER_H__
+#ifndef __NMV_CONNECTION_MANAGER_H__
+#define __NMV_CONNECTION_MANAGER_H__

 #include "nmv-connection.h"

@@ -84,5 +84,5 @@ protected:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_CONNECTION_MANAGER_H__
+#endif //__NMV_CONNECTION_MANAGER_H__

diff --git a/src/common/nmv-connection.h b/src/common/nmv-connection.h
index 9fffbc6..4887813 100644
--- a/src/common/nmv-connection.h
+++ b/src/common/nmv-connection.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CONNECTION_H__
-#define __NEMIVER_CONNECTION_H__
+#ifndef __NMV_CONNECTION_H__
+#define __NMV_CONNECTION_H__

 #include "nmv-safe-ptr-utils.h"
 #include "nmv-object.h"
@@ -110,5 +110,5 @@ typedef common::SafePtr<Connection,

 }//end namespace common
 }//end nemiver
-#endif //end __NEMIVER_CONNECTION_H__
+#endif //end __NMV_CONNECTION_H__

diff --git a/src/common/nmv-date-utils.h b/src/common/nmv-date-utils.h
index de6c352..6ff6c64 100644
--- a/src/common/nmv-date-utils.h
+++ b/src/common/nmv-date-utils.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_DATE_UTILS_H__
-#define __NEMIVER_DATE_UTILS_H__
+#ifndef __NMV_DATE_UTILS_H__
+#define __NMV_DATE_UTILS_H__

 #include <sys/time.h>
 #include "nmv-api-macros.h"
@@ -49,5 +49,5 @@ void NEMIVER_API get_current_datetime (UString &a_datetime);
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_DATE_UTILS_H__
+#endif //__NMV_DATE_UTILS_H__

diff --git a/src/common/nmv-delete-statement.h
b/src/common/nmv-delete-statement.h
index e1c6f1e..5199010 100644
--- a/src/common/nmv-delete-statement.h
+++ b/src/common/nmv-delete-statement.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_DELETE_STATEMENT_H__
-#define __NEMIVER_DELETE_STATEMENT_H__
+#ifndef __NMV_DELETE_STATEMENT_H__
+#define __NMV_DELETE_STATEMENT_H__

 #include "nmv-sql-statement.h"

@@ -56,5 +56,5 @@ public:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_DELETE_STATEMENT_H__
+#endif //__NMV_DELETE_STATEMENT_H__

diff --git a/src/common/nmv-dynamic-module.h b/src/common/nmv-dynamic-module.h
index c8765d1..5841e85 100644
--- a/src/common/nmv-dynamic-module.h
+++ b/src/common/nmv-dynamic-module.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_DYNAMIC_MODULE_H__
-#define __NEMIVER_DYNAMIC_MODULE_H__
+#ifndef __NMV_DYNAMIC_MODULE_H__
+#define __NMV_DYNAMIC_MODULE_H__

 #include <vector>
 #include <list>
@@ -432,5 +432,5 @@ load_iface_using_context (DynamicModule &a_dynmod,
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif// __NEMIVER_DYNAMIC_MODULE_H__
+#endif// __NMV_DYNAMIC_MODULE_H__

diff --git a/src/common/nmv-env.h b/src/common/nmv-env.h
index 5e63543..2d15bfd 100644
--- a/src/common/nmv-env.h
+++ b/src/common/nmv-env.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_ENV_H__
-#define __NEMIVER_ENV_H__
+#ifndef __NMV_ENV_H__
+#define __NMV_ENV_H__

 #include "nmv-api-macros.h"
 #include "nmv-ustring.h"
@@ -95,5 +95,5 @@ NEMIVER_END_NAMESPACE (env)
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_ENV_H__
+#endif //__NMV_ENV_H__

diff --git a/src/common/nmv-exception.h b/src/common/nmv-exception.h
index 0248810..49fdc45 100644
--- a/src/common/nmv-exception.h
+++ b/src/common/nmv-exception.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_EXCEPTION_H__
-#define __NEMIVER_EXCEPTION_H__
+#ifndef __NMV_EXCEPTION_H__
+#define __NMV_EXCEPTION_H__

 #include <cstdlib>
 #include <stdexcept>
@@ -148,4 +148,4 @@ return; \
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_EXCEPTION_H__
+#endif //__NMV_EXCEPTION_H__
diff --git a/src/common/nmv-i-connection-driver.h
b/src/common/nmv-i-connection-driver.h
index 64693cf..6a78539 100644
--- a/src/common/nmv-i-connection-driver.h
+++ b/src/common/nmv-i-connection-driver.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_I_CONNECTION_DRIVER_H__
-#define __NEMIVER_I_CONNECTION_DRIVER_H__
+#ifndef __NMV_I_CONNECTION_DRIVER_H__
+#define __NMV_I_CONNECTION_DRIVER_H__

 #include <glib.h>
 #include "nmv-object.h"
@@ -102,5 +102,5 @@ typedef common::SafePtr<IConnectionDriver,
 }//end common
 }//end nemiver

-#endif //__NEMIVER_I_CONNECTION_DRIVER_H__
+#endif //__NMV_I_CONNECTION_DRIVER_H__

diff --git a/src/common/nmv-i-connection-manager-driver.h
b/src/common/nmv-i-connection-manager-driver.h
index 83b0392..14e5b3b 100644
--- a/src/common/nmv-i-connection-manager-driver.h
+++ b/src/common/nmv-i-connection-manager-driver.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_I_CONNECTION_MANAGER_DRIVER_H__
-#define __NEMIVER_I_CONNECTION_MANAGER_DRIVER_H__
+#ifndef __NMV_I_CONNECTION_MANAGER_DRIVER_H__
+#define __NMV_I_CONNECTION_MANAGER_DRIVER_H__

 #include "nmv-ustring.h"
 #include "nmv-dynamic-module.h"
@@ -104,5 +104,5 @@ typedef common::SafePtr<IConnectionManagerDriver,
                         common::ObjectUnref> IConnectionManagerDriverSafePtr;
 };//end namespace common
 };//end namespace nemiver
-#endif //__NEMIVER_I_CONNECTION_MANAGER_DRIVER_H__
+#endif //__NMV_I_CONNECTION_MANAGER_DRIVER_H__

diff --git a/src/common/nmv-i-input-stream.h b/src/common/nmv-i-input-stream.h
index f1dee9e..caf5f9d 100644
--- a/src/common/nmv-i-input-stream.h
+++ b/src/common/nmv-i-input-stream.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_I_INPUT_STREAM_H__
-#define __NEMIVER_I_INPUT_STREAM_H__
+#ifndef __NMV_I_INPUT_STREAM_H__
+#define __NMV_I_INPUT_STREAM_H__

 #include "nmv-object.h"

@@ -62,5 +62,5 @@ public:
 };//end class InputStream
 }//end namespace common
 }//end namespace nemiver
-#endif //__NEMIVER_INPUT_STREAM_H__
+#endif //__NMV_INPUT_STREAM_H__

diff --git a/src/common/nmv-initializer.h b/src/common/nmv-initializer.h
index 3500d13..c89c210 100644
--- a/src/common/nmv-initializer.h
+++ b/src/common/nmv-initializer.h
@@ -21,8 +21,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_INITIALIZER_H__
-#define __NEMIVER_INITIALIZER_H__
+#ifndef __NMV_INITIALIZER_H__
+#define __NMV_INITIALIZER_H__

 #include "nmv-api-macros.h"

@@ -43,5 +43,5 @@ public:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_INITIALIZER_H__
+#endif //__NMV_INITIALIZER_H__

diff --git a/src/common/nmv-insert-statement.h
b/src/common/nmv-insert-statement.h
index e876390..3b3d808 100644
--- a/src/common/nmv-insert-statement.h
+++ b/src/common/nmv-insert-statement.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_INSERT_STATEMENT_H__
-#define __NEMIVER_INSERT_STATEMENT_H__
+#ifndef __NMV_INSERT_STATEMENT_H__
+#define __NMV_INSERT_STATEMENT_H__

 #include "nmv-sql-statement.h"

@@ -58,5 +58,5 @@ public:

 }// end namespace common
 }//end namespace nemiver
-#endif //__NEMIVER_INSERT_STATEMENT_H__
+#endif //__NMV_INSERT_STATEMENT_H__

diff --git a/src/common/nmv-loc.h b/src/common/nmv-loc.h
index 8243a10..d969f3d 100644
--- a/src/common/nmv-loc.h
+++ b/src/common/nmv-loc.h
@@ -23,8 +23,8 @@
  *See COPYRIGHT file copyright information.
  */

-#ifndef __NEMIVER_LOC_H__
-#define __NEMIVER_LOC_H__
+#ifndef __NMV_LOC_H__
+#define __NMV_LOC_H__

 #include "nmv-ustring.h"
 #include "nmv-address.h"
@@ -156,4 +156,4 @@ class NEMIVER_API AddressLoc : public Loc
 NEMIVER_END_NAMESPACE (common)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_LOC_H__
+#endif //__NMV_LOC_H__
diff --git a/src/common/nmv-parsing-utils.h b/src/common/nmv-parsing-utils.h
index c303448..ae1ac20 100644
--- a/src/common/nmv-parsing-utils.h
+++ b/src/common/nmv-parsing-utils.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_PARSING_UTILS_H__
-#define __NEMIVER_PARSING_UTILS_H__
+#ifndef __NMV_PARSING_UTILS_H__
+#define __NMV_PARSING_UTILS_H__

 #include <glibmm.h>
 #include "nmv-ustring.h"
@@ -61,5 +61,5 @@ NEMIVER_API bool string_to_date (const UString
&a_str, Glib::Date &a_date);
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_PARSING_UTILS_H__
+#endif //__NMV_PARSING_UTILS_H__

diff --git a/src/common/nmv-plugin.h b/src/common/nmv-plugin.h
index 9e93858..5f148c7 100644
--- a/src/common/nmv-plugin.h
+++ b/src/common/nmv-plugin.h
@@ -244,5 +244,5 @@ public:
 }//end namespace common
 };//end namespace nemiver

-#endif //__NEMIVER_PLUGIN_H__
+#endif //__NMV_PLUGIN_H__

diff --git a/src/common/nmv-range.h b/src/common/nmv-range.h
index 04de42f..af57351 100644
--- a/src/common/nmv-range.h
+++ b/src/common/nmv-range.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_RANGE_H__
-#define __NEMIVER_RANGE_H__
+#ifndef __NMV_RANGE_H__
+#define __NMV_RANGE_H__

 #include "nmv-namespace.h"
 #include "nmv-api-macros.h"
diff --git a/src/common/nmv-safe-ptr.h b/src/common/nmv-safe-ptr.h
index 23195a3..5206594 100644
--- a/src/common/nmv-safe-ptr.h
+++ b/src/common/nmv-safe-ptr.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_SAFE_PTR_H__
-#define __NEMIVER_SAFE_PTR_H__
+#ifndef __NMV_SAFE_PTR_H__
+#define __NMV_SAFE_PTR_H__

 #include <cstdlib>

@@ -259,5 +259,5 @@ public:
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_SAFR_PTR_H__
+#endif //__NMV_SAFR_PTR_H__

diff --git a/src/common/nmv-scope-logger.h b/src/common/nmv-scope-logger.h
index 7092cbc..a16871b 100644
--- a/src/common/nmv-scope-logger.h
+++ b/src/common/nmv-scope-logger.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_SCOPE_LOGGER_H__
-#define __NEMIVER_SCOPE_LOGGER_H__
+#ifndef __NMV_SCOPE_LOGGER_H__
+#define __NMV_SCOPE_LOGGER_H__

 #include "nmv-api-macros.h"
 #include "nmv-log-stream-utils.h"
diff --git a/src/common/nmv-sequence.h b/src/common/nmv-sequence.h
index a1c64d9..6e53df5 100644
--- a/src/common/nmv-sequence.h
+++ b/src/common/nmv-sequence.h
@@ -25,8 +25,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SEQUENCE_H__
-#define __NEMIVER_SEQUENCE_H__
+#ifndef __NMV_SEQUENCE_H__
+#define __NMV_SEQUENCE_H__

 #include "nmv-api-macros.h"
 #include "nmv-object.h"
@@ -65,5 +65,5 @@ public:

 }//end namespace common
 }//end namespace nemiver
-#endif // __NEMIVER_SEQUENCE_H__
+#endif // __NMV_SEQUENCE_H__

diff --git a/src/common/nmv-sql-statement.h b/src/common/nmv-sql-statement.h
index 1dbc3b6..9e8dc5d 100644
--- a/src/common/nmv-sql-statement.h
+++ b/src/common/nmv-sql-statement.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SQL_STATEMENT_H__
-#define __NEMIVER_SQL_STATEMENT_H__
+#ifndef __NMV_SQL_STATEMENT_H__
+#define __NMV_SQL_STATEMENT_H__

 //#pragma GCC visibility push(default)
 #include <vector>
@@ -124,4 +124,4 @@ NEMIVER_API common::LogStream & operator<<
(common::LogStream &,

 }//end namespace common
 }//end namespace nemiver
-#endif //__NEMIVER_SQL_STATEMENT_H__
+#endif //__NMV_SQL_STATEMENT_H__
diff --git a/src/common/nmv-tools.h b/src/common/nmv-tools.h
index c219d37..9e90481 100644
--- a/src/common/nmv-tools.h
+++ b/src/common/nmv-tools.h
@@ -28,8 +28,8 @@
 #include "nmv-exception.h"
 #include "nmv-transaction.h"

-#ifndef __NEMIVER_TOOLS_H__
-#define __NEMIVER_TOOLS_H__
+#ifndef __NMV_TOOLS_H__
+#define __NMV_TOOLS_H__

 using namespace std;

@@ -54,5 +54,5 @@ bool NEMIVER_API execute_one_statement (const
common::UString &a_sql_string,
 }//end namespace common
 }//end namespace verissimus

-#endif //__NEMIVER_TOOL_H__
+#endif //__NMV_TOOL_H__

diff --git a/src/common/nmv-transaction.h b/src/common/nmv-transaction.h
index 6bc549e..5c30331 100644
--- a/src/common/nmv-transaction.h
+++ b/src/common/nmv-transaction.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_TRANSACTION_H__
-#define __NEMIVER_TRANSACTION_H__
+#ifndef __NMV_TRANSACTION_H__
+#define __NMV_TRANSACTION_H__

 /// \file
 /// the declaration of the application level transaction class
@@ -130,5 +130,5 @@ struct TransactionAutoHelper
 }//end namespace common
 }//end namespace nemiver

-#endif //__NEMIVER_TRANSACTION_H__
+#endif //__NMV_TRANSACTION_H__

diff --git a/src/common/nmv-ustring.h b/src/common/nmv-ustring.h
index 531f865..5a6cc7e 100644
--- a/src/common/nmv-ustring.h
+++ b/src/common/nmv-ustring.h
@@ -27,8 +27,8 @@
  * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-#ifndef __NEMIVER_USTRING_H__
-#define __NEMIVER_USTRING_H__
+#ifndef __NMV_USTRING_H__
+#define __NMV_USTRING_H__

 #include <vector>
 #include <string>
diff --git a/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h
b/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h
index 05031e2..1cbdaa1 100644
--- a/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h
+++ b/src/dbdimpl/sqlite/nmv-sqlite-cnx-drv.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SQLITE_CNX_DRV_H__
-#define __NEMIVER_SQLITE_CNX_DRV_H__
+#ifndef __NMV_SQLITE_CNX_DRV_H__
+#define __NMV_SQLITE_CNX_DRV_H__

 #include "common/nmv-i-connection-driver.h"

@@ -91,5 +91,5 @@ public:
 }//end namspace common
 }//end namespace nemiver

-#endif //__NEMIVER_SQLITE_CNX_DRV_H__
+#endif //__NMV_SQLITE_CNX_DRV_H__

diff --git a/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h
b/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h
index 877bbd4..84f1f52 100644
--- a/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h
+++ b/src/dbdimpl/sqlite/nmv-sqlite-cnx-mgr-drv.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SQLITE_CNX_MGR_DRV_H__
-#define __NEMIVER_SQLITE_CNX_MGR_DRV_H__
+#ifndef __NMV_SQLITE_CNX_MGR_DRV_H__
+#define __NMV_SQLITE_CNX_MGR_DRV_H__

 #include "common/nmv-i-connection-manager-driver.h"
 #include "common/nmv-i-connection-driver.h"
@@ -58,5 +58,5 @@ public:
 }//end namespace dbd
 }//end namespace nemiver

-#endif //__NEMIVER_SQLITE_CNX_MGR_DRV_H__
+#endif //__NMV_SQLITE_CNX_MGR_DRV_H__

diff --git a/src/dbgengine/nmv-i-debugger.h b/src/dbgengine/nmv-i-debugger.h
index b375798..1ea0569 100644
--- a/src/dbgengine/nmv-i-debugger.h
+++ b/src/dbgengine/nmv-i-debugger.h
@@ -23,8 +23,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_I_DEBUGGER_H__
-#define __NEMIVER_I_DEBUGGER_H__
+#ifndef __NMV_I_DEBUGGER_H__
+#define __NMV_I_DEBUGGER_H__

 #include <stdint.h>
 #include <vector>
@@ -1379,5 +1379,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_I_DEBUGGER_H__
+#endif //__NMV_I_DEBUGGER_H__

diff --git a/src/langs/nmv-cpp-ast.h b/src/langs/nmv-cpp-ast.h
index 3b777e2..98314d3 100644
--- a/src/langs/nmv-cpp-ast.h
+++ b/src/langs/nmv-cpp-ast.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CPP_AST_H__
-#define __NEMIVER_CPP_AST_H__
+#ifndef __NMV_CPP_AST_H__
+#define __NMV_CPP_AST_H__

 #include <string>
 #include <list>
@@ -2750,5 +2750,5 @@ public:

 NEMIVER_END_NAMESPACE (cpp)
 NEMIVER_END_NAMESPACE (nemiver)
-#endif /*__NEMIVER_CPP_AST_H__*/
+#endif /*__NMV_CPP_AST_H__*/

diff --git a/src/langs/nmv-cpp-lexer-utils.h b/src/langs/nmv-cpp-lexer-utils.h
index 8757ca9..16dae6c 100644
--- a/src/langs/nmv-cpp-lexer-utils.h
+++ b/src/langs/nmv-cpp-lexer-utils.h
@@ -21,8 +21,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CPP_LEXER_UTILS_H__
-#define __NEMIVER_CPP_LEXER_UTILS_H__
+#ifndef __NMV_CPP_LEXER_UTILS_H__
+#define __NMV_CPP_LEXER_UTILS_H__

 #include <iosfwd>
 #include "nmv-cpp-lexer.h"
@@ -38,5 +38,5 @@ std::ostream& operator<< (std::ostream &, const Token&);
 NEMIVER_END_NAMESPACE (cpp)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_CPP_LEXER_UTILS_H__
+#endif //__NMV_CPP_LEXER_UTILS_H__

diff --git a/src/langs/nmv-cpp-lexer.h b/src/langs/nmv-cpp-lexer.h
index 343ce48..c8f7249 100644
--- a/src/langs/nmv-cpp-lexer.h
+++ b/src/langs/nmv-cpp-lexer.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CPP_LEXER_H__
-#define __NEMIVER_CPP_LEXER_H__
+#ifndef __NMV_CPP_LEXER_H__
+#define __NMV_CPP_LEXER_H__

 #include <string>
 #include "nmv-cpp-ast.h"
@@ -118,5 +118,5 @@ public:
 NEMIVER_END_NAMESPACE (cpp)
 NEMIVER_END_NAMESPACE (nemiver)

-#endif /*__NEMIVER_CPP_LEXER_H__*/
+#endif /*__NMV_CPP_LEXER_H__*/

diff --git a/src/persp/dbgperspective/nmv-call-function-dialog.h
b/src/persp/dbgperspective/nmv-call-function-dialog.h
index d0f4cc5..952d317 100644
--- a/src/persp/dbgperspective/nmv-call-function-dialog.h
+++ b/src/persp/dbgperspective/nmv-call-function-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_CALL_FUNCTION_DIALOG_H__
-#define __NEMIVER_CALL_FUNCTION_DIALOG_H__
+#ifndef __NMV_CALL_FUNCTION_DIALOG_H__
+#define __NMV_CALL_FUNCTION_DIALOG_H__

 #include <list>
 #include "common/nmv-safe-ptr-utils.h"
@@ -54,5 +54,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif /*__NEMIVER_CALL_FUNCTION_DIALOG_H__*/
+#endif /*__NMV_CALL_FUNCTION_DIALOG_H__*/

diff --git a/src/persp/dbgperspective/nmv-load-core-dialog.h
b/src/persp/dbgperspective/nmv-load-core-dialog.h
index 8870fe5..9c621e2 100644
--- a/src/persp/dbgperspective/nmv-load-core-dialog.h
+++ b/src/persp/dbgperspective/nmv-load-core-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_LOAD_CORE_DIALOG_H__
-#define __NEMIVER_LOAD_CORE_DIALOG_H__
+#ifndef __NMV_LOAD_CORE_DIALOG_H__
+#define __NMV_LOAD_CORE_DIALOG_H__

 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-dialog.h"
@@ -54,5 +54,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_LOAD_CORE_DIALOG_H__
+#endif //__NMV_LOAD_CORE_DIALOG_H__

diff --git a/src/persp/dbgperspective/nmv-open-file-dialog.h
b/src/persp/dbgperspective/nmv-open-file-dialog.h
index 41cb3b2..e1a1370 100644
--- a/src/persp/dbgperspective/nmv-open-file-dialog.h
+++ b/src/persp/dbgperspective/nmv-open-file-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_OPEN_FILE_DIALOG_H__
-#define __NEMIVER_OPEN_FILE_DIALOG_H__
+#ifndef __NMV_OPEN_FILE_DIALOG_H__
+#define __NMV_OPEN_FILE_DIALOG_H__

 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-dialog.h"
@@ -54,5 +54,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_OPEN_FILE_DIALOG_H__
+#endif //__NMV_OPEN_FILE_DIALOG_H__

diff --git a/src/persp/dbgperspective/nmv-run-program-dialog.h
b/src/persp/dbgperspective/nmv-run-program-dialog.h
index d5a83fc..a72e001 100644
--- a/src/persp/dbgperspective/nmv-run-program-dialog.h
+++ b/src/persp/dbgperspective/nmv-run-program-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_RUN_PROGRAM_DIALOG_H__
-#define __NEMIVER_RUN_PROGRAM_DIALOG_H__
+#ifndef __NMV_RUN_PROGRAM_DIALOG_H__
+#define __NMV_RUN_PROGRAM_DIALOG_H__

 #include <map>
 #include "common/nmv-safe-ptr-utils.h"
@@ -65,5 +65,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_RUN_PROGRAM_DIALOG_H__
+#endif //__NMV_RUN_PROGRAM_DIALOG_H__

diff --git a/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
b/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
index 944a3aa..9d48e4c 100644
--- a/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
+++ b/src/persp/dbgperspective/nmv-saved-sessions-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SAVED_SESSIONS_DIALOG_H__
-#define __NEMIVER_SAVED_SESSIONS_DIALOG_H__
+#ifndef __NMV_SAVED_SESSIONS_DIALOG_H__
+#define __NMV_SAVED_SESSIONS_DIALOG_H__

 #include <gtkmm/treeview.h>
 #include <gtkmm/liststore.h>
@@ -57,5 +57,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_SAVED_SESSIONS_DIALOG_H__
+#endif //__NMV_SAVED_SESSIONS_DIALOG_H__

diff --git a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
index f8d1118..4e9c755 100644
--- a/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
+++ b/src/persp/dbgperspective/nmv-set-breakpoint-dialog.h
@@ -24,8 +24,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SET_BREAKPOINT_DIALOG_H__
-#define __NEMIVER_SET_BREAKPOINT_DIALOG_H__
+#ifndef __NMV_SET_BREAKPOINT_DIALOG_H__
+#define __NMV_SET_BREAKPOINT_DIALOG_H__

 #include "common/nmv-safe-ptr-utils.h"
 #include "common/nmv-address.h"
@@ -86,5 +86,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_SET_BREAKPOINT_DIALOG_H__
+#endif //__NMV_SET_BREAKPOINT_DIALOG_H__

diff --git a/src/persp/dbgperspective/nmv-set-jump-to-dialog.h
b/src/persp/dbgperspective/nmv-set-jump-to-dialog.h
index 41da37f..e458a77 100644
--- a/src/persp/dbgperspective/nmv-set-jump-to-dialog.h
+++ b/src/persp/dbgperspective/nmv-set-jump-to-dialog.h
@@ -23,8 +23,8 @@
  *See COPYRIGHT file copyright information.
  */

-#ifndef __NEMIVER_SET_JUMP_TO_DIALOG_H__
-#define __NEMIVER_SET_JUMP_TO_DIALOG_H__
+#ifndef __NMV_SET_JUMP_TO_DIALOG_H__
+#define __NMV_SET_JUMP_TO_DIALOG_H__

 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-dialog.h"
@@ -55,4 +55,4 @@ class SetJumpToDialog : public Dialog

 NEMIVER_END_NAMESPACE (nemiver)

-#endif // __NEMIVER_JUMP_TO_DIALOG_H__
+#endif // __NMV_JUMP_TO_DIALOG_H__
diff --git a/src/persp/nmv-i-perspective.h b/src/persp/nmv-i-perspective.h
index b8ca7f0..bc7d0fd 100644
--- a/src/persp/nmv-i-perspective.h
+++ b/src/persp/nmv-i-perspective.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_I_PERSPECTIVE_H__
-#define __NEMIVER_I_PERSPECTIVE_H__
+#ifndef __NMV_I_PERSPECTIVE_H__
+#define __NMV_I_PERSPECTIVE_H__

 #include <gtkmm.h>
 #include <list>
@@ -146,5 +146,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_I_PERSPECTIVE_H__
+#endif //__NMV_I_PERSPECTIVE_H__

diff --git a/src/uicommon/nmv-dialog.h b/src/uicommon/nmv-dialog.h
index 9cea926..41aa25e 100644
--- a/src/uicommon/nmv-dialog.h
+++ b/src/uicommon/nmv-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_DIALOG_H__
-#define __NEMIVER_DIALOG_H__
+#ifndef __NMV_DIALOG_H__
+#define __NMV_DIALOG_H__

 #include <gtkmm/builder.h>
 #include "common/nmv-object.h"
@@ -84,6 +84,6 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_DIALOG_H__
+#endif //__NMV_DIALOG_H__


diff --git a/src/uicommon/nmv-locate-file-dialog.h
b/src/uicommon/nmv-locate-file-dialog.h
index ff7f91b..5def510 100644
--- a/src/uicommon/nmv-locate-file-dialog.h
+++ b/src/uicommon/nmv-locate-file-dialog.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_LOCATE_FILE_DIALOG_H__
-#define __NEMIVER_LOCATE_FILE_DIALOG_H__
+#ifndef __NMV_LOCATE_FILE_DIALOG_H__
+#define __NMV_LOCATE_FILE_DIALOG_H__

 #include "common/nmv-safe-ptr-utils.h"
 #include "nmv-dialog.h"
@@ -51,5 +51,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_LOCATE_FILE_DIALOG_H__
+#endif //__NMV_LOCATE_FILE_DIALOG_H__

diff --git a/src/uicommon/nmv-source-editor.h b/src/uicommon/nmv-source-editor.h
index 13132e6..72f2615 100644
--- a/src/uicommon/nmv-source-editor.h
+++ b/src/uicommon/nmv-source-editor.h
@@ -22,8 +22,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_SOURCE_EDITOR_H__
-#define __NEMIVER_SOURCE_EDITOR_H__
+#ifndef __NMV_SOURCE_EDITOR_H__
+#define __NMV_SOURCE_EDITOR_H__

 #include <list>
 #include <functional>
@@ -208,5 +208,5 @@ public:

 NEMIVER_END_NAMESPACE (nemiver)

-#endif //__NEMIVER_DBG_SOURCE_EDITOR_H__
+#endif //__NMV_DBG_SOURCE_EDITOR_H__

diff --git a/src/uicommon/nmv-ui-utils.h b/src/uicommon/nmv-ui-utils.h
index 2c245c0..b4e3c3b 100644
--- a/src/uicommon/nmv-ui-utils.h
+++ b/src/uicommon/nmv-ui-utils.h
@@ -25,8 +25,8 @@
  *
  *See COPYRIGHT file copyright information.
  */
-#ifndef __NEMIVER_UI_UTILS_H__
-#define __NEMIVER_UI_UTILS_H__
+#ifndef __NMV_UI_UTILS_H__
+#define __NMV_UI_UTILS_H__

 #include "common/nmv-api-macros.h"
 #include <gtkmm.h>
@@ -198,5 +198,5 @@ struct WidgetUnref {
 }//end namespace ui_utils
 }//end namespace nemiver

-#endif// __NEMIVER_UI_UTILS_H__
+#endif// __NMV_UI_UTILS_H__

-- 
1.7.5.3


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