From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- .../llui_libtest/llui_libtest.cpp | 262 ++++++++++----------- .../integration_tests/llui_libtest/llui_libtest.h | 10 +- .../integration_tests/llui_libtest/llwidgetreg.cpp | 104 ++++---- indra/integration_tests/llui_libtest/llwidgetreg.h | 14 +- 4 files changed, 195 insertions(+), 195 deletions(-) (limited to 'indra/integration_tests/llui_libtest') diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp index a0418f09d5..efb9c47a91 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.cpp +++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llui_libtest.cpp * @brief Integration test for the LLUI library * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -31,7 +31,7 @@ #include "llwidgetreg.h" // linden library includes -#include "llcontrol.h" // LLControlGroup +#include "llcontrol.h" // LLControlGroup #include "lldir.h" #include "lldiriterator.h" #include "llerrorcontrol.h" @@ -48,29 +48,29 @@ // *TODO: teach Parabuild about this program, run automatically after full builds // I believe these must be globals, not stack variables. JC -LLControlGroup gSavedSettings("Global"); // saved at end of session +LLControlGroup gSavedSettings("Global"); // saved at end of session LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings -// We can't create LLImageGL objects because we have no window or rendering +// We can't create LLImageGL objects because we have no window or rendering // context. Provide enough of an LLUIImage to test the LLUI library without // an underlying image. class TestUIImage : public LLUIImage { public: - TestUIImage() - : LLUIImage( std::string(), NULL ) // NULL ImageGL, don't deref! - { } - - /*virtual*/ S32 getWidth() const - { - return 16; - } - - /*virtual*/ S32 getHeight() const - { - return 16; - } + TestUIImage() + : LLUIImage( std::string(), NULL ) // NULL ImageGL, don't deref! + { } + + /*virtual*/ S32 getWidth() const + { + return 16; + } + + /*virtual*/ S32 getHeight() const + { + return 16; + } }; @@ -79,138 +79,138 @@ class LLTexture ; class TestImageProvider : public LLImageProviderInterface { public: - /*virtual*/ LLPointer getUIImage(const std::string& name, S32 priority) - { - return makeImage(); - } - - /*virtual*/ LLPointer getUIImageByID(const LLUUID& id, S32 priority) - { - return makeImage(); - } - - /*virtual*/ void cleanUp() - { - } - - LLPointer makeImage() - { - LLPointer image_gl; - LLPointer image = new TestUIImage(); //LLUIImage( std::string(), image_gl); - mImageList.push_back(image); - return image; - } - + /*virtual*/ LLPointer getUIImage(const std::string& name, S32 priority) + { + return makeImage(); + } + + /*virtual*/ LLPointer getUIImageByID(const LLUUID& id, S32 priority) + { + return makeImage(); + } + + /*virtual*/ void cleanUp() + { + } + + LLPointer makeImage() + { + LLPointer image_gl; + LLPointer image = new TestUIImage(); //LLUIImage( std::string(), image_gl); + mImageList.push_back(image); + return image; + } + public: - // Unclear if we need this, hold on to one copy of each image we make - std::vector > mImageList; + // Unclear if we need this, hold on to one copy of each image we make + std::vector > mImageList; }; TestImageProvider gTestImageProvider; void init_llui() { - // Font lookup needs directory support + // Font lookup needs directory support #if LL_DARWIN - const char* newview_path = "../../../../newview"; + const char* newview_path = "../../../../newview"; #else - const char* newview_path = "../../../newview"; + const char* newview_path = "../../../newview"; #endif - gDirUtilp->initAppDirs("SecondLife", newview_path); - gDirUtilp->setSkinFolder("default", "en"); - - // colors are no longer stored in a LLControlGroup file - LLUIColorTable::instance().loadFromSettings(); - - std::string config_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings.xml"); - gSavedSettings.loadFromFile(config_filename); - - // See LLAppViewer::init() - LLUI::settings_map_t settings; - settings["config"] = &gSavedSettings; - settings["ignores"] = &gWarningSettings; - settings["floater"] = &gSavedSettings; - settings["account"] = &gSavedPerAccountSettings; - - // Don't use real images as we don't have a GL context - LLUI::initClass(settings, &gTestImageProvider); - - const bool no_register_widgets = false; - LLWidgetReg::initClass( no_register_widgets ); - - // Otherwise we get translation warnings when setting up floaters - // (tooltips for buttons) - std::set default_args; - LLTransUtil::parseStrings("strings.xml", default_args); - LLTransUtil::parseLanguageStrings("language_settings.xml"); - LLFontManager::initClass(); - - // Creating widgets apparently requires fonts to be initialized, - // otherwise it crashes. - LLFontGL::initClass(96.f, 1.f, 1.f, - gDirUtilp->getAppRODataDir(), - false ); // don't create gl textures - - LLFloaterView::Params fvparams; - fvparams.name("Floater View"); - fvparams.rect( LLRect(0,480,640,0) ); - fvparams.mouse_opaque(false); - fvparams.follows.flags(FOLLOWS_ALL); - fvparams.tab_stop(false); - gFloaterView = LLUICtrlFactory::create (fvparams); + gDirUtilp->initAppDirs("SecondLife", newview_path); + gDirUtilp->setSkinFolder("default", "en"); + + // colors are no longer stored in a LLControlGroup file + LLUIColorTable::instance().loadFromSettings(); + + std::string config_filename = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings.xml"); + gSavedSettings.loadFromFile(config_filename); + + // See LLAppViewer::init() + LLUI::settings_map_t settings; + settings["config"] = &gSavedSettings; + settings["ignores"] = &gWarningSettings; + settings["floater"] = &gSavedSettings; + settings["account"] = &gSavedPerAccountSettings; + + // Don't use real images as we don't have a GL context + LLUI::initClass(settings, &gTestImageProvider); + + const bool no_register_widgets = false; + LLWidgetReg::initClass( no_register_widgets ); + + // Otherwise we get translation warnings when setting up floaters + // (tooltips for buttons) + std::set default_args; + LLTransUtil::parseStrings("strings.xml", default_args); + LLTransUtil::parseLanguageStrings("language_settings.xml"); + LLFontManager::initClass(); + + // Creating widgets apparently requires fonts to be initialized, + // otherwise it crashes. + LLFontGL::initClass(96.f, 1.f, 1.f, + gDirUtilp->getAppRODataDir(), + false ); // don't create gl textures + + LLFloaterView::Params fvparams; + fvparams.name("Floater View"); + fvparams.rect( LLRect(0,480,640,0) ); + fvparams.mouse_opaque(false); + fvparams.follows.flags(FOLLOWS_ALL); + fvparams.tab_stop(false); + gFloaterView = LLUICtrlFactory::create (fvparams); } /*==========================================================================*| static std::string get_xui_dir() { - std::string delim = gDirUtilp->getDirDelimiter(); - return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim; + std::string delim = gDirUtilp->getDirDelimiter(); + return gDirUtilp->getSkinBaseDir() + delim + "default" + delim + "xui" + delim; } // buildFromFile() no longer supports generate-output-LLXMLNode void export_test_floaters() { - // Convert all test floaters to new XML format - std::string delim = gDirUtilp->getDirDelimiter(); - std::string xui_dir = get_xui_dir() + "en" + delim; - std::string filename; - - LLDirIterator iter(xui_dir, "floater_test_*.xml"); - while (iter.next(filename)) - { - if (filename.find("_new.xml") != std::string::npos) - { - // don't re-export other test floaters - continue; - } - LL_INFOS() << "Converting " << filename << LL_ENDL; - // Build a floater and output new attributes - LLXMLNodePtr output_node = new LLXMLNode(); - LLFloater* floater = new LLFloater(LLSD()); - floater->buildFromFile( filename, - // FALSE, // don't open floater - output_node); - std::string out_filename = gDirUtilp->add(xui_dir, filename); - std::string::size_type extension_pos = out_filename.rfind(".xml"); - out_filename.resize(extension_pos); - out_filename += "_new.xml"; - - LL_INFOS() << "Output: " << out_filename << LL_ENDL; - LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w"); - LLXMLNode::writeHeaderToFile(floater_file); - output_node->writeToFile(floater_file); - fclose(floater_file); - } + // Convert all test floaters to new XML format + std::string delim = gDirUtilp->getDirDelimiter(); + std::string xui_dir = get_xui_dir() + "en" + delim; + std::string filename; + + LLDirIterator iter(xui_dir, "floater_test_*.xml"); + while (iter.next(filename)) + { + if (filename.find("_new.xml") != std::string::npos) + { + // don't re-export other test floaters + continue; + } + LL_INFOS() << "Converting " << filename << LL_ENDL; + // Build a floater and output new attributes + LLXMLNodePtr output_node = new LLXMLNode(); + LLFloater* floater = new LLFloater(LLSD()); + floater->buildFromFile( filename, + // FALSE, // don't open floater + output_node); + std::string out_filename = gDirUtilp->add(xui_dir, filename); + std::string::size_type extension_pos = out_filename.rfind(".xml"); + out_filename.resize(extension_pos); + out_filename += "_new.xml"; + + LL_INFOS() << "Output: " << out_filename << LL_ENDL; + LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w"); + LLXMLNode::writeHeaderToFile(floater_file); + output_node->writeToFile(floater_file); + fclose(floater_file); + } } |*==========================================================================*/ int main(int argc, char** argv) { - // Must init LLError for llerrs to actually cause errors. - LLError::initForApplication("."); - - init_llui(); - -// export_test_floaters(); - - return 0; + // Must init LLError for llerrs to actually cause errors. + LLError::initForApplication("."); + + init_llui(); + +// export_test_floaters(); + + return 0; } diff --git a/indra/integration_tests/llui_libtest/llui_libtest.h b/indra/integration_tests/llui_libtest/llui_libtest.h index d365ebb5e0..ffa5f82784 100644 --- a/indra/integration_tests/llui_libtest/llui_libtest.h +++ b/indra/integration_tests/llui_libtest/llui_libtest.h @@ -1,24 +1,24 @@ -/** +/** * @file llui_libtest.h * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp index cbf6021119..d3d3468185 100644 --- a/indra/integration_tests/llui_libtest/llwidgetreg.cpp +++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp @@ -1,24 +1,24 @@ -/** +/** * @file llwidgetreg.cpp * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -56,52 +56,52 @@ void LLWidgetReg::initClass(bool register_widgets) { - // Only need to register if the Windows linker has optimized away the - // references to the object files. - if (register_widgets) - { - LLDefaultChildRegistry::Register button("button"); - LLDefaultChildRegistry::Register menu_button("menu_button"); - LLDefaultChildRegistry::Register check_box("check_box"); - LLDefaultChildRegistry::Register combo_box("combo_box"); - LLDefaultChildRegistry::Register filter_editor("filter_editor"); - LLDefaultChildRegistry::Register flyout_button("flyout_button"); - LLDefaultChildRegistry::Register container_view("container_view"); - LLDefaultChildRegistry::Register icon("icon"); - LLDefaultChildRegistry::Register loading_indicator("loading_indicator"); - LLDefaultChildRegistry::Register line_editor("line_editor"); - LLDefaultChildRegistry::Register menu_item_separator("menu_item_separator"); - LLDefaultChildRegistry::Register menu_item_call_gl("menu_item_call"); - LLDefaultChildRegistry::Register menu_item_check_gl("menu_item_check"); - LLDefaultChildRegistry::Register menu("menu"); - LLDefaultChildRegistry::Register menu_bar("menu_bar"); - LLDefaultChildRegistry::Register context_menu("context_menu"); - LLDefaultChildRegistry::Register multi_slider_bar("multi_slider_bar"); - LLDefaultChildRegistry::Register multi_slider("multi_slider"); - LLDefaultChildRegistry::Register panel("panel", &LLPanel::fromXML); - LLDefaultChildRegistry::Register layout_stack("layout_stack"); - LLDefaultChildRegistry::Register progress_bar("progress_bar"); - LLDefaultChildRegistry::Register radio_group("radio_group"); - LLDefaultChildRegistry::Register search_editor("search_editor"); - LLDefaultChildRegistry::Register scroll_container("scroll_container"); - LLDefaultChildRegistry::Register scrolling_panel_list("scrolling_panel_list"); - LLDefaultChildRegistry::Register scroll_list("scroll_list"); - LLDefaultChildRegistry::Register slider_bar("slider_bar"); - LLDefaultChildRegistry::Register slider("slider"); - LLDefaultChildRegistry::Register spinner("spinner"); - LLDefaultChildRegistry::Register stat_bar("stat_bar"); - //LLDefaultChildRegistry::Register placeholder("placeholder"); - LLDefaultChildRegistry::Register tab_container("tab_container"); - LLDefaultChildRegistry::Register text("text"); - LLDefaultChildRegistry::Register time("time"); - LLDefaultChildRegistry::Register simple_text_editor("simple_text_editor"); - LLDefaultChildRegistry::Register ui_ctrl("ui_ctrl"); - LLDefaultChildRegistry::Register stat_view("stat_view"); - //LLDefaultChildRegistry::Register locate("locate"); - //LLDefaultChildRegistry::Register pad("pad"); - LLDefaultChildRegistry::Register view_border("view_border"); - } + // Only need to register if the Windows linker has optimized away the + // references to the object files. + if (register_widgets) + { + LLDefaultChildRegistry::Register button("button"); + LLDefaultChildRegistry::Register menu_button("menu_button"); + LLDefaultChildRegistry::Register check_box("check_box"); + LLDefaultChildRegistry::Register combo_box("combo_box"); + LLDefaultChildRegistry::Register filter_editor("filter_editor"); + LLDefaultChildRegistry::Register flyout_button("flyout_button"); + LLDefaultChildRegistry::Register container_view("container_view"); + LLDefaultChildRegistry::Register icon("icon"); + LLDefaultChildRegistry::Register loading_indicator("loading_indicator"); + LLDefaultChildRegistry::Register line_editor("line_editor"); + LLDefaultChildRegistry::Register menu_item_separator("menu_item_separator"); + LLDefaultChildRegistry::Register menu_item_call_gl("menu_item_call"); + LLDefaultChildRegistry::Register menu_item_check_gl("menu_item_check"); + LLDefaultChildRegistry::Register menu("menu"); + LLDefaultChildRegistry::Register menu_bar("menu_bar"); + LLDefaultChildRegistry::Register context_menu("context_menu"); + LLDefaultChildRegistry::Register multi_slider_bar("multi_slider_bar"); + LLDefaultChildRegistry::Register multi_slider("multi_slider"); + LLDefaultChildRegistry::Register panel("panel", &LLPanel::fromXML); + LLDefaultChildRegistry::Register layout_stack("layout_stack"); + LLDefaultChildRegistry::Register progress_bar("progress_bar"); + LLDefaultChildRegistry::Register radio_group("radio_group"); + LLDefaultChildRegistry::Register search_editor("search_editor"); + LLDefaultChildRegistry::Register scroll_container("scroll_container"); + LLDefaultChildRegistry::Register scrolling_panel_list("scrolling_panel_list"); + LLDefaultChildRegistry::Register scroll_list("scroll_list"); + LLDefaultChildRegistry::Register slider_bar("slider_bar"); + LLDefaultChildRegistry::Register slider("slider"); + LLDefaultChildRegistry::Register spinner("spinner"); + LLDefaultChildRegistry::Register stat_bar("stat_bar"); + //LLDefaultChildRegistry::Register placeholder("placeholder"); + LLDefaultChildRegistry::Register tab_container("tab_container"); + LLDefaultChildRegistry::Register text("text"); + LLDefaultChildRegistry::Register time("time"); + LLDefaultChildRegistry::Register simple_text_editor("simple_text_editor"); + LLDefaultChildRegistry::Register ui_ctrl("ui_ctrl"); + LLDefaultChildRegistry::Register stat_view("stat_view"); + //LLDefaultChildRegistry::Register locate("locate"); + //LLDefaultChildRegistry::Register pad("pad"); + LLDefaultChildRegistry::Register view_border("view_border"); + } - // *HACK: Usually this is registered as a viewer text editor - LLDefaultChildRegistry::Register text_editor("text_editor"); + // *HACK: Usually this is registered as a viewer text editor + LLDefaultChildRegistry::Register text_editor("text_editor"); } diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.h b/indra/integration_tests/llui_libtest/llwidgetreg.h index 30b915eee2..673214991b 100644 --- a/indra/integration_tests/llui_libtest/llwidgetreg.h +++ b/indra/integration_tests/llui_libtest/llwidgetreg.h @@ -1,24 +1,24 @@ -/** +/** * @file llwidgetreg.h * * $LicenseInfo:firstyear=2009&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2010, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library 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 * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -26,12 +26,12 @@ #define LLWIDGETREG_H // Register all widgets with the builder registry. -// Useful on Windows where linker discards all references to the +// Useful on Windows where linker discards all references to the // static LLDefaultChildRegistry::Register<> calls. class LLWidgetReg { public: - static void initClass(bool register_widgets); + static void initClass(bool register_widgets); }; #endif -- cgit v1.2.3