move qzmq source files to src/core and remove the src/core/qzmq dir

The qzmq code is a fork but we don't expect upstream changes, so no need to keep the nested layout.
fastly · Feb 5, 2025 · baf7178 · baf7178
1 parent 9b35cdb
commit baf7178
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 199 deletions.
diff --git a/src/core/core.pri b/src/core/core.pri
@@ -1,4 +1,15 @@
-include(qzmq/src/src.pri)
+HEADERS += \
+	$$PWD/qzmqcontext.h \
+	$$PWD/qzmqsocket.h \
+	$$PWD/qzmqvalve.h \
+	$$PWD/qzmqreqmessage.h \
+	$$PWD/qzmqreprouter.h
+
+SOURCES += \
+	$$PWD/qzmqcontext.cpp \
+	$$PWD/qzmqsocket.cpp \
+	$$PWD/qzmqvalve.cpp \
+	$$PWD/qzmqreprouter.cpp
 
 HEADERS += $$PWD/processquit.h
 SOURCES += $$PWD/processquit.cpp

diff --git a/src/core/qzmq/.gitignore b/src/core/qzmq/.gitignore
diff --git a/src/core/qzmq/COPYING b/src/core/qzmq/COPYING
diff --git a/src/core/qzmq/README b/src/core/qzmq/README
diff --git a/src/core/qzmq/examples/examples.pri b/src/core/qzmq/examples/examples.pri
diff --git a/src/core/qzmq/examples/examples.pro b/src/core/qzmq/examples/examples.pro
diff --git a/src/core/qzmq/examples/helloclient/helloclient.cpp b/src/core/qzmq/examples/helloclient/helloclient.cpp
diff --git a/src/core/qzmq/examples/helloclient/helloclient.pro b/src/core/qzmq/examples/helloclient/helloclient.pro
diff --git a/src/core/qzmq/examples/helloserver/helloserver.cpp b/src/core/qzmq/examples/helloserver/helloserver.cpp
diff --git a/src/core/qzmq/examples/helloserver/helloserver.pro b/src/core/qzmq/examples/helloserver/helloserver.pro
diff --git a/src/core/qzmq/qzmq.pro b/src/core/qzmq/qzmq.pro
diff --git a/src/core/qzmq/src/src.pri b/src/core/qzmq/src/src.pri
diff --git a/src/core/qzmq/src/qzmqcontext.cpp → src/core/qzmqcontext.cpp b/src/core/qzmq/src/qzmqcontext.cpp → src/core/qzmqcontext.cpp
diff --git a/src/core/qzmq/src/qzmqcontext.h → src/core/qzmqcontext.h b/src/core/qzmq/src/qzmqcontext.h → src/core/qzmqcontext.h
diff --git a/src/core/qzmq/src/qzmqreprouter.cpp → src/core/qzmqreprouter.cpp b/src/core/qzmq/src/qzmqreprouter.cpp → src/core/qzmqreprouter.cpp
diff --git a/src/core/qzmq/src/qzmqreprouter.h → src/core/qzmqreprouter.h b/src/core/qzmq/src/qzmqreprouter.h → src/core/qzmqreprouter.h
diff --git a/src/core/qzmq/src/qzmqreqmessage.h → src/core/qzmqreqmessage.h b/src/core/qzmq/src/qzmqreqmessage.h → src/core/qzmqreqmessage.h
diff --git a/src/core/qzmq/src/qzmqsocket.cpp → src/core/qzmqsocket.cpp b/src/core/qzmq/src/qzmqsocket.cpp → src/core/qzmqsocket.cpp
diff --git a/src/core/qzmq/src/qzmqsocket.h → src/core/qzmqsocket.h b/src/core/qzmq/src/qzmqsocket.h → src/core/qzmqsocket.h
diff --git a/src/core/qzmq/src/qzmqvalve.cpp → src/core/qzmqvalve.cpp b/src/core/qzmq/src/qzmqvalve.cpp → src/core/qzmqvalve.cpp
diff --git a/src/core/qzmq/src/qzmqvalve.h → src/core/qzmqvalve.h b/src/core/qzmq/src/qzmqvalve.h → src/core/qzmqvalve.h
diff --git a/src/cpp.pro b/src/cpp.pro
@@ -22,7 +22,6 @@ DEFINES += NO_IRISNET
 
 INCLUDEPATH += $$SRC_DIR/../target/include
 INCLUDEPATH += $$SRC_DIR/core
-INCLUDEPATH += $$SRC_DIR/core/qzmq/src
 
 include(core/core.pri)
 include(m2adapter/m2adapter.pri)

diff --git a/src/cpptests.pro b/src/cpptests.pro
@@ -18,7 +18,6 @@ DEFINES += NO_IRISNET
 
 INCLUDEPATH += $$SRC_DIR/../target/include
 INCLUDEPATH += $$SRC_DIR/core
-INCLUDEPATH += $$SRC_DIR/core/qzmq/src
 
 include(core/tests.pri)
 include(proxy/tests.pri)