From 7206f6d1249da0dd8e879d0c0b26185fc6ef89d9 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 11 Nov 2014 04:14:01 +0100 Subject: added all of SciTECO's declarations to the "SciTECO" namespace normally, since SciTECO is not a library, this is not strictly necessary since every library should use proper name prefixes or namespaces for all global declarations to avoid name clashes. However * you cannot always rely on that * Scintilla does violate the practice of using prefixes or namespaces. The public APIs are OK, but it does define global functions/methods, e.g. for "Document" that clashed with SciTECO's "TECODocument" class at link-time. Scintilla can put its definitions in a namespace, but this feature cannot be easily enabled without patching Scintilla. * a "SciTECO" namespace will be necessary if "SciTECO" is ever to be turned into a library. Even if this library will have only a C-linkage API, it must ensure it doesn't clutter the global namespace. So the old "TECODocument" class was renamed back to "Document" (SciTECO::Document). --- src/ring.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ring.cpp') diff --git a/src/ring.cpp b/src/ring.cpp index 939a75c..19b494f 100644 --- a/src/ring.cpp +++ b/src/ring.cpp @@ -44,10 +44,10 @@ #include /* still need to clean up */ -#ifdef interface #undef interface #endif -#endif + +namespace SciTECO { namespace States { StateEditFile editfile; @@ -752,3 +752,5 @@ StateSaveFile::done(const gchar *str) return &States::start; } + +} /* namespace SciTECO */ -- cgit v1.2.3