aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ring.h
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.h
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.h')
-rw-r--r--src/ring.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/ring.h b/src/ring.h
index be2689e..8fc148c 100644
--- a/src/ring.h
+++ b/src/ring.h
@@ -34,6 +34,8 @@
#include "qregisters.h"
#include "parser.h"
+namespace SciTECO {
+
/*
* Auxiliary functions
*/
@@ -54,7 +56,7 @@ gchar *get_absolute_path(const gchar *path);
* Classes
*/
-class Buffer : public TECODocument {
+class Buffer : public Document {
class UndoTokenClose : public UndoToken {
Buffer *buffer;
@@ -72,7 +74,7 @@ public:
gint savepoint_id;
bool dirty;
- Buffer() : TECODocument(),
+ Buffer() : Document(),
filename(NULL), savepoint_id(0), dirty(false) {}
~Buffer()
{
@@ -104,14 +106,14 @@ public:
inline void
edit(void)
{
- TECODocument::edit();
+ Document::edit();
interface.info_update(this);
}
inline void
undo_edit(void)
{
interface.undo_info_update(this);
- TECODocument::undo_edit();
+ Document::undo_edit();
}
void load(const gchar *filename);
@@ -254,4 +256,6 @@ current_doc_must_undo(void)
QRegisters::current->must_undo;
}
+} /* namespace SciTECO */
+
#endif