From d5fc00a4f8b5f77808fbedba8221c0cf8b856337 Mon Sep 17 00:00:00 2001 From: mattn Date: Thu, 26 Jun 2008 14:30:58 +0000 Subject: [PATCH] * removed unnecessary gi18n.h inclusions git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@283 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- contrib/bkgrnd2d/dialog.cpp | 1 - contrib/bobtoolz/StdAfx.h | 1 - contrib/camera/camera.h | 1 - contrib/gtkgensurf/gendlgs.cpp | 1 - contrib/gtkgensurf/gensurf.cpp | 1 - contrib/gtkgensurf/gensurf.h | 1 - contrib/prtview/stdafx.h | 1 - include/idatastream.h | 40 +++++++++---------- plugins/surface/surfacedialog.cpp | 1 - plugins/surface_heretic2/surfacedialog.cpp | 1 - .../surfaceflagsdialog_heretic2.cpp | 1 - plugins/surface_quake2/surfacedialog.cpp | 1 - .../surfaceflagsdialog_quake2.cpp | 1 - plugins/textool/StdAfx.h | 1 - radiant/camwindow.cpp | 1 - radiant/dialog.cpp | 1 - radiant/dialog.h | 1 - radiant/dialoginfo.cpp | 1 - radiant/gtkmisc.cpp | 1 - radiant/preferences.cpp | 1 + radiant/qe3.cpp | 1 - radiant/qe3.h | 1 - radiant/texwindow.cpp | 1 - radiant/xywindow.cpp | 1 - 24 files changed, 21 insertions(+), 42 deletions(-) diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index 204ae5e1..1d3b135f 100644 --- 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 -#include #include "bkgrnd2d.h" #include "dialog.h" diff --git a/contrib/bobtoolz/StdAfx.h b/contrib/bobtoolz/StdAfx.h index d49d54d5..d2d518f9 100644 --- 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 #include -#include #include #include diff --git a/contrib/camera/camera.h b/contrib/camera/camera.h index 05a2aeaf..cf1387c2 100644 --- a/contrib/camera/camera.h +++ b/contrib/camera/camera.h @@ -36,7 +36,6 @@ Copyright (C) 2002 Splash Damage Ltd. class CCamera; #include -#include #include "str.h" diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 80149dbb..9297ea2c 100644 --- 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 -#include #include #include #include diff --git a/contrib/gtkgensurf/gensurf.cpp b/contrib/gtkgensurf/gensurf.cpp index f7ff99d2..df40e911 100644 --- 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 -#include #include #include /* diff --git a/contrib/gtkgensurf/gensurf.h b/contrib/gtkgensurf/gensurf.h index b137c025..8e42ac0d 100644 --- 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 -#include #include "qerplugin.h" //#include "qertypes.h" diff --git a/contrib/prtview/stdafx.h b/contrib/prtview/stdafx.h index d988f205..2fddbdc9 100644 --- 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 -#include #if defined(__linux__) || defined(__APPLE__) #include diff --git a/include/idatastream.h b/include/idatastream.h index 19534aa4..1ca7b7b7 100644 --- 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. -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: -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. -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_ @@ -43,9 +43,9 @@ NOTE: why IDataStream and not IStream? because IStream is defined in windows IDL 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 @@ -61,7 +61,7 @@ public: 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; diff --git a/plugins/surface/surfacedialog.cpp b/plugins/surface/surfacedialog.cpp index dd0483ce..591cf7cb 100644 --- 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 -#include #include #include "surfdlg_plugin.h" diff --git a/plugins/surface_heretic2/surfacedialog.cpp b/plugins/surface_heretic2/surfacedialog.cpp index 7c016fcb..343ab291 100644 --- 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 -#include #include #include "surfdlg_plugin.h" diff --git a/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp b/plugins/surface_heretic2/surfaceflagsdialog_heretic2.cpp index 63c8378e..30774482 100644 --- 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 -#include #include #include "surfdlg_plugin.h" diff --git a/plugins/surface_quake2/surfacedialog.cpp b/plugins/surface_quake2/surfacedialog.cpp index 37aad9cc..5c7efbf4 100644 --- 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 -#include #include #include "surfdlg_plugin.h" diff --git a/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp b/plugins/surface_quake2/surfaceflagsdialog_quake2.cpp index 7619ab1b..5978b4d5 100644 --- 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 -#include #include #include "surfdlg_plugin.h" diff --git a/plugins/textool/StdAfx.h b/plugins/textool/StdAfx.h index c87a8b57..e4190ef8 100644 --- 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 #include -#include #include #include diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 68b959d5..35c2bde5 100644 --- 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 -#include #include extern void DrawPathLines(); diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index 9c6c2f8f..e3324c67 100644 --- 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 -#include #include #include diff --git a/radiant/dialog.h b/radiant/dialog.h index 009ed185..97aea2cb 100644 --- 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 -#include #include "str.h" #include "gtkmisc.h" diff --git a/radiant/dialoginfo.cpp b/radiant/dialoginfo.cpp index f7101e21..54a7472c 100644 --- 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 -#include //#include "qe3.h" GtkWidget *g_dlgInfo; diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 6e496669..42a6b927 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -39,7 +39,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #endif #include -#include #ifdef _WIN32 #include diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 9911b748..781b4e84 100644 --- 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 +#include #include #if defined (__linux__) || defined (__APPLE__) #include diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp index 49042668..25ef26cd 100644 --- 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 -#include #include #include "gtkmisc.h" #if defined (__linux__) || defined (__APPLE__) diff --git a/radiant/qe3.h b/radiant/qe3.h index c4412cbd..6ced65b3 100644 --- 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 -#include #include #include diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index d246a203..b3f96981 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -41,7 +41,6 @@ Clean up texture menu. #include #endif #include -#include #include #include #include "stdafx.h" diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 0ac6c974..3302bfef 100644 --- 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 -#include #include #include -- 2.39.2