Skip to content

Commit

Permalink
REUSE-ify whole project
Browse files Browse the repository at this point in the history
  • Loading branch information
lnjX committed Jan 15, 2022
1 parent 37359c7 commit a0d1776
Show file tree
Hide file tree
Showing 57 changed files with 245 additions and 32 deletions.
4 changes: 4 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2018 Jeremy Lainé <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

platform: x64

environment:
Expand Down
4 changes: 4 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2019 Georg Rudoy <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

AlignAfterOpenBracket: Align
AlignTrailingComments: true
BasedOnStyle: WebKit
Expand Down
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2021 Linus Jahn <[email protected]>
SPDX-License-Identifier: CC0-1.0
-->

Before opening a pull-request please do:
- [ ] Documentation:
- [ ] Document every new public class and function
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/push-docs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2020 Linus Jahn <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

---
name: push-docs

Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2020 Jeremy Lainé <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

name: tests

on: [push, pull_request]
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2010 Boris Pek <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

CMakeLists.txt.*
.DS_Store
build*
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
SPDX-FileCopyrightText: 2010 Jeremy Lainé <[email protected]>
SPDX-License-Identifier: CC0-1.0

QXMPP AUTHORS
-------------

Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2010 Jeremy Lainé <[email protected]>
SPDX-License-Identifier: CC0-1.0
-->

QXmpp 1.5.0 (UNRELEASED)
------------------------

Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

cmake_minimum_required(VERSION 3.3)
project(qxmpp VERSION 1.5.0)

Expand Down
4 changes: 4 additions & 0 deletions QXmppConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

@PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/QXmpp.cmake")
check_required_components(QXmpp)
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>
SPDX-License-Identifier: CC0-1.0
-->

# QXmpp [![XMPP:2022 Client IM Mobile+ Compliance Badge](https://img.shields.io/badge/XMPP%3A2022%20Client-Core%20IM%20Mobile%2B-green)][xmpp-compliance] [![Build Status](https://github.com/qxmpp-project/qxmpp/workflows/tests/badge.svg)](https://github.com/qxmpp-project/qxmpp/actions) [![Code Coverage](https://img.shields.io/codecov/c/github/qxmpp-project/qxmpp.svg)](https://codecov.io/gh/qxmpp-project/qxmpp) [![Latest release](https://img.shields.io/github/v/release/qxmpp-project/qxmpp)](https://github.com/qxmpp-project/qxmpp/releases/latest) [![Website](https://img.shields.io/website?down_message=offline&label=documentation&up_message=online&url=https%3A%2F%2Fdoc.qxmpp.org%2F)][qxmpp-doc]

QXmpp is a cross-platform C++ XMPP client and server library. It is written
Expand Down
6 changes: 4 additions & 2 deletions cmake/modules/FindGLIB2.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# SPDX-FileCopyrightText: 2008 Laurent Montel <[email protected]>
#
# SPDX-License-Identifier: LicenseRef-MIT-variant

# - Try to find the GLIB2 libraries
# Once done this will define
#
# GLIB2_FOUND - system has glib2
# GLIB2_INCLUDE_DIR - the glib2 include directory
# GLIB2_LIBRARIES - glib2 library

# Copyright (c) 2008 Laurent Montel, <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
Expand Down
8 changes: 5 additions & 3 deletions cmake/modules/FindGObject.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# SPDX-FileCopyrightText: Tim Beaulen <[email protected]>
# SPDX-FileCopyrightText: Helio Chissini de Castro <[email protected]>
#
# SPDX-License-Identifier: LicenseRef-MIT-variant

# - Try to find GObject
# Once done this will define
#
Expand All @@ -6,9 +11,6 @@
# GOBJECT_LIBRARIES - the libraries needed to use GObject
# GOBJECT_DEFINITIONS - Compiler switches required for using GObject

# Copyright (c) 2006, Tim Beaulen <[email protected]>
# Copyright (c) 2008 Helio Chissini de Castro, <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
Expand Down
6 changes: 5 additions & 1 deletion cmake/modules/FindGStreamer.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2010 Collabora Ltd., George Kiagiadakis <[email protected]>
#
# SPDX-License-Identifier: LicenseRef-MIT-variant

# - Try to find GStreamer
# Once done this will define
#
Expand All @@ -13,7 +17,7 @@
# GSTREAMER_<plugin_lib>_LIBRARY_FOUND - system has <plugin_lib>
# GSTREAMER_<plugin_lib>_LIBRARY - the <plugin_lib> library
# GSTREAMER_<plugin_lib>_INCLUDE_DIR - the <plugin_lib> include directory
#

# Copyright (c) 2010, Collabora Ltd.
# @author George Kiagiadakis <[email protected]>
#
Expand Down
6 changes: 5 additions & 1 deletion cmake/modules/MacroFindGStreamerLibrary.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# - macro find_gstreamer_library
# SPDX-FileCopyrightText: 2010 Collabora Ltd., George Kiagiadakis <[email protected]>
#
# SPDX-License-Identifier: LicenseRef-MIT-variant

# - macro find_gstreamer_library

# Copyright (c) 2010, Collabora Ltd.
# @author George Kiagiadakis <[email protected]>
#
Expand Down
4 changes: 4 additions & 0 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

find_package(Doxygen REQUIRED)

if(NOT DOXYGEN_FOUND)
Expand Down
4 changes: 4 additions & 0 deletions doc/Doxyfile.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

PROJECT_NAME = "QXmpp"
PROJECT_NUMBER = "Version: @PROJECT_VERSION@"
INPUT = @PROJECT_SOURCE_DIR@/doc/index.doc \
Expand Down
4 changes: 4 additions & 0 deletions doc/index.doc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2014 Jeremy Lainé <[email protected]>
//
// SPDX-License-Identifier: CC0-1.0

/*! \mainpage

QXmpp is a cross-platform C++ XMPP client library based on the Qt
Expand Down
4 changes: 4 additions & 0 deletions doc/using.doc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2014 Jeremy Lainé <[email protected]>
//
// SPDX-License-Identifier: CC0-1.0

/*! \page using Using QXmpp


Expand Down
4 changes: 4 additions & 0 deletions doc/xep.doc
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2014 Jeremy Lainé <[email protected]>
//
// SPDX-License-Identifier: CC0-1.0

/*! \page xep XMPP Extensions

This document lists the XMPP Extensions (XEP) available in QXmpp.
Expand Down
4 changes: 4 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

macro(add_simple_example EXAMPLE_NAME)
add_executable(${EXAMPLE_NAME} example_${EXAMPLE_NAME}/example_${EXAMPLE_NAME}.cpp)
target_link_libraries(${EXAMPLE_NAME} qxmpp)
Expand Down
6 changes: 6 additions & 0 deletions examples/example_0_connected/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

This example just connects to the xmpp server. And start receiving presences (updates) from the server.

After running this example, you can see this user online, if it's added in your roster (friends list).
Expand Down
6 changes: 6 additions & 0 deletions examples/example_1_echoClient/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

This is a very simple bot which echoes the message sent to it.

Run this example, send it a message from a friend of this bot. You will receive the message back.
Expand Down
6 changes: 6 additions & 0 deletions examples/example_2_rosterHandling/README
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<!--
SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

This example demonstrates how to get the roster and presence updates.
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2012 Jeremy Lainé <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>example_3_transferHandling.cpp</file>
Expand Down
4 changes: 4 additions & 0 deletions examples/example_5_rpcInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

add_executable(5_rpcInterface main.cpp remoteinterface.cpp)
target_link_libraries(5_rpcInterface qxmpp)
3 changes: 2 additions & 1 deletion examples/example_5_rpcInterface/main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// SPDX-FileCopyrightText: 2011 Manjeet Dahiya <manjeetdahiya@gmail.com>
// SPDX-FileCopyrightText: 2009 Ian Geiser <ian.geiser@gmail.com>
// SPDX-FileCopyrightText: 2010 Jeremy Lainé <[email protected]>
// SPDX-FileCopyrightText: 2011 Manjeet Dahiya <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

Expand Down
4 changes: 4 additions & 0 deletions examples/example_5_rpcInterface/remoteinterface.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2009 Ian Geiser <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "remoteinterface.h"

RemoteInterface::RemoteInterface(QObject *parent) : QXmppInvokable(parent)
Expand Down
4 changes: 4 additions & 0 deletions examples/example_5_rpcInterface/remoteinterface.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2009 Ian Geiser <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#ifndef REMOTEINTERFACE_H
#define REMOTEINTERFACE_H

Expand Down
3 changes: 3 additions & 0 deletions examples/example_5_rpcInterface/xmlrpctest.txt.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2009 Ian Geiser <[email protected]>

SPDX-License-Identifier: CC0-1.0
4 changes: 4 additions & 0 deletions examples/example_6_rpcClient/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

add_executable(6_rpcClient main.cpp rpcClient.cpp)
target_link_libraries(6_rpcClient qxmpp)
4 changes: 4 additions & 0 deletions examples/example_9_vCard/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Gui)

add_executable(9_vCard example_9_vCard.cpp)
Expand Down
6 changes: 6 additions & 0 deletions examples/example_9_vCard/README
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
<!--
SPDX-FileCopyrightText: 2009 Manjeet Dahiya <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

This example demonstrates how to get the vCards and handle Avatars of the roster entities.
4 changes: 4 additions & 0 deletions qxmpp.pc.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
libdir=@CMAKE_INSTALL_FULL_LIBDIR@
Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

option(BUILD_SHARED "Build SHARED library" ON)

add_definitions(-DQXMPP_BUILD)
Expand Down
29 changes: 5 additions & 24 deletions src/base/QXmppGlobal.h.in
Original file line number Diff line number Diff line change
@@ -1,27 +1,8 @@
/*
* Copyright (C) 2008-2021 The QXmpp developers
*
* Author:
* Manjeet Dahiya
* Niels Ole Salscheider
* Linus Jahn
*
* Source:
* https://github.com/qxmpp-project/qxmpp
*
* This file is a part of QXmpp library.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
*/
// SPDX-FileCopyrightText: 2010 Manjeet Dahiya <[email protected]>
// SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
// SPDX-FileCopyrightText: 2019 Linus Jahn <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#ifndef QXMPPGLOBAL_H
#define QXMPPGLOBAL_H
Expand Down
4 changes: 4 additions & 0 deletions src/base/QXmppPubSubPublishOptions.h
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
// SPDX-FileCopyrightText: 2021 Linus Jahn <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#include "QXmppPubSubNodeConfig.h"
4 changes: 4 additions & 0 deletions src/base/QXmppSendResult.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2021 Linus Jahn <[email protected]>
//
// SPDX-License-Identifier: LGPL-2.1-or-later

#ifndef QXMPPSENDRESULT_H
#define QXMPPSENDRESULT_H

Expand Down
4 changes: 4 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

include_directories(.)

find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Test)
Expand Down
4 changes: 4 additions & 0 deletions tests/qxmpptransfermanager/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2017 Niels Ole Salscheider <[email protected]>
#
# SPDX-License-Identifier: CC0-1.0

include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_executable(tst_qxmpptransfermanager tst_qxmpptransfermanager.cpp tst_qxmpptransfermanager.qrc)
add_test(tst_qxmpptransfermanager tst_qxmpptransfermanager)
Expand Down
3 changes: 3 additions & 0 deletions tests/qxmpptransfermanager/test.svg.license
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
SPDX-FileCopyrightText: 2010 Jeremy Lainé <[email protected]>

SPDX-License-Identifier: CC0-1.0
6 changes: 6 additions & 0 deletions tests/qxmpptransfermanager/tst_qxmpptransfermanager.qrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
SPDX-FileCopyrightText: 2015 Jeremy Lainé <[email protected]>

SPDX-License-Identifier: CC0-1.0
-->

<!DOCTYPE RCC><RCC version="1.0">
<qresource>
<file>test.svg</file>
Expand Down
Loading

0 comments on commit a0d1776

Please sign in to comment.