diff options
Diffstat (limited to 'src/linguist/linguist/main.cpp')
| -rw-r--r-- | src/linguist/linguist/main.cpp | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp index 311344385..38cb55671 100644 --- a/src/linguist/linguist/main.cpp +++ b/src/linguist/linguist/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Linguist of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "mainwindow.h" #include "globals.h" @@ -87,8 +62,6 @@ private: int main(int argc, char **argv) { - Q_INIT_RESOURCE(linguist); - QApplication app(argc, argv); QApplication::setOverrideCursor(Qt::WaitCursor); @@ -101,10 +74,10 @@ int main(int argc, char **argv) QString resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath); QStringList args = app.arguments(); - for (int i = 1; i < args.count(); ++i) { + for (int i = 1; i < args.size(); ++i) { QString argument = args.at(i); if (argument == QLatin1String("-resourcedir")) { - if (i + 1 < args.count()) { + if (i + 1 < args.size()) { resourceDir = QFile::decodeName(args.at(++i).toLocal8Bit()); } else { // issue a warning |