ported over the 1.5 branch version of q3map2 which is newer

[xonotic/netradiant.git] / radiant / mainframe.h

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index 23a4264255ec3fc6bf1b14f82e4e643d6ca735c0..3d7d1468fa5beb5d04e3523c32f19c329a701c4e 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "gtkr_vector.h"
 
 #ifdef __APPLE__
-#define __toascii(c)    ((c) & 0x7f) 
+#define __toascii(c)    ((c) & 0x7f)
 #endif
 
 const int RAD_SHIFT =   0x01;
@@ -53,7 +53,7 @@ struct SCommandInfo
 
 struct SKeyInfo
 {
-  char* m_strName;
+  const char* m_strName;
   unsigned int m_nVKKey;
 };
 
@@ -431,13 +431,13 @@ public:
   bool RequestAPI(APIDescriptor_t *pAPI);
   const char* GetInfo();
   const char* GetName();
-      
+
   void ImportMap(IDataStream *in, CPtrArray *ents, const char *type);
   void ExportMap(CPtrArray *ents, IDataStream *out, const char *type);
 
   CSynapseClientRadiant() { }
   virtual ~CSynapseClientRadiant() { }
-};  
+};
 
 class MainFrame
 {
@@ -475,7 +475,7 @@ protected:
   /*!
   build the menu once the filename is found
   */
-  void process_xlink (Str &FileName, char *menu_name, const char *base_url, GtkWidget *menu, GtkAccelGroup *accel);
+  void process_xlink (Str &FileName, const char *menu_name, const char *base_url, GtkWidget *menu, GtkAccelGroup *accel);
 
   void Create ();
   void create_main_menu (GtkWidget *window, GtkWidget *vbox);
@@ -542,7 +542,7 @@ public:
   void ReleaseContexts ();
   void CreateContexts ();
 
-  void SetActiveXY(XYWnd* p) 
+  void SetActiveXY(XYWnd* p)
   {
     if (m_pActiveXY)
       m_pActiveXY->SetActive(false);