From fa2cb167910bd9a801318b24a915733dae18c6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 6 Jan 2020 19:41:48 +0100
Subject: kopete: Added ability to build with shared tqca library. QCA files
 renamed to TQCA to match tqca library.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1037d386233764a3fd46c8e18699c874520d6d9e)
---
 kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp  | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h         | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp   | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h   | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp     | 2 +-
 kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'kopete/protocols/jabber/libiris/iris/xmpp-core')

diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt b/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
index 4361f30e..78aeea48 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/CMakeLists.txt
@@ -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}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
index be32bda6..a27811ec 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp
@@ -32,7 +32,7 @@
 #include "xmpp.h"
 
 #include <tqguardedptr.h>
-#include <qca.h>
+#include <tqca.h>
 #include "safedelete.h"
 
 #ifdef NO_NDNS
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
index d91767ce..99b8c7f6 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/hash.h
@@ -21,7 +21,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include <qcaprovider.h>
+#include <tqcaprovider.h>
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
index f9328436..4f9533bc 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/protocol.cpp
@@ -25,7 +25,7 @@
 
 #include "protocol.h"
 
-#include <qca.h>
+#include <tqca.h>
 #include "base64.h"
 #include "hash.h"
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
index 4d60e3d3..ac4f60b6 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.h
@@ -21,7 +21,7 @@
 #ifndef SECURESTREAM_H
 #define SECURESTREAM_H
 
-#include <qca.h>
+#include <tqca.h>
 #include "bytestream.h"
 
 #define USE_TLSHANDLER
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
index ca55c72a..1bd4f715 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.cpp
@@ -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"
 
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
index 3c888362..dc4bd64b 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/simplesasl.h
@@ -21,7 +21,7 @@
 #ifndef SIMPLESASL_H
 #define SIMPLESASL_H
 
-#include <qcaprovider.h>
+#include <tqcaprovider.h>
 
 namespace XMPP
 {
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index f8652b35..e0d09d8e 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -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"
diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
index ea613b75..86092bad 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp
@@ -21,7 +21,7 @@
 #include "xmpp.h"
 
 #include <tqtimer.h>
-#include <qca.h>
+#include <tqca.h>
 
 using namespace XMPP;
 
-- 
cgit v1.2.1