← Back to branch summary

~ubuntu-branches/debian/sid/kdevelop/sid

« back to all changes in this revision

Viewing changes to projectmanagers/cmake/cmakemanager.cpp

  • Committer: Package Import Robot
  • Author(s): Pino Toscano, Andreas Cord-Landwehr
  • Date: 2014-01-18 10:13:08 UTC
  • mfrom: (1.3.21)
  • Revision ID: package-import@ubuntu.com-20140118101308-3o17vgglnms0emch
Tags: 4:4.5.2-1
http://bugs.debian.org/731896
* Team upload.
* New upstream release.

[ Andreas Cord-Landwehr ]
* Remove patch okteta_optional_structures_tool.diff, applied upstream.
* Bump build dependency for kdevplatform-dev to 1.5.2.
* Bump Standards-Version to 3.9.5: no changes needed.
* Update debian/watch file to track xz compressed tarballs (Closes: #731896)

Show diffs side-by-side

added added

removed removed

Lines of Context:
projectmanagers/cmake/cmakemanager.cpp
1587
1587
 
1588
1588
bool CMakeManager::removeFilesAndFolders(const QList<KDevelop::ProjectBaseItem*> &items)
1589
1589
{
 
1590
    IProject* p = 0;
 
1591
    QList<QUrl> urls;
 
1592
    foreach(ProjectBaseItem* item, items)
 
1593
    {
 
1594
        Q_ASSERT(item->folder() || item->file());
 
1595
        Q_ASSERT(!item->file() || !item->file()->parent()->target());
 
1596
 
 
1597
        urls += item->url();
 
1598
        if(!p)
 
1599
            p = item->project();
 
1600
    }
 
1601
 
1590
1602
    //First do CMakeLists changes
1591
1603
    ApplyChangesWidget changesWidget;
1592
1604
    changesWidget.setCaption(DIALOG_CAPTION);
1605
1617
            return false;
1606
1618
    }
1607
1619
 
 
1620
    bool ret = true;
1608
1621
    //Then delete the files/folders
1609
 
    foreach(ProjectBaseItem* item, items)
 
1622
    foreach(const QUrl& file, urls)
1610
1623
    {
1611
 
        Q_ASSERT(item->folder() || item->file());
1612
 
        Q_ASSERT(!item->file() || !item->file()->parent()->target());
1613
 
 
1614
 
        if (!KDevelop::removeUrl(item->project(), item->url(), (bool)item->folder()))
1615
 
            return false;
 
1624
        ret &= KDevelop::removeUrl(p, file, QDir(file.toLocalFile()).exists());
1616
1625
    }
1617
1626
 
1618
 
    return true;
 
1627
    return ret;
1619
1628
}
1620
1629
 
1621
1630
bool CMakeManager::removeFilesFromTargets(const QList<ProjectFileItem*> &files)