forked from qt-creator/qt-creator
Clang: Make ClangString inline
ClangString is called many times so inlining the thin wrapper brings little performance advantages without any disadvantages. Change-Id: Ieb1229cf8e81ed3fda859254230df14d56c405ca Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
@@ -52,7 +52,6 @@ HEADERS += $$PWD/clangcodemodelserver.h \
|
||||
|
||||
SOURCES += $$PWD/clangcodemodelserver.cpp \
|
||||
$$PWD/codecompleter.cpp \
|
||||
$$PWD/clangstring.cpp \
|
||||
$$PWD/translationunitisnullexception.cpp \
|
||||
$$PWD/codecompletefailedexception.cpp \
|
||||
$$PWD/clangcodecompleteresults.cpp \
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** 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 The Qt Company. For licensing terms
|
||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||
** information use the contact form at https://www.qt.io/contact-us.
|
||||
**
|
||||
** GNU General Public License Usage
|
||||
** Alternatively, this file may be used under the terms of the GNU
|
||||
** General Public License version 3 as published by the Free Software
|
||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||
** included in the packaging of this file. Please review the following
|
||||
** information to ensure the GNU General Public License requirements will
|
||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
**
|
||||
****************************************************************************/
|
||||
|
||||
#include "clangstring.h"
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace ClangBackEnd {
|
||||
|
||||
ClangString::ClangString(CXString cxString)
|
||||
: cxString(cxString)
|
||||
{
|
||||
}
|
||||
|
||||
ClangString::~ClangString()
|
||||
{
|
||||
clang_disposeString(cxString);
|
||||
}
|
||||
|
||||
bool ClangString::isNull() const
|
||||
{
|
||||
return cxString.data == nullptr;
|
||||
}
|
||||
|
||||
ClangString &ClangString::operator=(ClangString &&other)
|
||||
{
|
||||
if (this != &other) {
|
||||
clang_disposeString(cxString);
|
||||
cxString = std::move(other.cxString);
|
||||
other.cxString.data = nullptr;
|
||||
other.cxString.private_flags = 0;
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
const char *ClangString::cString() const
|
||||
{
|
||||
return clang_getCString(cxString);
|
||||
}
|
||||
|
||||
ClangString::ClangString(ClangString &&other)
|
||||
: cxString(std::move(other.cxString))
|
||||
{
|
||||
other.cxString.data = nullptr;
|
||||
other.cxString.private_flags = 0;
|
||||
}
|
||||
|
||||
ClangString::operator Utf8String() const
|
||||
{
|
||||
return Utf8String(cString(), -1);
|
||||
}
|
||||
|
||||
} // namespace ClangBackEnd
|
||||
|
||||
@@ -29,25 +29,63 @@
|
||||
|
||||
#include <utf8string.h>
|
||||
|
||||
#include <cstring>
|
||||
|
||||
namespace ClangBackEnd {
|
||||
|
||||
class ClangString
|
||||
{
|
||||
public:
|
||||
ClangString(CXString cxString);
|
||||
~ClangString();
|
||||
ClangString(CXString cxString)
|
||||
: cxString(cxString)
|
||||
{
|
||||
}
|
||||
|
||||
~ClangString()
|
||||
{
|
||||
clang_disposeString(cxString);
|
||||
}
|
||||
|
||||
ClangString(const ClangString &) = delete;
|
||||
const ClangString &operator=(const ClangString &) = delete;
|
||||
|
||||
ClangString(ClangString &&other);
|
||||
ClangString &operator=(ClangString &&other);
|
||||
|
||||
operator Utf8String() const;
|
||||
ClangString(ClangString &&other)
|
||||
: cxString(std::move(other.cxString))
|
||||
{
|
||||
other.cxString.data = nullptr;
|
||||
other.cxString.private_flags = 0;
|
||||
}
|
||||
|
||||
|
||||
ClangString &operator=(ClangString &&other)
|
||||
{
|
||||
if (this != &other) {
|
||||
clang_disposeString(cxString);
|
||||
cxString = std::move(other.cxString);
|
||||
other.cxString.data = nullptr;
|
||||
other.cxString.private_flags = 0;
|
||||
}
|
||||
|
||||
return *this;
|
||||
}
|
||||
|
||||
const char *cString() const
|
||||
{
|
||||
return clang_getCString(cxString);
|
||||
}
|
||||
|
||||
operator Utf8String() const
|
||||
{
|
||||
return Utf8String(cString(), -1);
|
||||
}
|
||||
|
||||
bool isNull() const
|
||||
{
|
||||
return cxString.data == nullptr;
|
||||
}
|
||||
|
||||
const char *cString() const;
|
||||
|
||||
bool isNull() const;
|
||||
|
||||
private:
|
||||
CXString cxString;
|
||||
|
||||
Reference in New Issue
Block a user