replace qCmdLineArgs() with its body

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 65ca761..2a15750 100644 (file)
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -204,7 +204,6 @@ set(CORE_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qbasictimer.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qeventloop.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qpointer.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcorecmdlineargs_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcoreapplication.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcoreevent.h
     ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qmetaobject.h

diff --git a/src/core/kernel/qcoreapplication.cpp b/src/core/kernel/qcoreapplication.cpp
index 10f4ba4..56a5cac 100644 (file)
--- a/src/core/kernel/qcoreapplication.cpp
+++ b/src/core/kernel/qcoreapplication.cpp
@@ -37,7 +37,6 @@
 #include "qabstracteventdispatcher.h"
 #include "qcoreevent.h"
 #include "qeventloop.h"
-#include "qcorecmdlineargs_p.h"
 #include "qdatastream.h"
 #include "qdebug.h"
 #include "qdir.h"

diff --git a/src/core/kernel/qcorecmdlineargs_p.h b/src/core/kernel/qcorecmdlineargs_p.h
deleted file mode 100644 (file)
index b54ef0c..0000000
--- a/src/core/kernel/qcorecmdlineargs_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Copyright (C) 2016-2020 Ivailo Monev
-**
-** This file is part of the QtCore module of the Katie Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: 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 QCORECMDLINEARGS_P_H
-#define QCORECMDLINEARGS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Katie API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "QtCore/qstringlist.h"
-
-QT_BEGIN_NAMESPACE
-
-static inline QStringList qCmdLineArgs(int argc, char *argv[])
-{
-    QStringList args;
-    for (int i = 0; i != argc; ++i)
-        args += QString::fromLocal8Bit(argv[i]);
-    return args;
-}
-
-QT_END_NAMESPACE
-
-#endif // QCORECMDLINEARGS_P_H

diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt
index 3e96d9f..40bc8fc 100644 (file)
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -20,7 +20,6 @@ set(RCC_SOURCES
 
 set(RCC_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/rcc.h
-    ${CMAKE_SOURCE_DIR}/src/core/kernel/qcorecmdlineargs_p.h
 )
 
 katie_setup_target(rcc ${RCC_SOURCES} ${RCC_HEADERS})

diff --git a/src/tools/rcc/rccmain.cpp b/src/tools/rcc/rccmain.cpp
index b6509d9..a29b90d 100644 (file)
--- a/src/tools/rcc/rccmain.cpp
+++ b/src/tools/rcc/rccmain.cpp
@@ -31,8 +31,7 @@
 **
 ****************************************************************************/
 
-#include <rcc.h>
-#include "qcorecmdlineargs_p.h"
+#include "rcc.h"
 
 #include <QDebug>
 #include <QDir>
@@ -134,7 +133,9 @@ int runRcc(int argc, char *argv[])
     bool projectRequested = false;
     QStringList filenamesIn;
 
-    QStringList args = qCmdLineArgs(argc, argv);
+    QStringList args;
+    for (int i = 0; i != argc; ++i)
+        args += QString::fromLocal8Bit(argv[i]);
 
     RCCResourceLibrary library;
 

diff --git a/tests/benchmarks/core/io/qdir/tree/4.6.0-list.txt b/tests/benchmarks/core/io/qdir/tree/4.6.0-list.txt
index b915320..68e3376 100644 (file)
--- a/tests/benchmarks/core/io/qdir/tree/4.6.0-list.txt
+++ b/tests/benchmarks/core/io/qdir/tree/4.6.0-list.txt
@@ -7981,7 +7981,6 @@
  qcoreapplication_mac.cpp
  qcoreapplication_p.h
  qcoreapplication_win.cpp
- qcorecmdlineargs_p.h
  qcoreevent.cpp
  qcoreevent.h
  qcoreglobaldata.cpp