← Back to branch summary

~bzoltan/kubuntu-packaging/decouple_cmake_plugin

« back to all changes in this revision

Viewing changes to src/plugins/qmldesigner/designercore/model/model.cpp

  • Committer: Timo Jyrinki
  • Date: 2013-12-02 09:16:15 UTC
  • mfrom: (1.1.29)
  • Revision ID: timo.jyrinki@canonical.com-20131202091615-xbj1os1f604ber1m
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/qmldesigner/designercore/model/model.cpp
1731
1731
 
1732
1732
QList<Import> Model::possibleImports() const
1733
1733
{
1734
 
    QList<Import> possibleImportList;
1735
 
 
1736
 
    possibleImportList.append(Import::createLibraryImport("QtQuick", "2.1"));
1737
 
    possibleImportList.append(Import::createLibraryImport("QtQuick.Controls", "1.0"));
1738
 
    possibleImportList.append(Import::createLibraryImport("QtQuick.Layouts", "1.0"));
1739
 
    possibleImportList.append(Import::createLibraryImport("QtQuick.Window", "2.0"));
1740
 
 
1741
 
    return possibleImportList;
 
1734
    return d->m_possibleImportList;
1742
1735
}
1743
1736
 
1744
1737
QList<Import> Model::usedImports() const
1745
1738
{
1746
 
    QList<Import> usedImportList;
1747
 
 
1748
 
    usedImportList.append(Import::createLibraryImport("QtQuick"));
1749
 
 
1750
 
    return usedImportList;
 
1739
    return d->m_usedImportList;
1751
1740
}
1752
1741
 
1753
1742
void Model::changeImports(const QList<Import> &importsToBeAdded, const QList<Import> &importsToBeRemoved)
1755
1744
    d->changeImports(importsToBeAdded, importsToBeRemoved);
1756
1745
}
1757
1746
 
 
1747
void Model::setPossibleImports(const QList<Import> &possibleImports)
 
1748
{
 
1749
    d->m_possibleImportList = possibleImports;
 
1750
}
 
1751
 
 
1752
void Model::setUsedImports(const QList<Import> &usedImports)
 
1753
{
 
1754
    d->m_usedImportList = usedImports;
 
1755
}
 
1756
 
1758
1757
 
1759
1758
static bool compareVersions(const QString &version1, const QString &version2, bool allowHigherVersion)
1760
1759
{
1936
1935
{
1937
1936
//    Internal::WriteLocker locker(d);
1938
1937
    RewriterView *rewriterView = qobject_cast<RewriterView*>(view);
1939
 
    if (rewriterView) {
 
1938
    if (rewriterView)
1940
1939
        return;
1941
 
    }
1942
1940
 
1943
1941
    NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view);
1944
 
    if (nodeInstanceView) {
 
1942
    if (nodeInstanceView)
1945
1943
        return;
1946
 
    }
1947
1944
 
1948
1945
    d->attachView(view);
1949
1946
}
1962
1959
    bool emitNotify = (emitDetachNotify == NotifyView);
1963
1960
 
1964
1961
    RewriterView *rewriterView = qobject_cast<RewriterView*>(view);
1965
 
    if (rewriterView) {
 
1962
    if (rewriterView)
1966
1963
        return;
1967
 
    }
1968
1964
 
1969
1965
    NodeInstanceView *nodeInstanceView = qobject_cast<NodeInstanceView*>(view);
1970
 
    if (nodeInstanceView) {
 
1966
    if (nodeInstanceView)
1971
1967
        return;
1972
 
    }
1973
1968
 
1974
1969
    d->detachView(view, emitNotify);
1975
1970
}