← Back to branch summary

~ubuntu-filemanager-dev/ubuntu-filemanager-app/trunk

« back to all changes in this revision

Viewing changes to src/plugin/folderlistmodel/dirmodel.cpp

  • Committer: Tarmac
  • Author(s): carlos-mazieri
  • Date: 2014-05-16 15:27:05 UTC
  • mfrom: (168.3.3 app-devel-pre2)
  • Revision ID: tarmac-20140516152705-7vfzc1unhe9g03ml
this is the second part of the https://code.launchpad.net/~carlos-mazieri/ubuntu-filemanager-app/app-devel/+merge/216409.

Approved by Arto Jalkanen, Ubuntu Phone Apps Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin/folderlistmodel/dirmodel.cpp
1189
1189
        connect(this,          SIGNAL(pathChanged(QString)),
1190
1190
                mExtFSWatcher, SLOT(setCurrentPath(QString)));
1191
1191
 
1192
 
        connect(mExtFSWatcher, SIGNAL(pathModified()),
1193
 
                this,          SLOT(onThereAreExternalChanges()));
 
1192
        connect(mExtFSWatcher, SIGNAL(pathModified(QString)),
 
1193
                this,          SLOT(onThereAreExternalChanges(QString)));
1194
1194
 
1195
1195
       //setCurrentPath() checks for empty paths
1196
1196
       mExtFSWatcher->setCurrentPath(mCurrentDir);
1216
1216
}
1217
1217
 
1218
1218
 
1219
 
void DirModel::onThereAreExternalChanges()
 
1219
void DirModel::onThereAreExternalChanges(const QString& pathModifiedOutside)
1220
1220
{
1221
1221
    if ( IS_FILE_MANAGER_IDLE() )
1222
1222
    {
1223
1223
#if DEBUG_EXT_FS_WATCHER
1224
1224
        qDebug() << "[extFsWatcher]" << QDateTime::currentDateTime().toString("hh:mm:ss.zzz")
1225
 
                 << Q_FUNC_INFO << this << "File System modified";
 
1225
                 << Q_FUNC_INFO << this << "File System modified" << pathModifiedOutside;
 
1226
#else
 
1227
  Q_UNUSED(pathModifiedOutside);
1226
1228
#endif
1227
1229
        DirListWorker *w =
1228
1230
                createWorkerRequest(IORequest::DirListExternalFSChanges,