← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kdevplatform/quantal-proposed

« back to all changes in this revision

Viewing changes to shell/project.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Fathi Boudra, Fathi Boudra, Sune Vuorela
  • Date: 2010-07-22 20:36:46 UTC
  • mfrom: (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100722203646-ujxro0qx5bivjj58
Tags: 1.0.1-1
* New upstream release.

[ Fathi Boudra ]
* Add localization packages: Finnish (fi), Dutch (nl), Slovenian (sl) and
  Thai (th).
* Update debian/control:
  - bump Standards-Version to 3.9.0 (no changes needed).
  - comment turkish localization package, not shipped in this release.
* Update debian/rules: remove workaround for FindKDE4Internal.cmake default
  rpath value, fixed in kdelibs5-dev 4.4.1.

[ Sune Vuorela ]
* Remove hardcoded dependency in libsublime1 on kdelibs5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/project.cpp
142
142
    KUrl developerFileUrl;
143
143
    QString developerTempFile;
144
144
    QString projectTempFile;
145
 
    KTemporaryFile* tmp;
146
145
    IPlugin* manager;
147
146
    IPlugin* vcsPlugin;
148
147
    ProjectFolderItem* topItem;
308
307
        if( !statJob->exec() || !KIO::NetAccess::download( developerFileUrl, developerTempFile,
309
308
            Core::self()->uiController()->activeMainWindow() ) )
310
309
        {
311
 
            tmp = new KTemporaryFile();
312
 
            tmp->open();
313
 
            developerTempFile = tmp->fileName();
314
 
            tmp->close();
 
310
            KTemporaryFile tmp;
 
311
            tmp.open();
 
312
            developerTempFile = tmp.fileName();
315
313
        }
316
314
        return true;
317
315
    }
434
432
    d->project = this;
435
433
    d->manager = 0;
436
434
    d->topItem = 0;
437
 
    d->tmp = 0;
438
435
    d->vcsPlugin = 0;
439
436
    d->loading = false;
440
437
    d->scheduleReload = false;
535
532
{
536
533
    Core::self()->projectController()->projectModel()->removeRow( d->topItem->row() );
537
534
 
538
 
    if( d->tmp )
539
 
    {
540
 
        d->tmp->close();
541
 
    }
542
 
 
543
535
    if( !KIO::NetAccess::upload( d->developerTempFile, d->developerFileUrl,
544
536
                Core::self()->uiController()->activeMainWindow() ) )
545
537
    {
548
540
                         "Attention: The project settings you changed will be lost."
549
541
                    ) );
550
542
    }
551
 
    delete d->tmp;
552
543
}
553
544
 
554
545
bool Project::inProject( const KUrl& url ) const