Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-10-19 21:05:54 +00:00
parent 68e4b37812
commit 2b33feeecd
16 changed files with 105 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmake/modules/FindDBus.cmake
View file

@ -26,8 +26,6 @@ find_path(DBUS_INCLUDES
HINTS
$ENV{DBUSDIR}/include
${PC_DBUS_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -40,10 +38,6 @@ find_path(DBUS_ARCH_INCLUDES
$ENV{DBUSDIR}/lib
${PC_DBUS_INCLUDEDIR}
${PC_DBUS_LIBDIR}
/usr/include
/usr/local/include
/usr/lib
/usr/local/lib
${INCLUDE_INSTALL_DIR}
${LIB_INSTALL_DIR}
)
@ -57,8 +51,6 @@ find_library(DBUS_LIBRARIES
HINTS
$ENV{DBUSDIR}/lib
${PC_DBUS_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindEGL.cmake
View file

@ -25,8 +25,6 @@ find_path(EGL_INCLUDES
HINTS
$ENV{EGLDIR}/include
${PC_EGL_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -35,8 +33,6 @@ find_library(EGL_LIBRARIES
HINTS
$ENV{EGLDIR}/lib
${PC_EGL_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindFontconfig.cmake
View file

@ -24,8 +24,6 @@ find_path(FONTCONFIG_INCLUDES
HINTS
$ENV{FONTCONFIGDIR}/include
${PC_FONTCONFIG_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -34,8 +32,6 @@ find_library(FONTCONFIG_LIBRARIES
HINTS
$ENV{FONTCONFIGDIR}/lib
${PC_FONTCONFIG_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindGConf2.cmake
View file

@ -25,8 +25,6 @@ find_path(GCONF2_INCLUDES
HINTS
$ENV{GCONF2DIR}/include
${PC_GCONF2_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -35,8 +33,6 @@ find_library(GCONF2_LIBRARIES
HINTS
$ENV{GCONF2DIR}/lib
${PC_GCONF2_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

8
cmake/modules/FindGLib2.cmake
View file

@ -26,8 +26,6 @@ find_path(GLIB2_INCLUDES
HINTS
$ENV{GLIB2DIR}/include
${PC_GLIB2_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -40,10 +38,6 @@ find_path(GLIB2_CONFIG_INCLUDES
$ENV{GLIB2DIR}/lib
${PC_GLIB2_INCLUDEDIR}
${PC_GLIB2_LIBDIR}
/usr/include
/usr/local/include
/usr/lib
/usr/local/lib
${INCLUDE_INSTALL_DIR}
)
@ -56,8 +50,6 @@ find_library(GLIB2_LIBRARIES
HINTS
$ENV{GLIB2DIR}/lib
${PC_GLIB2_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindHarfBuzz.cmake
View file

@ -25,8 +25,6 @@ find_path(HARFBUZZ_INCLUDES
HINTS
$ENV{HARFBUZZDIR}/include
${PC_HARFBUZZ_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -35,8 +33,6 @@ find_library(HARFBUZZ_LIBRARIES
HINTS
$ENV{HARFBUZZDIR}/lib
${PC_HARFBUZZ_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

6
cmake/modules/FindICU.cmake
View file

@ -24,8 +24,6 @@ find_path(ICU_INCLUDES
HINTS
$ENV{ICUDIR}/include
${PC_ICU_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -34,8 +32,6 @@ find_library(ICU_LIBRARIES
HINTS
$ENV{ICUDIR}/lib
${PC_ICU_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)
@ -44,8 +40,6 @@ find_library(ICUUC_LIBRARIES
HINTS
$ENV{ICUDIR}/lib
${PC_ICU_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindIconv.cmake
View file

@ -20,8 +20,6 @@ find_path(ICONV_INCLUDES
iconv.h
HINTS
$ENV{ICONVDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -30,8 +28,6 @@ find_library(ICONV_LIBRARIES
iconv libiconv libiconv-2 c
HINTS
$ENV{ICONVDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindMNG.cmake
View file

@ -25,8 +25,6 @@ find_path(MNG_INCLUDES
HINTS
$ENV{MNGDIR}/include
${PC_MNG_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -35,8 +33,6 @@ find_library(MNG_LIBRARIES
HINTS
$ENV{MNGDIR}/lib
${PC_MNG_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindMySQL.cmake
View file

@ -21,8 +21,6 @@ find_path(MYSQL_INCLUDES
PATH_SUFFIXES mysql
HINTS
$ENV{MYSQLDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -30,8 +28,6 @@ find_library(MYSQL_LIBRARIES
mysqld
HINTS
$ENV{MYSQLDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindNAS.cmake
View file

@ -21,8 +21,6 @@ find_path(NAS_INCLUDES
PATH_SUFFIXES audio
HINTS
$ENV{NASDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -30,8 +28,6 @@ find_library(NAS_LIBRARIES
audio
HINTS
$ENV{NASDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindNIS.cmake
View file

@ -20,8 +20,6 @@ find_path(NIS_INCLUDES
rpc/rpc.h
HINTS
$ENV{NISDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -29,8 +27,6 @@ find_library(NIS_LIBRARIES
nsl
HINTS
$ENV{NISDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindODBC.cmake
View file

@ -21,8 +21,6 @@ find_path(ODBC_INCLUDES
PATH_SUFFIXES iodbc libiodbc
HINTS
$ENV{ODBCDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -30,8 +28,6 @@ find_library(ODBC_LIBRARIES
odbc iodbc
HINTS
$ENV{ODBCDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindResolv.cmake
View file

@ -20,8 +20,6 @@ find_path(RESOLV_INCLUDES
resolv.h
HINTS
$ENV{RESOLVDIR}/include
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -30,8 +28,6 @@ find_library(RESOLV_LIBRARIES
resolv c
HINTS
$ENV{RESOLVDIR}/lib
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

4
cmake/modules/FindSqlite.cmake
View file

@ -25,8 +25,6 @@ find_path(SQLITE_INCLUDES
HINTS
$ENV{SQLITEDIR}/include
${PC_SQLITE_INCLUDEDIR}
/usr/include
/usr/local/include
${INCLUDE_INSTALL_DIR}
)
@ -35,8 +33,6 @@ find_library(SQLITE_LIBRARIES
HINTS
$ENV{SQLITEDIR}/lib
${PC_SQLITE_LIBDIR}
/usr/lib
/usr/local/lib
${LIB_INSTALL_DIR}
)

78
src/core/tools/qcryptographichash.cpp
View file

@ -52,7 +52,6 @@ class QCryptographicHashPrivate
{
public:
QCryptographicHash::Algorithm method;
union {
MD4_CTX md4Context;
MD5_CTX md5Context;
SHA_CTX sha1Context;
@ -60,7 +59,6 @@ public:
SHA256_CTX sha256Context;
SHA512_CTX sha384Context;
SHA512_CTX sha512Context;
};
QByteArray result;
};
@ -116,28 +114,35 @@ QCryptographicHash::~QCryptographicHash()
void QCryptographicHash::reset()
{
switch (d->method) {
case Md4:
case QCryptographicHash::Md4: {
MD4_Init(&d->md4Context);
break;
case Md5:
}
case QCryptographicHash::Md5: {
MD5_Init(&d->md5Context);
break;
case Sha1:
}
case QCryptographicHash::Sha1: {
SHA1_Init(&d->sha1Context);
break;
case Sha224:
}
case QCryptographicHash::Sha224: {
SHA224_Init(&d->sha224Context);
break;
case Sha256:
}
case QCryptographicHash::Sha256: {
SHA256_Init(&d->sha256Context);
break;
case Sha384:
}
case QCryptographicHash::Sha384: {
SHA384_Init(&d->sha384Context);
break;
case Sha512:
}
case QCryptographicHash::Sha512: {
SHA512_Init(&d->sha512Context);
break;
}
}
d->result.clear();
}
@ -148,28 +153,35 @@ void QCryptographicHash::reset()
void QCryptographicHash::addData(const char *data, int length)
{
switch (d->method) {
case Md4:
MD4_Update(&d->md4Context, (const unsigned char *)data, length);
case QCryptographicHash::Md4: {
MD4_Update(&d->md4Context, data, length);
break;
case Md5:
MD5_Update(&d->md5Context, (const unsigned char *)data, length);
}
case QCryptographicHash::Md5: {
MD5_Update(&d->md5Context, data, length);
break;
case Sha1:
SHA1_Update(&d->sha1Context, (const unsigned char *)data, length);
}
case QCryptographicHash::Sha1: {
SHA1_Update(&d->sha1Context, data, length);
break;
case Sha224:
SHA224_Update(&d->sha224Context, reinterpret_cast<const unsigned char *>(data), length);
}
case QCryptographicHash::Sha224: {
SHA224_Update(&d->sha224Context, data, length);
break;
case Sha256:
SHA256_Update(&d->sha256Context, reinterpret_cast<const unsigned char *>(data), length);
}
case QCryptographicHash::Sha256: {
SHA256_Update(&d->sha256Context, data, length);
break;
case Sha384:
SHA384_Update(&d->sha384Context, reinterpret_cast<const unsigned char *>(data), length);
}
case QCryptographicHash::Sha384: {
SHA384_Update(&d->sha384Context, data, length);
break;
case Sha512:
SHA512_Update(&d->sha512Context, reinterpret_cast<const unsigned char *>(data), length);
}
case QCryptographicHash::Sha512: {
SHA512_Update(&d->sha512Context, data, length);
break;
}
}
d->result.clear();
}
@ -207,43 +219,43 @@ QByteArray QCryptographicHash::result() const
return d->result;
switch (d->method) {
case Md4: {
case QCryptographicHash::Md4: {
MD4_CTX copy = d->md4Context;
d->result.resize(16);
MD4_Final((unsigned char *)d->result.data(), &copy);
MD4_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Md5: {
case QCryptographicHash::Md5: {
MD5_CTX copy = d->md5Context;
d->result.resize(16);
MD5_Final((unsigned char *)d->result.data(), &copy);
MD5_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Sha1: {
case QCryptographicHash::Sha1: {
SHA_CTX copy = d->sha1Context;
d->result.resize(20);
SHA1_Final((unsigned char *)d->result.data(), &copy);
SHA1_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Sha224: {
case QCryptographicHash::Sha224: {
SHA256_CTX copy = d->sha224Context;
d->result.resize(57);
SHA224_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Sha256:{
case QCryptographicHash::Sha256:{
SHA256_CTX copy = d->sha256Context;
d->result.resize(65);
SHA256_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Sha384:{
case QCryptographicHash::Sha384:{
SHA512_CTX copy = d->sha384Context;
d->result.resize(97);
SHA384_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);
break;
}
case Sha512:{
case QCryptographicHash::Sha512:{
SHA512_CTX copy = d->sha512Context;
d->result.resize(129);
SHA512_Final(reinterpret_cast<unsigned char *>(d->result.data()), &copy);