fixed compile errors

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@48 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/contrib/prtview/prtview.cpp b/contrib/prtview/prtview.cpp
index 34c6e70f3916a065e271b3dc9596fd28c3468eab..113d7b96674bc6f1db62757b11de54faf89607a0 100644 (file)
--- a/contrib/prtview/prtview.cpp
+++ b/contrib/prtview/prtview.cpp
@@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "iscenegraph.h"
 #include "iglrender.h"
 #include "iplugin.h"
+#include "stream/stringstream.h"
 
 #include "portals.h"
 #include "AboutDialog.h"
@@ -42,7 +43,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define Q3R_CMD_SHOW_2D "Toggle portals (2D)"
 #define Q3R_CMD_OPTIONS "Configure Portal Viewer"
 
-static char INIfn[PATH_MAX];
+CopiedString INIfn;
 
 /////////////////////////////////////////////////////////////////////////////
 // CPrtViewApp construction
@@ -68,8 +69,9 @@ static char INIfn[PATH_MAX];
 
 void PrtView_construct()
 {
-  strcpy(INIfn, GlobalRadiant().getSettingsPath());
-  strcat(INIfn, "prtview.ini");
+  StringOutputStream tmp(64);
+  tmp << GlobalRadiant().getSettingsPath() << "prtview.ini";
+  INIfn = tmp.c_str();
 
   portals.show_2d = INIGetInt(RENDER_2D, FALSE) ? true : false;
   portals.aa_2d = INIGetInt(AA_2D, FALSE) ? true : false;
@@ -157,7 +159,7 @@ int INIGetInt(char *key, int def)
 {
   char value[1024];
 
-  if (read_var (INIfn, CONFIG_SECTION, key, value))
+  if (read_var (INIfn.c_str(), CONFIG_SECTION, key, value))
     return atoi (value);
   else
     return def;
@@ -171,7 +173,7 @@ void INISetInt(char *key, int val, char *comment /* = NULL */)
     sprintf(s, "%d        ; %s", val, comment);
   else
     sprintf(s, "%d", val);
-  save_var (INIfn, CONFIG_SECTION, key, s);
+  save_var (INIfn.c_str(), CONFIG_SECTION, key, s);
 }
 
 

diff --git a/libs/generic/callback.h b/libs/generic/callback.h
index 68fc0662c6d17c049ba540a3cebc219a7e5b4b04..36653a73d4297b85122525d4c762a217e755bfd1 100644 (file)
--- a/libs/generic/callback.h
+++ b/libs/generic/callback.h
@@ -215,7 +215,7 @@ public:
   }
 };
 
-template<typename typename Thunk_>
+template<typename Thunk_>
 class CallbackBase
 {
   void* m_environment;
@@ -235,17 +235,17 @@ public:
   }
 };
 
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator==(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return self.getEnvironment() == other.getEnvironment() && self.getThunk() == other.getThunk();
 }
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator!=(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return !(self == other);
 }
-template<typename typename Thunk>
+template<typename Thunk>
 inline bool operator<(const CallbackBase<Thunk>& self, const CallbackBase<Thunk>& other)
 {
   return self.getEnvironment() < other.getEnvironment() ||