Merge lp:~ajalkane/ubuntu-filemanager-app/carlos-folderlistmodel-qml-fixes into lp:~carlos-mazieri/ubuntu-filemanager-app/model

[Arto Jalkanen]

QML does not have type info, so the functions that can be called
from QML must have unique names. Also a property should not be
Q_INVOKABLE.

[Carlos Jose Mazieri (carlos-mazieri)]

Thank you, it is great, sometimes I forgot about we crating things for QML.

[David Planella (dpm)]

Hi, thanks a lot for the fix!

On an another MP that has now just landed we've added the code for the plugin to the same source tree as that of the app, so that we can more easily build it and ship the plugin in the same click package. Would you mind using the "Resubmit proposal" link at the top right-hand side of this MP's page to change the target branch to be trunk?

I.e. ~ubuntu-filemanager-dev/ubuntu-filemanager-app/trunk

review: Needs Fixing

[David Planella (dpm)]

Looking at the date, this seems to be quite an old MP. Has it already been included in the plugin code, and if so, could someone change the status to Merged? Thanks!

review: Needs Information

[Arto Jalkanen (ajalkane)]

This is okay now, fixing status as merged.

[Carlos Jose Mazieri (carlos-mazieri)]

It has been already merged, I do not understand why it happens.

review: Approve

=== modified file 'folderlistmodel/dirmodel.cpp'
--- folderlistmodel/dirmodel.cpp	2013-04-20 18:07:39 +0000
+++ folderlistmodel/dirmodel.cpp	2013-04-22 19:59:28 +0000
@@ -561,7 +561,7 @@
 }
 
 
-void DirModel::remove(int row)
+void DirModel::removeIndex(int row)
 {
     if (IS_VALID_ROW(row))
     {
@@ -575,18 +575,18 @@
     }
 }
 
-void DirModel::remove(const QStringList& items)
+void DirModel::removePaths(const QStringList& items)
 {
      this->rm(items);
 }
 
-void DirModel::copy(int row)
+void DirModel::copyIndex(int row)
 {
     if (IS_VALID_ROW(row))
     {
         const QFileInfo &fi = mDirectoryContents.at(row);
         QStringList list(fi.absoluteFilePath());
-        this->copy(list);
+        this->copyPaths(list);
     }
     else
     {
@@ -594,13 +594,13 @@
     }
 }
 
-void DirModel::copy(const QStringList &items)
+void DirModel::copyPaths(const QStringList &items)
 {
    m_fsAction->copy(items);
 }
 
 
-void DirModel::cut(int row)
+void DirModel::cutIndex(int row)
 {
     if (IS_VALID_ROW(row))
     {
@@ -615,7 +615,7 @@
 }
 
 
-void DirModel::cut(const QStringList &items)
+void DirModel::cutPaths(const QStringList &items)
 {
      m_fsAction->cut(items);
 }

=== modified file 'folderlistmodel/dirmodel.h'
--- folderlistmodel/dirmodel.h	2013-04-20 18:07:39 +0000
+++ folderlistmodel/dirmodel.h	2013-04-22 19:59:28 +0000
@@ -162,7 +162,7 @@
     SortOrder getSortOrder() const;
 
     Q_PROPERTY(int clipboardUrlsCounter READ getClipboardUrlsCounter NOTIFY clipboardChanged)
-    Q_INVOKABLE int getClipboardUrlsCounter() const;
+    int getClipboardUrlsCounter() const;
 
     Q_INVOKABLE QString homePath() const;
 
@@ -173,45 +173,45 @@
     Q_INVOKABLE  bool cdInto(int row);
 
     /*!
-     * \brief copy() puts the item pointed by \a row (dir or file) into the clipboard
+     * \brief copyIndex() puts the item pointed by \a row (dir or file) into the clipboard
      * \param row points to the item file or directory
      */
-    Q_INVOKABLE void  copy(int row);
+    Q_INVOKABLE void  copyIndex(int row);
 
     /*!
-     *  \brief copy(const QStringList& urls) several items (dirs or files) into the clipboard
+     *  \brief copyPaths(const QStringList& urls) several items (dirs or files) into the clipboard
      *  \param items  fullpathnames or names only
      */
-    Q_INVOKABLE void  copy(const QStringList& items);
+    Q_INVOKABLE void  copyPaths(const QStringList& items);
 
     /*!
-     * \brief cut() puts the item into the clipboard as \ref copy(),
+     * \brief cutIndex() puts the item into the clipboard as \ref copy(),
      *        mark the item to be removed after \ref paste()
      * \param row points to the item file or directory
      */   
-    Q_INVOKABLE void  cut(int row);
+    Q_INVOKABLE void  cutIndex(int row);
 
     /*!
      *  \brief cut() puts several items (dirs or files) into the clipboard as \ref copy(),
      *         mark the item to be removed after \ref paste()
      *   \param items  fullpathnames or names only
      */
-    Q_INVOKABLE void  cut(const QStringList& items);
+    Q_INVOKABLE void  cutPaths(const QStringList& items);
 
     /*!
-     * \brief remove()  remove a item file or directory
+     * \brief removeIndex();  remove a item file or directory
      *
      * I gets the item indicated by \row and calls \ref rm()
      *
      * \param row points to the item to b e removed
      * \return true if it was possible to remove the item
      */
-    Q_INVOKABLE void remove(int row);
+    Q_INVOKABLE void removeIndex(int row);
 
     /*!
      *  Just calls \ref rm()
      */
-    Q_INVOKABLE void remove(const QStringList& items);
+    Q_INVOKABLE void removePaths(const QStringList& items);
 
 
 public slots: