From dd1e9a68d4534dead3ab1931e91da20ec42a10f9 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Tue, 22 Jan 2013 01:38:25 -0500 Subject: [PATCH] Removal of the deprecated lltabcontainervertical. --- indra/llui/CMakeLists.txt | 2 -- indra/llui/lltabcontainer.cpp | 1 - indra/llui/lltabcontainervertical.cpp | 33 --------------------------- indra/llui/lltabcontainervertical.h | 33 --------------------------- indra/llui/lluictrlfactory.cpp | 1 - indra/newview/llfloatercustomize.cpp | 1 - indra/newview/llfloaterpreference.h | 1 - indra/newview/llpanelavatar.cpp | 1 - indra/newview/llpanelclassified.cpp | 1 - indra/newview/llpanelpick.cpp | 1 - 10 files changed, 75 deletions(-) delete mode 100644 indra/llui/lltabcontainervertical.cpp delete mode 100644 indra/llui/lltabcontainervertical.h diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt index 5049da27a..669f47479 100644 --- a/indra/llui/CMakeLists.txt +++ b/indra/llui/CMakeLists.txt @@ -63,7 +63,6 @@ set(llui_SOURCE_FILES llspinctrl.cpp llstyle.cpp lltabcontainer.cpp - lltabcontainervertical.cpp lltextbox.cpp lltexteditor.cpp lltextparser.cpp @@ -129,7 +128,6 @@ set(llui_HEADER_FILES llspinctrl.h llstyle.h lltabcontainer.h - lltabcontainervertical.h lltextbox.h lltexteditor.h lltextparser.h diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp index 24ccd848f..9a4510690 100644 --- a/indra/llui/lltabcontainer.cpp +++ b/indra/llui/lltabcontainer.cpp @@ -42,7 +42,6 @@ #include "lltextbox.h" #include "llcriticaldamp.h" #include "lluictrlfactory.h" -#include "lltabcontainervertical.h" #include "llrender.h" #include "llmultifloater.h" diff --git a/indra/llui/lltabcontainervertical.cpp b/indra/llui/lltabcontainervertical.cpp deleted file mode 100644 index a729c95fd..000000000 --- a/indra/llui/lltabcontainervertical.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @file lltabcontainervertical.cpp - * @brief LLTabContainerVertical base class - * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * - * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 - * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception - * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. - * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. - * $/LicenseInfo$ - */ - -// deprecated: see LLTabContainer diff --git a/indra/llui/lltabcontainervertical.h b/indra/llui/lltabcontainervertical.h deleted file mode 100644 index ce42367f8..000000000 --- a/indra/llui/lltabcontainervertical.h +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @file lltabcontainervertical.h - * @brief LLTabContainerVertical base class - * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * - * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 - * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception - * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. - * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. - * $/LicenseInfo$ - */ - -// deprecated: see LLTabContainer diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 24a13d36e..eb86f1e96 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -64,7 +64,6 @@ #include "llmultisliderctrl.h" #include "llspinctrl.h" #include "lltabcontainer.h" -#include "lltabcontainervertical.h" #include "lltextbox.h" #include "lltexteditor.h" #include "llui.h" diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp index 680df5f05..9e5c367ce 100644 --- a/indra/newview/llfloatercustomize.cpp +++ b/indra/newview/llfloatercustomize.cpp @@ -50,7 +50,6 @@ #include "llscrollcontainer.h" #include "llscrollingpanelparam.h" #include "llsliderctrl.h" -#include "lltabcontainervertical.h" #include "llviewerwindow.h" #include "llinventoryfunctions.h" #include "llinventoryobserver.h" diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index 747a3ffb5..512a9979e 100644 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -40,7 +40,6 @@ #define LL_LLFLOATERPREFERENCE_H #include "llfloater.h" -#include "lltabcontainervertical.h" class HippoPanelGrids; class LLPanelGeneral; diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index ef3bb65f4..f5792ae86 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -69,7 +69,6 @@ #include "llscrolllistctrl.h" #include "llstatusbar.h" #include "lltabcontainer.h" -#include "lltabcontainervertical.h" #include "llimview.h" #include "lltooldraganddrop.h" #include "lluiconstants.h" diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index 1d3e50360..2ec1ac0eb 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -56,7 +56,6 @@ #include "lllineeditor.h" #include "llfloateravatarinfo.h" #include "llfloaterclassified.h" -#include "lltabcontainervertical.h" #include "lltextbox.h" #include "llcombobox.h" #include "llviewertexteditor.h" diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 7bcb0eb31..da0b9a546 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -47,7 +47,6 @@ #include "llcheckboxctrl.h" #include "llviewercontrol.h" #include "lllineeditor.h" -#include "lltabcontainervertical.h" #include "lltextbox.h" #include "llviewertexteditor.h" #include "lltexturectrl.h"