kopete: Added ability to build with shared tqca library.

QCA files renamed to TQCA to match tqca library.

Signed-off-by: Slávek Banko <[email protected]>

25 files changed, 41 insertions, 34 deletions

diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt
index 61202e95..50a5089a 100644
--- a/kopete/protocols/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/CMakeLists.txt
@@ -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}
 )
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 3fa61483..dc04ec6b 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -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"
diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp
index ef90323c..0bcdaebd 100644
--- a/kopete/protocols/jabber/jabberclient.cpp
+++ b/kopete/protocols/jabber/jabberclient.cpp
@@ -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>
diff --git a/kopete/protocols/jabber/libiris/CMakeLists.txt b/kopete/protocols/jabber/libiris/CMakeLists.txt
index 6c649aa5..0f18fa52 100644
--- a/kopete/protocols/jabber/libiris/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/CMakeLists.txt
@@ -10,5 +10,7 @@
 #################################################
 
 add_subdirectory( iris )
-add_subdirectory( qca )
+if( NOT TQCA_FOUND )
+  add_subdirectory( qca )
+endif( )
 add_subdirectory( cutestuff )
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
index 151dd407..22e517fc 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/CMakeLists.txt
@@ -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}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
index 5e900119..ed211ac5 100644
--- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
+++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp
@@ -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"
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt b/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
index fc694180..2739cbee 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/iris/jabber/CMakeLists.txt
@@ -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}
 )
 
 
diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
index 4170897c..7cbf759a 100644
--- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
+++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp
@@ -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"
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;
 
diff --git a/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt b/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
index 46de2435..162ecffa 100644
--- a/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
+++ b/kopete/protocols/jabber/libiris/qca/src/CMakeLists.txt
@@ -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
 )
diff --git a/kopete/protocols/jabber/libiris/qca/src/Makefile.am b/kopete/protocols/jabber/libiris/qca/src/Makefile.am
index b43d303e..8c3c80d8 100644
--- a/kopete/protocols/jabber/libiris/qca/src/Makefile.am
+++ b/kopete/protocols/jabber/libiris/qca/src/Makefile.am
@@ -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
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.cpp b/kopete/protocols/jabber/libiris/qca/src/tqca.cpp
index 89df0bb0..a4e8ab11 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.cpp
+++ b/kopete/protocols/jabber/libiris/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"
@@ -1478,4 +1478,4 @@ TQByteArray SASL::readOutgoing()
 	return a;
 }
 
-#include "qca.moc"
+#include "tqca.moc"
diff --git a/kopete/protocols/jabber/libiris/qca/src/qca.h b/kopete/protocols/jabber/libiris/qca/src/tqca.h
index 7a8a3af4..701aeb31 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qca.h
+++ b/kopete/protocols/jabber/libiris/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/jabber/libiris/qca/src/qcaprovider.h b/kopete/protocols/jabber/libiris/qca/src/tqcaprovider.h
index b0e5385a..f88d1b4f 100644
--- a/kopete/protocols/jabber/libiris/qca/src/qcaprovider.h
+++ b/kopete/protocols/jabber/libiris/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/jabber/tdeioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
index 4736203b..7a76a943 100644
--- a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
@@ -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}
 )
diff --git a/kopete/protocols/jabber/ui/CMakeLists.txt b/kopete/protocols/jabber/ui/CMakeLists.txt
index a4488d62..0493c9ee 100644
--- a/kopete/protocols/jabber/ui/CMakeLists.txt
+++ b/kopete/protocols/jabber/ui/CMakeLists.txt
@@ -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}
 )
 
 
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 753636e0..a75e206e 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -33,7 +33,7 @@
 #include <tqtimer.h>
 #include <tqregexp.h>
 
-#include <qca.h>
+#include <tqca.h>
 #include "xmpp.h"
 #include "xmpp_tasks.h"