summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qcoreapplication.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-01-24 22:26:31 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-31 16:17:55 +0100
commit3855233dab82946ba50ddd90ce86df035998da8e (patch)
tree908cdc84626a17dde6450810f97859502dcddab3 /src/corelib/kernel/qcoreapplication.cpp
parent9a4d30d9995a806ca7c69692992383b28c655054 (diff)
Remove many deprecated methods
Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 58cccfa3b6..ae30167a42 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1774,7 +1774,7 @@ QString QCoreApplication::applicationFilePath()
}
# endif
- QString argv0 = QFile::decodeName(QByteArray(argv()[0]));
+ QString argv0 = QFile::decodeName(arguments().at(0).toLocal8Bit());
QString absPath;
if (!argv0.isEmpty() && argv0.at(0) == QLatin1Char('/')) {
@@ -1822,35 +1822,6 @@ qint64 QCoreApplication::applicationPid()
}
/*!
- \obsolete
-
- Use arguments().size() instead.
-*/
-int QCoreApplication::argc()
-{
- if (!self) {
- qWarning("QCoreApplication::argc: Please instantiate the QApplication object first");
- return 0;
- }
- return self->d_func()->argc;
-}
-
-
-/*!
- \obsolete
-
- Use arguments() instead.
-*/
-char **QCoreApplication::argv()
-{
- if (!self) {
- qWarning("QCoreApplication::argv: Please instantiate the QApplication object first");
- return 0;
- }
- return self->d_func()->argv;
-}
-
-/*!
\since 4.1
Returns the list of command-line arguments.