~ubuntu-branches/ubuntu/oneiric/kdenetwork/oneiric-updates

« back to all changes in this revision

Viewing changes to kget/core/kget.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac, Philip Muškovac
  • Date: 2011-07-10 12:36:35 UTC
  • mfrom: (1.1.59 upstream)
  • Revision ID: package-import@ubuntu.com-20110710123635-3db9oyxdswp4sp1e
Tags: 4:4.6.90-0ubuntu1
* New upstream release
 - Bump on kde-sc-dev-latest
 - s/kdebase-runtime-dev/kde-runtime-dev
* Dropped kubuntu_05_samba_sharing.diff <- went upstream
* Added kubuntu_05_make_old_symbols_reappear_and_fix_building.diff
* Refreshed *.install
* Refreshed symbols

[ Philip Muškovac ]
* fix debug package depends on kdebase-runtime-dbg -> kde-runtime-dbg 
  and recommends on kde-workspace-dbg

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
#include "core/kget.h"
16
16
 
17
17
#include "mainwindow.h"
 
18
#include "core/mostlocalurl.h"
18
19
#include "core/transfer.h"
19
20
#include "core/transferdatasource.h"
20
21
#include "core/transfergroup.h"
28
29
#include "settings.h"
29
30
#include "core/transferhistorystore.h"
30
31
#include <iostream>
31
 
#include <kio/netaccess.h>
32
32
#include <kinputdialog.h>
33
33
#include <kfiledialog.h>
34
34
#include <kmessagebox.h>
178
178
TransferHandler * KGet::addTransfer(KUrl srcUrl, QString destDir, QString suggestedFileName, // krazy:exclude=passbyvalue
179
179
                                    QString groupName, bool start)
180
180
{
181
 
    srcUrl = KIO::NetAccess::mostLocalUrl(srcUrl, m_mainWindow);
 
181
    srcUrl = mostLocalUrl(srcUrl);
182
182
    // Note: destDir may actually be a full path to a file :-(
183
183
    kDebug(5001) << "Source:" << srcUrl.url() << ", dest: " << destDir << ", sugg file: " << suggestedFileName << endl;
184
184
 
288
288
 
289
289
    for(; it!=itEnd ; ++it)
290
290
    {
291
 
        *it = KIO::NetAccess::mostLocalUrl(*it, m_mainWindow);
 
291
        *it = mostLocalUrl(*it);
292
292
        if ( isValidSource( *it ) )
293
293
            urlsToDownload.append( *it );
294
294
    }
1198
1198
        }
1199
1199
    }
1200
1200
 
1201
 
    QList<KGetPlugin *>::ConstIterator it2 = pluginList.constBegin();
1202
 
    QList<KGetPlugin *>::ConstIterator it2End = pluginList.constEnd();
1203
 
 
1204
1201
    foreach (KGetPlugin *plugin, pluginList)
1205
1202
    {
1206
1203
        m_transferFactories.append(qobject_cast<TransferFactory *>(plugin));
1463
1460
void GenericObserver::groupsChangedEvent(QMap<TransferGroupHandler*, TransferGroup::ChangesFlags> groups)
1464
1461
{
1465
1462
    bool recalculate = false;
1466
 
    foreach (TransferGroup::ChangesFlags flags, groups)
 
1463
    foreach (const TransferGroup::ChangesFlags &flags, groups)
1467
1464
    {
1468
1465
        if (flags & TransferGroup::Gc_Percent || flags & TransferGroup::Gc_Status) {
1469
1466
            recalculate = true;