From cfdbf498079953e7afceb2ad7226a185d9eb1f30 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 4 Aug 2021 23:09:59 +0200 Subject: [PATCH] Remove clippertool.cpp/h which were empty. Remove worldspawn.rc as it's MSVC specific. Add two missing toolbar constructors. --- src/Makefile | 2 -- src/clippertool.cpp | 22 -------------- src/clippertool.h | 25 --------------- src/mainframe.cpp | 9 +++--- src/worldspawn.rc | 74 --------------------------------------------- 5 files changed, 4 insertions(+), 128 deletions(-) delete mode 100644 src/clippertool.cpp delete mode 100644 src/clippertool.h delete mode 100644 src/worldspawn.rc diff --git a/src/Makefile b/src/Makefile index 875912a..1565818 100644 --- a/src/Makefile +++ b/src/Makefile @@ -50,7 +50,6 @@ WS_OBJS = \ brushxml.o \ build.o \ camwindow.o \ - clippertool.o \ commands.o \ console.o \ csg.o \ @@ -140,7 +139,6 @@ brushtokens.o: brushtokens.cpp brushtokens.h brushxml.o: brushxml.cpp brushxml.h build.o: build.cpp build.h camwindow.o: camwindow.cpp camwindow.h -clippertool.o: clippertool.cpp clippertool.h commands.o: commands.cpp commands.h console.o: console.cpp console.h csg.o: csg.cpp csg.h diff --git a/src/clippertool.cpp b/src/clippertool.cpp deleted file mode 100644 index c167716..0000000 --- a/src/clippertool.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - Copyright (C) 2001-2006, William Joseph. - All Rights Reserved. - - This file is part of GtkRadiant. - - GtkRadiant is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GtkRadiant is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GtkRadiant; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "clippertool.h" diff --git a/src/clippertool.h b/src/clippertool.h deleted file mode 100644 index 5c1365d..0000000 --- a/src/clippertool.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 2001-2006, William Joseph. - All Rights Reserved. - - This file is part of GtkRadiant. - - GtkRadiant is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - GtkRadiant is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GtkRadiant; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#if !defined( INCLUDED_CLIPPERTOOL_H ) -#define INCLUDED_CLIPPERTOOL_H - -#endif diff --git a/src/mainframe.cpp b/src/mainframe.cpp index e053c5d..f3fd99c 100644 --- a/src/mainframe.cpp +++ b/src/mainframe.cpp @@ -2359,15 +2359,14 @@ ui::Toolbar create_main_toolbar() Select_constructToolbar(toolbar); space(); CSG_constructToolbar(toolbar); - - + space(); + ComponentModes_constructToolbar(toolbar); + space(); + Manipulators_constructToolbar(toolbar); space(); XYWnd_constructToolbar(toolbar); - - space(); CamWnd_constructToolbar(toolbar); - space(); Patch_constructToolbar(toolbar); diff --git a/src/worldspawn.rc b/src/worldspawn.rc deleted file mode 100644 index 189edf8..0000000 --- a/src/worldspawn.rc +++ /dev/null @@ -1,74 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -//#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -//#ifdef _WIN32 -//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -//#pragma code_page(1252) -//#endif //_WIN32 - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_WORLDSPAWN -ICON DISCARDABLE -"worldspawn.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "//#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED -