summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/groupwise/libgroupwise
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-06 19:41:48 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-02-02 04:40:27 +0100
commit1037d386233764a3fd46c8e18699c874520d6d9e (patch)
treeefbf197f81d814e062bb40aec490056c46f5a5ec /kopete/protocols/groupwise/libgroupwise
parent115400db72f2a55daa516ff56bd570902b42029a (diff)
downloadtdenetwork-1037d386233764a3fd46c8e18699c874520d6d9e.tar.gz
tdenetwork-1037d386233764a3fd46c8e18699c874520d6d9e.zip
kopete: Added ability to build with shared tqca library.
QCA files renamed to TQCA to match tqca library. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kopete/protocols/groupwise/libgroupwise')
-rw-r--r--kopete/protocols/groupwise/libgroupwise/CMakeLists.txt6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/gwclientstream.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt6
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp (renamed from kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp)8
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h (renamed from kopete/protocols/groupwise/libgroupwise/qca/src/qca.h)2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h (renamed from kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h)4
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/securestream.h2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt2
-rw-r--r--kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h2
12 files changed, 24 insertions, 22 deletions
diff --git a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
index ef158cd9..7fb622e1 100644
--- a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
@@ -9,7 +9,9 @@
#
#################################################
-add_subdirectory( qca )
+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}
)
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
index 67d22462..0c395159 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp
@@ -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"
diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
index c7166ffe..c63868f7 100644
--- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
+++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.h
@@ -20,7 +20,7 @@
#ifndef GW_CLIENTSTREAM_H
#define GW_CLIENTSTREAM_H
-#include <qca.h>
+#include <tqca.h>
#include "gwfield.h"
#include "stream.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
index 9c74e339..c14c9761 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/CMakeLists.txt
@@ -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
)
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
index e9a361d9..4441fe33 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.am
@@ -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
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
index 3981964a..5656addf 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.cpp
@@ -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"
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
index 7a8a3af4..701aeb31 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qca.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqca.h
@@ -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
diff --git a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
index b0e5385a..f88d1b4f 100644
--- a/kopete/protocols/groupwise/libgroupwise/qca/src/qcaprovider.h
+++ b/kopete/protocols/groupwise/libgroupwise/qca/src/tqcaprovider.h
@@ -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
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
index 7965e08a..372d7d9a 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp
@@ -19,7 +19,7 @@
#include <tqtimer.h>
-#include <qca.h>
+#include <tqca.h>
#include "qcatlshandler.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.h b/kopete/protocols/groupwise/libgroupwise/securestream.h
index d5b877fd..ccf916e6 100644
--- a/kopete/protocols/groupwise/libgroupwise/securestream.h
+++ b/kopete/protocols/groupwise/libgroupwise/securestream.h
@@ -21,7 +21,7 @@
#ifndef SECURESTREAM_H
#define SECURESTREAM_H
-#include <qca.h>
+#include <tqca.h>
#include "tlshandler.h"
#include "bytestream.h"
diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
index 1fc4a60a..8c85f94e 100644
--- a/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/tasks/CMakeLists.txt
@@ -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}
)
diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
index f4df0b8a..a4b1fee0 100644
--- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
+++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.h
@@ -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"