Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'

[xonotic/netradiant.git] / plugins / textool / TexTool.cpp

diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp
index eb519033e1061166787f2973f97379d543514e53..9ba7b01bffd66abe8f7eaf8d0939f9b88ff884ed 100644 (file)
--- a/plugins/textool/TexTool.cpp
+++ b/plugins/textool/TexTool.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
+Copyright (C) 1999-2006 Id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
 
 This file is part of GtkRadiant.
@@ -38,7 +38,7 @@ static void dialog_button_callback (GtkWidget *widget, gpointer data)
   ret = (int*)g_object_get_data (G_OBJECT (parent), "ret");
  
   *loop = 0;
-  *ret = (int)data;
+  *ret = gpointer_to_int (data);
 }
  
 static gint dialog_delete_callback (GtkWidget *widget, GdkEvent* event, gpointer data)
@@ -182,7 +182,7 @@ CWindowListener g_Listen;
 
 // plugin interfaces ---------------------------
 bool                   g_bQglInitDone = false;
-_QERQglTable           g_QglTable;
+OpenGLBinding          g_QglTable;
 bool                   g_bSelectedFaceInitDone = false;
 _QERSelectedFaceTable  g_SelectedFaceTable;
 bool            g_bUITable = false;
@@ -533,7 +533,7 @@ static void DoExpose ()
   }
 
   // let the control points manager render
-  g_pManager->Render( );
+  g_pManager->render( );
 }
 
 static bool CanProcess ()
@@ -821,14 +821,14 @@ extern "C" void QERPlug_Dispatch(const char* p, vec3_t vMin, vec3_t vMax, bool b
   // if it's the first call, perhaps we need some additional init steps
   if (!g_bQglInitDone)
   {
-    g_QglTable.m_nSize = sizeof(_QERQglTable);
+    g_QglTable.m_nSize = sizeof(OpenGLBinding);
     if ( g_FuncTable.m_pfnRequestInterface( QERQglTable_GUID, static_cast<LPVOID>(&g_QglTable) ) )
     {
       g_bQglInitDone = true;
     }
     else
     {
-      Sys_Printf("TexTool plugin: _QERQglTable interface request failed\n");
+      Sys_Printf("TexTool plugin: OpenGLBinding interface request failed\n");
       return;
     }
   }
@@ -919,13 +919,8 @@ extern "C" void QERPlug_Dispatch(const char* p, vec3_t vMin, vec3_t vMax, bool b
 CSynapseServer* g_pSynapseServer = NULL;
 CSynapseClientTexTool g_SynapseClient;
 
-#if __GNUC__ >= 4
-#pragma GCC visibility push(default)
-#endif
-extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces( const char *version, CSynapseServer *pServer ) {
-#if __GNUC__ >= 4
-#pragma GCC visibility pop
-#endif
+extern "C" CSynapseClient* SYNAPSE_DLL_EXPORT Synapse_EnumerateInterfaces (const char *version, CSynapseServer *pServer)
+{
   if (strcmp(version, SYNAPSE_VERSION))
   {
     Syn_Printf("ERROR: synapse API version mismatch: should be '" SYNAPSE_VERSION "', got '%s'\n", version);