← Back to branch summary

~ubuntu-branches/ubuntu/saucy/digikam/saucy

« back to all changes in this revision

Viewing changes to libs/models/albummodeldragdrophandler.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 23:19:11 UTC
  • mfrom: (1.2.33 upstream) (3.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221231911-z9jip7s5aht1jqn9
Tags: 2:1.7.0-1ubuntu1
* Merge from Debian Experimental. Remaining Ubuntu changes:
  - Export .pot name and copy to plugins in debian/rules
  - Version build-depends on kipi-plugins-dev to ensure build is against the
    same version on all archs
* Drop debian/patches/kubuntu_01_linker.diff, incoporated upstream
* Remove patches directory and unused patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/models/albummodeldragdrophandler.cpp
35
35
{
36
36
 
37
37
AlbumModelDragDropHandler::AlbumModelDragDropHandler(AbstractAlbumModel* model)
38
 
                         : QObject(model), m_model(model)
 
38
    : QObject(model), m_model(model)
39
39
{
40
40
}
41
41
 
59
59
    return QStringList();
60
60
}
61
61
 
62
 
QMimeData *AlbumModelDragDropHandler::createMimeData(const QList<Album*>&)
 
62
QMimeData* AlbumModelDragDropHandler::createMimeData(const QList<Album*>&)
63
63
{
64
64
    return 0;
65
65
}
67
67
bool AlbumModelDragDropHandler::acceptsMimeData(const QMimeData* mime)
68
68
{
69
69
    QStringList modelTypes = mimeTypes();
 
70
 
70
71
    for (int i = 0; i < modelTypes.count(); ++i)
71
72
    {
72
73
        if (mime->hasFormat(modelTypes.at(i))) //&& (e->dropAction() & model->supportedDropActions()))
 
74
        {
73
75
            return true;
 
76
        }
74
77
    }
 
78
 
75
79
    return false;
76
80
}
77
81