diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-05-03 11:33:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-05-03 13:28:26 +0200 |
commit | 1cc3a5ecd9169b301d7c1de5f18e1f951bac51f4 (patch) | |
tree | ac66cae88e43a97ad89880b7a8eda9cfad770b83 /src/plugins/coreplugin | |
parent | d006ca80a62ba94fbde3d992cf0565fa44f5b8ba (diff) | |
download | qt-creator-1cc3a5ecd9169b301d7c1de5f18e1f951bac51f4.tar.gz |
Core: Clean up context
Move the context code into its own implementation file (from id.cpp)
Change-Id: I5e487e0ab0a9b3a33ef32f2d5b7a5d703bded099
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r-- | src/plugins/coreplugin/coreplugin.pro | 1 | ||||
-rw-r--r-- | src/plugins/coreplugin/coreplugin.qbs | 1 | ||||
-rw-r--r-- | src/plugins/coreplugin/icontext.cpp | 56 | ||||
-rw-r--r-- | src/plugins/coreplugin/id.cpp | 18 |
4 files changed, 60 insertions, 16 deletions
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index b4fcbf975a..d9c0b343d6 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -24,6 +24,7 @@ SOURCES += mainwindow.cpp \ fancytabwidget.cpp \ generalsettings.cpp \ id.cpp \ + icontext.cpp \ messagemanager.cpp \ messageoutputwindow.cpp \ outputpane.cpp \ diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 78b6d11994..52e4a22860 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -72,6 +72,7 @@ QtcPlugin { "generatedfile.h", "helpmanager.cpp", "helpmanager.h", + "icontext.cpp", "icontext.h", "icore.cpp", "icore.h", diff --git a/src/plugins/coreplugin/icontext.cpp b/src/plugins/coreplugin/icontext.cpp new file mode 100644 index 0000000000..0218a82df9 --- /dev/null +++ b/src/plugins/coreplugin/icontext.cpp @@ -0,0 +1,56 @@ +/************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** +** GNU Lesser General Public License Usage +** +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this file. +** Please review the following information to ensure the GNU Lesser General +** Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** Other Usage +** +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +**************************************************************************/ + +#include "icontext.h" + +#include "id.h" + +#include <QString> + +namespace Core { + +Context::Context(const char *id, int offset) +{ + d.append(Id(QLatin1String(id) + QString::number(offset)).uniqueIdentifier()); +} + +void Context::add(const char *id) +{ + d.append(Id(id).uniqueIdentifier()); +} + +bool Context::contains(const char *id) const +{ + return d.contains(Id(id).uniqueIdentifier()); +} + +} // namespace Core diff --git a/src/plugins/coreplugin/id.cpp b/src/plugins/coreplugin/id.cpp index 2f7a8510c3..80641ca693 100644 --- a/src/plugins/coreplugin/id.cpp +++ b/src/plugins/coreplugin/id.cpp @@ -32,11 +32,12 @@ #include "id.h" #include "coreconstants.h" -#include "icontext.h" #include <utils/qtcassert.h> +#include <QByteArray> #include <QHash> +#include <QVector> namespace Core { @@ -131,19 +132,4 @@ QString Id::toString() const return QString::fromLatin1(stringFromId[m_id]); } -Context::Context(const char *id, int offset) -{ - d.append(Id(QLatin1String(id) + QString::number(offset)).uniqueIdentifier()); -} - -void Context::add(const char *id) -{ - d.append(Id(id).uniqueIdentifier()); -} - -bool Context::contains(const char *id) const -{ - return d.contains(Id(id).uniqueIdentifier()); -} - } // namespace Core |