diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 03:09:22 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-18 03:09:22 (GMT) |
commit | e6dcb15ca670ac9a01ac7c4c96a7de2959f98498 (patch) | |
tree | 0869a1e87a2a3ce952c6334c70b4f8589523024e /src | |
parent | 96d5029126707771a3b956e6db0391ae7d619853 (diff) | |
download | Qt-e6dcb15ca670ac9a01ac7c4c96a7de2959f98498.zip Qt-e6dcb15ca670ac9a01ac7c4c96a7de2959f98498.tar.gz Qt-e6dcb15ca670ac9a01ac7c4c96a7de2959f98498.tar.bz2 |
Fix naming.
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/dirmodel/qmldir | 1 | ||||
-rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro (renamed from src/imports/dirmodel/dirmodel.pro) | 4 | ||||
-rw-r--r-- | src/imports/folderlistmodel/plugin.cpp (renamed from src/imports/dirmodel/plugin.cpp) | 4 | ||||
-rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp (renamed from src/imports/dirmodel/qdeclarativefolderlistmodel.cpp) | 12 | ||||
-rw-r--r-- | src/imports/folderlistmodel/qdeclarativefolderlistmodel.h (renamed from src/imports/dirmodel/qdeclarativefolderlistmodel.h) | 3 | ||||
-rw-r--r-- | src/imports/folderlistmodel/qmldir | 1 | ||||
-rw-r--r-- | src/imports/imports.pro | 2 |
7 files changed, 6 insertions, 21 deletions
diff --git a/src/imports/dirmodel/qmldir b/src/imports/dirmodel/qmldir deleted file mode 100644 index 0be644f..0000000 --- a/src/imports/dirmodel/qmldir +++ /dev/null @@ -1 +0,0 @@ -plugin qmlviewerplugin diff --git a/src/imports/dirmodel/dirmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 03f3a1a..781dfc2 100644 --- a/src/imports/dirmodel/dirmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -1,4 +1,4 @@ -TARGET = qmlviewerplugin +TARGET = qmlfolderlistmodelplugin TARGETPATH = Qt/labs/folderlistmodel include(../qimportbase.pri) @@ -17,7 +17,7 @@ symbian:{ load(data_caging_paths) include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - importFiles.sources = qmlviewerplugin.dll qmldir + importFiles.sources = qmlfolderlistmodelplugin.dll qmldir importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH DEPLOYMENT = importFiles diff --git a/src/imports/dirmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp index 61bf354..b94efb0 100644 --- a/src/imports/dirmodel/plugin.cpp +++ b/src/imports/folderlistmodel/plugin.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -class QmlViewerPlugin : public QDeclarativeExtensionPlugin +class QmlFolderListModelPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT public: @@ -61,5 +61,5 @@ QT_END_NAMESPACE #include "plugin.moc" -Q_EXPORT_PLUGIN2(qmlviewerplugin, QT_PREPEND_NAMESPACE(QmlViewerPlugin)); +Q_EXPORT_PLUGIN2(qmlfolderlistmodelplugin, QT_PREPEND_NAMESPACE(QmlFolderListModelPlugin)); diff --git a/src/imports/dirmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp index 50ef4ae..a16f0c6 100644 --- a/src/imports/dirmodel/qdeclarativefolderlistmodel.cpp +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp @@ -147,18 +147,6 @@ QVariant QDeclarativeFolderListModel::data(const QModelIndex &index, int role) c return rv; } -QString QDeclarativeFolderListModel::fileName(int index) const -{ - QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex); - return d->model.data(modelIndex, QDirModel::FileNameRole).toString(); -} - -QUrl QDeclarativeFolderListModel::filePath(int index) const -{ - QModelIndex modelIndex = d->model.index(index, 0, d->folderIndex); - return QUrl::fromLocalFile(d->model.data(modelIndex, QDirModel::FilePathRole).toString()); -} - int QDeclarativeFolderListModel::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent); diff --git a/src/imports/dirmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h index 86a7588..e610a14 100644 --- a/src/imports/dirmodel/qdeclarativefolderlistmodel.h +++ b/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h @@ -77,9 +77,6 @@ public: int count() const { return rowCount(QModelIndex()); } - Q_INVOKABLE QString fileName(int index) const; - Q_INVOKABLE QUrl filePath(int index) const; - QUrl folder() const; void setFolder(const QUrl &folder); diff --git a/src/imports/folderlistmodel/qmldir b/src/imports/folderlistmodel/qmldir new file mode 100644 index 0000000..6e115bb --- /dev/null +++ b/src/imports/folderlistmodel/qmldir @@ -0,0 +1 @@ +plugin qmlfolderlistmodelplugin diff --git a/src/imports/imports.pro b/src/imports/imports.pro index df43b76..e937742 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += dirmodel particles gestures +SUBDIRS += folderlistmodel particles gestures contains(QT_CONFIG, webkit): SUBDIRS += webkit contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia |