* removed unnecessary gi18n.h inclusions

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

diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp
index 204ae5e16b1d6a12eeebdb51f0b4f3dbe2c9b4c6..1d3b135fcf793c875e263dfb7edc7b1d3e9bbe35 100644 (file)
--- a/contrib/bkgrnd2d/dialog.cpp
+++ b/contrib/bkgrnd2d/dialog.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
 #include <gtk/gtk.h>
 //
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 
 #include "bkgrnd2d.h"
 #include "dialog.h"
 
 #include "bkgrnd2d.h"
 #include "dialog.h"

diff --git a/contrib/bobtoolz/StdAfx.h b/contrib/bobtoolz/StdAfx.h
index d49d54d5808f0cbc8a5e4aca06b00b9359daca38..d2d518f9c8144231287359df7802696240da22a6 100644 (file)
--- a/contrib/bobtoolz/StdAfx.h
+++ b/contrib/bobtoolz/StdAfx.h
@@ -30,7 +30,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/contrib/camera/camera.h b/contrib/camera/camera.h
index 05a2aeaf001d812f897834477c03cd487e5ba8be..cf1387c2e8e2abebb96b1a563035700e231cb78b 100644 (file)
--- a/contrib/camera/camera.h
+++ b/contrib/camera/camera.h
@@ -36,7 +36,6 @@ Copyright (C) 2002 Splash Damage Ltd.
 class CCamera;
 
 #include <gtk/gtk.h>
 class CCamera;
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 
 #include "str.h"
 
 
 #include "str.h"
 

diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp
index 80149dbb5f63a7f4f13187d75b485089595aed4f..9297ea2c431d11f09cd91831d8a39de447e94ca6 100644 (file)
--- a/contrib/gtkgensurf/gendlgs.cpp
+++ b/contrib/gtkgensurf/gendlgs.cpp
@@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include <gtk/gtk.h>
 */
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/contrib/gtkgensurf/gensurf.cpp b/contrib/gtkgensurf/gensurf.cpp
index f7ff99d21475c115bba953865d66b698c885b3e9..df40e9114b30ad282daf18cff0d6392eab68d6e7 100644 (file)
--- a/contrib/gtkgensurf/gensurf.cpp
+++ b/contrib/gtkgensurf/gensurf.cpp
@@ -18,7 +18,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include <gtk/gtk.h>
 */
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <stdio.h>
 #include <stdlib.h>
 /*
 #include <stdio.h>
 #include <stdlib.h>
 /*

diff --git a/contrib/gtkgensurf/gensurf.h b/contrib/gtkgensurf/gensurf.h
index b137c025bbdc12253ece301bd4c539d44051af8e..8e42ac0d0492f84685cae2f417a3e6ccd564ea41 100644 (file)
--- a/contrib/gtkgensurf/gensurf.h
+++ b/contrib/gtkgensurf/gensurf.h
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define _GENSURF_H_
 
 #include <gtk/gtk.h>
 #define _GENSURF_H_
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 
 #include "qerplugin.h"
 //#include "qertypes.h"
 
 #include "qerplugin.h"
 //#include "qertypes.h"

diff --git a/contrib/prtview/stdafx.h b/contrib/prtview/stdafx.h
index d988f2052d86202cfa473abbcac853376a950706..2fddbdc9de274ab1530ff94027e610d023d7a913 100644 (file)
--- a/contrib/prtview/stdafx.h
+++ b/contrib/prtview/stdafx.h
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #define __PRTVIEW_AFX_H__
 
 #include <gtk/gtk.h>
 #define __PRTVIEW_AFX_H__
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 
 #if defined(__linux__) || defined(__APPLE__)
 #include <GL/glx.h>
 
 #if defined(__linux__) || defined(__APPLE__)
 #include <GL/glx.h>

diff --git a/include/idatastream.h b/include/idatastream.h
index 19534aa42046b0df9fcf36bf78bb68e86a175502..1ca7b7b7f36224df94235af9ac1fa21f7e198042 100644 (file)
--- a/include/idatastream.h
+++ b/include/idatastream.h
@@ -3,30 +3,30 @@ Copyright (c) 2001, Loki software, inc.
 modifications (c) 2001, Id software, inc.
 All rights reserved.
 
 modifications (c) 2001, Id software, inc.
 All rights reserved.
 

-Redistribution and use in source and binary forms, with or without modification, 
+Redistribution and use in source and binary forms, with or without modification,

 are permitted provided that the following conditions are met:
 
 are permitted provided that the following conditions are met:
 

-Redistributions of source code must retain the above copyright notice, this list 
+Redistributions of source code must retain the above copyright notice, this list

 of conditions and the following disclaimer.
 
 Redistributions in binary form must reproduce the above copyright notice, this
 list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 
 of conditions and the following disclaimer.
 
 Redistributions in binary form must reproduce the above copyright notice, this
 list of conditions and the following disclaimer in the documentation and/or
 other materials provided with the distribution.
 

-Neither the name of Loki software nor the names of its contributors may be used 
-to endorse or promote products derived from this software without specific prior 
-written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY 
-DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+Neither the name of Loki software nor the names of its contributors may be used
+to endorse or promote products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+DIRECT,INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */
 
 #ifndef _ISTREAM_H_
 */
 
 #ifndef _ISTREAM_H_


@@ -43,9 +43,9 @@ NOTE: why IDataStream and not IStream? because IStream is defined in windows IDL
 
 class IDataStream
 {
 
 class IDataStream
 {

-public:  
-  IDataStream();
-  virtual ~IDataStream();
+public:
+       IDataStream();
+       virtual ~IDataStream();

 
        virtual void IncRef () = 0;     ///< Increment the number of references to this object
        virtual void DecRef () = 0; ///< Decrement the reference count
 
        virtual void IncRef () = 0;     ///< Increment the number of references to this object
        virtual void DecRef () = 0; ///< Decrement the reference count


@@ -61,7 +61,7 @@ public:
        virtual int GetChar()=0;
        virtual int PutChar(int c)=0;
 
        virtual int GetChar()=0;
        virtual int PutChar(int c)=0;
 

-  virtual void printf(const char*, ...) = 0; ///< completely matches the usual printf behaviour
+       virtual void printf(const char*, ...) = 0; ///< completely matches the usual printf behaviour

 
        virtual void Abort()=0;
        virtual void Flush()=0;
 
        virtual void Abort()=0;
        virtual void Flush()=0;

diff --git a/plugins/surface/surfacedialog.cpp b/plugins/surface/surfacedialog.cpp
index dd0483ce04116cf7fc37705427b6a125f083e561..591cf7cb311324714cf6c37daa38d186ea64c191 100644 (file)
--- a/plugins/surface/surfacedialog.cpp
+++ b/plugins/surface/surfacedialog.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"

diff --git a/plugins/surface_heretic2/surfacedialog.cpp b/plugins/surface_heretic2/surfacedialog.cpp
index 7c016fcbec4e8e63222edd15446c219f6f70b4d9..343ab291675338389675b02726420ba9e317883d 100644 (file)
--- a/plugins/surface_heretic2/surfacedialog.cpp
+++ b/plugins/surface_heretic2/surfacedialog.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"

diff --git a/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp b/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp
index 63c8378ec6a571a199bcd80b1ae606dab2bccf3d..307744822557069bb75637f89f30d8a58e76bacb 100644 (file)
--- a/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp
+++ b/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include <gtk/gtk.h>
 */
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"

diff --git a/plugins/surface_quake2/surfacedialog.cpp b/plugins/surface_quake2/surfacedialog.cpp
index 37aad9cce837e7072e73cd89ae994b7dca46cd62..5c7efbf474a4e55875cbcfb3b742e0169e63440f 100644 (file)
--- a/plugins/surface_quake2/surfacedialog.cpp
+++ b/plugins/surface_quake2/surfacedialog.cpp
@@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"

diff --git a/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp b/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp
index 7619ab1bc37d1846ccd2c25decd84e8d71a3f433..5978b4d5b34235d46b004798e9dac5a692c4cb72 100644 (file)
--- a/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp
+++ b/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include <gtk/gtk.h>
 */
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "surfdlg_plugin.h"

diff --git a/plugins/textool/StdAfx.h b/plugins/textool/StdAfx.h
index c87a8b57c5cafc2dd4400c430e5ec7362e794dff..e4190ef8cb946f1d8c57556d53feba533f362f96 100644 (file)
--- a/plugins/textool/StdAfx.h
+++ b/plugins/textool/StdAfx.h
@@ -25,7 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // standard headers
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 // standard headers
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 68b959d585bfd50a263e33ede141c144e3f435dc..35c2bde573493f45916a115a58642acde4bbe76b 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <gtk/gtk.h>
 
 #include "stdafx.h"
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <GL/gl.h>
 
 extern void DrawPathLines();
 #include <GL/gl.h>
 
 extern void DrawPathLines();

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 9c6c2f8f01fa85c1c551b5bd31f6d5a8f9431381..e3324c6763bee9712cbec1e301b9c332693013e9 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <gtk/gtk.h>
 
 #include "stdafx.h"
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

diff --git a/radiant/dialog.h b/radiant/dialog.h
index 009ed18521f9aeeb52d43aa1303372d074639d11..97aea2cb097a249120bae889edd59b49640b992b 100644 (file)
--- a/radiant/dialog.h
+++ b/radiant/dialog.h
@@ -23,7 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define _DIALOG_H_
 
 #include <gtk/gtk.h>
 #define _DIALOG_H_
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include "str.h"
 #include "gtkmisc.h"
 
 #include "str.h"
 #include "gtkmisc.h"
 

diff --git a/radiant/dialoginfo.cpp b/radiant/dialoginfo.cpp
index f7101e217ead3f6995cb62c54bf2401e5139196c..54a7472c9923096bf3cc64c53fcb98903d933a60 100644 (file)
--- a/radiant/dialoginfo.cpp
+++ b/radiant/dialoginfo.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <gtk/gtk.h>
 
 #include "stdafx.h"
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 //#include "qe3.h"
 
 GtkWidget *g_dlgInfo;
 //#include "qe3.h"
 
 GtkWidget *g_dlgInfo;

diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp
index 6e496669e8f7361d6de1d2199d668d6c9925fdf2..42a6b9273c7acbf279eaf6a3a213ce276e2ec8ed 100644 (file)
--- a/radiant/gtkmisc.cpp
+++ b/radiant/gtkmisc.cpp
@@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <gtk/gtk.h>
 #endif
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>
 
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 9911b7480b4c65d0b7181ed0a66b300da8ef6468..781b4e841d5abbcd77a8706972dd0efab24926a2 100644 (file)
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -27,6 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <glib.h>
 
 #include "stdafx.h"
 #include <glib.h>

+#include <glib/gi18n.h>

 #include <assert.h>
 #if defined (__linux__) || defined (__APPLE__)
 #include <sys/stat.h>
 #include <assert.h>
 #if defined (__linux__) || defined (__APPLE__)
 #include <sys/stat.h>

diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index 49042668354b7503af966b206cdf031f0486304b..25ef26cd108249c292987be0919257950bd14e00 100644 (file)
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <gtk/gtk.h>
 
 #include "stdafx.h"
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <sys/stat.h>
 #include "gtkmisc.h"
 #if defined (__linux__) || defined (__APPLE__)
 #include <sys/stat.h>
 #include "gtkmisc.h"
 #if defined (__linux__) || defined (__APPLE__)

diff --git a/radiant/qe3.h b/radiant/qe3.h
index c4412cbd4a760bdb1b1ad338103467b90e81d30e..6ced65b3bb791681fa6ca15bb05f87684cf4b9f6 100644 (file)
--- a/radiant/qe3.h
+++ b/radiant/qe3.h
@@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "qgl.h"
 
 #include <gtk/gtk.h>
 #include "qgl.h"
 
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>
 

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index d246a20331df53344d2f687c28cda3a4ebfe8adc..b3f969815c785e1d3d6aa0db4ce74366bf6984ef 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -41,7 +41,6 @@ Clean up texture menu.
 #include <dirent.h>
 #endif
 #include <gtk/gtk.h>
 #include <dirent.h>
 #endif
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <assert.h>
 #include <sys/stat.h>
 #include "stdafx.h"
 #include <assert.h>
 #include <sys/stat.h>
 #include "stdafx.h"

diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp
index 0ac6c974ccf42c90d43c2af44dd3d643d2778f2b..3302bfef9e10a6110616fd61a91282fd1be035f7 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "stdafx.h"
 #include <gtk/gtk.h>
 
 #include "stdafx.h"
 #include <gtk/gtk.h>

-#include <glib/gi18n.h>

 #include <assert.h>
 #include <GL/gl.h>
 
 #include <assert.h>
 #include <GL/gl.h>