← Back to branch summary

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

« back to all changes in this revision

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

  • 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.cpp
15
15
 */
16
16
 
17
17
#include "contenthub.h"
18
 
#include <contentpeer.h>
19
 
#include <contenttransfer.h>
20
 
#include <contenttype.h>
21
 
#include <qmlimportexporthandler.h>
 
18
#include "contentpeer.h"
 
19
#include "contentstore.h"
 
20
#include "contenttransfer.h"
 
21
#include "contenttype.h"
 
22
#include "qmlimportexporthandler.h"
22
23
 
23
24
#include <com/ubuntu/content/hub.h>
24
25
#include <com/ubuntu/content/peer.h>
121
122
    return qmlPeer;
122
123
}
123
124
 
 
125
ContentStore *ContentHub::defaultStoreForType(int type)
 
126
{
 
127
    qDebug() << Q_FUNC_INFO;
 
128
 
 
129
    const cuc::Type &hubType = ContentType::contentType2HubType(type);
 
130
    const cuc::Store *hubStore = m_hub->store_for_scope_and_type(cuc::app, hubType);
 
131
 
 
132
    qDebug() << Q_FUNC_INFO << "STORE:" << hubStore->uri();
 
133
 
 
134
    ContentStore *qmlStore = new ContentStore(this);
 
135
    qmlStore->setStore(hubStore);
 
136
 
 
137
    return qmlStore;
 
138
}
 
139
 
124
140
/*!
125
141
 * \qmlmethod ContentHub::knownSourcesForType()
126
142
 *