Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove the redundant UI validator

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-06-07 19:58:11 +03:00
parent 28095b2a3e
commit 82b4dff15c
4 changed files with 0 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tools/uic/CMakeLists.txt
View file

@ -18,7 +18,6 @@ set(UIC_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
${CMAKE_CURRENT_SOURCE_DIR}/treewalker.cpp ${CMAKE_CURRENT_SOURCE_DIR}/treewalker.cpp
${CMAKE_CURRENT_SOURCE_DIR}/ui4.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/cppextractimages.h
${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.h ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.h
${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteicondata.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}/treewalker.h
${CMAKE_CURRENT_SOURCE_DIR}/utils.h ${CMAKE_CURRENT_SOURCE_DIR}/utils.h
${CMAKE_CURRENT_SOURCE_DIR}/ui4.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/cppextractimages.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwritedeclaration.cpp
${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteicondata.cpp ${CMAKE_CURRENT_SOURCE_DIR}/cpp/cppwriteicondata.cpp

2
src/tools/uic/uic.cpp
View file

@ -44,7 +44,6 @@
#include "driver.h" #include "driver.h"
#include "option.h" #include "option.h"
#include "treewalker.h" #include "treewalker.h"
#include "validator.h"
#include "cppwriteincludes.h" #include "cppwriteincludes.h"
#include "cppwritedeclaration.h" #include "cppwritedeclaration.h"
@ -243,7 +242,6 @@ bool Uic::write(DomUI *ui)
WriteIncludes writeIncludes(this); WriteIncludes writeIncludes(this);
writeIncludes.acceptUI(ui); writeIncludes.acceptUI(ui);
Validator(this).acceptUI(ui);
WriteDeclaration(this, writeIncludes.scriptsActivated()).acceptUI(ui); WriteDeclaration(this, writeIncludes.scriptsActivated()).acceptUI(ui);
if (opt.headerProtection) if (opt.headerProtection)

94
src/tools/uic/validator.cpp
View file

@ -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

74
src/tools/uic/validator.h
View file

@ -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