← Back to branch summary

~ps-jenkins/gallery-app/ubuntu-vivid-proposed

« back to all changes in this revision

Viewing changes to tests/unittests/gallerythumbnailimageprovider/gallery-manager.cpp

  • Committer: Guenter Schwann
  • Date: 2013-04-15 12:05:00 UTC
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: guenter.schwann@canonical.com-20130415120500-fh98u8vuuu7lg1rb
Use cmake instead of qmake

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/gallerythumbnailimageprovider/gallery-manager.cpp
27
27
 
28
28
GalleryManager* GalleryManager::gallery_mgr_ = NULL;
29
29
 
30
 
GalleryManager::GalleryManager(const QString&, const QDir& pictures_dir, QQuickView*, const bool)
 
30
GalleryManager::GalleryManager(const QDir& pictures_dir, QQuickView*, const bool)
31
31
    : collections_initialised(false),
32
32
      resource_(NULL),
33
33
      gallery_standard_image_provider_(NULL),
49
49
    gallery_mgr_ = NULL;
50
50
}
51
51
 
52
 
GalleryManager* GalleryManager::instance(const QString& application_path_dir, const QDir& pictures_dir,
 
52
GalleryManager* GalleryManager::instance(const QDir& pictures_dir,
53
53
                                         QQuickView* view, const bool log_image_loading)
54
54
{
55
55
    if (!gallery_mgr_)
56
 
        gallery_mgr_ = new GalleryManager(application_path_dir, pictures_dir, view, log_image_loading);
 
56
        gallery_mgr_ = new GalleryManager(pictures_dir, view, log_image_loading);
57
57
 
58
58
    return gallery_mgr_;
59
59
}