From 82b4dff15ca252567067b7d8b15ae08f978261cf Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 7 Jun 2016 19:58:11 +0300 Subject: [PATCH] remove the redundant UI validator Signed-off-by: Ivailo Monev --- src/tools/uic/CMakeLists.txt | 2 - src/tools/uic/uic.cpp | 2 - src/tools/uic/validator.cpp | 94 -------------------------------------------- src/tools/uic/validator.h | 74 ---------------------------------- 4 files changed, 172 deletions(-) delete mode 100644 src/tools/uic/validator.cpp delete mode 100644 src/tools/uic/validator.h diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index a5f5f5b7e..cd5335fe7 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -18,7 +18,6 @@ set(UIC_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/treewalker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/ui4.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/validator.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppextractimages.h ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.h ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteicondata.h @@ -38,7 +37,6 @@ set(UIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/treewalker.h ${CMAKE_CURRENT_SOURCE_DIR}/utils.h ${CMAKE_CURRENT_SOURCE_DIR}/ui4.h - ${CMAKE_CURRENT_SOURCE_DIR}/validator.h ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppextractimages.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteicondata.cpp diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp index c05abe76a..a52a60d19 100644 --- a/src/tools/uic/uic.cpp +++ b/src/tools/uic/uic.cpp @@ -44,7 +44,6 @@ #include "driver.h" #include "option.h" #include "treewalker.h" -#include "validator.h" #include "cppwriteincludes.h" #include "cppwritedeclaration.h" @@ -243,7 +242,6 @@ bool Uic::write(DomUI *ui) WriteIncludes writeIncludes(this); writeIncludes.acceptUI(ui); - Validator(this).acceptUI(ui); WriteDeclaration(this, writeIncludes.scriptsActivated()).acceptUI(ui); if (opt.headerProtection) diff --git a/src/tools/uic/validator.cpp b/src/tools/uic/validator.cpp deleted file mode 100644 index eac50d96d..000000000 --- a/src/tools/uic/validator.cpp +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "validator.h" -#include "driver.h" -#include "ui4.h" -#include "uic.h" - -QT_BEGIN_NAMESPACE - -Validator::Validator(Uic *uic) : - m_driver(uic->driver()) -{ -} - -void Validator::acceptUI(DomUI *node) -{ - TreeWalker::acceptUI(node); -} - -void Validator::acceptWidget(DomWidget *node) -{ - (void) m_driver->findOrInsertWidget(node); - - TreeWalker::acceptWidget(node); -} - -void Validator::acceptLayoutItem(DomLayoutItem *node) -{ - (void) m_driver->findOrInsertLayoutItem(node); - - TreeWalker::acceptLayoutItem(node); -} - -void Validator::acceptLayout(DomLayout *node) -{ - (void) m_driver->findOrInsertLayout(node); - - TreeWalker::acceptLayout(node); -} - -void Validator::acceptActionGroup(DomActionGroup *node) -{ - (void) m_driver->findOrInsertActionGroup(node); - - TreeWalker::acceptActionGroup(node); -} - -void Validator::acceptAction(DomAction *node) -{ - (void) m_driver->findOrInsertAction(node); - - TreeWalker::acceptAction(node); -} - -QT_END_NAMESPACE diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h deleted file mode 100644 index 919db6b1a..000000000 --- a/src/tools/uic/validator.h +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef VALIDATOR_H -#define VALIDATOR_H - -#include "treewalker.h" - -QT_BEGIN_NAMESPACE - -class QTextStream; -class Driver; -class Uic; - -struct Option; - -struct Validator : public TreeWalker -{ - Validator(Uic *uic); - - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - - void acceptLayoutItem(DomLayoutItem *node); - void acceptLayout(DomLayout *node); - - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); - -private: - Driver *m_driver; -}; - -QT_END_NAMESPACE - -#endif // VALIDATOR_H -- 2.11.0