Fixes against new iris

psi-im · Mar 11, 2024 · bebb649 · bebb649
1 parent 83a8dfb
commit bebb649
Show file tree

Hide file tree

Showing 132 changed files with 277 additions and 393 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -68,7 +68,7 @@ option( PLUGINS_NO_DEBUG "Add -DPLUGINS_NO_DEBUG definition" OFF )
 # Developers options
 option( DEV_MODE "Enable prepare-bin-libs target for MS Windows only. Set PSI_DATADIR and PSI_LIBDIR to CMAKE_RUNTIME_OUTPUT_DIRECTORY to debug plugins for Linux only" OFF )
 # Iris options
-option( BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA} )
+option( IRIS_BUNDLED_QCA "Adds: DTLS, Blake2b and other useful for XMPP crypto-stuff" ${DEFAULT_BUNDLED_QCA} )
 option( BUNDLED_USRSCTP "Compile compatible usrsctp lib when system one is not available or uncompatible (required for p2p file transfer)" ${DEFAULT_BUNDLED_USRSCTP} )
 if (UNIX AND "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
     option( ENABLE_ASAN "Enable compilation with address sanitizer" OFF )
@@ -174,7 +174,7 @@ if(USE_CRASH)
     add_definitions(-DUSE_CRASH)
 endif()
 
-if(BUNDLED_QCA)
+if(IRIS_BUNDLED_QCA)
     add_definitions(-DQCA_STATIC)
 endif()
 
@@ -347,7 +347,7 @@ endif()
 if(NOT ONLY_PLUGINS)
     add_subdirectory( 3rdparty )
     if(BUNDLED_IRIS)
-        add_subdirectory( iris )
+        include(iris/bundled.cmake)
     else()
         find_package( Iris REQUIRED )
         include_directories(${Iris_INCLUDE_DIR})

diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake
diff --git a/cmake/modules/get-version.cmake b/cmake/modules/get-version.cmake
@@ -9,7 +9,7 @@ set(DEFAULT_VER "1.5")
 if(NOT Git_FOUND)
     include(FindGit)
     find_package(Git)
-    if((NOT BUNDLED_USRSCTP OR NOT BUNDLED_QCA) AND (NOT Git_FOUND))
+    if((NOT BUNDLED_USRSCTP OR NOT IRIS_BUNDLED_QCA) AND (NOT Git_FOUND))
         message(STATUS "Git utility not found")
     endif()
 endif()

diff --git a/iris b/iris
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -100,7 +100,7 @@ if(APPLE)
     list(APPEND EXTRA_LDFLAGS "-framework Carbon" "-framework AppKit" "-framework IOKit" "-framework CoreAudio" "-framework AudioToolbox")
 endif()
 
-if (NOT BUNDLED_QCA)
+if (NOT IRIS_BUNDLED_QCA)
     find_package( Qca REQUIRED )
     include_directories(${Qca_INCLUDE_DIR})
 else()
@@ -146,11 +146,11 @@ include_directories(
 )
 
 if(BUNDLED_IRIS)
-    include_directories(
-        ${PROJECT_SOURCE_DIR}/iris/src
-        ${PROJECT_SOURCE_DIR}/iris/include
-        ${PROJECT_SOURCE_DIR}/iris/include/iris
-    )
+    # include_directories(
+    #     ${PROJECT_SOURCE_DIR}/iris/src
+    #     ${PROJECT_SOURCE_DIR}/iris/include
+    #     ${PROJECT_SOURCE_DIR}/iris/include/iris
+    # )
 else()
     include_directories(${Iris_INCLUDE_DIR})
 endif()
@@ -631,7 +631,7 @@ elseif(APPLE)
     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin" BUNDLE DESTINATION ".")
 
     # Special hack for qca package from Homebrew
-    if(HOMEBREW AND NOT BUNDLED_QCA)
+    if(HOMEBREW AND NOT IRIS_BUNDLED_QCA)
         install(DIRECTORY "${HOMEBREW}/opt/qca/lib/qt5/plugins/crypto"
                 DESTINATION "${CLIENT_NAME}.app/Contents/PlugIns")
     endif()

diff --git a/src/accountmanagedlg.cpp b/src/accountmanagedlg.cpp
@@ -23,14 +23,13 @@
 #include "common.h"
 #include "iconaction.h"
 #include "miniclient.h"
-#include "proxy.h"
 #include "psiaccount.h"
 #include "psicon.h"
 #include "psicontactlist.h"
 #include "psiiconset.h"
 #include "shortcutmanager.h"
 #include "ui_accountremove.h"
-#include "xmpp_tasks.h"
+#include "iris/xmpp_tasks.h"
 
 #include <QButtonGroup>
 #include <QDropEvent>

diff --git a/src/accountregdlg.cpp b/src/accountregdlg.cpp
@@ -27,7 +27,7 @@
 #include "serverlistquerier.h"
 #include "textutil.h"
 #include "xdata_widget.h"
-#include "xmpp_tasks.h"
+#include "iris/xmpp_tasks.h"
 
 #include <QMessageBox>
 #include <QScrollArea>

diff --git a/src/accountregdlg.h b/src/accountregdlg.h
@@ -22,7 +22,7 @@
 
 #include "profiles.h"
 #include "ui_accountreg.h"
-#include "xmpp_jid.h"
+#include "iris/xmpp_jid.h"
 
 #include <QDialog>
 #include <QString>

diff --git a/src/activitydlg.cpp b/src/activitydlg.cpp
@@ -22,10 +22,10 @@
 #include "activitycatalog.h"
 #include "pepmanager.h"
 #include "psiaccount.h"
-#include "psiiconset.h"
-#include "xmpp_client.h"
-#include "xmpp_pubsubitem.h"
-#include "xmpp_task.h"
+#include "iconset.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_pubsubitem.h"
+#include "iris/xmpp_task.h"
 
 ActivityDlg::ActivityDlg(QList<PsiAccount *> list) : QDialog(nullptr), pa_(list)
 {

diff --git a/src/adduserdlg.cpp b/src/adduserdlg.cpp
@@ -21,15 +21,14 @@
 
 #include "busywidget.h"
 #include "common.h"
-#include "iconwidget.h"
 #include "infodlg.h"
 #include "psiaccount.h"
 #include "psiiconset.h"
 #include "tasklist.h"
 #include "vcardfactory.h"
-#include "xmpp_client.h"
-#include "xmpp_tasks.h"
-#include "xmpp_vcard.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_tasks.h"
+#include "iris/xmpp_vcard.h"
 
 #include <QCheckBox>
 #include <QComboBox>

diff --git a/src/ahcexecutetask.cpp b/src/ahcexecutetask.cpp
@@ -21,7 +21,7 @@
 
 #include "ahcformdlg.h"
 #include "psiaccount.h"
-#include "xmpp_xmlcommon.h"
+#include "iris/xmpp_xmlcommon.h"
 
 using namespace XMPP;
 

diff --git a/src/ahcexecutetask.h b/src/ahcexecutetask.h
@@ -21,8 +21,8 @@
 #define AHCEXECUTETASK_H
 
 #include "ahcommand.h"
-#include "xmpp_jid.h"
-#include "xmpp_task.h"
+#include "iris/xmpp_jid.h"
+#include "iris/xmpp_task.h"
 
 class QDomElement;
 

diff --git a/src/ahcformdlg.cpp b/src/ahcformdlg.cpp
@@ -24,7 +24,7 @@
 #include "busywidget.h"
 #include "psiaccount.h"
 #include "xdata_widget.h"
-#include "xmpp_client.h"
+#include "iris/xmpp_client.h"
 
 #include <QLabel>
 #include <QLayout>

diff --git a/src/ahcformdlg.h b/src/ahcformdlg.h
@@ -21,8 +21,8 @@
 #define AHCFORMDLG_H
 
 #include "ui_ahcformdlg.h"
-#include "xmpp_jid.h"
-#include "xmpp_xdata.h"
+#include "iris/xmpp_jid.h"
+#include "iris/xmpp_xdata.h"
 
 #include <QDialog>
 #include <QObject>

diff --git a/src/ahcommand.cpp b/src/ahcommand.cpp
@@ -19,7 +19,7 @@
 
 #include "ahcommand.h"
 
-#include "xmpp_xdata.h"
+#include "iris/xmpp_xdata.h"
 
 #include <QDomDocument>
 #include <QDomElement>

diff --git a/src/ahcommand.h b/src/ahcommand.h
@@ -20,7 +20,7 @@
 #ifndef AHCOMMAND_H
 #define AHCOMMAND_H
 
-#include "xmpp_xdata.h"
+#include "iris/xmpp_xdata.h"
 
 #include <QSharedDataPointer>
 #include <QString>

diff --git a/src/ahcommanddlg.cpp b/src/ahcommanddlg.cpp
@@ -23,8 +23,8 @@
 #include "ahcformdlg.h"
 #include "busywidget.h"
 #include "psiaccount.h"
-#include "xmpp_client.h"
-#include "xmpp_xmlcommon.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_xmlcommon.h"
 
 #include <QComboBox>
 #include <QLabel>

diff --git a/src/ahcommanddlg.h b/src/ahcommanddlg.h
@@ -21,7 +21,7 @@
 #define AHCOMMANDDLG_H
 
 #include "ui_ahcommanddlg.h"
-#include "xmpp_jid.h"
+#include "iris/xmpp_jid.h"
 
 #include <QDialog>
 #include <QList>

diff --git a/src/ahcservermanager.cpp b/src/ahcservermanager.cpp
@@ -23,10 +23,10 @@
 #include "ahcommandserver.h"
 #include "psiaccount.h"
 #include "xdata_widget.h"
-#include "xmpp_client.h"
-#include "xmpp_tasks.h"
-#include "xmpp_xdata.h"
-#include "xmpp_xmlcommon.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_tasks.h"
+#include "iris/xmpp_xdata.h"
+#include "iris/xmpp_xmlcommon.h"
 
 #include <QComboBox>
 #include <QLayout>

diff --git a/src/avatars.cpp b/src/avatars.cpp
@@ -31,16 +31,15 @@
 #include "iconset.h"
 #include "pepmanager.h"
 #include "pixmaputil.h"
-#include "profiles.h"
 #include "psiaccount.h"
 #include "vcardfactory.h"
-#include "xmpp_client.h"
-#include "xmpp_hash.h"
-#include "xmpp_pubsubitem.h"
-#include "xmpp_resource.h"
-#include "xmpp_tasks.h"
-#include "xmpp_vcard.h"
-#include "xmpp_xmlcommon.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_hash.h"
+#include "iris/xmpp_pubsubitem.h"
+#include "iris/xmpp_resource.h"
+#include "iris/xmpp_tasks.h"
+#include "iris/xmpp_vcard.h"
+#include "iris/xmpp_xmlcommon.h"
 
 #include <QBuffer>
 #include <QDateTime>

diff --git a/src/avcall/avcall.h b/src/avcall/avcall.h
@@ -19,7 +19,7 @@
 #ifndef AVCALL_H
 #define AVCALL_H
 
-#include "xmpp.h"
+#include "iris/xmpp.h"
 
 #include <QObject>
 

diff --git a/src/avcall/jinglertp.cpp b/src/avcall/jinglertp.cpp
@@ -18,7 +18,6 @@
 
 #include "jinglertp.h"
 
-#include "iceagent.h"
 #include "iris/iceagent.h"
 #include "iris/netnames.h"
 #include "iris/turnclient.h"

diff --git a/src/bookmarkmanagedlg.h b/src/bookmarkmanagedlg.h
@@ -21,7 +21,7 @@
 #define BOOKMARKMANAGEDLG_H
 
 #include "ui_bookmarkmanage.h"
-#include "xmpp_jid.h"
+#include "iris/xmpp_jid.h"
 
 #include <QDialog>
 

diff --git a/src/bookmarkmanager.cpp b/src/bookmarkmanager.cpp
@@ -21,9 +21,9 @@
 
 #include "psiaccount.h"
 #include "psioptions.h"
-#include "xmpp_client.h"
-#include "xmpp_task.h"
-#include "xmpp_xmlcommon.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_task.h"
+#include "iris/xmpp_xmlcommon.h"
 
 // -----------------------------------------------------------------------------
 

diff --git a/src/captchadlg.cpp b/src/captchadlg.cpp
@@ -3,9 +3,9 @@
 #include "psiaccount.h"
 #include "ui_captchadlg.h"
 #include "xdata_widget.h"
-#include "xmpp_captcha.h"
-#include "xmpp_client.h"
-#include "xmpp_tasks.h"
+#include "iris/xmpp_captcha.h"
+#include "iris/xmpp_client.h"
+#include "iris/xmpp_tasks.h"
 
 using namespace XMPP;