mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
refactor(core): remove CString
This commit is contained in:
sudden6
parent
25c279c320
commit
4e548662d7
|
|
@ -216,8 +216,6 @@ set(${PROJECT_NAME}_SOURCES
|
|||
src/core/core.h
|
||||
src/core/corestructs.cpp
|
||||
src/core/corestructs.h
|
||||
src/core/cstring.cpp
|
||||
src/core/cstring.h
|
||||
src/core/indexedlist.h
|
||||
src/core/recursivesignalblocker.cpp
|
||||
src/core/recursivesignalblocker.h
|
||||
|
|
|
|||
2
qtox.pro
2
qtox.pro
|
|
@ -437,7 +437,6 @@ HEADERS += \
|
|||
src/core/coreav.h \
|
||||
src/core/corefile.h \
|
||||
src/core/corestructs.h \
|
||||
src/core/cstring.h \
|
||||
src/core/indexedlist.h \
|
||||
src/core/recursivesignalblocker.h \
|
||||
src/core/toxcall.h \
|
||||
|
|
@ -559,7 +558,6 @@ SOURCES += \
|
|||
src/core/coreav.cpp \
|
||||
src/core/corefile.cpp \
|
||||
src/core/corestructs.cpp \
|
||||
src/core/cstring.cpp \
|
||||
src/core/recursivesignalblocker.cpp \
|
||||
src/core/toxcall.cpp \
|
||||
src/core/toxencrypt.cpp \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include "core.h"
|
||||
#include "corefile.h"
|
||||
#include "src/core/coreav.h"
|
||||
#include "src/core/cstring.h"
|
||||
#include "src/core/toxstring.h"
|
||||
#include "src/net/avatarbroadcaster.h"
|
||||
#include "src/nexus.h"
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
#include "core.h"
|
||||
#include "corefile.h"
|
||||
#include "corestructs.h"
|
||||
#include "src/core/cstring.h"
|
||||
#include "src/persistence/profile.h"
|
||||
#include "src/persistence/settings.h"
|
||||
#include <QDebug>
|
||||
|
|
|
|||
|
|
@ -1,68 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2013 by Maxim Biro <nurupo.contributions@gmail.com>
|
||||
Copyright © 2014 by The qTox Project Contributors
|
||||
|
||||
This file is part of qTox, a Qt-based graphical interface for Tox.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
qTox is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "cstring.h"
|
||||
#include <QString>
|
||||
|
||||
CString::CString(const QString& string)
|
||||
: CString(string.toUtf8())
|
||||
{
|
||||
}
|
||||
|
||||
CString::CString(const QByteArray& ba_string)
|
||||
{
|
||||
cString = new uint8_t[ba_string.size()]();
|
||||
cStringSize = ba_string.size();
|
||||
memcpy(cString, reinterpret_cast<const uint8_t*>(ba_string.data()), cStringSize);
|
||||
}
|
||||
|
||||
CString::CString(const CString& cstr)
|
||||
{
|
||||
cStringSize = cstr.cStringSize;
|
||||
cString = new uint8_t[cStringSize]();
|
||||
memcpy(cString, cstr.cString, cStringSize);
|
||||
}
|
||||
|
||||
CString::~CString()
|
||||
{
|
||||
delete[] cString;
|
||||
}
|
||||
|
||||
uint8_t* CString::data()
|
||||
{
|
||||
return cString;
|
||||
}
|
||||
|
||||
uint16_t CString::size() const
|
||||
{
|
||||
return cStringSize;
|
||||
}
|
||||
|
||||
QString CString::toString(const uint8_t* cString, uint16_t cStringSize)
|
||||
{
|
||||
return QString::fromUtf8(reinterpret_cast<const char*>(cString), cStringSize);
|
||||
}
|
||||
|
||||
uint16_t CString::fromString(const QString& string, uint8_t* cString)
|
||||
{
|
||||
QByteArray byteArray = QByteArray(string.toUtf8());
|
||||
memcpy(cString, reinterpret_cast<uint8_t*>(byteArray.data()), byteArray.size());
|
||||
return byteArray.size();
|
||||
}
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
/*
|
||||
Copyright (C) 2013 by Maxim Biro <nurupo.contributions@gmail.com>
|
||||
Copyright © 2014 by The qTox Project Contributors
|
||||
|
||||
This file is part of qTox, a Qt-based graphical interface for Tox.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
qTox is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with qTox. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef CSTRING_H
|
||||
#define CSTRING_H
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
class QString;
|
||||
class QByteArray;
|
||||
|
||||
class CString
|
||||
{
|
||||
public:
|
||||
explicit CString(const QString& string);
|
||||
explicit CString(const QByteArray& ba_string);
|
||||
explicit CString(const CString& cstr);
|
||||
~CString();
|
||||
|
||||
uint8_t* data();
|
||||
uint16_t size() const;
|
||||
|
||||
static QString toString(const uint8_t* cMessage, const uint16_t cMessageSize);
|
||||
static uint16_t fromString(const QString& message, uint8_t* cMessage);
|
||||
|
||||
private:
|
||||
const static int MAX_SIZE_OF_UTF8_ENCODED_CHARACTER = 4;
|
||||
|
||||
uint8_t* cString;
|
||||
uint16_t cStringSize;
|
||||
};
|
||||
#endif // CSTRING_H
|
||||
|
|
@ -27,7 +27,6 @@
|
|||
#include "src/chatlog/content/text.h"
|
||||
#include "src/core/core.h"
|
||||
#include "src/core/coreav.h"
|
||||
#include "src/core/cstring.h"
|
||||
#include "src/friend.h"
|
||||
#include "src/nexus.h"
|
||||
#include "src/persistence/offlinemsgengine.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user