remove GINGA_NAMESPACE macros

TeleMidia · Jan 6, 2023 · 832de8f · 832de8f
1 parent c8b991d
commit 832de8f
Show file tree

Hide file tree

Showing 48 changed files with 124 additions and 132 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,32 +1,32 @@
-{
-    // this configuration use the ms-vscode.cmake-tools extension
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "cmaketools",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "${workspaceFolder}/examples/primeiro-joao/00syncProp.ncl",
-            ],
-            "cwd": "${workspaceFolder}",
-            "environment": [
-                {
-                    "name": "PATH",
-                    "value": "${env:PATH};${command:cmake.getLaunchTargetDirectory}"
-                },
-            ],
-            "miDebuggerPath": "C:\\msys64\\usr\\bin\\gdb.exe",
-            "externalConsole": false,
-            "stopAtEntry": false,
-            "setupCommands": [
-                {
-                    "description": "gdb",
-                    "text": "-enable-pretty-printing",
-                    "ignoreFailures": true
-                }
-            ]
-        }
-    ]
+{
+    // this configuration use the ms-vscode.cmake-tools extension
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "cmaketools",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [
+                "${workspaceFolder}/examples/primeiro-joao/00syncProp.ncl",
+            ],
+            "cwd": "${workspaceFolder}",
+            "environment": [
+                {
+                    "name": "PATH",
+                    "value": "${env:PATH};${command:cmake.getLaunchTargetDirectory}"
+                },
+            ],
+            "miDebuggerPath": "C:/msys64/mingw64/bin/gdb.exe",
+            "externalConsole": false,
+            "stopAtEntry": false,
+            "setupCommands": [
+                {
+                    "description": "gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ]
+        }
+    ]
 }
diff --git a/lib/Composition.cpp b/lib/Composition.cpp
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Document.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 Composition::Composition (const string &id) : Object (id)
 {
@@ -68,4 +68,4 @@ Composition::addChild (Object *child)
     }
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Composition.h b/lib/Composition.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Object.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Composition : public Object
 {
@@ -37,6 +37,6 @@ class Composition : public Object
   set<Object *> _children;
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // COMPOSITION_H
diff --git a/lib/Context.cpp b/lib/Context.cpp
@@ -21,7 +21,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Document.h"
 #include "MediaSettings.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Public.
 
@@ -389,4 +389,4 @@ Context::setLinksStatus (bool status)
   _status = status;
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Context.h b/lib/Context.h
@@ -21,7 +21,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Composition.h"
 #include "Event.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Context : public Composition
 {
@@ -59,6 +59,6 @@ class Context : public Composition
   bool _status;       ///< Whether links are active.
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // CONTEXT_H
diff --git a/lib/Document.cpp b/lib/Document.cpp
@@ -25,7 +25,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Switch.h"
 #include "PlayerRemote.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 /**
  * @brief Creates a new document.
@@ -574,4 +574,4 @@ Document::setData (const string &key, void *value, UserDataCleanFunc fn)
   return _udata.setData (key, value, fn);
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Document.h b/lib/Document.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Object.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Context;
 class Media;
@@ -73,6 +73,6 @@ class Document
   UserData _udata;                    ///< Attached user data.
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // DOCUMENT_H
diff --git a/lib/Event.cpp b/lib/Event.cpp
@@ -19,7 +19,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Event.h"
 #include "Object.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Public.
 
@@ -309,4 +309,4 @@ Event::getStringAsTransition (string str)
     g_assert_not_reached ();
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Event.h b/lib/Event.h
@@ -21,7 +21,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "aux-ginga.h"
 #include "Predicate.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Object;
 
@@ -138,6 +138,6 @@ typedef struct
   string delay;                 ///< Delay.
 } Action;
 
-GINGA_NAMESPACE_END
+}
 
 #endif // EVENT_H
diff --git a/lib/Formatter.cpp b/lib/Formatter.cpp
@@ -38,7 +38,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "ParserLua.h" // for ncl-ltab support
 #endif
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Option data.
 typedef struct GingaOptionData
@@ -625,4 +625,4 @@ Formatter::setOptionSize (Formatter *self, const string &name, int value)
   TRACE ("%s:=%d", name.c_str (), value);
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Formatter.h b/lib/Formatter.h
@@ -23,7 +23,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Document.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class WebServices;
 class Context;
@@ -109,6 +109,6 @@ class Formatter : public Ginga
   bool _eos;
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // FORMATTER_H
diff --git a/lib/Media.cpp b/lib/Media.cpp
@@ -24,7 +24,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Event.h"
 #include "Player.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Public.
 
@@ -527,4 +527,4 @@ Media::doStop ()
   Object::doStop ();
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Media.h b/lib/Media.h
@@ -21,7 +21,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Object.h"
 #include "Player.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Media : public Object
 {
@@ -49,6 +49,6 @@ class Media : public Object
   void doStop () override;
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // MEDIA_H
diff --git a/lib/MediaSettings.cpp b/lib/MediaSettings.cpp
@@ -21,7 +21,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "Context.h"
 #include "Switch.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Public.
 
@@ -122,4 +122,4 @@ MediaSettings::scheduleFocusUpdate (const string &next)
   _nextFocus = next;
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/MediaSettings.h b/lib/MediaSettings.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Media.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class MediaSettings : public Media
 {
@@ -47,6 +47,6 @@ class MediaSettings : public Media
   bool _hasNextFocus; // true if a focus update is scheduled
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // MEDIA_SETTINGS_H
diff --git a/lib/Object.cpp b/lib/Object.cpp
@@ -26,7 +26,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "MediaSettings.h"
 #include "Switch.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Public.
 
@@ -432,4 +432,4 @@ Object::doStop ()
     cast (Context *, _parent)->decAwakeChildren ();
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Object.h b/lib/Object.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Event.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Document;
 class Composition;
@@ -122,6 +122,6 @@ class Object
   virtual void doStop ();
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // OBJECT_H
diff --git a/lib/Parser.cpp b/lib/Parser.cpp
@@ -31,7 +31,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include <fontconfig/fontconfig.h>
 #include <libxml/uri.h>
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // XML helper macros and functions.
 #define toCString(s) deconst (char *, (s))
@@ -4351,4 +4351,4 @@ Parser::parseFile (const string &path, int width, int height,
   return doc;
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/Parser.h b/lib/Parser.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Document.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class Parser
 {
@@ -29,6 +29,6 @@ class Parser
   static Document *parseFile (const string &, int, int, string *);
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // PARSER_H
diff --git a/lib/ParserLua.cpp b/lib/ParserLua.cpp
@@ -28,7 +28,7 @@ GINGA_BEGIN_DECLS
 #include "aux-lua.h"
 GINGA_END_DECLS
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 /* TODO:
 
@@ -841,4 +841,4 @@ ParserLua::parseFile (const string &path, string *errmsg)
   return doc;
 }
 
-GINGA_NAMESPACE_END
+}
diff --git a/lib/ParserLua.h b/lib/ParserLua.h
@@ -20,7 +20,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include "Document.h"
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 class ParserLua
 {
@@ -29,6 +29,6 @@ class ParserLua
   static Document *parseFile (const string &, string *);
 };
 
-GINGA_NAMESPACE_END
+}
 
 #endif // PARSER_LUA_H
diff --git a/lib/Player.cpp b/lib/Player.cpp
@@ -35,7 +35,7 @@ along with Ginga.  If not, see <https://www.gnu.org/licenses/>.  */
 #include "PlayerHTML.h"
 #endif
 
-GINGA_NAMESPACE_BEGIN
+namespace ginga {
 
 // Mime-type table.
 static map<string, string> mime_table = {
@@ -821,4 +821,4 @@ Player::redrawDebuggingInfo (cairo_t *cr)
   cairo_surface_destroy (debug);
 }
 
-GINGA_NAMESPACE_END
+}