← Back to branch summary

~content-hub-team/content-hub/trunk

« back to all changes in this revision

Viewing changes to import/Ubuntu/Content/contenthub.h

  • Committer: Tarmac
  • Author(s): Ken VanDine
  • Date: 2013-09-30 18:39:00 UTC
  • mfrom: (48.1.1 content-hub-lp1231368)
  • Revision ID: tarmac-20130930183900-61vw3dr45uph3six
Pulled back in all the changes that were reverted in rev 47.  Bug (LP: #1231368) seemed to be caused by gallery-app needing a rebuild against this version of content-hub.

Approved by PS Jenkins bot, Günter Schwann.

Show diffs side-by-side

added added

removed removed

Lines of Context:
import/Ubuntu/Content/contenthub.h
23
23
#include <QQmlListProperty>
24
24
 
25
25
class ContentPeer;
 
26
class ContentStore;
26
27
class ContentTransfer;
27
28
class QmlImportExportHandler;
28
29
 
31
32
namespace content {
32
33
class Hub;
33
34
class Peer;
 
35
class Store;
34
36
class Type;
35
37
class Transfer;
36
38
}
48
50
    Q_INVOKABLE ContentPeer *defaultSourceForType(int type);
49
51
    Q_INVOKABLE QList<ContentPeer *> knownSourcesForType(int type);
50
52
 
 
53
    Q_INVOKABLE ContentStore *defaultStoreForType(int type);
 
54
 
51
55
    Q_INVOKABLE ContentTransfer* importContent(int type);
52
56
    Q_INVOKABLE ContentTransfer* importContent(int type, ContentPeer *peer);
53
57