TDE
/
tdenetwork
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdenetwork
0
0
Fork 0
Code Issues Releases Wiki Activity

kopete: Added ability to build with shared tqca library.

Browse Source 
QCA files renamed to TQCA to match tqca library.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/23/head
Slávek Banko 5 years ago
parent 115400db72
commit 1037d38623
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
41 changed files with 83 additions and 60 deletions
Show Stats Download Patch File Download Diff File

9
kopete/ConfigureChecks.cmake
Unescape View File

@ -20,6 +20,15 @@ if( (BUILD_KOPETE_PROTOCOL_JABBER AND WITH_JINGLE) OR (BUILD_KOPETE_PROTOCOL_MSN
endif( )
# tqca (groupwise, jabber)
if( BUILD_KOPETE_PROTOCOL_GROUPWISE OR BUILD_KOPETE_PROTOCOL_JABBER )
pkg_search_module( TQCA tqca )
if( NOT TQCA_FOUND )
message( STATUS " not found, built-in copy will be used" )
endif( )
endif( )
### Check for videodev header
check_include_file( "libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H )
if( HAVE_LIBV4L1_VIDEODEV_H )

9
kopete/protocols/groupwise/CMakeLists.txt
Unescape View File

@ -9,6 +9,11 @@
#
#################################################
if( NOT TQCA_FOUND )
set( TQCA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src )
set( TQCA_LIBRARIES "groupwise_tqca-static" )
endif( )
add_subdirectory( icons )
add_subdirectory( libgroupwise )
add_subdirectory( ui )
@ -18,12 +23,12 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}/ui
${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise
${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/tasks
${CMAKE_CURRENT_SOURCE_DIR}/libgroupwise/qca/src
${CMAKE_CURRENT_SOURCE_DIR}/ui
${CMAKE_SOURCE_DIR}/kopete/libkopete
${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)
link_directories(
@ -45,6 +50,6 @@ tde_add_kpart( kopete_groupwise AUTOMOC
gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp
LINK
kopetegroupwiseui-static groupwise-static groupwise_tasks-static
groupwise_qca-static kopete-shared
${TQCA_LIBRARIES} kopete-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kopete/protocols/groupwise/gwaccount.cpp
Unescape View File

@ -43,7 +43,7 @@
#include <kopeteview.h>
#include "client.h"
#include <qca.h>
#include <tqca.h>
#include "gwcontact.h"
#include "gwcontactlist.h"
#include "gwprotocol.h"

4
kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
Unescape View File

@ -9,7 +9,9 @@
#
#################################################
if( NOT TQCA_FOUND )
add_subdirectory( qca )
endif( )
add_subdirectory( tasks )
# add_definitions(
@ -19,10 +21,10 @@ add_subdirectory( tasks )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/qca/src
${CMAKE_SOURCE_DIR}/kopete/libkopete
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
Unescape View File

@ -21,7 +21,7 @@
//#include <tqtextstream.h>
//#include <tqguardedptr.h>
// #include <qca.h>
// #include <tqca.h>
// #include <stdlib.h>
// #include "bytestream.h"
// #include "base64.h"

2
kopete/protocols/groupwise/libgroupwise/gwclientstream.h
Unescape View File

@ -20,7 +20,7 @@
#ifndef GW_CLIENTSTREAM_H
#define GW_CLIENTSTREAM_H
#include <qca.h>
#include <tqca.h>
#include "gwfield.h"
#include "stream.h"

6
kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
Unescape View File

@ -15,8 +15,8 @@ include_directories(
)
##### groupwise_qca (static) ####################
##### groupwise_tqca (static) ###################
tde_add_library( groupwise_qca STATIC_PIC AUTOMOC
SOURCES qca.cpp
tde_add_library( groupwise_tqca STATIC_PIC AUTOMOC
SOURCES tqca.cpp
)

8
kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
Unescape View File

@ -1,8 +1,8 @@
METASOURCES = AUTO
noinst_LTLIBRARIES = libqca.la
noinst_LTLIBRARIES = libtqca.la
INCLUDES = $(all_includes)
libqca_la_SOURCES = \
qca.cpp
# libqca_la_LIBADD = -lqt-mt
libtqca_la_SOURCES = \
tqca.cpp
# libtqca_la_LIBADD = -lqt-mt

8
kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp → kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
Unescape View File

@ -1,5 +1,5 @@
/*
* qca.cpp - TQt Cryptographic Architecture
* tqca.cpp - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
*
*/
#include "qca.h"
#include "tqca.h"
#include <tqptrlist.h>
#include <tqdir.h>
@ -30,7 +30,7 @@
#include <tqapplication.h>
#include <tqguardedptr.h>
#include <stdlib.h>
#include "qcaprovider.h"
#include "tqcaprovider.h"
#if defined(Q_OS_WIN32)
#define PLUGIN_EXT "dll"
@ -1483,4 +1483,4 @@ TQByteArray SASL::readOutgoing()
return a;
}
#include "qca.moc"
#include "tqca.moc"

2
kopete/protocols/jabber/libiris/qca/src/qca.h → kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
Unescape View File

@ -1,5 +1,5 @@
/*
* qca.h - TQt Cryptographic Architecture
* tqca.h - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or

4
kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h → kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
Unescape View File

@ -1,5 +1,5 @@
/*
* qcaprovider.h - TQCA Plugin API
* tqcaprovider.h - TQCA Plugin API
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@ -26,7 +26,7 @@
#include <tqdatetime.h>
#include <tqobject.h>
#include <tqhostaddress.h>
#include "qca.h"
#include "tqca.h"
#define TQCA_PLUGIN_VERSION 1

2
kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
Unescape View File

@ -19,7 +19,7 @@
#include <tqtimer.h>
#include <qca.h>
#include <tqca.h>
#include "qcatlshandler.h"

2
kopete/protocols/groupwise/libgroupwise/securestream.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef SECURESTREAM_H
#define SECURESTREAM_H
#include <qca.h>
#include <tqca.h>
#include "tlshandler.h"
#include "bytestream.h"

2
kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
Unescape View File

@ -13,9 +13,9 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_SOURCE_DIR}/../qca/src
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
Unescape View File

@ -19,7 +19,7 @@
#include "gwclientstream.h"
#include "gwconnector.h"
#include <qca.h>
#include <tqca.h>
#include "tqcatlshandler.h"
#include "requestfactory.h"
#include "request.h"

2
kopete/protocols/groupwise/ui/CMakeLists.txt
Unescape View File

@ -12,13 +12,13 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise
${CMAKE_CURRENT_SOURCE_DIR}/../libgroupwise/qca/src
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_BINARY_DIR}/kopete/libkopete/ui
${CMAKE_SOURCE_DIR}/kopete/libkopete
${CMAKE_SOURCE_DIR}/kopete/libkopete/ui
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

9
kopete/protocols/jabber/CMakeLists.txt
Unescape View File

@ -9,6 +9,11 @@
#
#################################################
if( NOT TQCA_FOUND )
set( TQCA_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libiris/qca/src )
set( TQCA_LIBRARIES "tqca-static" )
endif( )
add_subdirectory( ui )
add_subdirectory( icons )
add_subdirectory( libiris )
@ -34,7 +39,6 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/include
${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/jabber
${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/xmpp-im
${CMAKE_CURRENT_SOURCE_DIR}/libiris/qca/src
${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/util
${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/network
${CMAKE_CURRENT_SOURCE_DIR}/ui
@ -44,6 +48,7 @@ include_directories(
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)
link_directories(
@ -79,7 +84,7 @@ tde_add_kpart( kopete_jabber AUTOMOC
LINK
jabberclient-static kopetejabberui-static
iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static
qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
${TQCA_LIBRARIES} cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES}
kopete-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kopete/protocols/jabber/jabberaccount.cpp
Unescape View File

@ -25,7 +25,7 @@
#include "filetransfer.h"
#include "xmpp.h"
#include "xmpp_tasks.h"
#include <qca.h>
#include <tqca.h>
#include "bsocket.h"
#include "jabberaccount.h"

2
kopete/protocols/jabber/jabberclient.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <tqtimer.h>
#include <tqregexp.h>
#include <qca.h>
#include <tqca.h>
#include <bsocket.h>
#include <filetransfer.h>
#include <xmpp_tasks.h>

2
kopete/protocols/jabber/libiris/CMakeLists.txt
Unescape View File

@ -10,5 +10,7 @@
#################################################
add_subdirectory( iris )
if( NOT TQCA_FOUND )
add_subdirectory( qca )
endif( )
add_subdirectory( cutestuff )

2
kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
Unescape View File

@ -12,9 +12,9 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../util
${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <tqurl.h>
#include <tqtimer.h>
#include <tqguardedptr.h>
#include <qca.h>
#include <tqca.h>
#include <stdlib.h>
#include "bsocket.h"
#include "base64.h"

2
kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
Unescape View File

@ -16,10 +16,10 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../xmpp-core
${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/util
${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/network
${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <tqtimer.h>
#include <tqguardedptr.h>
#include <stdlib.h>
#include <qca.h>
#include <tqca.h>
#include "xmpp_xmlcommon.h"
#include "../xmpp-core/hash.h"
#include "socks.h"

2
kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
Unescape View File

@ -12,11 +12,11 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../include
${CMAKE_CURRENT_SOURCE_DIR}/../../qca/src
${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/util
${CMAKE_CURRENT_SOURCE_DIR}/../../cutestuff/network
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
Unescape View File

@ -32,7 +32,7 @@
#include "xmpp.h"
#include <tqguardedptr.h>
#include <qca.h>
#include <tqca.h>
#include "safedelete.h"
#ifdef NO_NDNS

2
kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef HASH_H
#define HASH_H
#include <qcaprovider.h>
#include <tqcaprovider.h>
namespace XMPP
{

2
kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
Unescape View File

@ -25,7 +25,7 @@
#include "protocol.h"
#include <qca.h>
#include <tqca.h>
#include "base64.h"
#include "hash.h"

2
kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef SECURESTREAM_H
#define SECURESTREAM_H
#include <qca.h>
#include <tqca.h>
#include "bytestream.h"
#define USE_TLSHANDLER

2
kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <tqstringlist.h>
#include <tqptrlist.h>
#include <tqvaluelist.h>
#include <qca.h>
#include <tqca.h>
#include <stdlib.h>
#include "base64.h"

2
kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
Unescape View File

@ -21,7 +21,7 @@
#ifndef SIMPLESASL_H
#define SIMPLESASL_H
#include <qcaprovider.h>
#include <tqcaprovider.h>
namespace XMPP
{

2
kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
Unescape View File

@ -47,7 +47,7 @@
#include <tqtextstream.h>
#include <tqguardedptr.h>
#include <tqtimer.h>
#include <qca.h>
#include <tqca.h>
#include <stdlib.h>
#include "bytestream.h"
#include "base64.h"

2
kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
Unescape View File

@ -21,7 +21,7 @@
#include "xmpp.h"
#include <tqtimer.h>
#include <qca.h>
#include <tqca.h>
using namespace XMPP;

6
kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
Unescape View File

@ -15,8 +15,8 @@ include_directories(
)
##### qca (static) ##############################
##### tqca (static) #############################
tde_add_library( qca STATIC_PIC AUTOMOC
SOURCES qca.cpp
tde_add_library( tqca STATIC_PIC AUTOMOC
SOURCES tqca.cpp
)

6
kopete/protocols/jabber/libiris/qca/src/Makefile.am
Unescape View File

@ -1,7 +1,7 @@
METASOURCES = AUTO
noinst_LTLIBRARIES = libqca.la
noinst_LTLIBRARIES = libtqca.la
INCLUDES = $(all_includes)
libqca_la_SOURCES = \
qca.cpp
libtqca_la_SOURCES = \
tqca.cpp

8
kopete/protocols/jabber/libiris/qca/src/qca.cpp → kopete/protocols/jabber/libiris/qca/src/tqca.cpp
Unescape View File

@ -1,5 +1,5 @@
/*
* qca.cpp - TQt Cryptographic Architecture
* tqca.cpp - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@ -18,7 +18,7 @@
*
*/
#include "qca.h"
#include "tqca.h"
#include <tqptrlist.h>
#include <tqdir.h>
@ -30,7 +30,7 @@
#include <tqapplication.h>
#include <tqguardedptr.h>
#include <stdlib.h>
#include "qcaprovider.h"
#include "tqcaprovider.h"
#if defined(Q_OS_WIN32)
#define PLUGIN_EXT "dll"
@ -1478,4 +1478,4 @@ TQByteArray SASL::readOutgoing()
return a;
}
#include "qca.moc"
#include "tqca.moc"

2
kopete/protocols/groupwise/libgroupwise/qca/src/qca.h → kopete/protocols/jabber/libiris/qca/src/tqca.h
Unescape View File

@ -1,5 +1,5 @@
/*
* qca.h - TQt Cryptographic Architecture
* tqca.h - TQt Cryptographic Architecture
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or

4
kopete/protocols/jabber/libiris/qca/src/qcaprovider.h → kopete/protocols/jabber/libiris/qca/src/tqcaprovider.h
Unescape View File

@ -1,5 +1,5 @@
/*
* qcaprovider.h - TQCA Plugin API
* tqcaprovider.h - TQCA Plugin API
* Copyright (C) 2003 Justin Karneges
*
* This library is free software; you can redistribute it and/or
@ -26,7 +26,7 @@
#include <tqdatetime.h>
#include <tqobject.h>
#include <tqhostaddress.h>
#include "qca.h"
#include "tqca.h"
#define TQCA_PLUGIN_VERSION 1

2
kopete/protocols/jabber/tdeioslave/CMakeLists.txt
Unescape View File

@ -37,6 +37,6 @@ tde_add_kpart( tdeio_jabberdisco AUTOMOC
LINK
jabberclient-static
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
${TQCA_LIBRARIES} cutestuff_network-static cutestuff_util-static tdeio-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR}
)

2
kopete/protocols/jabber/ui/CMakeLists.txt
Unescape View File

@ -16,13 +16,13 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/include
${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/jabber
${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im
${CMAKE_CURRENT_SOURCE_DIR}/../libiris/qca/src
${CMAKE_CURRENT_SOURCE_DIR}/../libiris/cutestuff/util
${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete
${CMAKE_CURRENT_SOURCE_DIR}/../../../libkopete/ui
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${TQCA_INCLUDE_DIR}
)

2
kopete/protocols/jabber/ui/jabberregisteraccount.cpp
Unescape View File

@ -33,7 +33,7 @@
#include <tqtimer.h>
#include <tqregexp.h>
#include <qca.h>
#include <tqca.h>
#include "xmpp.h"
#include "xmpp_tasks.h"

Write Preview
Loading…
Cancel
Save