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>

4 files changed, 3 insertions, 36 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.
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 75120285a2..45583a67fa 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -87,10 +87,6 @@ public:
 
     ~QCoreApplication();
 
-#ifdef QT_DEPRECATED
-    QT_DEPRECATED static int argc();
-    QT_DEPRECATED static char **argv();
-#endif
     static QStringList arguments();
 
     static void setAttribute(Qt::ApplicationAttribute attribute, bool on = true);
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 93c8685482..5f43b52939 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -436,7 +436,7 @@ T qFindChild(const QObject *o, const QString &name = QString());
 QList<T> qFindChildren(const QObject *oobj, const QString &name = QString());
 QList<T> qFindChildren(const QObject *o, const QRegExp &re);
 #endif
-#ifdef QT_DEPRECATED
+#if QT_DEPRECATED_SINCE(5, 0)
 template<typename T>
 inline QT_DEPRECATED T qFindChild(const QObject *o, const QString &name = QString())
 { return o->findChild<T>(name); }
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 240e167350..07ef4dc41e 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -502,7 +502,7 @@ template<> inline QVariant qvariant_cast<QVariant>(const QVariant &v)
     return v;
 }
 
-#ifdef QT_DEPRECATED
+#if QT_DEPRECATED_SINCE(5, 0)
 template<typename T>
 inline QT_DEPRECATED T qVariantValue(const QVariant &variant)
 { return qvariant_cast<T>(variant); }