Skip to content
Snippets Groups Projects
  • Eike Ziller's avatar
    ea271432
    Merge remote-tracking branch 'origin/3.2' · ea271432
    Eike Ziller authored
    Conflicts:
    	src/libs/utils/ipaddresslineedit.cpp
    	src/libs/utils/logging.h
    	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
    	src/plugins/android/Android.pluginspec.in
    	src/plugins/android/androiddeploystep.cpp
    	src/plugins/android/androiddeploystep.h
    	src/plugins/android/androiddeploystepfactory.cpp
    	src/plugins/android/androiddeploystepwidget.cpp
    	src/plugins/android/androidpackagecreationfactory.cpp
    	src/plugins/android/androidpackagecreationstep.cpp
    	src/plugins/android/androidpackagecreationstep.h
    	src/plugins/android/androidpackagecreationwidget.cpp
    	src/plugins/android/androidpackagecreationwidget.h
    	src/plugins/android/javafilewizard.cpp
    	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
    	src/plugins/baremetal/BareMetal.pluginspec.in
    	src/plugins/bazaar/Bazaar.pluginspec.in
    	src/plugins/beautifier/Beautifier.pluginspec.in
    	src/plugins/bineditor/BinEditor.pluginspec.in
    	src/plugins/bookmarks/Bookmarks.pluginspec.in
    	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
    	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
    	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
    	src/plugins/classview/ClassView.pluginspec.in
    	src/plugins/clearcase/ClearCase.pluginspec.in
    	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
    	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
    	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
    	src/plugins/coreplugin/Core.pluginspec.in
    	src/plugins/cpaster/CodePaster.pluginspec.in
    	src/plugins/cppeditor/CppEditor.pluginspec.in
    	src/plugins/cppeditor/cppfilewizard.cpp
    	src/plugins/cpptools/CppTools.pluginspec.in
    	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
    	src/plugins/cpptools/cppmodelmanagerinterface.cpp
    	src/plugins/cpptools/cppmodelmanagerinterface.h
    	src/plugins/cvs/CVS.pluginspec.in
    	src/plugins/debugger/Debugger.pluginspec.in
    	src/plugins/designer/Designer.pluginspec.in
    	src/plugins/diffeditor/DiffEditor.pluginspec.in
    	src/plugins/emacskeys/EmacsKeys.pluginspec.in
    	src/plugins/fakevim/FakeVim.pluginspec.in
    	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
    	src/plugins/git/Git.pluginspec.in
    	src/plugins/git/gitorious/gitorious.cpp
    	src/plugins/git/gitorious/gitorious.h
    	src/plugins/git/gitorious/gitoriousclonewizard.cpp
    	src/plugins/git/gitorious/gitorioushostwidget.cpp
    	src/plugins/git/gitorious/gitorioushostwidget.h
    	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
    	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
    	src/plugins/git/gitorious/gitoriousprojectwidget.h
    	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
    	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
    	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
    	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
    	src/plugins/glsleditor/GLSLEditor.pluginspec.in
    	src/plugins/glsleditor/glsleditorfactory.cpp
    	src/plugins/glsleditor/glslfilewizard.cpp
    	src/plugins/helloworld/HelloWorld.pluginspec.in
    	src/plugins/help/Help.pluginspec.in
    	src/plugins/imageviewer/ImageViewer.pluginspec.in
    	src/plugins/ios/Ios.pluginspec.in
    	src/plugins/macros/Macros.pluginspec.in
    	src/plugins/mercurial/Mercurial.pluginspec.in
    	src/plugins/perforce/Perforce.pluginspec.in
    	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
    	src/plugins/pythoneditor/PythonEditor.pluginspec.in
    	src/plugins/pythoneditor/pythoneditorwidget.cpp
    	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
    	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
    	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
    	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
    	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
    	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
    	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
    	src/plugins/qmljseditor/qmljseditorfactory.cpp
    	src/plugins/qmljstools/QmlJSTools.pluginspec.in
    	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
    	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
    	src/plugins/qnx/Qnx.pluginspec.in
    	src/plugins/qtsupport/QtSupport.pluginspec.in
    	src/plugins/remotelinux/RemoteLinux.pluginspec.in
    	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
    	src/plugins/resourceeditor/resourcewizard.h
    	src/plugins/subversion/Subversion.pluginspec.in
    	src/plugins/tasklist/TaskList.pluginspec.in
    	src/plugins/texteditor/TextEditor.pluginspec.in
    	src/plugins/texteditor/basetexteditor_p.h
    	src/plugins/texteditor/basetextmark.cpp
    	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
    	src/plugins/texteditor/codeassist/defaultassistinterface.h
    	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
    	src/plugins/texteditor/itexteditor.cpp
    	src/plugins/texteditor/itexteditor.h
    	src/plugins/texteditor/itextmark.cpp
    	src/plugins/texteditor/plaintexteditor.cpp
    	src/plugins/texteditor/plaintexteditor.h
    	src/plugins/texteditor/texteditoractionhandler.cpp
    	src/plugins/todo/Todo.pluginspec.in
    	src/plugins/updateinfo/UpdateInfo.pluginspec.in
    	src/plugins/valgrind/Valgrind.pluginspec.in
    	src/plugins/vcsbase/VcsBase.pluginspec.in
    	src/plugins/welcome/Welcome.pluginspec.in
    	src/plugins/winrt/WinRt.pluginspec.in
    	tests/auto/debugger/temporarydir.h
    
    Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
    ea271432
    History
    Merge remote-tracking branch 'origin/3.2'
    Eike Ziller authored
    Conflicts:
    	src/libs/utils/ipaddresslineedit.cpp
    	src/libs/utils/logging.h
    	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
    	src/plugins/android/Android.pluginspec.in
    	src/plugins/android/androiddeploystep.cpp
    	src/plugins/android/androiddeploystep.h
    	src/plugins/android/androiddeploystepfactory.cpp
    	src/plugins/android/androiddeploystepwidget.cpp
    	src/plugins/android/androidpackagecreationfactory.cpp
    	src/plugins/android/androidpackagecreationstep.cpp
    	src/plugins/android/androidpackagecreationstep.h
    	src/plugins/android/androidpackagecreationwidget.cpp
    	src/plugins/android/androidpackagecreationwidget.h
    	src/plugins/android/javafilewizard.cpp
    	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
    	src/plugins/baremetal/BareMetal.pluginspec.in
    	src/plugins/bazaar/Bazaar.pluginspec.in
    	src/plugins/beautifier/Beautifier.pluginspec.in
    	src/plugins/bineditor/BinEditor.pluginspec.in
    	src/plugins/bookmarks/Bookmarks.pluginspec.in
    	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
    	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
    	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
    	src/plugins/classview/ClassView.pluginspec.in
    	src/plugins/clearcase/ClearCase.pluginspec.in
    	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
    	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
    	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
    	src/plugins/coreplugin/Core.pluginspec.in
    	src/plugins/cpaster/CodePaster.pluginspec.in
    	src/plugins/cppeditor/CppEditor.pluginspec.in
    	src/plugins/cppeditor/cppfilewizard.cpp
    	src/plugins/cpptools/CppTools.pluginspec.in
    	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
    	src/plugins/cpptools/cppmodelmanagerinterface.cpp
    	src/plugins/cpptools/cppmodelmanagerinterface.h
    	src/plugins/cvs/CVS.pluginspec.in
    	src/plugins/debugger/Debugger.pluginspec.in
    	src/plugins/designer/Designer.pluginspec.in
    	src/plugins/diffeditor/DiffEditor.pluginspec.in
    	src/plugins/emacskeys/EmacsKeys.pluginspec.in
    	src/plugins/fakevim/FakeVim.pluginspec.in
    	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
    	src/plugins/git/Git.pluginspec.in
    	src/plugins/git/gitorious/gitorious.cpp
    	src/plugins/git/gitorious/gitorious.h
    	src/plugins/git/gitorious/gitoriousclonewizard.cpp
    	src/plugins/git/gitorious/gitorioushostwidget.cpp
    	src/plugins/git/gitorious/gitorioushostwidget.h
    	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
    	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
    	src/plugins/git/gitorious/gitoriousprojectwidget.h
    	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
    	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
    	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
    	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
    	src/plugins/glsleditor/GLSLEditor.pluginspec.in
    	src/plugins/glsleditor/glsleditorfactory.cpp
    	src/plugins/glsleditor/glslfilewizard.cpp
    	src/plugins/helloworld/HelloWorld.pluginspec.in
    	src/plugins/help/Help.pluginspec.in
    	src/plugins/imageviewer/ImageViewer.pluginspec.in
    	src/plugins/ios/Ios.pluginspec.in
    	src/plugins/macros/Macros.pluginspec.in
    	src/plugins/mercurial/Mercurial.pluginspec.in
    	src/plugins/perforce/Perforce.pluginspec.in
    	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
    	src/plugins/pythoneditor/PythonEditor.pluginspec.in
    	src/plugins/pythoneditor/pythoneditorwidget.cpp
    	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
    	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
    	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
    	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
    	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
    	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
    	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
    	src/plugins/qmljseditor/qmljseditorfactory.cpp
    	src/plugins/qmljstools/QmlJSTools.pluginspec.in
    	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
    	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
    	src/plugins/qnx/Qnx.pluginspec.in
    	src/plugins/qtsupport/QtSupport.pluginspec.in
    	src/plugins/remotelinux/RemoteLinux.pluginspec.in
    	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
    	src/plugins/resourceeditor/resourcewizard.h
    	src/plugins/subversion/Subversion.pluginspec.in
    	src/plugins/tasklist/TaskList.pluginspec.in
    	src/plugins/texteditor/TextEditor.pluginspec.in
    	src/plugins/texteditor/basetexteditor_p.h
    	src/plugins/texteditor/basetextmark.cpp
    	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
    	src/plugins/texteditor/codeassist/defaultassistinterface.h
    	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
    	src/plugins/texteditor/itexteditor.cpp
    	src/plugins/texteditor/itexteditor.h
    	src/plugins/texteditor/itextmark.cpp
    	src/plugins/texteditor/plaintexteditor.cpp
    	src/plugins/texteditor/plaintexteditor.h
    	src/plugins/texteditor/texteditoractionhandler.cpp
    	src/plugins/todo/Todo.pluginspec.in
    	src/plugins/updateinfo/UpdateInfo.pluginspec.in
    	src/plugins/valgrind/Valgrind.pluginspec.in
    	src/plugins/vcsbase/VcsBase.pluginspec.in
    	src/plugins/welcome/Welcome.pluginspec.in
    	src/plugins/winrt/WinRt.pluginspec.in
    	tests/auto/debugger/temporarydir.h
    
    Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
cppsemanticinfoupdater.h 2.19 KiB
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.  For licensing terms and
** conditions see http://www.qt.io/licensing.  For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file.  Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights.  These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/

#ifndef CPPSEMANTICINFOUPDATER_H
#define CPPSEMANTICINFOUPDATER_H

#include "cppsemanticinfo.h"

#include <QObject>
#include <QScopedPointer>

namespace CppTools {

class SemanticInfoUpdaterPrivate;

class SemanticInfoUpdater : public QObject
{
    Q_OBJECT
    Q_DISABLE_COPY(SemanticInfoUpdater)

public:
    explicit SemanticInfoUpdater();
    ~SemanticInfoUpdater();

    SemanticInfo semanticInfo() const;

    SemanticInfo update(const SemanticInfo::Source &source);
    void updateDetached(const SemanticInfo::Source source);

signals:
    void updated(CppTools::SemanticInfo semanticInfo);

private:
    QScopedPointer<SemanticInfoUpdaterPrivate> d;
};

} // namespace CppTools

#endif // CPPSEMANTICINFOUPDATER_H