glom r1460 - in trunk: . glom/python_embed/python_module glom/translation

[murrayc svn gnome org]

Author: murrayc
Date: Tue Mar 18 09:01:59 2008
New Revision: 1460
URL: http://svn.gnome.org/viewvc/glom?rev=1460&view=rev

Log:
2008-03-18  Murray Cumming  <murrayc murrayc com>

* glom/python_embed/python_module/py_glom_module.cc (initglom):
Added more casts to non-const char* from static strings, to 
avoid warnings with Python. Python should use const char*, of course.

Modified:
   trunk/ChangeLog
   trunk/glom/python_embed/python_module/py_glom_module.cc
   trunk/glom/translation/window_translations.cc

Modified: trunk/glom/python_embed/python_module/py_glom_module.cc
==============================================================================
--- trunk/glom/python_embed/python_module/py_glom_module.cc	(original)
+++ trunk/glom/python_embed/python_module/py_glom_module.cc	Tue Mar 18 09:01:59 2008
@@ -49,22 +49,22 @@
     return;
 
 
-  m = Py_InitModule3("glom", pyglom_methods,
-                      "Python module for Glom caluclated fields.");
+  m = Py_InitModule3((char*)"glom", pyglom_methods,
+                      (char*)"Python module for Glom caluclated fields.");
 
 
   Py_INCREF(Glom::PyGlomRecord_GetPyType());
-  PyModule_AddObject(m, "Record", (PyObject *)Glom::PyGlomRecord_GetPyType());
+  PyModule_AddObject(m, (char*)"Record", (PyObject *)Glom::PyGlomRecord_GetPyType());
 
   Py_INCREF(Glom::PyGlomRelated_GetPyType());
-  PyModule_AddObject(m, "Related", (PyObject *)Glom::PyGlomRelated_GetPyType());
+  PyModule_AddObject(m, (char*)"Related", (PyObject *)Glom::PyGlomRelated_GetPyType());
 
   Py_INCREF(Glom::PyGlomRelated_GetPyType());
-  PyModule_AddObject(m, "RelatedRecord", (PyObject *)Glom::PyGlomRelated_GetPyType());
+  PyModule_AddObject(m, (char*)"RelatedRecord", (PyObject *)Glom::PyGlomRelated_GetPyType());
 
 
   if(PyErr_Occurred())
-    Py_FatalError ("Can't initialise glom module");
+    Py_FatalError((char*)"Can't initialise glom module");
 }
 
 

Modified: trunk/glom/translation/window_translations.cc
==============================================================================
--- trunk/glom/translation/window_translations.cc	(original)
+++ trunk/glom/translation/window_translations.cc	Tue Mar 18 09:01:59 2008
@@ -32,7 +32,6 @@
 #include <gettext-po.h>
 #include "config.h" //For HAVE_GETTEXTPO_XERROR
 
-#include <libgnomevfsmm/handle.h>
 #include <sstream>
 
 namespace Glom