summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qresource.cpp
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2010-08-06 14:04:27 (GMT)
committerJoão Abecasis <joao.abecasis@nokia.com>2010-08-09 17:45:24 (GMT)
commit2e7d5def1fdabb5949fbffc629da500aa2bb78d7 (patch)
treed9801ac9b8faebe302cb4a37526ccc412e500532 /src/corelib/io/qresource.cpp
parentb738719a192c49f9bab64cebfa2bad67b9630870 (diff)
downloadQt-2e7d5def1fdabb5949fbffc629da500aa2bb78d7.zip
Qt-2e7d5def1fdabb5949fbffc629da500aa2bb78d7.tar.gz
Qt-2e7d5def1fdabb5949fbffc629da500aa2bb78d7.tar.bz2
There goes QResourceFileEngineHandler
There's no reason why resources can't be handled in the default handler. Reviewed-by: Marius Storm-Olsen
Diffstat (limited to 'src/corelib/io/qresource.cpp')
-rw-r--r--src/corelib/io/qresource.cpp23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index ce9c57e..929885c 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -1185,21 +1185,6 @@ QResource::unregisterResource(const uchar *rccData, const QString &resourceRoot)
return false;
}
-//file type handler
-class QResourceFileEngineHandler : public QAbstractFileEngineHandler
-{
-public:
- QResourceFileEngineHandler() { }
- ~QResourceFileEngineHandler() { }
- QAbstractFileEngine *create(const QString &path) const;
-};
-QAbstractFileEngine *QResourceFileEngineHandler::create(const QString &path) const
-{
- if (path.size() > 0 && path.startsWith(QLatin1Char(':')))
- return new QResourceFileEngine(path);
- return 0;
-}
-
//resource engine
class QResourceFileEnginePrivate : public QAbstractFileEnginePrivate
{
@@ -1506,12 +1491,6 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr)
return true;
}
-//Initialization and cleanup
-Q_GLOBAL_STATIC(QResourceFileEngineHandler, resource_file_handler)
-
-static int qt_force_resource_init() { resource_file_handler(); return 1; }
-Q_CORE_EXPORT void qInitResourceIO() { resource_file_handler(); }
-static int qt_forced_resource_init = qt_force_resource_init();
-Q_CONSTRUCTOR_FUNCTION(qt_force_resource_init)
+Q_CORE_EXPORT void qInitResourceIO() { } // ### Qt 5: remove
QT_END_NAMESPACE