From 783cf7d9814805acb354fd8c363ca9a24911239b Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 6 Dec 2015 12:56:00 +0100 Subject: [PATCH] LP-183 removed unused settingsutil (not related to LP-183...) --- ground/gcs/src/libs/utils/settingsutils.cpp | 48 --------------------- ground/gcs/src/libs/utils/settingsutils.h | 40 ----------------- ground/gcs/src/libs/utils/utils.pro | 2 - 3 files changed, 90 deletions(-) delete mode 100644 ground/gcs/src/libs/utils/settingsutils.cpp delete mode 100644 ground/gcs/src/libs/utils/settingsutils.h diff --git a/ground/gcs/src/libs/utils/settingsutils.cpp b/ground/gcs/src/libs/utils/settingsutils.cpp deleted file mode 100644 index c10b9ab42..000000000 --- a/ground/gcs/src/libs/utils/settingsutils.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/** - ****************************************************************************** - * - * @file settingsutils.cpp - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. - * Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. - * @brief - * @see The GNU Public License (GPL) Version 3 - * @defgroup - * @{ - * - *****************************************************************************/ -/* - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "settingsutils.h" - -#include - -namespace Utils { -QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category) -{ - QString rc(category); - const QChar underscore = QLatin1Char('_'); - const int size = rc.size(); - - for (int i = 0; i < size; i++) { - const QChar c = rc.at(i); - if (!c.isLetterOrNumber() && c != underscore) { - rc[i] = underscore; - } - } - return rc; -} -} // namespace Utils diff --git a/ground/gcs/src/libs/utils/settingsutils.h b/ground/gcs/src/libs/utils/settingsutils.h deleted file mode 100644 index be85a69e7..000000000 --- a/ground/gcs/src/libs/utils/settingsutils.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - ****************************************************************************** - * - * @file settingsutils.h - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. - * Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. - * @brief - * @see The GNU Public License (GPL) Version 3 - * @defgroup - * @{ - * - *****************************************************************************/ -/* - * This program 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 3 of the License, or - * (at your option) any later version. - * - * This program 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 this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef SETTINGSTUTILS_H -#define SETTINGSTUTILS_H - -#include "utils_global.h" - -namespace Utils { -// Create a usable settings key from a category, -// for example Editor|C++ -> Editor_C__ -QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category); -} // namespace Utils - -#endif // SETTINGSTUTILS_H diff --git a/ground/gcs/src/libs/utils/utils.pro b/ground/gcs/src/libs/utils/utils.pro index 1cd671d33..16701460f 100644 --- a/ground/gcs/src/libs/utils/utils.pro +++ b/ground/gcs/src/libs/utils/utils.pro @@ -13,7 +13,6 @@ DEFINES += PLUGIN_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_PLUGIN_PATH, $$ SOURCES += \ reloadpromptutils.cpp \ - settingsutils.cpp \ stringutils.cpp \ filesearch.cpp \ pathchooser.cpp \ @@ -75,7 +74,6 @@ else:SOURCES += consoleprocess_unix.cpp HEADERS += \ utils_global.h \ reloadpromptutils.h \ - settingsutils.h \ stringutils.h \ filesearch.h \ listutils.h \