aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ring.cpp
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-11 04:14:01 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2014-11-11 04:14:01 +0100
commit7206f6d1249da0dd8e879d0c0b26185fc6ef89d9 (patch)
tree9f570b266ee49c06290c048b600346ab8b0dbddd /src/ring.cpp
parent0987ca8b5b1a6ff50bfc8c3b171fdaf6cfff3a2b (diff)
downloadsciteco-7206f6d1249da0dd8e879d0c0b26185fc6ef89d9.tar.gz
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).
Diffstat (limited to 'src/ring.cpp')
-rw-r--r--src/ring.cpp6
1 files changed, 4 insertions, 2 deletions
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 <windows.h>
/* 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 */