From 54df09c4b3d9b40861e5575dd14e7c8248f0ccd1 Mon Sep 17 00:00:00 2001 From: sehraf Date: Thu, 8 Nov 2018 18:13:20 +0100 Subject: [PATCH 01/26] add missing DEFINE, fix small bugs --- retroshare-gui/src/gui/statistics/DhtWindow.cpp | 6 +++--- retroshare.pri | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/retroshare-gui/src/gui/statistics/DhtWindow.cpp b/retroshare-gui/src/gui/statistics/DhtWindow.cpp index 5684593fd..8527da286 100644 --- a/retroshare-gui/src/gui/statistics/DhtWindow.cpp +++ b/retroshare-gui/src/gui/statistics/DhtWindow.cpp @@ -288,7 +288,7 @@ void DhtWindow::updateNetPeers() rsDht->getNetPeerList(peerIds); /* collate peer stats */ - int nPeers = peerIds.size(); + size_t nPeers = peerIds.size(); // from DHT peers int nOnlinePeers = 0; @@ -339,7 +339,7 @@ void DhtWindow::updateNetPeers() for(it = peerIds.begin(); it != peerIds.end(); ++it) { /* find the entry */ - QTreeWidgetItem *peer_item = NULL; + QTreeWidgetItem *peer_item = nullptr; #if 0 QString qpeerid = QString::fromStdString(*it); int itemCount = ui.peerTreeWidget->topLevelItemCount(); @@ -438,7 +438,7 @@ void DhtWindow::updateNetPeers() case RSDHT_PEERCONN_CONNECTED: { cpsstr = tr("Connected"); - break; + switch(status.mPeerConnectMode) { default: diff --git a/retroshare.pri b/retroshare.pri index a8025dc79..77102e4e0 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -432,6 +432,10 @@ rs_gxs_trans { } } +bitdht { + DEFINES *= RS_USE_BITDHT +} + rs_async_chat { DEFINES *= RS_ASYNC_CHAT } From cd9a2db4e3c319ce019633223fa25cb474e4d4cf Mon Sep 17 00:00:00 2001 From: csoler Date: Fri, 20 Jul 2018 19:48:29 +0200 Subject: [PATCH 02/26] fixed license in retroshare-gui/src/chat/ and main files --- retroshare-gui/src/control/bandwidthevent.h | 45 +++++++++---------- retroshare-gui/src/control/eventtype.h | 45 +++++++++---------- .../gui/advsearch/advancedsearchdialog.cpp | 43 +++++++++--------- .../src/gui/advsearch/advancedsearchdialog.h | 41 ++++++++--------- .../src/gui/advsearch/expressionwidget.cpp | 42 ++++++++--------- .../src/gui/advsearch/expressionwidget.h | 41 ++++++++--------- .../src/gui/advsearch/guiexprelement.cpp | 41 ++++++++--------- .../src/gui/advsearch/guiexprelement.h | 41 ++++++++--------- retroshare-gui/src/gui/chat/ChatDialog.cpp | 42 ++++++++--------- retroshare-gui/src/gui/chat/ChatDialog.h | 42 ++++++++--------- .../src/gui/chat/ChatLobbyDialog.cpp | 45 +++++++++---------- retroshare-gui/src/gui/chat/ChatLobbyDialog.h | 43 +++++++++--------- .../src/gui/chat/ChatLobbyUserNotify.cpp | 41 ++++++++--------- .../src/gui/chat/ChatLobbyUserNotify.h | 41 ++++++++--------- retroshare-gui/src/gui/chat/ChatStyle.cpp | 42 ++++++++--------- retroshare-gui/src/gui/chat/ChatStyle.h | 42 ++++++++--------- retroshare-gui/src/gui/chat/ChatTabWidget.cpp | 42 ++++++++--------- retroshare-gui/src/gui/chat/ChatTabWidget.h | 42 ++++++++--------- .../src/gui/chat/ChatUserNotify.cpp | 41 ++++++++--------- retroshare-gui/src/gui/chat/ChatUserNotify.h | 41 ++++++++--------- retroshare-gui/src/gui/chat/ChatWidget.cpp | 43 +++++++++--------- retroshare-gui/src/gui/chat/ChatWidget.h | 42 ++++++++--------- .../src/gui/chat/CreateLobbyDialog.cpp | 41 ++++++++--------- .../src/gui/chat/CreateLobbyDialog.h | 21 +++++++++ .../src/gui/chat/PopupChatDialog.cpp | 42 ++++++++--------- retroshare-gui/src/gui/chat/PopupChatDialog.h | 42 ++++++++--------- .../src/gui/chat/PopupChatWindow.cpp | 42 ++++++++--------- retroshare-gui/src/gui/chat/PopupChatWindow.h | 42 ++++++++--------- .../src/gui/chat/PopupDistantChatDialog.cpp | 41 ++++++++--------- .../src/gui/chat/PopupDistantChatDialog.h | 42 ++++++++--------- retroshare-gui/src/main.cpp | 41 ++++++++--------- retroshare-gui/src/retroshare-gui.pro | 18 ++++++++ retroshare-gui/src/rshare.cpp | 43 +++++++++--------- 33 files changed, 693 insertions(+), 650 deletions(-) diff --git a/retroshare-gui/src/control/bandwidthevent.h b/retroshare-gui/src/control/bandwidthevent.h index 4ebbf9c90..19441a527 100644 --- a/retroshare-gui/src/control/bandwidthevent.h +++ b/retroshare-gui/src/control/bandwidthevent.h @@ -1,26 +1,25 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - - +/******************************************************************************* + * control/bandwidthevent.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (c) 2006-2007, crypton * + * Copyright (c) 2006, Matt Edman, Justin Hipple * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _BANDWIDTHEVENT_H #define _BANDWIDTHEVENT_H #include "eventtype.h" diff --git a/retroshare-gui/src/control/eventtype.h b/retroshare-gui/src/control/eventtype.h index aa785cce6..703f46eda 100644 --- a/retroshare-gui/src/control/eventtype.h +++ b/retroshare-gui/src/control/eventtype.h @@ -1,26 +1,25 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - - +/******************************************************************************* + * control/eventtype.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (c) 2006-2007, crypton * + * Copyright (c) 2006, Matt Edman, Justin Hipple * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _EVENTTYPE_H #define _EVENTTYPE_H diff --git a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp index 4e8ae0687..ae226fe76 100644 --- a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp +++ b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp @@ -1,25 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ - -#include "advancedsearchdialog.h" +/******************************************************************************* + * gui/advsearch/advancedsearchdialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ AdvancedSearchDialog::AdvancedSearchDialog(QWidget * parent) : QDialog (parent) { diff --git a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h index 02626283a..317809e6f 100644 --- a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h +++ b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h @@ -1,23 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ +/******************************************************************************* + * gui/advsearch/advancedsearchdialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _AdvancedSearch_h_ #define _AdvancedSearch_h_ diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp index d5e83c3fc..2b6ad3b2e 100644 --- a/retroshare-gui/src/gui/advsearch/expressionwidget.cpp +++ b/retroshare-gui/src/gui/advsearch/expressionwidget.cpp @@ -1,24 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ - +/******************************************************************************* + * gui/advsearch/expressionwidget.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "expressionwidget.h" ExpressionWidget::ExpressionWidget(QWidget * parent, bool initial) : QWidget(parent) diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.h b/retroshare-gui/src/gui/advsearch/expressionwidget.h index 2ebc6b851..40ef3ec47 100644 --- a/retroshare-gui/src/gui/advsearch/expressionwidget.h +++ b/retroshare-gui/src/gui/advsearch/expressionwidget.h @@ -1,23 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ +/******************************************************************************* + * gui/advsearch/expressionwidget.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _ExpressionWidget_h_ #define _ExpressionWidget_h_ #include diff --git a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp index 7cf7e0732..44d1350a4 100644 --- a/retroshare-gui/src/gui/advsearch/guiexprelement.cpp +++ b/retroshare-gui/src/gui/advsearch/guiexprelement.cpp @@ -1,23 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ +/******************************************************************************* + * gui/advsearch/guiexprelement.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "guiexprelement.h" #define STR_FIELDS_MIN_WIDTH 200 diff --git a/retroshare-gui/src/gui/advsearch/guiexprelement.h b/retroshare-gui/src/gui/advsearch/guiexprelement.h index 0b78f7975..00748f4f7 100644 --- a/retroshare-gui/src/gui/advsearch/guiexprelement.h +++ b/retroshare-gui/src/gui/advsearch/guiexprelement.h @@ -1,23 +1,24 @@ -/**************************************************************** -* RetroShare is distributed under the following license: -* -* Copyright (C) 2006, 2007 The RetroShare Team -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, -* Boston, MA 02110-1301, USA. -****************************************************************/ +/******************************************************************************* + * gui/advsearch/guiexprelement.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _GuiExprElement_h_ #define _GuiExprElement_h_ diff --git a/retroshare-gui/src/gui/chat/ChatDialog.cpp b/retroshare-gui/src/gui/chat/ChatDialog.cpp index 390ac5f05..d7edd2152 100644 --- a/retroshare-gui/src/gui/chat/ChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatDialog.cpp @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011 RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/chat/ChatDialog.h b/retroshare-gui/src/gui/chat/ChatDialog.h index 2a1ad86a6..7bfbc16ec 100644 --- a/retroshare-gui/src/gui/chat/ChatDialog.h +++ b/retroshare-gui/src/gui/chat/ChatDialog.h @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011 RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CHATDIALOG_H #define CHATDIALOG_H diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp index 259faca37..0305ff6c0 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp @@ -1,27 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, csoler - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - ****************************************************************/ - - +/******************************************************************************* + * gui/chat/ChatLobbyDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006 Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include #include diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h index 6f3f52096..688cfb1c9 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.h +++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.h @@ -1,25 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - - +/******************************************************************************* + * gui/chat/ChatLobbyDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006 Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _CHATLOBBYDIALOG_H #define _CHATLOBBYDIALOG_H diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp index ddfa24426..0b989ee2c 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp +++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2014 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatLobbyUserNotify.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2014 Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h index d55310f9d..fd95511b4 100644 --- a/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h +++ b/retroshare-gui/src/gui/chat/ChatLobbyUserNotify.h @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2014 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatLobbyUserNotify.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2014 Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CHATLOBBYUSERNOTIFY_H #define CHATLOBBYUSERNOTIFY_H diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp index 3cda190be..481f87e95 100644 --- a/retroshare-gui/src/gui/chat/ChatStyle.cpp +++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatStyle.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ /* Directory tree for stylesheets: diff --git a/retroshare-gui/src/gui/chat/ChatStyle.h b/retroshare-gui/src/gui/chat/ChatStyle.h index 75e395d58..fce6de164 100644 --- a/retroshare-gui/src/gui/chat/ChatStyle.h +++ b/retroshare-gui/src/gui/chat/ChatStyle.h @@ -1,24 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * gui/chat/ChatStyle.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _CHATSTYLE_H #define _CHATSTYLE_H diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp index 6dd9c2757..7642f3827 100644 --- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatTabWidget.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.h b/retroshare-gui/src/gui/chat/ChatTabWidget.h index aa9b1bb9e..da9806022 100644 --- a/retroshare-gui/src/gui/chat/ChatTabWidget.h +++ b/retroshare-gui/src/gui/chat/ChatTabWidget.h @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatTabWidget.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CHATTABWIDGET_H #define CHATTABWIDGET_H diff --git a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp index 3d244567e..ecb563938 100644 --- a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp +++ b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatUserNotify.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "ChatUserNotify.h" #include "gui/notifyqt.h" diff --git a/retroshare-gui/src/gui/chat/ChatUserNotify.h b/retroshare-gui/src/gui/chat/ChatUserNotify.h index 9b3926f32..f70b37a54 100644 --- a/retroshare-gui/src/gui/chat/ChatUserNotify.h +++ b/retroshare-gui/src/gui/chat/ChatUserNotify.h @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatUserNotify.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CHATUSERNOTIFY_H #define CHATUSERNOTIFY_H diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index ef92819f7..d5663f8b8 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1,25 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * gui/chat/ChatWidget.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include #include diff --git a/retroshare-gui/src/gui/chat/ChatWidget.h b/retroshare-gui/src/gui/chat/ChatWidget.h index 127575d73..d8f949503 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.h +++ b/retroshare-gui/src/gui/chat/ChatWidget.h @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/ChatWidget.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CHATWIDGET_H #define CHATWIDGET_H diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp index b0e5da106..1aeb96366 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2010 Christopher Evi-Parker - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/CreateLobbyDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2010, Christopher Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "CreateLobbyDialog.h" diff --git a/retroshare-gui/src/gui/chat/CreateLobbyDialog.h b/retroshare-gui/src/gui/chat/CreateLobbyDialog.h index 2fe668674..fc5d8357b 100644 --- a/retroshare-gui/src/gui/chat/CreateLobbyDialog.h +++ b/retroshare-gui/src/gui/chat/CreateLobbyDialog.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * gui/chat/CreateLobbyDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CREATELOBBYDIALOG_H #define CREATELOBBYDIALOG_H diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp index 9221f2500..1591669f4 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/PopupChatDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "PopupChatDialog.h" #include "PopupChatWindow.h" diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.h b/retroshare-gui/src/gui/chat/PopupChatDialog.h index 49e3036b3..91fa17091 100644 --- a/retroshare-gui/src/gui/chat/PopupChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupChatDialog.h @@ -1,24 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * gui/chat/PopupChatDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _POPUPCHATDIALOG_H #define _POPUPCHATDIALOG_H diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp index 4893ab94e..8cf4b1601 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp @@ -1,24 +1,24 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/PopupChatWindow.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.h b/retroshare-gui/src/gui/chat/PopupChatWindow.h index 1c822fa1d..d3c76c45c 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.h +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.h @@ -1,24 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * gui/chat/PopupChatWindow.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2006, Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _POPUPCHATWINDOW_H #define _POPUPCHATWINDOW_H diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp index 969041596..6f0ddd711 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2013, Cyril Soler - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/PopupDistantChatDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2013, Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h index 26a795fa8..15a83232f 100644 --- a/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h +++ b/retroshare-gui/src/gui/chat/PopupDistantChatDialog.h @@ -1,24 +1,24 @@ - -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2013, Cyril Soler - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/chat/PopupDistantChatDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2013, Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index acb8d390d..dc0f413e6 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare QT Gui is distributed under the following license: - * - * Copyright (C) 2006, crypton - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * retroshare-gui/src/: main.cpp * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2006 by Crypton * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "util/stacktrace.h" diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index e83ad180c..6501b1caa 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -1,3 +1,21 @@ +################################################################################ +# retroshare-gui.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program 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 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = app diff --git a/retroshare-gui/src/rshare.cpp b/retroshare-gui/src/rshare.cpp index 7939d7611..74fe3b6a7 100644 --- a/retroshare-gui/src/rshare.cpp +++ b/retroshare-gui/src/rshare.cpp @@ -1,24 +1,25 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2006-2007, crypton - * Copyright (c) 2006, Matt Edman, Justin Hipple - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * retroshare-gui/src/: main.cpp * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2006-2007 by Crypton * + * Copyright (c) 2006, Matt Edman, Justin Hipple * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include From ca80161bfb11bbb77f69bcb1373eb487c7e0be3a Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 22 Jul 2018 00:02:06 +0200 Subject: [PATCH 03/26] fixed wrongly removed line --- retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp index ae226fe76..ab1476579 100644 --- a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp +++ b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.cpp @@ -20,6 +20,8 @@ * * *******************************************************************************/ +#include "advancedsearchdialog.h" + AdvancedSearchDialog::AdvancedSearchDialog(QWidget * parent) : QDialog (parent) { setupUi(this); From 3e3adf733753356097ecb84a9e1ca9e10bf87dec Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sun, 28 Oct 2018 21:34:45 +0100 Subject: [PATCH 04/26] Removed some old build scripts --- Start_RetroShare-Gui_Debug.bat | 11 -- build-all-mingw32make.bat | 217 --------------------------- libbitdht/src/mingw32make.bat | 13 -- libretroshare/src/TODO | 7 - libretroshare/src/mingw32make.bat | 14 -- msys2_build_libs/Makefile | 28 ---- plugins/mingw32make.bat | 13 -- retroshare-gui/src/mingw32make.bat | 15 -- retroshare-nogui/src/mingw32make.bat | 12 -- 9 files changed, 330 deletions(-) delete mode 100755 Start_RetroShare-Gui_Debug.bat delete mode 100755 build-all-mingw32make.bat delete mode 100644 libbitdht/src/mingw32make.bat delete mode 100644 libretroshare/src/TODO delete mode 100644 libretroshare/src/mingw32make.bat delete mode 100755 msys2_build_libs/Makefile delete mode 100644 plugins/mingw32make.bat delete mode 100644 retroshare-gui/src/mingw32make.bat delete mode 100644 retroshare-nogui/src/mingw32make.bat diff --git a/Start_RetroShare-Gui_Debug.bat b/Start_RetroShare-Gui_Debug.bat deleted file mode 100755 index 38680ccef..000000000 --- a/Start_RetroShare-Gui_Debug.bat +++ /dev/null @@ -1,11 +0,0 @@ -set QTDIR=C:\Qt\5.5\mingw492_32 -set LIBS=..\libs -set RSPATH=.\retroshare-gui\src\debug - -set PATH=%QTDIR%\bin;%LIBS%\bin;%PATH% - -If not exist %RSPATH%\retroshare.exe ( - build-all-mingw32make.bat -) - -%RSPATH%\retroshare.exe diff --git a/build-all-mingw32make.bat b/build-all-mingw32make.bat deleted file mode 100755 index 49eebe687..000000000 --- a/build-all-mingw32make.bat +++ /dev/null @@ -1,217 +0,0 @@ -set QTDIR=C:\Qt\5.5\mingw492_32\ -set MINGW=C:\Qt\Tools\mingw492_32 - -set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH% -set DEBUG=1 - -@echo off -rem emptying used variables in case the script was aborted and tempfile -set pack= -set clean= -set errorlevel= -if exist tmp.txt del tmp.txt - - -:loop1 -if %1x == x ( - rem if not exist tmp.txt echo debug >>tmp.txt - goto :end1 -) -if /i %1==clean ( - set clean=clean - shift - goto :loop1 -) -if /i %1==pack ( - set pack=pack - shift - goto :loop1 -) -echo.%1>>tmp.txt -shift -goto :loop1 - -:end1 -if %clean%x==cleanx ( - if not exist tmp.txt echo %clean% >>tmp.txt -) - -if not exist tmp.txt ( - if not %pack%x==packx ( - echo debug >>tmp.txt - set clean=clean - ) -) - -for /f %%a in (tmp.txt) do ( -if ECHO==1 @echo on - - - - -rem TODO: Remove these lines -rem GOTO :retroshare-gui - - - - -:libbitdht -rem ################################### -rem ### libbitdht ##################### -rem ################################### -cd libbitdht\src - -if not %clean%x==x mingw32-make clean - -qmake libbitdht.pro -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### libbitdht done ################ -echo ################################### -cd ..\.. - -:openpgpsdk -rem ################################### -rem ### openpgpsdk #################### -rem ################################### -cd openpgpsdk\src - -if not %clean%x==x mingw32-make clean - -qmake openpgpsdk.pro -CALL :TEST_ERROR - -mingw32-make -CALL :TEST_ERROR -echo ################################### -echo ### openpgpsdk done ############### -echo ################################### -cd ..\.. - -:libresapi -rem ################################### -rem ### libresapi ##################### -rem ################################### -cd libresapi\src - -if not %clean%x==x mingw32-make clean - -qmake libresapi.pro -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### libresapi done ################ -echo ################################### -cd ..\.. - -:libretroshare -rem ################################### -rem ### libretroshare ################# -rem ################################### -cd libretroshare\src - -if not %clean%x==x mingw32-make clean - -qmake libretroshare.pro "CONFIG+=version_detail_bash_script" -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### libretroshare done ############ -echo ################################### -cd ..\.. - -:pegmarkdown -rem ################################### -rem ### pegmarkdown ################### -rem ################################### -cd supportlibs\pegmarkdown - -if not %clean%x==x mingw32-make clean - -qmake pegmarkdown.pro -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### pegmarkdown done ############## -echo ################################### -cd ..\.. - -:retroshare-nogui -rem ################################### -rem ### retroshare-nogui ############## -rem ################################### -cd retroshare-nogui\src - -if not %clean%x==x mingw32-make clean - -qmake retroshare-nogui.pro -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### retroshare-nogui done ######### -echo ################################### -cd ..\.. - -:retroshare-gui -rem ################################### -rem ### retroshare-gui ################ -rem ################################### -cd retroshare-gui\src - -if not %clean%x==x mingw32-make clean - -rem qmake -r -spec ..\mkspecs\win32-g++ "CONFIG+=version_detail_bash_script" retroshare-gui.pro -qmake retroshare-gui.pro "CONFIG+=version_detail_bash_script" -CALL :TEST_ERROR - -mingw32-make %%a -CALL :TEST_ERROR -echo ################################### -echo ### retroshare-gui done ########### -echo ################################### - -cd ..\.. -@echo off -) - - -@echo off -if %pack%x==packx call packaging.bat -rem ################################### -rem ### clean up ###################### -rem ################################### -set clean= -del tmp.txt -set pack= -pause - -rem ################################### -rem ### END ########################### -rem ################################### -GOTO :EOF - - -:TEST_ERROR -@echo off -if errorlevel 1 ( - pause - set clean= - del tmp.txt - set pack= - EXIT -) -if ECHO==1 @echo on -EXIT /B - -:EOF \ No newline at end of file diff --git a/libbitdht/src/mingw32make.bat b/libbitdht/src/mingw32make.bat deleted file mode 100644 index 008a15473..000000000 --- a/libbitdht/src/mingw32make.bat +++ /dev/null @@ -1,13 +0,0 @@ -set QTDIR=C:\Qt\4.8.6 -set MINGW=C:\MinGW - -set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH% - -mingw32-make clean - -qmake libbitdht.pro - -mingw32-make - -pause - diff --git a/libretroshare/src/TODO b/libretroshare/src/TODO deleted file mode 100644 index 0e5e4f51b..000000000 --- a/libretroshare/src/TODO +++ /dev/null @@ -1,7 +0,0 @@ - -TODO ---------------- - -Too much to list... - -test SVN \ No newline at end of file diff --git a/libretroshare/src/mingw32make.bat b/libretroshare/src/mingw32make.bat deleted file mode 100644 index 3a58fe173..000000000 --- a/libretroshare/src/mingw32make.bat +++ /dev/null @@ -1,14 +0,0 @@ -set QTDIR=C:\Qt\4.8.6 -set MINGW=C:\MinGW -set GIT=C:\Program Files\Git - -set PATH=%QTDIR%\bin;%MINGW%\bin;;%GIT%\bin;%PATH% - -mingw32-make clean - -qmake libretroshare.pro "CONFIG+=version_detail_bash_script" - -mingw32-make - -pause - diff --git a/msys2_build_libs/Makefile b/msys2_build_libs/Makefile deleted file mode 100755 index e7f940780..000000000 --- a/msys2_build_libs/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -SQLCIPHER_VERSION=3.3.1 -MSYS2AUTOMAKE=/usr/share/automake-1.15 - -BLD=../build-libs -DLD=../downloads - -all: dirs sqlcipher - -dirs: - mkdir -p ../../libs/include - mkdir -p ../../libs/lib - mkdir -p ../../libs/bin - mkdir -p $(DLD) - mkdir -p $(BLD) - -sqlcipher: | ../../libs/lib/libsqlcipher.a - -$(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz: - curl.exe -L -k https://github.com/sqlcipher/sqlcipher/archive/v$(SQLCIPHER_VERSION).tar.gz -o $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz - -../../libs/lib/libsqlcipher.a: $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz - tar xvf $(DLD)/sqlcipher-$(SQLCIPHER_VERSION).tar.gz -C $(BLD) - cp $(MSYS2AUTOMAKE)/config.guess $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/config.guess - cp $(MSYS2AUTOMAKE)/config.sub $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/config.sub - cd $(BLD)/sqlcipher-$(SQLCIPHER_VERSION) && LIBS="-L`pwd`/../../libs/lib -lgdi32 $$LIBS" && export LIBS && ./configure --disable-shared --enable-static --enable-tempstore=yes CFLAGS="-DSQLITE_HAS_CODEC -I`pwd`/../../libs/include" LDFLAGS="-L`pwd`/../../libs/lib -lcrypto -lgdi32" && make install prefix="`pwd`/install" - cp -r $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/include/* ../../libs/include/ - cp $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/lib/libsqlcipher.a ../../libs/lib/ - cp $(BLD)/sqlcipher-$(SQLCIPHER_VERSION)/install/bin/sqlcipher.exe ../../libs/bin/ diff --git a/plugins/mingw32make.bat b/plugins/mingw32make.bat deleted file mode 100644 index c5b3f8f6a..000000000 --- a/plugins/mingw32make.bat +++ /dev/null @@ -1,13 +0,0 @@ -set QTDIR=C:\Qt\4.8.6 -set MINGW=C:\MinGW - -set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH% - -mingw32-make clean - -qmake plugins.pro - -mingw32-make - -pause - diff --git a/retroshare-gui/src/mingw32make.bat b/retroshare-gui/src/mingw32make.bat deleted file mode 100644 index 6959bc761..000000000 --- a/retroshare-gui/src/mingw32make.bat +++ /dev/null @@ -1,15 +0,0 @@ -set QTDIR=C:\Qt\5.5.0\5.5\mingw492_32 -set MINGW=C:\Qt\Tools\mingw492_32 - -set GIT=C:\Program Files\Git - -set PATH=%QTDIR%\bin;%MINGW%\bin;%GIT%\bin;%PATH% - - -qmake retroshare-gui.pro "CONFIG+=version_detail_bash_script" - - -mingw32-make - -pause - diff --git a/retroshare-nogui/src/mingw32make.bat b/retroshare-nogui/src/mingw32make.bat deleted file mode 100644 index fbc0b627e..000000000 --- a/retroshare-nogui/src/mingw32make.bat +++ /dev/null @@ -1,12 +0,0 @@ -set QTDIR=C:\Qt\4.8.5 -set MINGW=C:\MinGW - -set PATH=%QTDIR%\bin;%MINGW%\bin;%PATH% - - -qmake retroshare-nogui.pro - -mingw32-make - -pause - From 7742e0ca39b0335ccd2a6b5fd34a06d8c6f559f1 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sun, 28 Oct 2018 22:15:07 +0100 Subject: [PATCH 05/26] Removed version.html --- retroshare-gui/src/gui/HelpDialog.cpp | 9 ++------- retroshare-gui/src/gui/help/version.html | 5 ----- retroshare-gui/src/gui/help/version.html.in | 4 ---- retroshare-gui/src/gui/images.qrc | 1 - 4 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 retroshare-gui/src/gui/help/version.html delete mode 100644 retroshare-gui/src/gui/help/version.html.in diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp index c27e404a2..9790b6832 100644 --- a/retroshare-gui/src/gui/HelpDialog.cpp +++ b/retroshare-gui/src/gui/HelpDialog.cpp @@ -24,6 +24,7 @@ #include #include +#include "rshare.h" #ifdef ENABLE_WEBUI #include @@ -84,13 +85,7 @@ HelpDialog::HelpDialog(QWidget *parent) : ui->thanks->setText(in.readAll()); } - QFile versionFile(QLatin1String(":/help/version.html")); - if (versionFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - QTextStream in(&versionFile); - QString version = in.readAll(); - - ui->version->setText(version); - } + ui->version->setText(Rshare::retroshareVersion(true)); /* Add version numbers of libretroshare */ std::list libraries; diff --git a/retroshare-gui/src/gui/help/version.html b/retroshare-gui/src/gui/help/version.html deleted file mode 100644 index af3ae831f..000000000 --- a/retroshare-gui/src/gui/help/version.html +++ /dev/null @@ -1,5 +0,0 @@ -Retroshare Gui version : -Svn version : 8013 -Fr 13. Mär 16:32:53 CET 2015 - - diff --git a/retroshare-gui/src/gui/help/version.html.in b/retroshare-gui/src/gui/help/version.html.in deleted file mode 100644 index 189d71df2..000000000 --- a/retroshare-gui/src/gui/help/version.html.in +++ /dev/null @@ -1,4 +0,0 @@ -Retroshare Gui version : -Git version : $Branch$ -$Hash$ -$Date$ \ No newline at end of file diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 40613280e..8496f899b 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -646,7 +646,6 @@ images/newsfeed/news-feed-32.png images/newsfeed/news-feed-notify-32.png images/share-icon-16.png - help/version.html images/view-certificate-sign-48.png images/toasterEnable.png images/toasterDisable.png From 41d942c14403c58819d92b563b79f689b3972580 Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sun, 28 Oct 2018 22:16:01 +0100 Subject: [PATCH 06/26] Updated links in readme --- libretroshare/src/Readme.txt | 14 ++++++++------ retroshare-gui/src/README.txt | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libretroshare/src/Readme.txt b/libretroshare/src/Readme.txt index 735e8444a..0b722cb63 100644 --- a/libretroshare/src/Readme.txt +++ b/libretroshare/src/Readme.txt @@ -2,13 +2,15 @@ README for RetroShare ======================================================================================= -RetroShare web site . . . . http://retroshare.sourceforge.net/ -Documentation . . . . . . . http://retroshare.sourceforge.net/doc.html -Support . . . . . . . . . . http://retroshare.sourceforge.net/support.html +RetroShare web site . . . . http://retroshare.net/index.html +Developer's blog . . . . . https://retroshareteam.wordpress.com +Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/ +Support . . . . . . . . . . http://retroshare.net/support.html Forums . . . . . . . . . . http://retroshare.sourceforge.net/forum/ -Wiki . . . . . . . . . . . http://retroshare.sourceforge.net/wiki/ -The Developers site . . . . http://retroshare.sourceforge.net/developers.html -Project site . . . . . . . https://sourceforge.net/projects/retroshare +Wiki . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki +Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner +Project site . . . . . . . https://github.com/RetroShare/RetroShare +Relted projects/plugins . . https://github.com/RetroShare Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net diff --git a/retroshare-gui/src/README.txt b/retroshare-gui/src/README.txt index febfabcfa..ca43d5928 100644 --- a/retroshare-gui/src/README.txt +++ b/retroshare-gui/src/README.txt @@ -2,13 +2,15 @@ README for RetroShare ======================================================================================= -RetroShare web site . . . . http://retroshare.sourceforge.net/ -Documentation . . . . . . . http://retroshare.sourceforge.net/doc.html -Support . . . . . . . . . . http://retroshare.sourceforge.net/support.html +RetroShare web site . . . . http://retroshare.net/index.html +Developer's blog . . . . . https://retroshareteam.wordpress.com +Documentation . . . . . . . https://retroshare.readthedocs.io/en/latest/ +Support . . . . . . . . . . http://retroshare.net/support.html Forums . . . . . . . . . . http://retroshare.sourceforge.net/forum/ -Wiki . . . . . . . . . . . http://retroshare.sourceforge.net/wiki/ -The Developers site . . . . http://retroshare.sourceforge.net/developers.html -Project site . . . . . . . https://sourceforge.net/projects/retroshare +Wiki . . . . . . . . . . . https://github.com/RetroShare/documentation/wiki +Old developers site . . . . http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner +Project site . . . . . . . https://github.com/RetroShare/RetroShare +Relted projects/plugins . . https://github.com/RetroShare Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net From 4dce4002f0d02a62c58df6f5ff3b4b9213e7c25a Mon Sep 17 00:00:00 2001 From: hunbernd Date: Sun, 28 Oct 2018 22:25:26 +0100 Subject: [PATCH 07/26] Removed outdated instructions from readme --- libretroshare/src/Readme.txt | 53 ++++++----------------------------- retroshare-gui/src/README.txt | 47 ++++++------------------------- 2 files changed, 16 insertions(+), 84 deletions(-) diff --git a/libretroshare/src/Readme.txt b/libretroshare/src/Readme.txt index 0b722cb63..7f7f35c8e 100644 --- a/libretroshare/src/Readme.txt +++ b/libretroshare/src/Readme.txt @@ -14,54 +14,17 @@ Relted projects/plugins . . https://github.com/RetroShare Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net - -Compiling + Running RetroShare (V0.5.xxx) ========================================================================================= -REQUIREMENTS +Compiling RetroShare ========================================================================================= -Libraries/Tools: - * C/C++ Compiler. (standard on Linux/cygwin) - * Qt >= 4.5.x https://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz - * OpenSSL http://www.openssl.org/source/openssl-0.9.8k.tar.gz - * MiniUPnP http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz - * gpgme ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.8.tar.bz2 - * libgpg-error ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2 +Build Scripts are avaible on GIT: +https://github.com/RetroShare/RetroShare/tree/master/build_scripts -Windows only: - * Cygwin http://www.cygwin.com/cygwin/setup.exe (for openssl compile) - * MinGW/Msys package http://sourceforge.net/projects/mingw/files/ (for compile gpgme,libgpg-error) - * Pthreads http://sourceware.org/pthreads-win32/ - * Zlib http://www.zlib.net/ - - Latest RetroShare sources from (SVN) sourceforge.net: - svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare retroshare +You can find here instructions howto compile RetroShare: +https://retroshare.readthedocs.io/en/latest/developer/compilation/ -========================================================================================= - -Build Scripts are avaible on SVN for Debian and Ubuntu: -http://retroshare.svn.sourceforge.net/viewvc/retroshare/trunk/build_scripts/ - -Latest stable OpenSSL is available at: -http://www.openssl.org - -Latest miniupnpc-1.3 is avaible at: -http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz - -Latest gpgme Library is avaible at: -ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.1.8.tar.bz2 - -Latest libgpg-error Library is avaible at: -ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-1.7.tar.bz2 - -Windows only: - pthreads: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-8-0-release.tar.gz - zlib: http://www.zlib.net/zlib-1.2.3.tar.gz -========================================================================================= -You can find here instrustions howto compile libretroshare and gui: -http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner - -========================================================================================= -You can go on over to our forum when you have trouble with compiling: +You can go on over to our forum or chat lobby when you have trouble with compiling: +retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995 +retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5 http://retroshare.sourceforge.net/forum/ ---------------------------------------------- diff --git a/retroshare-gui/src/README.txt b/retroshare-gui/src/README.txt index ca43d5928..7f7f35c8e 100644 --- a/retroshare-gui/src/README.txt +++ b/retroshare-gui/src/README.txt @@ -14,48 +14,17 @@ Relted projects/plugins . . https://github.com/RetroShare Contact: . . . . . . . . . retroshare@lunamutt.com ,defnax@users.sourceforge.net - -Compiling + Running RetroShare (V0.5.xxx) ========================================================================================= -REQUIREMENTS +Compiling RetroShare ========================================================================================= -Libraries/Tools: - * C/C++ Compiler. (standard on Linux/cygwin) - * Qt >= 4.6.x http://qt.nokia.com/downloads/downloads#lgpl - * OpenSSL http://www.openssl.org/source/openssl-1.0.1c.tar.gz - * MiniUPnP http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz +Build Scripts are avaible on GIT: +https://github.com/RetroShare/RetroShare/tree/master/build_scripts -Windows only: - * Cygwin http://www.cygwin.com/cygwin/setup.exe (for compile, openssl, pthreads) - * MinGW/Msys package http://sourceforge.net/projects/mingw/files/(for compile zlib, miniupnc, bzip2) - * Pthreads http://sourceware.org/pthreads-win32/ - * Zlib http://www.zlib.net/ - * bzip2 http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz - - Latest RetroShare sources from (SVN) sourceforge.net: - svn co https://retroshare.svn.sourceforge.net/svnroot/retroshare retroshare - -========================================================================================= - -Build Scripts are avaible on SVN for Debian and Ubuntu: -http://retroshare.svn.sourceforge.net/viewvc/retroshare/trunk/build_scripts/ - -Latest stable OpenSSL is available at: -http://www.openssl.org - -Latest miniupnpc-1.3 is avaible at: -http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.3.tar.gz - - -Windows only: - pthreads: ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-8-0-release.tar.gz - zlib: http://www.zlib.net/zlib-1.2.3.tar.gz -========================================================================================= You can find here instructions howto compile RetroShare: -http://retroshare.sourceforge.net/wiki/index.php/Developers_Corner - -========================================================================================= -You can go on over to our forum when you have trouble with compiling: +https://retroshare.readthedocs.io/en/latest/developer/compilation/ + +You can go on over to our forum or chat lobby when you have trouble with compiling: +retroshare://forum?name=Developers%20Discussions&id=8fd22bd8f99754461e7ba1ca8a727995 +retroshare://chat_room?name=Retroshare%20Devel%20%28signed%29&id=L68DB0A1E09BDA3A5 http://retroshare.sourceforge.net/forum/ ---------------------------------------------- From 1e1e81704a47bdb2876ef3d256f777e297d19515 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 14:33:55 +0100 Subject: [PATCH 08/26] added license headers for librssimulator --- retroshare.pri | 2 +- tests/librssimulator/librssimulator.pro | 18 ++++++++++++++++ tests/librssimulator/peer/FakeLinkMgr.h | 21 +++++++++++++++++++ tests/librssimulator/peer/FakeNetMgr.h | 21 +++++++++++++++++++ tests/librssimulator/peer/FakePeerMgr.h | 21 +++++++++++++++++++ tests/librssimulator/peer/FakePublisher.h | 21 +++++++++++++++++++ .../librssimulator/peer/FakeServiceControl.h | 21 +++++++++++++++++++ tests/librssimulator/peer/PeerNode.cc | 21 +++++++++++++++++++ tests/librssimulator/peer/PeerNode.h | 21 +++++++++++++++++++ .../testing/IsolatedServiceTester.cc | 21 +++++++++++++++++++ .../testing/IsolatedServiceTester.h | 21 +++++++++++++++++++ tests/librssimulator/testing/SetFilter.cc | 21 +++++++++++++++++++ tests/librssimulator/testing/SetFilter.h | 21 +++++++++++++++++++ tests/librssimulator/testing/SetPacket.h | 21 +++++++++++++++++++ .../testing/SetServiceTester.cc | 21 +++++++++++++++++++ .../librssimulator/testing/SetServiceTester.h | 21 +++++++++++++++++++ 16 files changed, 313 insertions(+), 1 deletion(-) diff --git a/retroshare.pri b/retroshare.pri index 77102e4e0..1d8dcc36e 100644 --- a/retroshare.pri +++ b/retroshare.pri @@ -3,7 +3,7 @@ # Copyright (C) 2018, Retroshare team # # # # This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Lesser General Public License as # +# it under the terms of the GNU Affero General Public License as # # published by the Free Software Foundation, either version 3 of the # # License, or (at your option) any later version. # # # diff --git a/tests/librssimulator/librssimulator.pro b/tests/librssimulator/librssimulator.pro index b51a1f212..1f6ded77d 100644 --- a/tests/librssimulator/librssimulator.pro +++ b/tests/librssimulator/librssimulator.pro @@ -1,3 +1,21 @@ +################################################################################ +# librssimulator.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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 Affero General Public License for more details. # +# # +# You should have received a copy of the GNU Affero General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib diff --git a/tests/librssimulator/peer/FakeLinkMgr.h b/tests/librssimulator/peer/FakeLinkMgr.h index 2df13eb10..63e31c3b1 100644 --- a/tests/librssimulator/peer/FakeLinkMgr.h +++ b/tests/librssimulator/peer/FakeLinkMgr.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: FakeLinkMgr.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/peer/FakeNetMgr.h b/tests/librssimulator/peer/FakeNetMgr.h index 34ea21570..e1fc32969 100644 --- a/tests/librssimulator/peer/FakeNetMgr.h +++ b/tests/librssimulator/peer/FakeNetMgr.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: FakeNetMgr.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/peer/FakePeerMgr.h b/tests/librssimulator/peer/FakePeerMgr.h index fcc922895..31e52d276 100644 --- a/tests/librssimulator/peer/FakePeerMgr.h +++ b/tests/librssimulator/peer/FakePeerMgr.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: FakePeerMgr.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/peer/FakePublisher.h b/tests/librssimulator/peer/FakePublisher.h index cafb75376..924e7aecd 100644 --- a/tests/librssimulator/peer/FakePublisher.h +++ b/tests/librssimulator/peer/FakePublisher.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: FakePublisher.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/peer/FakeServiceControl.h b/tests/librssimulator/peer/FakeServiceControl.h index 7bd47acd6..ba0f417b9 100644 --- a/tests/librssimulator/peer/FakeServiceControl.h +++ b/tests/librssimulator/peer/FakeServiceControl.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: FakeServiceControl.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/peer/PeerNode.cc b/tests/librssimulator/peer/PeerNode.cc index 30c320759..cdfb588df 100644 --- a/tests/librssimulator/peer/PeerNode.cc +++ b/tests/librssimulator/peer/PeerNode.cc @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: PeerNode.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include #include #include diff --git a/tests/librssimulator/peer/PeerNode.h b/tests/librssimulator/peer/PeerNode.h index cf7ac428d..f902fbe5d 100644 --- a/tests/librssimulator/peer/PeerNode.h +++ b/tests/librssimulator/peer/PeerNode.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/peer/: PeerNode.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/testing/IsolatedServiceTester.cc b/tests/librssimulator/testing/IsolatedServiceTester.cc index e94a59b4e..35b978f3a 100644 --- a/tests/librssimulator/testing/IsolatedServiceTester.cc +++ b/tests/librssimulator/testing/IsolatedServiceTester.cc @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: IsolatedServiceTester.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include #include "retroshare/rsids.h" diff --git a/tests/librssimulator/testing/IsolatedServiceTester.h b/tests/librssimulator/testing/IsolatedServiceTester.h index 3fa5e2afc..e487c9323 100644 --- a/tests/librssimulator/testing/IsolatedServiceTester.h +++ b/tests/librssimulator/testing/IsolatedServiceTester.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: IsolatedServiceTester.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/testing/SetFilter.cc b/tests/librssimulator/testing/SetFilter.cc index d1400f7ba..fc8ec7dcb 100644 --- a/tests/librssimulator/testing/SetFilter.cc +++ b/tests/librssimulator/testing/SetFilter.cc @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: SetFilter.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "SetFilter.h" diff --git a/tests/librssimulator/testing/SetFilter.h b/tests/librssimulator/testing/SetFilter.h index 50df26955..132aa246f 100644 --- a/tests/librssimulator/testing/SetFilter.h +++ b/tests/librssimulator/testing/SetFilter.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: SetFilter.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include diff --git a/tests/librssimulator/testing/SetPacket.h b/tests/librssimulator/testing/SetPacket.h index 1e377191e..d01eeabf5 100644 --- a/tests/librssimulator/testing/SetPacket.h +++ b/tests/librssimulator/testing/SetPacket.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: SetPacket.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include "pqi/p3linkmgr.h" // for RsPeerId ?? diff --git a/tests/librssimulator/testing/SetServiceTester.cc b/tests/librssimulator/testing/SetServiceTester.cc index 3983b3a5b..a6ffa734d 100644 --- a/tests/librssimulator/testing/SetServiceTester.cc +++ b/tests/librssimulator/testing/SetServiceTester.cc @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: SetServiceTester.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include #include "time.h" diff --git a/tests/librssimulator/testing/SetServiceTester.h b/tests/librssimulator/testing/SetServiceTester.h index 862fc43e0..f454218d3 100644 --- a/tests/librssimulator/testing/SetServiceTester.h +++ b/tests/librssimulator/testing/SetServiceTester.h @@ -1,3 +1,24 @@ +/******************************************************************************* + * librssimulator/testing/: SetServiceTester.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once #include From 456845fc8c3935916f6155b711715fe6aa3bcf9a Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 15:48:33 +0100 Subject: [PATCH 09/26] fixed licenses in FeedReader --- build_scripts/Debian/debian_release_howto.txt | 120 +++++++++--------- openpgpsdk/src/openpgpsdk.pro | 18 +++ plugins/Common/retroshare_plugin.pri | 21 +++ plugins/FeedReader/FeedReader.pro | 21 +++ plugins/FeedReader/FeedReaderPlugin.cpp | 39 +++--- plugins/FeedReader/FeedReaderPlugin.h | 39 +++--- plugins/FeedReader/gui/AddFeedDialog.cpp | 39 +++--- plugins/FeedReader/gui/AddFeedDialog.h | 39 +++--- plugins/FeedReader/gui/FeedReaderConfig.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderConfig.h | 39 +++--- plugins/FeedReader/gui/FeedReaderDialog.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderDialog.h | 39 +++--- plugins/FeedReader/gui/FeedReaderFeedItem.cpp | 41 +++--- plugins/FeedReader/gui/FeedReaderFeedItem.h | 39 +++--- .../FeedReader/gui/FeedReaderFeedNotify.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderFeedNotify.h | 39 +++--- .../gui/FeedReaderMessageWidget.cpp | 20 +++ .../FeedReader/gui/FeedReaderMessageWidget.h | 20 +++ plugins/FeedReader/gui/FeedReaderNotify.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderNotify.h | 39 +++--- .../FeedReader/gui/FeedReaderStringDefs.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderStringDefs.h | 39 +++--- .../FeedReader/gui/FeedReaderUserNotify.cpp | 39 +++--- plugins/FeedReader/gui/FeedReaderUserNotify.h | 39 +++--- plugins/FeedReader/gui/PreviewFeedDialog.cpp | 39 +++--- plugins/FeedReader/gui/PreviewFeedDialog.h | 39 +++--- plugins/FeedReader/services/p3FeedReader.cc | 39 +++--- plugins/FeedReader/services/p3FeedReader.h | 39 +++--- .../FeedReader/services/p3FeedReaderThread.cc | 39 +++--- .../FeedReader/services/p3FeedReaderThread.h | 39 +++--- .../FeedReader/services/rsFeedReaderItems.cc | 39 +++--- .../FeedReader/services/rsFeedReaderItems.h | 39 +++--- plugins/FeedReader/util/CURLWrapper.cpp | 53 +++----- plugins/FeedReader/util/CURLWrapper.h | 39 +++--- plugins/FeedReader/util/HTMLWrapper.cpp | 39 +++--- plugins/FeedReader/util/HTMLWrapper.h | 39 +++--- plugins/FeedReader/util/XMLWrapper.cpp | 39 +++--- plugins/FeedReader/util/XMLWrapper.h | 39 +++--- plugins/FeedReader/util/XPathWrapper.cpp | 39 +++--- plugins/FeedReader/util/XPathWrapper.h | 39 +++--- plugins/plugins.pro | 18 +++ 41 files changed, 827 insertions(+), 753 deletions(-) diff --git a/build_scripts/Debian/debian_release_howto.txt b/build_scripts/Debian/debian_release_howto.txt index 8d669d311..f9c981f76 100644 --- a/build_scripts/Debian/debian_release_howto.txt +++ b/build_scripts/Debian/debian_release_howto.txt @@ -65,67 +65,69 @@ Uploading-to-mentors bug: Licensing issues: Various licenses involved: - R: re-licence to GPLv3 + L: re-licence to LGPLv3 + A: re-licence to AGPLv3 D: delete + d: delete in debian package to avoid licensing problems - Code part | Licenses |A| Authors | Comment - --------------------------------+------------------------+-+----------------------------------------------+------------------------------------------------- - libbitdht | GPLv3 | | drbob, csoler, Retroshare team | - bitdht/bencode.h | Public domain | | Mike Frysinger | - bitdht/bdrandom.h | GPLv2 |R| csoler | - --------------------------------+------------------------+-+----------------------------------------------+------------------------------------------------- - libresapi | GPLv3 | | G10H4ck, [], electron128 | Most files are unlicenced - libretroshare | GPLv2,GPLv3 | | csoler,drbob,Mr-alice,Chris,Thunder | Some files unversionned. - plugins/dlfcn_win32.cc | GPLv2.1 |R| Ramiro Polla | - pqi/authgpg.h | GPLv2 |R| Raghu Dev R. | .cc is authed by drbob - upnp/UPnPBase.h | GPLv2 | | Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted - util/pugiconfig.h | MIT | | Arseny Kapoulkyne | [unused file!] - util/rsstring.h | GPLv2 |R| Thomas Kister | - util/rswin.h | GPLv2 |R| Thomas Kister | - util/rsversioninfo.h | [none] | | Alexandrut | - util/stacktrace.h | GPLv2 |R| Timo Bingmann, G10H4ck | - librssimulator | [None] | | No authors | - openpgpsdk | Apache | | Rachell Wilmer, Ben Laurie | - pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | - plugins/feedreader | GPLv2 | | Thunder | - plugins/VOIP | | | | - AudioInputConfig.h+ | All right reserved | | Thorvald Natvig | Code can be modified/re-used. Mumble's code. - SpeezProcessor.h | | | Peter Zotov | - retroshare-android-notify-* | GPLv3 | | G10H4ck | - retroshare-android-service | GPLv3 | | G10H4ck | - retroshare-gui/src | | | Thunder, csoler, drbob, crypton | - control/* | GPLv2 | | Matt Edman, crypton, Justin Hiple | [Unused code] - common/ElideLabel.h | BSD | | Qt Toolkit | - common/FlowLayout.h | BSD | | Qt Toolkit | Is that really Qt code?? Qt examples can be used. - common/html.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/rwindow.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/vmessagebox.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/PictureFlow | unclear | | Ariya Hidayat (@kde.org) | [Unused code] - elastic/* | LGPL | | Trolltech | - FileTransfer/FTIWidget | GPLv2 | | defnax, lsn752 | - FileTransfer/xprogressb | GPLv2 | | Xesc | - help/browser.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - images/retroshare_win.rc.h | GPLv2 | | crypton | [Unused code] - msgs/textformat.h | GPLv3 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented - settings/rsettings.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - statistics/BandwidthGraphW.h| GPLv2 | | Matt Edman, defnax, Justin Hiple | - statistics/dhtgraph.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - toaster/MessageToaster.h | GPLv3 | | Xesc | - toaster/DownloadToaster.h | GPLv3 | | Xesc | - About{Widget,Dialog}.h | GPLv2 | | Unipro, Russia | Very small file. - linetypes.h | GPLv2 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented - mainpagestack.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - land/langagesupport.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - util/log.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - idle/idle.h | GPLv2 | | Justin Karneges | May be re-implemented - TorControl/* |* Public domaine | | John Brooks | Code from Ricochet.im - util/HandleRichText.h | GPLv2 | | Thomas Kister | - util/misc.h | GPLv2 | | defnax, Christophe Dumez | - util/printpreview.h | GPLv2 | | Trolltech example | - util/retrosharewin32.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - util/stringutil.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - rshare.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - retroshare-nogui/* | GPLv2 | | drbob | + Code part | Licenses | A| Authors | Comment + --------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- + libbitdht | GPLv3 | | drbob, csoler, Retroshare team | + bitdht/bencode.h | Public domain | | Mike Frysinger | + bitdht/bdrandom.h | GPLv2 | L| csoler | + --------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- + libresapi | GPLv3 | | G10H4ck, [], electron128 | Most files are unlicenced + libretroshare | GPLv2,GPLv3 | | csoler,drbob,Mr-alice,Chris,Thunder | Some files unversionned. + plugins/dlfcn_win32.cc | GPLv2.1 | L| Ramiro Polla | + pqi/authgpg.h | GPLv2 | L| Raghu Dev R. | .cc is authed by drbob + upnp/UPnPBase.h | GPLv2 | | Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted + util/pugiconfig.h | MIT | | Arseny Kapoulkyne | [unused file!] + util/rsstring.h | GPLv2 | L| Thomas Kister | + util/rswin.h | GPLv2 | L| Thomas Kister | + util/rsversioninfo.h | [none] | | Alexandrut | + util/stacktrace.h | GPLv2 | R| Timo Bingmann, G10H4ck | + librssimulator | [None] |dA| No authors | + openpgpsdk | Apache | | Rachell Wilmer, Ben Laurie | + pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | will be deleted when creating debian package + plugins/feedreader | GPLv2 | A| Thunder | + plugins/VOIP | | | | + AudioInputConfig.h+ | All right reserved | | Thorvald Natvig | Code can be modified/re-used. Mumble's code. + SpeezProcessor.h | | | Peter Zotov | + retroshare-android-notify-* | GPLv3 | | G10H4ck | + retroshare-android-service | GPLv3 | | G10H4ck | + retroshare-gui/src | | | Thunder, csoler, drbob, crypton | + control/* | GPLv2 | | Matt Edman, crypton, Justin Hiple | [Unused code] + common/ElideLabel.h | BSD | | Qt Toolkit | + common/FlowLayout.h | BSD | | Qt Toolkit | Is that really Qt code?? Qt examples can be used. + common/html.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/rwindow.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/vmessagebox.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/PictureFlow | unclear | | Ariya Hidayat (@kde.org) | [Unused code] + elastic/* | LGPL | | Trolltech | + FileTransfer/FTIWidget | GPLv2 | | defnax, lsn752 | + FileTransfer/xprogressb | GPLv2 | | Xesc | + help/browser.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + images/retroshare_win.rc.h | GPLv2 | | crypton | [Unused code] + msgs/textformat.h | GPLv3 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented + settings/rsettings.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + statistics/BandwidthGraphW.h| GPLv2 | | Matt Edman, defnax, Justin Hiple | + statistics/dhtgraph.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + toaster/MessageToaster.h | GPLv3 | | Xesc | + toaster/DownloadToaster.h | GPLv3 | | Xesc | + About{Widget,Dialog}.h | GPLv2 | | Unipro, Russia | Very small file. + linetypes.h | GPLv2 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented + mainpagestack.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + land/langagesupport.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + util/log.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + idle/idle.h | GPLv2 | | Justin Karneges | May be re-implemented + TorControl/* |* Public domaine | | John Brooks | Code from Ricochet.im + util/HandleRichText.h | GPLv2 | | Thomas Kister | + util/misc.h | GPLv2 | | defnax, Christophe Dumez | + util/printpreview.h | GPLv2 | | Trolltech example | + util/retrosharewin32.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + util/stringutil.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + rshare.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + retroshare-nogui/* | GPLv2 | | drbob | Plan: move to GPLv3 with OpenSSL exception diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index 40bdfca4c..05d95af78 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -1,3 +1,21 @@ +################################################################################ +# openpgpsdk.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib diff --git a/plugins/Common/retroshare_plugin.pri b/plugins/Common/retroshare_plugin.pri index 2f4d7a6a1..2bc669f99 100644 --- a/plugins/Common/retroshare_plugin.pri +++ b/plugins/Common/retroshare_plugin.pri @@ -1,3 +1,24 @@ +################################################################################ +# retroshare_plugin.pri # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + +TEMPLATE = subdirs + +SUBDIRS += \ !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index c60348551..238a63310 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -1,3 +1,24 @@ +################################################################################ +# FeedReader.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + +TEMPLATE = subdirs + +SUBDIRS += \ !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") CONFIG += qt uic qrc resources diff --git a/plugins/FeedReader/FeedReaderPlugin.cpp b/plugins/FeedReader/FeedReaderPlugin.cpp index ff69ce40b..6406dc034 100644 --- a/plugins/FeedReader/FeedReaderPlugin.cpp +++ b/plugins/FeedReader/FeedReaderPlugin.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/FeedReaderPlugin.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/FeedReaderPlugin.h b/plugins/FeedReader/FeedReaderPlugin.h index 12b45db20..e7d8653f1 100644 --- a/plugins/FeedReader/FeedReaderPlugin.h +++ b/plugins/FeedReader/FeedReaderPlugin.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/FeedReaderPlugin.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/plugins/FeedReader/gui/AddFeedDialog.cpp b/plugins/FeedReader/gui/AddFeedDialog.cpp index f094fdd4e..67934b322 100644 --- a/plugins/FeedReader/gui/AddFeedDialog.cpp +++ b/plugins/FeedReader/gui/AddFeedDialog.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/AddFeedDialog.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/gui/AddFeedDialog.h b/plugins/FeedReader/gui/AddFeedDialog.h index f91ff5d87..f9ab5e90e 100644 --- a/plugins/FeedReader/gui/AddFeedDialog.h +++ b/plugins/FeedReader/gui/AddFeedDialog.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/AddFeedDialog.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef ADDFEEDDIALOG_H #define ADDFEEDDIALOG_H diff --git a/plugins/FeedReader/gui/FeedReaderConfig.cpp b/plugins/FeedReader/gui/FeedReaderConfig.cpp index 8ff5d1c58..99d3dde6a 100644 --- a/plugins/FeedReader/gui/FeedReaderConfig.cpp +++ b/plugins/FeedReader/gui/FeedReaderConfig.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/AddReaderConfig.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "FeedReaderConfig.h" #include "ui_FeedReaderConfig.h" diff --git a/plugins/FeedReader/gui/FeedReaderConfig.h b/plugins/FeedReader/gui/FeedReaderConfig.h index 5d31b3b0c..ed01f5107 100644 --- a/plugins/FeedReader/gui/FeedReaderConfig.h +++ b/plugins/FeedReader/gui/FeedReaderConfig.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/AddReaderConfig.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _FEEDREADERCONFIG_H #define _FEEDREADERCONFIG_H diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp index 7641aa5fc..ca86715e2 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.cpp +++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderDialog.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/gui/FeedReaderDialog.h b/plugins/FeedReader/gui/FeedReaderDialog.h index bf707e0fa..80b6d25a3 100644 --- a/plugins/FeedReader/gui/FeedReaderDialog.h +++ b/plugins/FeedReader/gui/FeedReaderDialog.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderDialog.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _FEEDREADERDIALOG_H #define _FEEDREADERDIALOG_H diff --git a/plugins/FeedReader/gui/FeedReaderFeedItem.cpp b/plugins/FeedReader/gui/FeedReaderFeedItem.cpp index 7f940ab10..d813a5f7a 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedItem.cpp +++ b/plugins/FeedReader/gui/FeedReaderFeedItem.cpp @@ -1,23 +1,24 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderFeedItem.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/gui/FeedReaderFeedItem.h b/plugins/FeedReader/gui/FeedReaderFeedItem.h index b12e67cd7..10776c08b 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedItem.h +++ b/plugins/FeedReader/gui/FeedReaderFeedItem.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2013 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderFeedItem.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _FEEDREADERFEEDITEM_H #define _FEEDREADERFEEDITEM_H diff --git a/plugins/FeedReader/gui/FeedReaderFeedNotify.cpp b/plugins/FeedReader/gui/FeedReaderFeedNotify.cpp index 726dc6b5c..071efcb47 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedNotify.cpp +++ b/plugins/FeedReader/gui/FeedReaderFeedNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderFeedNotify.cpp * + * * + * Copyright (C) 2012 by RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/gui/FeedReaderFeedNotify.h b/plugins/FeedReader/gui/FeedReaderFeedNotify.h index 8f0c343d5..18342aa0c 100644 --- a/plugins/FeedReader/gui/FeedReaderFeedNotify.h +++ b/plugins/FeedReader/gui/FeedReaderFeedNotify.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderFeedNotify.h * + * * + * Copyright (C) 2012 by RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef FEEDREADERFEEDNOTIFY_H #define FEEDREADERFEEDNOTIFY_H diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp index 6be569fc5..f4f64df5b 100644 --- a/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp +++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderMessageWidget.cpp * + * * + * Copyright (C) 2012 by RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #include diff --git a/plugins/FeedReader/gui/FeedReaderMessageWidget.h b/plugins/FeedReader/gui/FeedReaderMessageWidget.h index bc713f5b4..da86daf47 100644 --- a/plugins/FeedReader/gui/FeedReaderMessageWidget.h +++ b/plugins/FeedReader/gui/FeedReaderMessageWidget.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderMessageWidget.h * + * * + * Copyright (C) 2012 by RetroShare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef FEEDREADERMESSAGEWIDGET_H #define FEEDREADERMESSAGEWIDGET_H diff --git a/plugins/FeedReader/gui/FeedReaderNotify.cpp b/plugins/FeedReader/gui/FeedReaderNotify.cpp index 650310939..a4d00c38f 100644 --- a/plugins/FeedReader/gui/FeedReaderNotify.cpp +++ b/plugins/FeedReader/gui/FeedReaderNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderNotify.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "FeedReaderNotify.h" diff --git a/plugins/FeedReader/gui/FeedReaderNotify.h b/plugins/FeedReader/gui/FeedReaderNotify.h index 869b04fca..08cdc3cc2 100644 --- a/plugins/FeedReader/gui/FeedReaderNotify.h +++ b/plugins/FeedReader/gui/FeedReaderNotify.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderNotify.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _FEEDREADERNOTIFY_H #define _FEEDREADERNOTIFY_H diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp index c94544eb5..99c537498 100644 --- a/plugins/FeedReader/gui/FeedReaderStringDefs.cpp +++ b/plugins/FeedReader/gui/FeedReaderStringDefs.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderStringDefs.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/gui/FeedReaderStringDefs.h b/plugins/FeedReader/gui/FeedReaderStringDefs.h index 96c013a69..f4b384c8f 100644 --- a/plugins/FeedReader/gui/FeedReaderStringDefs.h +++ b/plugins/FeedReader/gui/FeedReaderStringDefs.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderStringDefs.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef FEEDREADER_STRINGDEFS_H #define FEEDREADER_STRINGDEFS_H diff --git a/plugins/FeedReader/gui/FeedReaderUserNotify.cpp b/plugins/FeedReader/gui/FeedReaderUserNotify.cpp index 08897c342..207eb312c 100644 --- a/plugins/FeedReader/gui/FeedReaderUserNotify.cpp +++ b/plugins/FeedReader/gui/FeedReaderUserNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderUserNotify.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "FeedReaderUserNotify.h" #include "FeedReaderNotify.h" diff --git a/plugins/FeedReader/gui/FeedReaderUserNotify.h b/plugins/FeedReader/gui/FeedReaderUserNotify.h index 01702e801..aedffb282 100644 --- a/plugins/FeedReader/gui/FeedReaderUserNotify.h +++ b/plugins/FeedReader/gui/FeedReaderUserNotify.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/FeedReaderUserNotify.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef FEEDREADERUSERNOTIFY_H #define FEEDREADERUSERNOTIFY_H diff --git a/plugins/FeedReader/gui/PreviewFeedDialog.cpp b/plugins/FeedReader/gui/PreviewFeedDialog.cpp index 916aed82c..e1596f747 100644 --- a/plugins/FeedReader/gui/PreviewFeedDialog.cpp +++ b/plugins/FeedReader/gui/PreviewFeedDialog.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/PreviewFeedDialog.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ //#include #include diff --git a/plugins/FeedReader/gui/PreviewFeedDialog.h b/plugins/FeedReader/gui/PreviewFeedDialog.h index cc9cc7cca..a2a580c85 100644 --- a/plugins/FeedReader/gui/PreviewFeedDialog.h +++ b/plugins/FeedReader/gui/PreviewFeedDialog.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/gui/PreviewFeedDialog.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef PREVIEWFEEDDIALOG_H #define PREVIEWFEEDDIALOG_H diff --git a/plugins/FeedReader/services/p3FeedReader.cc b/plugins/FeedReader/services/p3FeedReader.cc index b964e0a74..3c530264f 100644 --- a/plugins/FeedReader/services/p3FeedReader.cc +++ b/plugins/FeedReader/services/p3FeedReader.cc @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/p3FeedReader.cc * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "rsFeedReaderItems.h" #include "p3FeedReader.h" diff --git a/plugins/FeedReader/services/p3FeedReader.h b/plugins/FeedReader/services/p3FeedReader.h index 7803edf8c..2c727c723 100644 --- a/plugins/FeedReader/services/p3FeedReader.h +++ b/plugins/FeedReader/services/p3FeedReader.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/p3FeedReader.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef P3_FEEDREADER #define P3_FEEDREADER diff --git a/plugins/FeedReader/services/p3FeedReaderThread.cc b/plugins/FeedReader/services/p3FeedReaderThread.cc index b8db8db46..873ba8d22 100644 --- a/plugins/FeedReader/services/p3FeedReaderThread.cc +++ b/plugins/FeedReader/services/p3FeedReaderThread.cc @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/p3FeedReaderThread.cc * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "p3FeedReaderThread.h" #include "rsFeedReaderItems.h" diff --git a/plugins/FeedReader/services/p3FeedReaderThread.h b/plugins/FeedReader/services/p3FeedReaderThread.h index 840e2e8f8..41060f16a 100644 --- a/plugins/FeedReader/services/p3FeedReaderThread.h +++ b/plugins/FeedReader/services/p3FeedReaderThread.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/p3FeedReaderThread.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef P3_FEEDREADERTHREAD #define P3_FEEDREADERTHREAD diff --git a/plugins/FeedReader/services/rsFeedReaderItems.cc b/plugins/FeedReader/services/rsFeedReaderItems.cc index 74ceedb93..538f8ff93 100644 --- a/plugins/FeedReader/services/rsFeedReaderItems.cc +++ b/plugins/FeedReader/services/rsFeedReaderItems.cc @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/rsFeedReaderItems.cc * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "serialiser/rsbaseserial.h" #include "serialiser/rstlvbase.h" diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h index da4e4fa72..25c1be830 100644 --- a/plugins/FeedReader/services/rsFeedReaderItems.h +++ b/plugins/FeedReader/services/rsFeedReaderItems.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/services/rsFeedReaderItems.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef RS_FEEDREADER_ITEMS_H #define RS_FEEDREADER_ITEMS_H diff --git a/plugins/FeedReader/util/CURLWrapper.cpp b/plugins/FeedReader/util/CURLWrapper.cpp index 47c398f9b..4e8c5c9bb 100644 --- a/plugins/FeedReader/util/CURLWrapper.cpp +++ b/plugins/FeedReader/util/CURLWrapper.cpp @@ -1,41 +1,26 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/CURLWrapper.cc * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "CURLWrapper.h" #include -//static int progressCallback (void *clientp, double /*dltotal*/, double /*dlnow*/, double /*ultotal*/, double /*ulnow*/) -//{ -// p3FeedReaderThread *thread = (p3FeedReaderThread*) clientp; - -// if (!thread->isRunning()) { -// /* thread was stopped */ -// return 1; -// } - -// long todo; // show progress in gui - -// return 0; -//} - CURLWrapper::CURLWrapper(const std::string &proxy) { mCurl = curl_easy_init(); diff --git a/plugins/FeedReader/util/CURLWrapper.h b/plugins/FeedReader/util/CURLWrapper.h index 66ac68f53..717a610d7 100644 --- a/plugins/FeedReader/util/CURLWrapper.h +++ b/plugins/FeedReader/util/CURLWrapper.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/CURLWrapper.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef CURLWRAPPER #define CURLWRAPPER diff --git a/plugins/FeedReader/util/HTMLWrapper.cpp b/plugins/FeedReader/util/HTMLWrapper.cpp index 7d02d826c..f7c421506 100644 --- a/plugins/FeedReader/util/HTMLWrapper.cpp +++ b/plugins/FeedReader/util/HTMLWrapper.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/HTMLWrapper.cc * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include diff --git a/plugins/FeedReader/util/HTMLWrapper.h b/plugins/FeedReader/util/HTMLWrapper.h index a19b8313f..622100002 100644 --- a/plugins/FeedReader/util/HTMLWrapper.h +++ b/plugins/FeedReader/util/HTMLWrapper.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/HTMLWrapper.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef HTMLWRAPPER #define HTMLWRAPPER diff --git a/plugins/FeedReader/util/XMLWrapper.cpp b/plugins/FeedReader/util/XMLWrapper.cpp index c51f60b1a..e0379cf73 100644 --- a/plugins/FeedReader/util/XMLWrapper.cpp +++ b/plugins/FeedReader/util/XMLWrapper.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/XMLWrapper.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/plugins/FeedReader/util/XMLWrapper.h b/plugins/FeedReader/util/XMLWrapper.h index ada98274f..209dd654f 100644 --- a/plugins/FeedReader/util/XMLWrapper.h +++ b/plugins/FeedReader/util/XMLWrapper.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/XMLWrapper.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef XMLWRAPPER #define XMLWRAPPER diff --git a/plugins/FeedReader/util/XPathWrapper.cpp b/plugins/FeedReader/util/XPathWrapper.cpp index 33512bed4..362946e30 100644 --- a/plugins/FeedReader/util/XPathWrapper.cpp +++ b/plugins/FeedReader/util/XPathWrapper.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/XPathWrapper.cpp * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "XPathWrapper.h" #include "XMLWrapper.h" diff --git a/plugins/FeedReader/util/XPathWrapper.h b/plugins/FeedReader/util/XPathWrapper.h index fd40fcd37..fa2c0761f 100644 --- a/plugins/FeedReader/util/XPathWrapper.h +++ b/plugins/FeedReader/util/XPathWrapper.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare GUI is distributed under the following license: - * - * Copyright (C) 2012 by Thunder - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/FeedReader/util/XPathWrapper.h * + * * + * Copyright (C) 2012 by Thunder * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef XPATHWRAPPER #define XPATHWRAPPER diff --git a/plugins/plugins.pro b/plugins/plugins.pro index 4db3505c2..209b82898 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -1,3 +1,21 @@ +################################################################################ +# plugins.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + TEMPLATE = subdirs SUBDIRS += \ From 53ec7467d5bfd01eabffc23f3d84ab842615ea0b Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 16:19:17 +0100 Subject: [PATCH 10/26] fixed licenses in VOIP. Permission pending for some files --- build_scripts/Debian/debian_release_howto.txt | 6 +- plugins/VOIP/VOIP.pro | 18 ++++++ plugins/VOIP/VOIPPlugin.cpp | 40 ++++++------ plugins/VOIP/gui/QVideoDevice.cpp | 20 ++++++ plugins/VOIP/gui/QVideoDevice.h | 22 ++++++- plugins/VOIP/gui/SpeexProcessor.cpp | 20 ++++++ plugins/VOIP/gui/SpeexProcessor.h | 24 +++++-- plugins/VOIP/gui/VOIPChatWidgetHolder.cpp | 40 ++++++------ plugins/VOIP/gui/VOIPChatWidgetHolder.h | 39 ++++++----- plugins/VOIP/gui/VOIPGUIHandler.cpp | 40 ++++++------ plugins/VOIP/gui/VOIPGUIHandler.h | 39 ++++++----- plugins/VOIP/gui/VOIPNotify.cpp | 39 ++++++----- plugins/VOIP/gui/VOIPNotify.h | 39 ++++++----- plugins/VOIP/gui/VOIPToasterItem.cpp | 39 ++++++----- plugins/VOIP/gui/VOIPToasterItem.h | 39 ++++++----- plugins/VOIP/gui/VOIPToasterNotify.cpp | 39 ++++++----- plugins/VOIP/gui/VOIPToasterNotify.h | 40 ++++++------ plugins/VOIP/gui/VideoProcessor.cpp | 20 ++++++ plugins/VOIP/gui/VideoProcessor.h | 20 ++++++ plugins/VOIP/gui/audiodevicehelper.cpp | 20 ++++++ plugins/VOIP/gui/audiodevicehelper.h | 20 ++++++ plugins/VOIP/services/p3VOIP.cc | 39 ++++++----- plugins/VOIP/services/p3VOIP.h | 39 ++++++----- plugins/VOIP/services/rsVOIPItems.cc | 39 ++++++----- plugins/VOIP/services/rsVOIPItems.h | 64 ++++++------------- 25 files changed, 471 insertions(+), 333 deletions(-) diff --git a/build_scripts/Debian/debian_release_howto.txt b/build_scripts/Debian/debian_release_howto.txt index f9c981f76..9ca411595 100644 --- a/build_scripts/Debian/debian_release_howto.txt +++ b/build_scripts/Debian/debian_release_howto.txt @@ -91,8 +91,10 @@ Licensing issues: pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | will be deleted when creating debian package plugins/feedreader | GPLv2 | A| Thunder | plugins/VOIP | | | | - AudioInputConfig.h+ | All right reserved | | Thorvald Natvig | Code can be modified/re-used. Mumble's code. - SpeezProcessor.h | | | Peter Zotov | + AudioInputConfig.h+ | All right reserved | | Thorvald Natvig | Code can be modified/re-used. Mumble's code. Asked permission to re-license on 04/11/2018. + AudioStats.h+ | All right reserved | | Thorvald Natvig | + AudioWizard.h+ | All right reserved | | Thorvald Natvig | + SpeexProcessor.h | | | Peter Zotov | retroshare-android-notify-* | GPLv3 | | G10H4ck | retroshare-android-service | GPLv3 | | G10H4ck | retroshare-gui/src | | | Thunder, csoler, drbob, crypton | diff --git a/plugins/VOIP/VOIP.pro b/plugins/VOIP/VOIP.pro index a1102b78e..187ecbd98 100644 --- a/plugins/VOIP/VOIP.pro +++ b/plugins/VOIP/VOIP.pro @@ -1,3 +1,21 @@ +################################################################################ +# VOIP.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") greaterThan(QT_MAJOR_VERSION, 4) { diff --git a/plugins/VOIP/VOIPPlugin.cpp b/plugins/VOIP/VOIPPlugin.cpp index eacb1460c..1f5a31b2e 100644 --- a/plugins/VOIP/VOIPPlugin.cpp +++ b/plugins/VOIP/VOIPPlugin.cpp @@ -1,23 +1,23 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/VOIPPlugin.cpp * + * * + * Copyright 2011 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #include diff --git a/plugins/VOIP/gui/QVideoDevice.cpp b/plugins/VOIP/gui/QVideoDevice.cpp index 5e6b66fce..c6db0f4f9 100644 --- a/plugins/VOIP/gui/QVideoDevice.cpp +++ b/plugins/VOIP/gui/QVideoDevice.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/QVideoDevice.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include diff --git a/plugins/VOIP/gui/QVideoDevice.h b/plugins/VOIP/gui/QVideoDevice.h index f1f4659ba..e0c21778e 100644 --- a/plugins/VOIP/gui/QVideoDevice.h +++ b/plugins/VOIP/gui/QVideoDevice.h @@ -1,4 +1,24 @@ -#pragma once +/******************************************************************************* + * plugins/VOIP/gui/QVideoDevice.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + +#pragma once #include #include "interface/rsVOIP.h" diff --git a/plugins/VOIP/gui/SpeexProcessor.cpp b/plugins/VOIP/gui/SpeexProcessor.cpp index 1ff7bab17..f752b9a94 100644 --- a/plugins/VOIP/gui/SpeexProcessor.cpp +++ b/plugins/VOIP/gui/SpeexProcessor.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/QVideoDevice.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include "SpeexProcessor.h" #include diff --git a/plugins/VOIP/gui/SpeexProcessor.h b/plugins/VOIP/gui/SpeexProcessor.h index 7dd2aecce..1dc37e100 100644 --- a/plugins/VOIP/gui/SpeexProcessor.h +++ b/plugins/VOIP/gui/SpeexProcessor.h @@ -1,7 +1,23 @@ -/* - * QtSpeex - Speex bindings for Qt - * Copyright (C) 2010 Peter Zotov - */ +/******************************************************************************* + * plugins/VOIP/gui/QVideoDevice.h * + * * + * Copyright (C) 2010 Peter Zotov * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp index 603d2472c..c56d3ecd8 100644 --- a/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp +++ b/plugins/VOIP/gui/VOIPChatWidgetHolder.cpp @@ -1,23 +1,23 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPChatWidgetHolder.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + //C++ #include //Qt diff --git a/plugins/VOIP/gui/VOIPChatWidgetHolder.h b/plugins/VOIP/gui/VOIPChatWidgetHolder.h index 666b9c2ab..d1ae384c1 100644 --- a/plugins/VOIP/gui/VOIPChatWidgetHolder.h +++ b/plugins/VOIP/gui/VOIPChatWidgetHolder.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPChatWidgetHolder.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once //Qt diff --git a/plugins/VOIP/gui/VOIPGUIHandler.cpp b/plugins/VOIP/gui/VOIPGUIHandler.cpp index f999ed437..3df80762b 100644 --- a/plugins/VOIP/gui/VOIPGUIHandler.cpp +++ b/plugins/VOIP/gui/VOIPGUIHandler.cpp @@ -1,23 +1,23 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPGUIHandler.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #include diff --git a/plugins/VOIP/gui/VOIPGUIHandler.h b/plugins/VOIP/gui/VOIPGUIHandler.h index bacd17451..7a0986437 100644 --- a/plugins/VOIP/gui/VOIPGUIHandler.h +++ b/plugins/VOIP/gui/VOIPGUIHandler.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPGUIHandler.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ // This class receives async-ed signals from the plugin notifier, // and executes GUI requests. diff --git a/plugins/VOIP/gui/VOIPNotify.cpp b/plugins/VOIP/gui/VOIPNotify.cpp index f2def5ee6..c80742cb5 100644 --- a/plugins/VOIP/gui/VOIPNotify.cpp +++ b/plugins/VOIP/gui/VOIPNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPNotify.cpp * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "VOIPNotify.h" diff --git a/plugins/VOIP/gui/VOIPNotify.h b/plugins/VOIP/gui/VOIPNotify.h index 31353f8fc..ff177a698 100644 --- a/plugins/VOIP/gui/VOIPNotify.h +++ b/plugins/VOIP/gui/VOIPNotify.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPNotify.h * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ // This class is a Qt object to get notification from the plugin's service threads, // and responsible to pass the info the the GUI part. diff --git a/plugins/VOIP/gui/VOIPToasterItem.cpp b/plugins/VOIP/gui/VOIPToasterItem.cpp index f1791a9c6..c250f67c3 100644 --- a/plugins/VOIP/gui/VOIPToasterItem.cpp +++ b/plugins/VOIP/gui/VOIPToasterItem.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPToasterItem.cpp * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ /*VOIP*/ #include "VOIPToasterItem.h" diff --git a/plugins/VOIP/gui/VOIPToasterItem.h b/plugins/VOIP/gui/VOIPToasterItem.h index e796db4e5..9eeef9da9 100644 --- a/plugins/VOIP/gui/VOIPToasterItem.h +++ b/plugins/VOIP/gui/VOIPToasterItem.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPToasterItem.h * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/plugins/VOIP/gui/VOIPToasterNotify.cpp b/plugins/VOIP/gui/VOIPToasterNotify.cpp index eff862467..2f9cf99ef 100644 --- a/plugins/VOIP/gui/VOIPToasterNotify.cpp +++ b/plugins/VOIP/gui/VOIPToasterNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/gui/VOIPToasterNotify.cpp * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ /*VOIP*/ #include "gui/VOIPToasterNotify.h" diff --git a/plugins/VOIP/gui/VOIPToasterNotify.h b/plugins/VOIP/gui/VOIPToasterNotify.h index 035589533..3125e90f6 100644 --- a/plugins/VOIP/gui/VOIPToasterNotify.h +++ b/plugins/VOIP/gui/VOIPToasterNotify.h @@ -1,24 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * plugins/VOIP/gui/VOIPToasterNotify.h * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/plugins/VOIP/gui/VideoProcessor.cpp b/plugins/VOIP/gui/VideoProcessor.cpp index e781dcc1f..fa8437008 100644 --- a/plugins/VOIP/gui/VideoProcessor.cpp +++ b/plugins/VOIP/gui/VideoProcessor.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/VideoProcessor.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #ifdef __MACH__ diff --git a/plugins/VOIP/gui/VideoProcessor.h b/plugins/VOIP/gui/VideoProcessor.h index 4946c4342..385a6ffa9 100644 --- a/plugins/VOIP/gui/VideoProcessor.h +++ b/plugins/VOIP/gui/VideoProcessor.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/VideoProcessor.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/plugins/VOIP/gui/audiodevicehelper.cpp b/plugins/VOIP/gui/audiodevicehelper.cpp index a54dffa5f..c321215c9 100644 --- a/plugins/VOIP/gui/audiodevicehelper.cpp +++ b/plugins/VOIP/gui/audiodevicehelper.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/audiodevicehelper.cpp * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include "audiodevicehelper.h" #include diff --git a/plugins/VOIP/gui/audiodevicehelper.h b/plugins/VOIP/gui/audiodevicehelper.h index 77018ae02..96ce86f0b 100644 --- a/plugins/VOIP/gui/audiodevicehelper.h +++ b/plugins/VOIP/gui/audiodevicehelper.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * plugins/VOIP/gui/audiodevicehelper.h * + * * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/plugins/VOIP/services/p3VOIP.cc b/plugins/VOIP/services/p3VOIP.cc index 4921fe0cc..fdff60912 100644 --- a/plugins/VOIP/services/p3VOIP.cc +++ b/plugins/VOIP/services/p3VOIP.cc @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/services/p3VOIP.cc * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "util/rsdir.h" #include "retroshare/rsiface.h" diff --git a/plugins/VOIP/services/p3VOIP.h b/plugins/VOIP/services/p3VOIP.h index 4be04af12..8aaa2e2c2 100644 --- a/plugins/VOIP/services/p3VOIP.h +++ b/plugins/VOIP/services/p3VOIP.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/services/p3VOIP.h * + * * + * Copyright (C) 2015 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/plugins/VOIP/services/rsVOIPItems.cc b/plugins/VOIP/services/rsVOIPItems.cc index cf4aefed7..745e938a0 100644 --- a/plugins/VOIP/services/rsVOIPItems.cc +++ b/plugins/VOIP/services/rsVOIPItems.cc @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/services/rsVOIPItem.cc * + * * + * Copyright 2011 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include "serialiser/rstypeserializer.h" diff --git a/plugins/VOIP/services/rsVOIPItems.h b/plugins/VOIP/services/rsVOIPItems.h index 222412853..af956a4f3 100644 --- a/plugins/VOIP/services/rsVOIPItems.h +++ b/plugins/VOIP/services/rsVOIPItems.h @@ -1,51 +1,25 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/services/rsVOIPItem.h * + * * + * Copyright 2011 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once -/* - * libretroshare/src/serialiser: rsVOIPItems.h - * - * RetroShare Serialiser. - * - * Copyright 2011 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include "rsitems/rsserviceids.h" From 15b3c481491ee39c44b27f25cabc7dcaccb243af Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 20:38:39 +0100 Subject: [PATCH 11/26] finished licenses in VOIP. Files re-licensed with authorization --- plugins/FeedReader/FeedReader.pro | 3 - plugins/VOIP/gui/AudioInputConfig.cpp | 75 ++++++------------ plugins/VOIP/gui/AudioInputConfig.h | 51 +++++------- plugins/VOIP/gui/AudioStats.cpp | 50 +++++------- plugins/VOIP/gui/AudioStats.h | 51 +++++------- plugins/VOIP/gui/AudioWizard.cpp | 110 +++++--------------------- plugins/VOIP/gui/AudioWizard.h | 49 +++++------- 7 files changed, 125 insertions(+), 264 deletions(-) diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro index 238a63310..6399c657e 100644 --- a/plugins/FeedReader/FeedReader.pro +++ b/plugins/FeedReader/FeedReader.pro @@ -16,9 +16,6 @@ # along with this program. If not, see . # ################################################################################ -TEMPLATE = subdirs - -SUBDIRS += \ !include("../Common/retroshare_plugin.pri"): error("Could not include file ../Common/retroshare_plugin.pri") CONFIG += qt uic qrc resources diff --git a/plugins/VOIP/gui/AudioInputConfig.cpp b/plugins/VOIP/gui/AudioInputConfig.cpp index b2add04e6..b063d5e48 100644 --- a/plugins/VOIP/gui/AudioInputConfig.cpp +++ b/plugins/VOIP/gui/AudioInputConfig.cpp @@ -1,34 +1,25 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - Copyright (C) 2008, Andreas Messer - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - +/******************************************************************************* + * plugins/VOIP/gui/AudioInputConfig.h * + * * + * Copyright (C) 2008, Andreas Messer * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ +#pragma once #include "AudioStats.h" #include "AudioInputConfig.h" @@ -42,14 +33,6 @@ #define iroundf(x) ( static_cast(x) ) -/*void AudioInputDialog::hideEvent(QHideEvent *) { - qtTick->stop(); -} - -void AudioInputDialog::showEvent(QShowEvent *) { - qtTick->start(20); -}*/ - class voipGraphSource: public RSGraphSource { public: @@ -289,20 +272,6 @@ bool AudioInputConfig::save(QString &/*errmsg*/) {//mainly useless beacause savi return true; } -/*bool AudioInputDialog::expert(bool b) { - qgbInterfaces->setVisible(b); - qgbAudio->setVisible(b); - qliFrames->setVisible(b); - qsFrames->setVisible(b); - qlFrames->setVisible(b); - qswTransmit->setVisible(b); - qliIdle->setVisible(b); - qsIdle->setVisible(b); - qlIdle->setVisible(b); - return true; -}*/ - - void AudioInputConfig::on_qsTransmitHold_valueChanged(int v) { float val = static_cast(v * FRAME_SIZE); val = val / SAMPLING_RATE; diff --git a/plugins/VOIP/gui/AudioInputConfig.h b/plugins/VOIP/gui/AudioInputConfig.h index ef53c28e9..3dd2cecae 100644 --- a/plugins/VOIP/gui/AudioInputConfig.h +++ b/plugins/VOIP/gui/AudioInputConfig.h @@ -1,33 +1,24 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - +/******************************************************************************* + * plugins/VOIP/gui/AudioInputConfig.h * + * * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ +#pragma once #pragma once #include diff --git a/plugins/VOIP/gui/AudioStats.cpp b/plugins/VOIP/gui/AudioStats.cpp index 93435127e..536cf0a1d 100644 --- a/plugins/VOIP/gui/AudioStats.cpp +++ b/plugins/VOIP/gui/AudioStats.cpp @@ -1,32 +1,24 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ +/******************************************************************************* + * plugins/VOIP/gui/AudioStats.cpp * + * * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ +#include #define iroundf(x) ( static_cast(x) ) diff --git a/plugins/VOIP/gui/AudioStats.h b/plugins/VOIP/gui/AudioStats.h index 2e3a6cc25..c515a9950 100644 --- a/plugins/VOIP/gui/AudioStats.h +++ b/plugins/VOIP/gui/AudioStats.h @@ -1,35 +1,26 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - +/******************************************************************************* + * plugins/VOIP/gui/AudioStats.h * + * * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once +#include #include //#include "mumble_pch.hpp" diff --git a/plugins/VOIP/gui/AudioWizard.cpp b/plugins/VOIP/gui/AudioWizard.cpp index c2e6a5a55..cbf24d9b4 100644 --- a/plugins/VOIP/gui/AudioWizard.cpp +++ b/plugins/VOIP/gui/AudioWizard.cpp @@ -1,41 +1,26 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - +/******************************************************************************* + * plugins/VOIP/gui/AudioWizard.cpp * + * * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include "AudioWizard.h" -//#include "AudioInput.h" -//#include "Global.h" -//#include "Settings.h" -//#include "Log.h" -//#include "MainWindow.h" #include "audiodevicehelper.h" #include "interface/rsVOIP.h" @@ -131,23 +116,6 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) { connect( ticker, SIGNAL( timeout ( ) ), this, SLOT( on_Ticker_timeout() ) ); } -/*bool AudioWizard::eventFilter(QObject *obj, QEvent *evt) { - if ((evt->type() == QEvent::MouseButtonPress) || - (evt->type() == QEvent::MouseMove)) { - QMouseEvent *qme = dynamic_cast(evt); - if (qme) { - if (qme->buttons() & Qt::LeftButton) { - QPointF qpf = qgvView->mapToScene(qme->pos()); - fX = static_cast(qpf.x()); - fY = static_cast(qpf.y()); - } - } - } - return QWizard::eventFilter(obj, evt); -}*/ - - - void AudioWizard::on_qsMaxAmp_valueChanged(int v) { rsVOIP->setVoipiMinLoudness(qMin(v, 30000)); } @@ -267,44 +235,6 @@ void AudioWizard::on_qrContinuous_clicked(bool on) { } } -/*void AudioWizard::on_skwPTT_keySet(bool valid, bool last) { - if (valid) - qrPTT->setChecked(true); - else if (qrPTT->isChecked()) - qrAmplitude->setChecked(true); - updateTriggerWidgets(valid); - bTransmitChanged = true; - - if (last) { - - const QList &buttons = skwPTT->getShortcut(); - QList ql; - bool found = false; - foreach(Shortcut s, g.s.qlShortcuts) { - if (s.iIndex == g.mw->gsPushTalk->idx) { - if (buttons.isEmpty()) - continue; - else if (! found) { - s.qlButtons = buttons; - found = true; - } - } - ql << s; - } - if (! found && ! buttons.isEmpty()) { - Shortcut s; - s.iIndex = g.mw->gsPushTalk->idx; - s.bSuppress = false; - s.qlButtons = buttons; - ql << s; - } - g.s.qlShortcuts = ql; - GlobalShortcutEngine::engine->bNeedRemap = true; - GlobalShortcutEngine::engine->needRemap(); - } -}*/ - - void AudioWizard::updateTriggerWidgets(bool vad_on) { if (!vad_on) qwVAD->hide(); diff --git a/plugins/VOIP/gui/AudioWizard.h b/plugins/VOIP/gui/AudioWizard.h index acd1f9ada..c8869d7e8 100644 --- a/plugins/VOIP/gui/AudioWizard.h +++ b/plugins/VOIP/gui/AudioWizard.h @@ -1,32 +1,23 @@ -/* Copyright (C) 2005-2010, Thorvald Natvig - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Mumble Developers nor the names of its - contributors may be used to endorse or promote products derived from this - software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ +/******************************************************************************* + * plugins/VOIP/gui/AudioWizard.h * + * * + * Copyright (C) 2005-2010 Thorvald Natvig * + * Copyright (C) 2012 by Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once From c80022f9c6ba38e0cc4f8aa655c9aedd77527f5e Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 4 Nov 2018 21:17:22 +0100 Subject: [PATCH 12/26] fixed licenses in tests/ --- .../libretroshare/crypto/chacha20_test.cc | 20 +++ .../libretroshare/gxs/common/data_support.cc | 20 +++ .../libretroshare/gxs/common/data_support.h | 20 +++ .../gxs/data_service/rsdataservice_test.cc | 20 +++ .../gxs/data_service/rsdataservice_test.h | 20 +++ .../gxs/data_service/rsgxsdata_test.cc | 131 ++++++++++-------- .../gxs/gen_exchange/genexchangetester.cc | 20 +++ .../gxs/gen_exchange/genexchangetester.h | 20 +++ .../gen_exchange/genexchangetestservice.cc | 20 +++ .../gxs/gen_exchange/genexchangetestservice.h | 20 +++ .../gxs/gen_exchange/gxspublishgrouptest.cc | 25 +++- .../gxs/gen_exchange/gxspublishgrouptest.h | 25 +++- .../gxs/gen_exchange/gxspublishmsgtest.cc | 25 +++- .../gxs/gen_exchange/gxspublishmsgtest.h | 25 +++- .../gxs/gen_exchange/gxsteststats.cpp | 20 +++ .../gxs/gen_exchange/gxsteststats.h | 20 +++ .../gxs/gen_exchange/rsdummyservices.cc | 20 ++- .../gxs/gen_exchange/rsdummyservices.h | 20 +++ .../gxs/gen_exchange/rsgenexchange_test.cc | 20 +++ .../gxs/nxs_test/nxsdummyservices.cc | 26 +++- .../gxs/nxs_test/nxsdummyservices.h | 25 +++- .../gxs/nxs_test/nxsgrpsync_test.cc | 25 +++- .../gxs/nxs_test/nxsgrpsync_test.h | 25 +++- .../gxs/nxs_test/nxsgrpsyncdelayed.cc | 25 +++- .../gxs/nxs_test/nxsgrpsyncdelayed.h | 25 +++- .../gxs/nxs_test/nxsgrptestscenario.cc | 25 +++- .../gxs/nxs_test/nxsgrptestscenario.h | 25 +++- .../gxs/nxs_test/nxsmsgsync_test.cc | 27 ++-- .../gxs/nxs_test/nxsmsgsync_test.h | 25 +++- .../gxs/nxs_test/nxsmsgtestscenario.cc | 25 +++- .../gxs/nxs_test/nxsmsgtestscenario.h | 25 +++- .../libretroshare/gxs/nxs_test/nxstesthub.cc | 20 +++ .../libretroshare/gxs/nxs_test/nxstesthub.h | 20 +++ .../gxs/nxs_test/rsgxsnetservice_test.cc | 25 +++- .../gxs/security/gxssecurity_test.cc | 46 +++--- .../serialiser/rsbaseitem_test.cc | 50 +++---- .../serialiser/rsgxsiditem_test.cc | 46 +++--- .../serialiser/rsgxsupdateitem_test.cc | 25 +++- .../serialiser/rsmsgitem_test.cc | 43 +++--- .../serialiser/rsnxsitems_test.cc | 19 +++ .../serialiser/rsstatusitem_test.cc | 44 +++--- .../libretroshare/serialiser/rstlvutil.cc | 51 +++---- .../libretroshare/serialiser/rstlvutil.h | 44 +++--- .../serialiser/rsturtleitem_test.cc | 46 +++--- .../libretroshare/serialiser/support.cc | 43 +++--- .../libretroshare/serialiser/support.h | 46 +++--- .../libretroshare/serialiser/tlvbase_test.cc | 44 +++--- .../libretroshare/serialiser/tlvbase_test2.cc | 51 +++---- .../libretroshare/serialiser/tlvitems_test.cc | 49 +++---- .../libretroshare/serialiser/tlvkey_test.cc | 20 +++ .../serialiser/tlvrandom_test.cc | 44 +++--- .../libretroshare/serialiser/tlvstack_test.cc | 50 +++---- .../libretroshare/serialiser/tlvtypes_test.cc | 44 +++--- .../services/gxs/FakePgpAuxUtils.cc | 43 +++--- .../services/gxs/FakePgpAuxUtils.h | 43 +++--- .../services/gxs/GxsIsolatedServiceTester.cc | 19 +++ .../services/gxs/GxsIsolatedServiceTester.h | 20 +++ .../services/gxs/GxsPairServiceTester.cc | 19 +++ .../services/gxs/GxsPairServiceTester.h | 19 +++ .../libretroshare/services/gxs/GxsPeerNode.cc | 20 +++ .../libretroshare/services/gxs/GxsPeerNode.h | 19 +++ .../services/gxs/gxstestservice.cc | 43 +++--- .../services/gxs/gxstestservice.h | 43 +++--- .../services/gxs/nxsbasic_test.cc | 26 +++- .../services/gxs/nxspair_tests.cc | 19 +++ .../services/gxs/rsgxstestitems.cc | 43 +++--- .../services/gxs/rsgxstestitems.h | 43 +++--- .../services/status/status_test.cc | 20 +++ tests/unittests/unittests.cc | 20 +++ tests/unittests/unittests.pro | 18 +++ 70 files changed, 1408 insertions(+), 753 deletions(-) diff --git a/tests/unittests/libretroshare/crypto/chacha20_test.cc b/tests/unittests/libretroshare/crypto/chacha20_test.cc index 8cd203cb3..4fad352e9 100644 --- a/tests/unittests/libretroshare/crypto/chacha20_test.cc +++ b/tests/unittests/libretroshare/crypto/chacha20_test.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/crypto/chacha20_test.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include // from libretroshare diff --git a/tests/unittests/libretroshare/gxs/common/data_support.cc b/tests/unittests/libretroshare/gxs/common/data_support.cc index ce716c62a..bad481de9 100644 --- a/tests/unittests/libretroshare/gxs/common/data_support.cc +++ b/tests/unittests/libretroshare/gxs/common/data_support.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/common/data_support.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include "libretroshare/serialiser/support.h" #include "data_support.h" diff --git a/tests/unittests/libretroshare/gxs/common/data_support.h b/tests/unittests/libretroshare/gxs/common/data_support.h index 674703488..44c285907 100644 --- a/tests/unittests/libretroshare/gxs/common/data_support.h +++ b/tests/unittests/libretroshare/gxs/common/data_support.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/common/data_support.h * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #pragma once #include "rsitems/rsnxsitems.h" diff --git a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc index d5da291a4..c33a336d4 100644 --- a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc +++ b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/data_service/rsdataservice_test.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include diff --git a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h index 13084de2f..b77c7123e 100644 --- a/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h +++ b/tests/unittests/libretroshare/gxs/data_service/rsdataservice_test.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/data_service/rsdataservice_test.h * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef RSDATASERVICE_TEST_H #define RSDATASERVICE_TEST_H diff --git a/tests/unittests/libretroshare/gxs/data_service/rsgxsdata_test.cc b/tests/unittests/libretroshare/gxs/data_service/rsgxsdata_test.cc index a74dbb280..1445c5221 100644 --- a/tests/unittests/libretroshare/gxs/data_service/rsgxsdata_test.cc +++ b/tests/unittests/libretroshare/gxs/data_service/rsgxsdata_test.cc @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/data_service/rsgxsdata_test.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include @@ -5,50 +24,50 @@ #include "libretroshare/gxs/common/data_support.h" #include "gxs/rsgxsdata.h" -#include - -std::string testEqual(const RsGxsGrpMetaData& d1,const RsGxsGrpMetaData& d2) +#include + +std::string testEqual(const RsGxsGrpMetaData& d1,const RsGxsGrpMetaData& d2) { - std::ostringstream out; - if(d1.mGroupId != d2.mGroupId ) { out << "mGroupId" << ": " << d1.mGroupId.toStdString() << "!=" << d2.mGroupId.toStdString() ; return out.str();} - if(d1.mOrigGrpId != d2.mOrigGrpId ) { out << "mOrigGrpId" << ": " << d1.mOrigGrpId.toStdString() << "!=" << d2.mOrigGrpId.toStdString() ; return out.str();} - if(d1.mAuthorId != d2.mAuthorId ) { out << "mAuthorId" << ": " << d1.mAuthorId.toStdString() << "!=" << d2.mAuthorId.toStdString() ; return out.str();} - if(d1.mCircleId != d2.mCircleId ) { out << "mCircleId" << ": " << d1.mCircleId.toStdString() << "!=" << d2.mCircleId.toStdString() ; return out.str();} - if(d1.mParentGrpId != d2.mParentGrpId ) { out << "mParentGrpId" << ": " << d1.mParentGrpId.toStdString() << "!=" << d2.mParentGrpId.toStdString() ; return out.str();} - if(d1.mGroupName != d2.mGroupName ) { out << "mGroupName" << ": " << d1.mGroupName << "!=" << d2.mGroupName ; return out.str();} - if(d1.mGroupFlags != d2.mGroupFlags ) { out << "mGroupFlags" << ": " << d1.mGroupFlags << "!=" << d2.mGroupFlags ; return out.str();} - if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << "!=" << d2.mPublishTs ; return out.str();} - if(d1.mSignFlags != d2.mSignFlags ) { out << "mSignFlags" << ": " << d1.mSignFlags << "!=" << d2.mSignFlags ; return out.str();} - if(d1.mCircleType != d2.mCircleType ) { out << "mCircleType" << ": " << d1.mCircleType << "!=" << d2.mCircleType ; return out.str();} - if(d1.mServiceString!= d2.mServiceString ) { out << "mServiceString" << ": " << d1.mServiceString << "!=" << d2.mServiceString ; return out.str();} - if(d1.mAuthenFlags != d2.mAuthenFlags ) { out << "mAuthenFlags" << ": " << d1.mAuthenFlags << "!=" << d2.mAuthenFlags ; return out.str();} - - // if(d1.signSet != d2.signSet ) { out << "signSet" << ": " << d1.signSet << "!=" << d2.signSet ; return out.str();} - // if(d1.keys != d2.keys ) { out << "keys" << ": " << d1.keys << "!=" << d2.keys ; return out.str();} - - return "" ; + std::ostringstream out; + if(d1.mGroupId != d2.mGroupId ) { out << "mGroupId" << ": " << d1.mGroupId.toStdString() << "!=" << d2.mGroupId.toStdString() ; return out.str();} + if(d1.mOrigGrpId != d2.mOrigGrpId ) { out << "mOrigGrpId" << ": " << d1.mOrigGrpId.toStdString() << "!=" << d2.mOrigGrpId.toStdString() ; return out.str();} + if(d1.mAuthorId != d2.mAuthorId ) { out << "mAuthorId" << ": " << d1.mAuthorId.toStdString() << "!=" << d2.mAuthorId.toStdString() ; return out.str();} + if(d1.mCircleId != d2.mCircleId ) { out << "mCircleId" << ": " << d1.mCircleId.toStdString() << "!=" << d2.mCircleId.toStdString() ; return out.str();} + if(d1.mParentGrpId != d2.mParentGrpId ) { out << "mParentGrpId" << ": " << d1.mParentGrpId.toStdString() << "!=" << d2.mParentGrpId.toStdString() ; return out.str();} + if(d1.mGroupName != d2.mGroupName ) { out << "mGroupName" << ": " << d1.mGroupName << "!=" << d2.mGroupName ; return out.str();} + if(d1.mGroupFlags != d2.mGroupFlags ) { out << "mGroupFlags" << ": " << d1.mGroupFlags << "!=" << d2.mGroupFlags ; return out.str();} + if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << "!=" << d2.mPublishTs ; return out.str();} + if(d1.mSignFlags != d2.mSignFlags ) { out << "mSignFlags" << ": " << d1.mSignFlags << "!=" << d2.mSignFlags ; return out.str();} + if(d1.mCircleType != d2.mCircleType ) { out << "mCircleType" << ": " << d1.mCircleType << "!=" << d2.mCircleType ; return out.str();} + if(d1.mServiceString!= d2.mServiceString ) { out << "mServiceString" << ": " << d1.mServiceString << "!=" << d2.mServiceString ; return out.str();} + if(d1.mAuthenFlags != d2.mAuthenFlags ) { out << "mAuthenFlags" << ": " << d1.mAuthenFlags << "!=" << d2.mAuthenFlags ; return out.str();} + + // if(d1.signSet != d2.signSet ) { out << "signSet" << ": " << d1.signSet << "!=" << d2.signSet ; return out.str();} + // if(d1.keys != d2.keys ) { out << "keys" << ": " << d1.keys << "!=" << d2.keys ; return out.str();} + + return "" ; } - -std::string testEqual(const RsGxsMsgMetaData& d1,const RsGxsMsgMetaData& d2) + +std::string testEqual(const RsGxsMsgMetaData& d1,const RsGxsMsgMetaData& d2) { - std::ostringstream out; - if(d1.mGroupId != d2.mGroupId ) { out << "mGroupId" << ": " << d1.mGroupId.toStdString() << " != " << d2.mGroupId.toStdString() ; return out.str();} - if(d1.mOrigMsgId != d2.mOrigMsgId ) { out << "mOrigMsgId" << ": " << d1.mOrigMsgId.toStdString() << " != " << d2.mOrigMsgId.toStdString() ; return out.str();} - if(d1.mAuthorId != d2.mAuthorId ) { out << "mAuthorId" << ": " << d1.mAuthorId.toStdString() << " != " << d2.mAuthorId.toStdString() ; return out.str();} - if(d1.mMsgId != d2.mMsgId ) { out << "mMsgId" << ": " << d1.mMsgId.toStdString() << " != " << d2.mMsgId.toStdString() ; return out.str();} - if(d1.mThreadId != d2.mThreadId ) { out << "mThreadId" << ": " << d1.mThreadId.toStdString() << " != " << d2.mThreadId.toStdString() ; return out.str();} - if(d1.mParentId != d2.mParentId ) { out << "mParentId" << ": " << d1.mParentId.toStdString() << " != " << d2.mParentId.toStdString() ; return out.str();} - if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << " != " << d2.mPublishTs ; return out.str();} - if(d1.mMsgName != d2.mMsgName ) { out << "mMsgName" << ": " << d1.mMsgName << " != " << d2.mMsgName ; return out.str();} - if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << " != " << d2.mPublishTs ; return out.str();} - if(d1.mMsgFlags != d2.mMsgFlags ) { out << "mMsgFlags" << ": " << d1.mMsgFlags << " != " << d2.mMsgFlags ; return out.str();} - - // if(d1.refcount != d2.refcount ) { out << "refcount" << ": " << d1.refcount << " != " << d2.refcount ; return out.str();} //Is Static - // if(d1.signSet != d2.signSet ) { out << "signSet" << ": " << d1.signSet << " != " << d2.signSet ; return out.str();} - - return "" ; + std::ostringstream out; + if(d1.mGroupId != d2.mGroupId ) { out << "mGroupId" << ": " << d1.mGroupId.toStdString() << " != " << d2.mGroupId.toStdString() ; return out.str();} + if(d1.mOrigMsgId != d2.mOrigMsgId ) { out << "mOrigMsgId" << ": " << d1.mOrigMsgId.toStdString() << " != " << d2.mOrigMsgId.toStdString() ; return out.str();} + if(d1.mAuthorId != d2.mAuthorId ) { out << "mAuthorId" << ": " << d1.mAuthorId.toStdString() << " != " << d2.mAuthorId.toStdString() ; return out.str();} + if(d1.mMsgId != d2.mMsgId ) { out << "mMsgId" << ": " << d1.mMsgId.toStdString() << " != " << d2.mMsgId.toStdString() ; return out.str();} + if(d1.mThreadId != d2.mThreadId ) { out << "mThreadId" << ": " << d1.mThreadId.toStdString() << " != " << d2.mThreadId.toStdString() ; return out.str();} + if(d1.mParentId != d2.mParentId ) { out << "mParentId" << ": " << d1.mParentId.toStdString() << " != " << d2.mParentId.toStdString() ; return out.str();} + if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << " != " << d2.mPublishTs ; return out.str();} + if(d1.mMsgName != d2.mMsgName ) { out << "mMsgName" << ": " << d1.mMsgName << " != " << d2.mMsgName ; return out.str();} + if(d1.mPublishTs != d2.mPublishTs ) { out << "mPublishTs" << ": " << d1.mPublishTs << " != " << d2.mPublishTs ; return out.str();} + if(d1.mMsgFlags != d2.mMsgFlags ) { out << "mMsgFlags" << ": " << d1.mMsgFlags << " != " << d2.mMsgFlags ; return out.str();} + + // if(d1.refcount != d2.refcount ) { out << "refcount" << ": " << d1.refcount << " != " << d2.refcount ; return out.str();} //Is Static + // if(d1.signSet != d2.signSet ) { out << "signSet" << ": " << d1.signSet << " != " << d2.signSet ; return out.str();} + + return "" ; } - + TEST(libretroshare_gxs, RsGxsData) { @@ -60,30 +79,30 @@ TEST(libretroshare_gxs, RsGxsData) uint32_t pktsize = grpMeta1.serial_size(RS_GXS_GRP_META_DATA_CURRENT_API_VERSION); char grp_data[pktsize]; - bool grpSerialise_OK = grpMeta1.serialise(grp_data, pktsize, RS_GXS_GRP_META_DATA_CURRENT_API_VERSION); - EXPECT_TRUE(grpSerialise_OK); + bool grpSerialise_OK = grpMeta1.serialise(grp_data, pktsize, RS_GXS_GRP_META_DATA_CURRENT_API_VERSION); + EXPECT_TRUE(grpSerialise_OK); grpMeta2.clear(); - bool grpDeserialise_OK = grpMeta2.deserialise(grp_data, pktsize); - EXPECT_TRUE(grpDeserialise_OK); - - EXPECT_EQ(testEqual(grpMeta1, grpMeta2), ""); - + bool grpDeserialise_OK = grpMeta2.deserialise(grp_data, pktsize); + EXPECT_TRUE(grpDeserialise_OK); - RsGxsMsgMetaData msgMeta1, msgMeta2; - - msgMeta1.clear(); - init_item(&msgMeta1); + EXPECT_EQ(testEqual(grpMeta1, grpMeta2), ""); + + + RsGxsMsgMetaData msgMeta1, msgMeta2; + + msgMeta1.clear(); + init_item(&msgMeta1); pktsize = msgMeta1.serial_size(); char msg_data[pktsize]; - bool msgSerialise_OK = msgMeta1.serialise(msg_data, &pktsize); - EXPECT_TRUE(msgSerialise_OK); + bool msgSerialise_OK = msgMeta1.serialise(msg_data, &pktsize); + EXPECT_TRUE(msgSerialise_OK); msgMeta2.clear(); - bool msgDeserialise_OK = msgMeta2.deserialise(msg_data, &pktsize); - EXPECT_TRUE(msgDeserialise_OK); + bool msgDeserialise_OK = msgMeta2.deserialise(msg_data, &pktsize); + EXPECT_TRUE(msgDeserialise_OK); - EXPECT_EQ(testEqual(msgMeta1, msgMeta2), ""); + EXPECT_EQ(testEqual(msgMeta1, msgMeta2), ""); } diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.cc b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.cc index 9d000d443..76b4bf889 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/genexchangetester.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.h b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.h index b464c730d..c47e27976 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetester.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/genexchangetester.h * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef GENEXCHANGETESTER_H #define GENEXCHANGETESTER_H diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.cc b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.cc index add532fdd..b7308cb03 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include "genexchangetestservice.h" GenExchangeTestService::GenExchangeTestService(RsGeneralDataService *dataServ, RsNetworkExchangeService * netService, RsGixs* gixs) diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.h b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.h index 011ee6973..0cc8d97df 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/genexchangetestservice.h * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef GENEXCHANGETESTSERVICE_H #define GENEXCHANGETESTSERVICE_H diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.cc b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.cc index d62a9ed60..a35d76163 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.cc @@ -1,9 +1,22 @@ -/* - * gxspublishgrouptest.cc - * - * Created on: 27 Apr 2013 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.cc * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "gxspublishgrouptest.h" #include "libretroshare/serialiser/support.h" diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.h b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.h index a0f642828..81ca57bd2 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.h @@ -1,9 +1,22 @@ -/* - * gxspublishgrouptest.h - * - * Created on: 27 Apr 2013 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxspublishgrouptest.h * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef GXSPUBLISHGROUPTEST_H_ #define GXSPUBLISHGROUPTEST_H_ diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.cc b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.cc index 80dc96cb3..a6aeee703 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.cc @@ -1,9 +1,22 @@ -/* - * gxspublishmsgtest.cpp - * - * Created on: 27 Apr 2013 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.cc * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.h b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.h index bcdfa6aeb..d7775b94c 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.h @@ -1,9 +1,22 @@ -/* - * gxspublishmsgtest.h - * - * Created on: 27 Apr 2013 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxspublishmsgtest.h * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef GXSPUBLISHMSGTEST_H_ #define GXSPUBLISHMSGTEST_H_ diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp index 256777c1a..bfa1bfc61 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxsteststats.cpp * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include "gxsteststats.h" #include "libretroshare/serialiser/support.h" diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.h b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.h index 482a3fbc3..a30dd459b 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/gxsteststats.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/gxsteststats.h * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef GXSTESTSTATS_H #define GXSTESTSTATS_H diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.cc b/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.cc index 4d8dd4984..ef629c7c3 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.cc @@ -1,4 +1,22 @@ - +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/rsdummyservices.cc * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "rsdummyservices.h" diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h b/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h index caf404728..a4f09ca1c 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h +++ b/tests/unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/rsdummyservices.h * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef RSDUMMYSERVICES_H #define RSDUMMYSERVICES_H diff --git a/tests/unittests/libretroshare/gxs/gen_exchange/rsgenexchange_test.cc b/tests/unittests/libretroshare/gxs/gen_exchange/rsgenexchange_test.cc index 32ffafe10..902c201a2 100644 --- a/tests/unittests/libretroshare/gxs/gen_exchange/rsgenexchange_test.cc +++ b/tests/unittests/libretroshare/gxs/gen_exchange/rsgenexchange_test.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/gen_exchange/rsgenexchangetest.cc * + * * + * Copyright (C) 2013, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc index d92e48936..c752c67c2 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.cc @@ -1,10 +1,22 @@ -/* - * nxsdummyservices.cc - * - * Created on: 13 Apr 2014 - * Author: crispy - */ - +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsdummyservice.cpp * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsdummyservices.h" diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h index 48eca0074..56da81fcb 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsdummyservices.h @@ -1,9 +1,22 @@ -/* - * nxsdummyservices.h - * - * Created on: 13 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsdummyservice.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSDUMMYSERVICES_H_ #define NXSDUMMYSERVICES_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.cc index b926fe0e4..ca58b67c7 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.cc @@ -1,9 +1,22 @@ -/* - * nxsgrpsync_test.cc - * - * Created on: 13 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsgrpsync_test.h" #include "retroshare/rstypes.h" diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.h index a0916ae08..17c7fbb70 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.h @@ -1,9 +1,22 @@ -/* - * nxsgrpsync_test.h - * - * Created on: 13 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrpsync_test.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSGRPSYNC_TEST_H_ #define NXSGRPSYNC_TEST_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.cc index b9e7dcd28..c44706322 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.cc @@ -1,9 +1,22 @@ -/* - * NxsGrpSyncDelayed.cpp - * - * Created on: 19 May 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsgrpsyncdelayed.h" #include "nxsdummyservices.h" diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.h index 2124d6c7e..1ef4d6cbd 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.h @@ -1,9 +1,22 @@ -/* - * NxsGrpSyncDelayed.h - * - * Created on: 19 May 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrpsyncdelayed.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSGRPSYNCDELAYED_H_ #define NXSGRPSYNCDELAYED_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.cc index 2bb241dd5..e7b55a4cb 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.cc @@ -1,9 +1,22 @@ -/* - * nxsgrptestscenario.cpp - * - * Created on: 23 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsgrptestscenario.h" #include diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.h index 51d5757d3..7704d0114 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.h @@ -1,9 +1,22 @@ -/* - * nxsgrptestscenario.h - * - * Created on: 23 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsgrptestscenario.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSGRPTESTSCENARIO_H_ #define NXSGRPTESTSCENARIO_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc index 88cb4cf34..25b4dad11 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc @@ -1,11 +1,22 @@ -/* - * nxsmsgsync_test.cc - * - * Created on: 13 Apr 2014 - * Author: crispy - */ - - +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsmsgsync_test.h" #include "retroshare/rstypes.h" diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.h index ee1c03711..2a5d54728 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.h @@ -1,9 +1,22 @@ -/* - * nxsmsgsync_test.h - * - * Created on: 13 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSMSGSYNC_TEST_H_ #define NXSMSGSYNC_TEST_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.cc index c1df535d0..44fc9a5e5 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.cc @@ -1,9 +1,22 @@ -/* - * nxsmsgtestscenario.cpp - * - * Created on: 26 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "nxsmsgtestscenario.h" diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.h b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.h index 323a54660..01a630065 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.h @@ -1,9 +1,22 @@ -/* - * nxsmsgtestscenario.h - * - * Created on: 26 Apr 2014 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxsmsgtestscenario.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef NXSMSGTESTSCENARIO_H_ #define NXSMSGTESTSCENARIO_H_ diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc index 04df689c7..5e7a4cbce 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxstesthub.cc * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include "nxstesthub.h" #include diff --git a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h index ee9524e7e..2edbbab8d 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h +++ b/tests/unittests/libretroshare/gxs/nxs_test/nxstesthub.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/nxstesthub.h * + * * + * Copyright (C) 2014, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef NXSTESTHUB_H #define NXSTESTHUB_H diff --git a/tests/unittests/libretroshare/gxs/nxs_test/rsgxsnetservice_test.cc b/tests/unittests/libretroshare/gxs/nxs_test/rsgxsnetservice_test.cc index 257b2de77..39f09aca0 100644 --- a/tests/unittests/libretroshare/gxs/nxs_test/rsgxsnetservice_test.cc +++ b/tests/unittests/libretroshare/gxs/nxs_test/rsgxsnetservice_test.cc @@ -1,9 +1,22 @@ -/* - * rsgxsnetservice_test.cc - * - * Created on: 11 Jul 2012 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/gxs/nxs_test/rsgxsnetservice_test.cc * + * * + * Copyright (C) 2012, Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/gxs/security/gxssecurity_test.cc b/tests/unittests/libretroshare/gxs/security/gxssecurity_test.cc index 8faba96cd..f090a861a 100644 --- a/tests/unittests/libretroshare/gxs/security/gxssecurity_test.cc +++ b/tests/unittests/libretroshare/gxs/security/gxssecurity_test.cc @@ -1,31 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/gxs/security/gxssecurity_tests.cc * + * * + * Copyright 2007-2008 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ -/* - * libretroshare/src/serialiser: rsturtleitems_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - */ #include #include diff --git a/tests/unittests/libretroshare/serialiser/rsbaseitem_test.cc b/tests/unittests/libretroshare/serialiser/rsbaseitem_test.cc index a3a8d0d01..eca009978 100644 --- a/tests/unittests/libretroshare/serialiser/rsbaseitem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsbaseitem_test.cc @@ -1,34 +1,22 @@ - -/* - * libretroshare/src/serialiser: rsbaseitem_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - * tlvfileitem test. - * - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/rsbaseitem_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc b/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc index c1aaa0fc0..c578cfa13 100644 --- a/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsgxsiditem_test.cc @@ -1,31 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/rsgxsiditem_test.cc * + * * + * Copyright 2007-2008 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ -/* - * libretroshare/src/serialiser: rsturtleitems_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - */ #include #include "rsitems/rsgxsiditems.h" diff --git a/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc b/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc index 9ece9edce..2d049f98d 100644 --- a/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc @@ -1,9 +1,22 @@ -/* - * rsgxsupdateitem_test.cc - * - * Created on: 9 Dec 2013 - * Author: crispy - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/rsgxsupdateitem_test.cc * + * * + * Copyright 2013 by Crispy * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc b/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc index 838d367ad..c2b6a0360 100644 --- a/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsmsgitem_test.cc @@ -1,27 +1,22 @@ -/* - * libretroshare/src/tests/serialiser: msgitem_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2010 by Christopher Evi-Parker. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/msgitem_test.cc * + * * + * Copyright 2010 by Christopher Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc b/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc index 0ff8f7f44..8950362f2 100644 --- a/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsnxsitems_test.cc @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/rsnxsitems_test.cc * + * * + * Copyright 2010 by Christopher Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "support.h" #include "libretroshare/gxs/common/data_support.h" diff --git a/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc b/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc index 48d037cca..70b0de569 100644 --- a/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsstatusitem_test.cc @@ -1,28 +1,22 @@ -/* - * libretroshare/src/tests/serialiser: rsstatusitem_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2010 by Christopher Evi-Parker. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * unittests/libretroshare/serialiser/rsstatusitem_test.cc * + * * + * Copyright 2010 by Christopher Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "support.h" #include "rsitems/rsstatusitems.h" diff --git a/tests/unittests/libretroshare/serialiser/rstlvutil.cc b/tests/unittests/libretroshare/serialiser/rstlvutil.cc index e468d49ad..53e6ede30 100644 --- a/tests/unittests/libretroshare/serialiser/rstlvutil.cc +++ b/tests/unittests/libretroshare/serialiser/rstlvutil.cc @@ -1,35 +1,22 @@ - -/* - * libretroshare/src/serialiser: rstlvutil.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -/* some utility functions mainly for debugging - * - * - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/rstlvutil.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/rstlvutil.h b/tests/unittests/libretroshare/serialiser/rstlvutil.h index 910c494d3..806e8e7d1 100644 --- a/tests/unittests/libretroshare/serialiser/rstlvutil.h +++ b/tests/unittests/libretroshare/serialiser/rstlvutil.h @@ -1,31 +1,25 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/rstlvutil.h * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #ifndef RS_TLV_UTIL_H #define RS_TLV_UTIL_H -/* - * libretroshare/src/serialiser: rstlvutil.h - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - /* some utility functions mainly for debugging */ diff --git a/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc b/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc index 265d50e9c..81b0db278 100644 --- a/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc +++ b/tests/unittests/libretroshare/serialiser/rsturtleitem_test.cc @@ -1,31 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/rsturtleitems_test.cc * + * * + * Copyright 2007-2008 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ -/* - * libretroshare/src/serialiser: rsturtleitems_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - */ #include #include diff --git a/tests/unittests/libretroshare/serialiser/support.cc b/tests/unittests/libretroshare/serialiser/support.cc index 29d7d782e..95d049fea 100644 --- a/tests/unittests/libretroshare/serialiser/support.cc +++ b/tests/unittests/libretroshare/serialiser/support.cc @@ -1,27 +1,22 @@ -/* - * libretroshare/src/serialiser: t_support.h.cc - * - * RetroShare Serialiser tests. - * - * Copyright 2007-2008 by Christopher Evi-Parker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/support.cc * + * * + * Copyright 2007-2008 by Christopher Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/support.h b/tests/unittests/libretroshare/serialiser/support.h index b9f8301d0..af6f8208b 100644 --- a/tests/unittests/libretroshare/serialiser/support.h +++ b/tests/unittests/libretroshare/serialiser/support.h @@ -1,31 +1,27 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/support.h * + * * + * Copyright 2007-2008 by Christopher Evi-Parker * + * Copyright 2007-2008 by Cyril Soler * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #ifndef SUPPORT_H_ #define SUPPORT_H_ -/* - * libretroshare/src/tests/serialiser: - * - * RetroShare Serialiser tests. - * - * Copyright 2007-2008 by Christopher Evi-Parker, Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include diff --git a/tests/unittests/libretroshare/serialiser/tlvbase_test.cc b/tests/unittests/libretroshare/serialiser/tlvbase_test.cc index a99038493..6e887d2f3 100644 --- a/tests/unittests/libretroshare/serialiser/tlvbase_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvbase_test.cc @@ -1,28 +1,22 @@ - -/* - * libretroshare/src/serialiser: tlvbase_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Horatio. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvbase_test.cc * + * * + * Copyright 2007-2008 by Horatio * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/tlvbase_test2.cc b/tests/unittests/libretroshare/serialiser/tlvbase_test2.cc index a1f6d4fee..8490a52ee 100644 --- a/tests/unittests/libretroshare/serialiser/tlvbase_test2.cc +++ b/tests/unittests/libretroshare/serialiser/tlvbase_test2.cc @@ -1,35 +1,22 @@ - -/* - * libretroshare/src/serialiser: tlvbase_test2.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -/****************************************************************** - * tlvfileitem test. - * - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvbase_test2.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/tlvitems_test.cc b/tests/unittests/libretroshare/serialiser/tlvitems_test.cc index 4204e4254..c111b1b66 100644 --- a/tests/unittests/libretroshare/serialiser/tlvitems_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvitems_test.cc @@ -1,34 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvitems_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ -/* - * libretroshare/src/serialiser: tlvitems_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - * tlvfileitem test. - * - * - */ #include #include diff --git a/tests/unittests/libretroshare/serialiser/tlvkey_test.cc b/tests/unittests/libretroshare/serialiser/tlvkey_test.cc index 25d8b14ac..477e84ec0 100644 --- a/tests/unittests/libretroshare/serialiser/tlvkey_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvkey_test.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvkey_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include diff --git a/tests/unittests/libretroshare/serialiser/tlvrandom_test.cc b/tests/unittests/libretroshare/serialiser/tlvrandom_test.cc index c861516e7..d9376bab1 100644 --- a/tests/unittests/libretroshare/serialiser/tlvrandom_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvrandom_test.cc @@ -1,28 +1,22 @@ - -/* - * libretroshare/src/serialiser: tlvrandom_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2009 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvrandom_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ /****************************************************************** * tlvrandom_test. diff --git a/tests/unittests/libretroshare/serialiser/tlvstack_test.cc b/tests/unittests/libretroshare/serialiser/tlvstack_test.cc index 6bcfaa513..0353ecb06 100644 --- a/tests/unittests/libretroshare/serialiser/tlvstack_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvstack_test.cc @@ -1,34 +1,22 @@ - -/* - * libretroshare/src/serialiser: tlvstack_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/****************************************************************** - * tlvfileitem test. - * - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvstack_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc b/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc index c24915e27..e9d64c394 100644 --- a/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc +++ b/tests/unittests/libretroshare/serialiser/tlvtypes_test.cc @@ -1,27 +1,23 @@ -/* - * libretroshare/src/serialiser: tlvfileitem_test.cc - * - * RetroShare Serialiser. - * - * Copyright 2007-2008 by Robert Fernie, Chris Evi-Parker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/serialiser/tlvtypes_test.cc * + * * + * Copyright 2007-2008 by Robert Fernie * + * Copyright 2007-2008 by Chris Evi-Parker * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.cc b/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.cc index f4dfc85dc..8a5bd9d4b 100644 --- a/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.cc +++ b/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.cc @@ -1,27 +1,22 @@ -/* - * unittests/libretroshare/services: fakepgpauxutils.h - * - * Identity interface for RetroShare. - * - * Copyright 2014-2014 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/FakePgpAuxUtils.cc * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "FakePgpAuxUtils.h" diff --git a/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.h b/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.h index 9866c3ee3..467a3140c 100644 --- a/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.h +++ b/tests/unittests/libretroshare/services/gxs/FakePgpAuxUtils.h @@ -1,27 +1,22 @@ -/* - * unittests/libretroshare/services: fakepgpauxutils.h - * - * Identity interface for RetroShare. - * - * Copyright 2014-2014 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/FakePgpAuxUtils.h * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once diff --git a/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc b/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc index 1345dc706..845320383 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc +++ b/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.cc * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ // from librssimulator #include "testing/IsolatedServiceTester.h" diff --git a/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.h b/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.h index 5fdb742f9..ef52047a3 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.h +++ b/tests/unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.h @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsIsolatedServiceTester.h * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #pragma once // from librssimulator diff --git a/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc b/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc index 7e2776b64..0ce816c37 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc +++ b/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.cc @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsPairServiceTester.cc * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ // local #include "GxsPairServiceTester.h" diff --git a/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.h b/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.h index fa758c926..6b75ad6e8 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.h +++ b/tests/unittests/libretroshare/services/gxs/GxsPairServiceTester.h @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsPairServiceTester.h * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once // from librssimulator diff --git a/tests/unittests/libretroshare/services/gxs/GxsPeerNode.cc b/tests/unittests/libretroshare/services/gxs/GxsPeerNode.cc index 3be7cd392..338e76975 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsPeerNode.cc +++ b/tests/unittests/libretroshare/services/gxs/GxsPeerNode.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsPeerNode.cc * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + // from libretroshare //#include "serialiser/rsstatusitems.h" diff --git a/tests/unittests/libretroshare/services/gxs/GxsPeerNode.h b/tests/unittests/libretroshare/services/gxs/GxsPeerNode.h index b5fa8f607..d5d065399 100644 --- a/tests/unittests/libretroshare/services/gxs/GxsPeerNode.h +++ b/tests/unittests/libretroshare/services/gxs/GxsPeerNode.h @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/GxsPeerNode.h * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once // from retroshare diff --git a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc index 882bd9cc8..afcafcec4 100644 --- a/tests/unittests/libretroshare/services/gxs/gxstestservice.cc +++ b/tests/unittests/libretroshare/services/gxs/gxstestservice.cc @@ -1,27 +1,22 @@ -/* - * libretroshare/src/services p3wiki.cc - * - * Wiki interface for RetroShare. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/gxstestservice.cc * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include "gxstestservice.h" #include "retroshare/rsgxsflags.h" diff --git a/tests/unittests/libretroshare/services/gxs/gxstestservice.h b/tests/unittests/libretroshare/services/gxs/gxstestservice.h index 02b51b55e..fadd8a1a2 100644 --- a/tests/unittests/libretroshare/services/gxs/gxstestservice.h +++ b/tests/unittests/libretroshare/services/gxs/gxstestservice.h @@ -1,27 +1,22 @@ -/* - * libretroshare/src/services: p3wikiservice.h - * - * Wiki interface for RetroShare. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/gxstestservice.h * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once diff --git a/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc b/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc index 9c4069c80..e5610f0ad 100644 --- a/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc +++ b/tests/unittests/libretroshare/services/gxs/nxsbasic_test.cc @@ -1,13 +1,25 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/nxsbasic_test.cc * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include -// from librssimulator -//#include "peer/PeerNode.h" - -// from libretroshare -//#include "gxs/rsgixs.h" -//#include "gxs/rsdataservice.h" -//#include "gxs/rsgxsnetservice.h" #include "rsitems/rsnxsitems.h" // local diff --git a/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc b/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc index 5eaf630e4..c6e429755 100644 --- a/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc +++ b/tests/unittests/libretroshare/services/gxs/nxspair_tests.cc @@ -1,3 +1,22 @@ +/******************************************************************************* + * unittests/libretroshare/services/gxs/nxspair_test.cc * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.cc b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.cc index 46025ca7a..2ac1c9457 100644 --- a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.cc +++ b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.cc @@ -1,27 +1,22 @@ -/* - * libretroshare/src/serialiser: rsgxstestserviceitems.cc - * - * RetroShare C++ Interface. - * - * Copyright 2012-2012 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/nxstestitems.cc * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #include diff --git a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h index 30003e996..06aaf5b91 100644 --- a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h +++ b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h @@ -1,27 +1,22 @@ -/* - * libretroshare/src/serialiser: rsgxstestserviceitems.h - * - * RetroShare C++ Interface. - * - * Copyright 2012-2012 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * unittests/libretroshare/services/gxs/nxstestitems.h * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ #pragma once diff --git a/tests/unittests/libretroshare/services/status/status_test.cc b/tests/unittests/libretroshare/services/status/status_test.cc index 06258f450..7433dd189 100644 --- a/tests/unittests/libretroshare/services/status/status_test.cc +++ b/tests/unittests/libretroshare/services/status/status_test.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/libretroshare/services/status/status_test.cc * + * * + * Copyright 2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include diff --git a/tests/unittests/unittests.cc b/tests/unittests/unittests.cc index ad0cf898c..f14700bf3 100644 --- a/tests/unittests/unittests.cc +++ b/tests/unittests/unittests.cc @@ -1,3 +1,23 @@ +/******************************************************************************* + * unittests/unittests.cc * + * * + * Copyright (C) 2018, Retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + ******************************************************************************/ + #include int main(int argc, char **argv) { diff --git a/tests/unittests/unittests.pro b/tests/unittests/unittests.pro index 439ca9da9..03e85dc7e 100644 --- a/tests/unittests/unittests.pro +++ b/tests/unittests/unittests.pro @@ -1,3 +1,21 @@ +################################################################################ +# unittests.pro # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") QT += network xml From 5f86ac1e3c7ae1e3afe30413f173aae83260d7c7 Mon Sep 17 00:00:00 2001 From: csoler Date: Thu, 8 Nov 2018 23:34:42 +0100 Subject: [PATCH 13/26] updated licenses in gui/Circles. partly changed licenses in gui/common. --- build_scripts/Debian/debian_release_howto.txt | 6 +-- .../src/gui/Circles/CirclesDialog.cpp | 43 +++++++++---------- .../src/gui/Circles/CirclesDialog.h | 43 +++++++++---------- .../src/gui/Circles/CreateCircleDialog.cpp | 43 +++++++++---------- .../src/gui/Circles/CreateCircleDialog.h | 43 +++++++++---------- retroshare-gui/src/gui/common/AvatarDefs.cpp | 39 ++++++++--------- retroshare-gui/src/gui/common/AvatarDefs.h | 40 ++++++++--------- .../src/gui/common/AvatarDialog.cpp | 41 ++++++++---------- retroshare-gui/src/gui/common/AvatarDialog.h | 41 ++++++++---------- .../src/gui/common/AvatarWidget.cpp | 39 ++++++++--------- retroshare-gui/src/gui/common/AvatarWidget.h | 39 ++++++++--------- .../src/gui/common/DropLineEdit.cpp | 40 ++++++++--------- retroshare-gui/src/gui/common/DropLineEdit.h | 40 ++++++++--------- retroshare-gui/src/gui/common/Emoticons.cpp | 39 ++++++++--------- retroshare-gui/src/gui/common/Emoticons.h | 39 ++++++++--------- retroshare-gui/src/gui/common/FeedNotify.cpp | 39 ++++++++--------- retroshare-gui/src/gui/common/FeedNotify.h | 39 ++++++++--------- retroshare-gui/src/gui/common/FilesDefs.cpp | 39 ++++++++--------- retroshare-gui/src/gui/common/FilesDefs.h | 39 ++++++++--------- 19 files changed, 353 insertions(+), 378 deletions(-) diff --git a/build_scripts/Debian/debian_release_howto.txt b/build_scripts/Debian/debian_release_howto.txt index 9ca411595..8e85d0b02 100644 --- a/build_scripts/Debian/debian_release_howto.txt +++ b/build_scripts/Debian/debian_release_howto.txt @@ -91,9 +91,9 @@ Licensing issues: pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | will be deleted when creating debian package plugins/feedreader | GPLv2 | A| Thunder | plugins/VOIP | | | | - AudioInputConfig.h+ | All right reserved | | Thorvald Natvig | Code can be modified/re-used. Mumble's code. Asked permission to re-license on 04/11/2018. - AudioStats.h+ | All right reserved | | Thorvald Natvig | - AudioWizard.h+ | All right reserved | | Thorvald Natvig | + AudioInputConfig.h+ | All right reserved | A| Thorvald Natvig | Permission to re-license on 04/11/2018 + AudioStats.h+ | All right reserved | A| Thorvald Natvig | + AudioWizard.h+ | All right reserved | A| Thorvald Natvig | SpeexProcessor.h | | | Peter Zotov | retroshare-android-notify-* | GPLv3 | | G10H4ck | retroshare-android-service | GPLv3 | | G10H4ck | diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp index c2d2d2200..8be03e718 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.cpp @@ -1,25 +1,24 @@ -/* - * Retroshare Circle Plugin. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/Circles/CirclesDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include diff --git a/retroshare-gui/src/gui/Circles/CirclesDialog.h b/retroshare-gui/src/gui/Circles/CirclesDialog.h index 478358745..7c96febad 100644 --- a/retroshare-gui/src/gui/Circles/CirclesDialog.h +++ b/retroshare-gui/src/gui/Circles/CirclesDialog.h @@ -1,25 +1,24 @@ -/* - * Retroshare Circle. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/Circles/CirclesDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef MRK_CIRCLE_DIALOG_H #define MRK_CIRCLE_DIALOG_H diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp index 7d2e601be..985eeca72 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp @@ -1,25 +1,24 @@ -/* - * Retroshare Circles. - * - * Copyright 2012-2013 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/Circles/CreateCirclesDialog.cpp * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.h b/retroshare-gui/src/gui/Circles/CreateCircleDialog.h index 2a6ce94de..dd5e52494 100644 --- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.h +++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.h @@ -1,25 +1,24 @@ -/* - * Retroshare Circles. - * - * Copyright 2012-2013 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/Circles/CreateCirclesDialog.h * + * * + * LibResAPI: API for local socket server * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef MRK_CREATE_CIRCLE_DIALOG_H #define MRK_CREATE_CIRCLE_DIALOG_H diff --git a/retroshare-gui/src/gui/common/AvatarDefs.cpp b/retroshare-gui/src/gui/common/AvatarDefs.cpp index b33563dae..926bc4dea 100644 --- a/retroshare-gui/src/gui/common/AvatarDefs.cpp +++ b/retroshare-gui/src/gui/common/AvatarDefs.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/AvatarDefs.cpp * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include diff --git a/retroshare-gui/src/gui/common/AvatarDefs.h b/retroshare-gui/src/gui/common/AvatarDefs.h index d468e8546..b084b8be3 100644 --- a/retroshare-gui/src/gui/common/AvatarDefs.h +++ b/retroshare-gui/src/gui/common/AvatarDefs.h @@ -1,24 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ - +/******************************************************************************* + * gui/common/AvatarDefs.h * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _AVATARDEFS_H #define _AVATARDEFS_H diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp index 3ac1d45df..921f2df54 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.cpp +++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp @@ -1,25 +1,22 @@ -/* - * Avatar Dialog - * - * Copyright 2015 by RetroShare Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/common/AvatarDialog.cpp * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include diff --git a/retroshare-gui/src/gui/common/AvatarDialog.h b/retroshare-gui/src/gui/common/AvatarDialog.h index f9380a319..488f09462 100644 --- a/retroshare-gui/src/gui/common/AvatarDialog.h +++ b/retroshare-gui/src/gui/common/AvatarDialog.h @@ -1,25 +1,22 @@ -/* - * Avatar Dialog. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * gui/common/AvatarDialog.h * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _AVATARDIALOG_H #define _AVATARDIALOG_H diff --git a/retroshare-gui/src/gui/common/AvatarWidget.cpp b/retroshare-gui/src/gui/common/AvatarWidget.cpp index 2224b537c..3422015bc 100644 --- a/retroshare-gui/src/gui/common/AvatarWidget.cpp +++ b/retroshare-gui/src/gui/common/AvatarWidget.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/AvatarWidget.cpp * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/common/AvatarWidget.h b/retroshare-gui/src/gui/common/AvatarWidget.h index de15ef066..e3b90022b 100644 --- a/retroshare-gui/src/gui/common/AvatarWidget.h +++ b/retroshare-gui/src/gui/common/AvatarWidget.h @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/AvatarWidget.h * + * * + * Copyright (C) 2012, Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef AVATARWIDGET_H #define AVATARWIDGET_H diff --git a/retroshare-gui/src/gui/common/DropLineEdit.cpp b/retroshare-gui/src/gui/common/DropLineEdit.cpp index d948377a2..852ec52ed 100644 --- a/retroshare-gui/src/gui/common/DropLineEdit.cpp +++ b/retroshare-gui/src/gui/common/DropLineEdit.cpp @@ -1,24 +1,22 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/DropLineEdit.cpp * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/common/DropLineEdit.h b/retroshare-gui/src/gui/common/DropLineEdit.h index e2166e9f0..b77a6ce6b 100644 --- a/retroshare-gui/src/gui/common/DropLineEdit.h +++ b/retroshare-gui/src/gui/common/DropLineEdit.h @@ -1,24 +1,22 @@ -/**************************************************************** - * - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/DropLineEdit.h * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef DROPLINEEDIT_H #define DROPLINEEDIT_H diff --git a/retroshare-gui/src/gui/common/Emoticons.cpp b/retroshare-gui/src/gui/common/Emoticons.cpp index 0875f30c0..a3b065088 100644 --- a/retroshare-gui/src/gui/common/Emoticons.cpp +++ b/retroshare-gui/src/gui/common/Emoticons.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/Emoticons.cpp * + * * + * Copyright (C) 2010, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-gui/src/gui/common/Emoticons.h b/retroshare-gui/src/gui/common/Emoticons.h index 713aec815..2b04fdd6d 100644 --- a/retroshare-gui/src/gui/common/Emoticons.h +++ b/retroshare-gui/src/gui/common/Emoticons.h @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2010, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/Emoticons.h * + * * + * Copyright (C) 2010, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _EMOTICONS_H #define _EMOTICONS_H diff --git a/retroshare-gui/src/gui/common/FeedNotify.cpp b/retroshare-gui/src/gui/common/FeedNotify.cpp index c51eabdad..08234966a 100644 --- a/retroshare-gui/src/gui/common/FeedNotify.cpp +++ b/retroshare-gui/src/gui/common/FeedNotify.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/FeedNotify.cpp * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "FeedNotify.h" diff --git a/retroshare-gui/src/gui/common/FeedNotify.h b/retroshare-gui/src/gui/common/FeedNotify.h index 6f0b8703c..3d53d95e9 100644 --- a/retroshare-gui/src/gui/common/FeedNotify.h +++ b/retroshare-gui/src/gui/common/FeedNotify.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2012 RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/FeedNotify.h * + * * + * Copyright (C) 2012, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef FEEDNOTIFY_H #define FEEDNOTIFY_H diff --git a/retroshare-gui/src/gui/common/FilesDefs.cpp b/retroshare-gui/src/gui/common/FilesDefs.cpp index 4ca20699a..83474a752 100644 --- a/retroshare-gui/src/gui/common/FilesDefs.cpp +++ b/retroshare-gui/src/gui/common/FilesDefs.cpp @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/FilesDefs.cpp * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "FilesDefs.h" diff --git a/retroshare-gui/src/gui/common/FilesDefs.h b/retroshare-gui/src/gui/common/FilesDefs.h index 241bc69c8..50a9e19ab 100644 --- a/retroshare-gui/src/gui/common/FilesDefs.h +++ b/retroshare-gui/src/gui/common/FilesDefs.h @@ -1,23 +1,22 @@ -/**************************************************************** - * This file is distributed under the following license: - * - * Copyright (c) 2011, RetroShare Team - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * gui/common/FilesDefs.h * + * * + * Copyright (C) 2011, Retroshare Team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef _FILESDEFS_H #define _FILESDEFS_H From b53e75ae82263ff74ee5a657660da8ab546da1ad Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 14:14:05 +0100 Subject: [PATCH 14/26] removed old/unreferenced gxs source files. Moved unfinished ideas for wire+acadb to unfinished/ --- libretroshare/src/ft/ftdbase.cc | 454 ------------------ libretroshare/src/ft/ftdbase.h | 104 ---- libretroshare/src/gxs/db_gixp.h | 158 ------ libretroshare/src/gxs/db_gmxp.h | 214 --------- libretroshare/src/gxs/db_gxp.h | 443 ----------------- libretroshare/src/gxs/db_gxp_apps.h | 385 --------------- libretroshare/src/gxs/db_gxp_service.h | 104 ---- .../src/{gxs => unfinished}/db_acadeeb.h | 0 .../src/{gxs => unfinished}/db_wire.h | 0 9 files changed, 1862 deletions(-) delete mode 100644 libretroshare/src/ft/ftdbase.cc delete mode 100644 libretroshare/src/ft/ftdbase.h delete mode 100644 libretroshare/src/gxs/db_gixp.h delete mode 100644 libretroshare/src/gxs/db_gmxp.h delete mode 100644 libretroshare/src/gxs/db_gxp.h delete mode 100644 libretroshare/src/gxs/db_gxp_apps.h delete mode 100644 libretroshare/src/gxs/db_gxp_service.h rename libretroshare/src/{gxs => unfinished}/db_acadeeb.h (100%) rename libretroshare/src/{gxs => unfinished}/db_wire.h (100%) diff --git a/libretroshare/src/ft/ftdbase.cc b/libretroshare/src/ft/ftdbase.cc deleted file mode 100644 index ef68304d8..000000000 --- a/libretroshare/src/ft/ftdbase.cc +++ /dev/null @@ -1,454 +0,0 @@ -/* - * libretroshare/src/ft: ftdbase.cc - * - * File Transfer for RetroShare. - * - * Copyright 2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "ft/ftdbase.h" -#include "util/rsdir.h" -#include "retroshare/rspeers.h" - -#include "serialiser/rsconfigitems.h" - -//#define DB_DEBUG 1 - -ftFiStore::ftFiStore(CacheStrapper *cs, CacheTransfer *cft, p3PeerMgr *pm, - RsPeerId ownid, std::string cachedir) - :FileIndexStore(cs, cft, pm, ownid, cachedir) -{ - return; -} - -bool ftFiStore::search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const -{ - /* could use hintflags to specify which bits of fileinfo to use additionally. - eg. hintflags & FT_SEARCH_PEER_ID, then only return matching peers + hash. - eg. hintflags & FT_SEARCH_NAME, then only return matching name + hash. - * - * Still to see if concept is worthwhle - */ - - /* remove unused parameter warnings */ - (void) hintflags; - -#ifdef DB_DEBUG - std::cerr << "ftFiStore::search(" << hash << "," << hintflags; - std::cerr << ")"; - std::cerr << std::endl; -#endif - - std::list results; - std::list::iterator it; - - if (SearchHash(hash, results)) - { - bool first = true; - for(it = results.begin(); it != results.end(); ++it) - { -#ifdef DB_DEBUG - std::cerr << "ftFiStore::search() found: "; - std::cerr << it->name << " (" << it->size; - std::cerr << ") @ " << it->id << " = " << hash; - std::cerr << std::endl; -#endif - bool fullmatch = true; - -// if (it->size != size) -// fullmatch = false; - - -#if 0 - if (hintflags & FT_SEARCH_PEER_ID) - { - pit = std::find(info.srcIds.begin(), - info.srcId.end(). it->id); - if (pit == info.srcIds.end()) - { - fullmatch = false; - } - } -#endif - - - if (fullmatch) - { - if (first) - { - first = false; - info.fname = it->name; - info.size = it->size; - info.hash = it->hash; - - } - - TransferInfo ti; - ti.peerId = it->id; - ti.name = it->name; - ti.tfRate = 0; - info.peers.push_back(ti); - } - } - - /**** DEPENDS ON SOURCES! - info.downloadStatus = FT_STATE_COMPLETE: - ****/ - - /* if the first flag is cleared, we've definitely - * had a full match!. - */ - - if (!first) - return true; - } - return false; -} - - -ftFiMonitor::ftFiMonitor(CacheStrapper *cs,std::string cachedir, const RsPeerId& pid,const std::string& config_dir) - :FileIndexMonitor(cs,cachedir, pid,config_dir), p3Config() -{ - return; -} - -bool ftFiMonitor::search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const -{ - return search(hash,hintflags,RsPeerId(),info) ; -} -bool ftFiMonitor::search(const RsFileHash &hash, FileSearchFlags hintflags, const RsPeerId& peer_id,FileInfo &info) const -{ -#ifdef DB_DEBUG - std::cerr << "ftFiMonitor::search(" << hash << "," << hintflags; - std::cerr << ")"; - std::cerr << std::endl; -#endif - - // Setup search flags according to hintflags. Originally flags was 0. I (cyril) don't know - // why we don't just pass hintflags there, so I tried to keep the idea. - // - FileSearchFlags flags = hintflags ; - flags &= (RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE); - - if(findLocalFile(hash, flags,peer_id,info.path, info.size,info.storage_permission_flags,info.parent_groups)) - { - /* fill in details */ -#ifdef DB_DEBUG - std::cerr << "ftFiMonitor::search() found: "; - std::cerr << path; - std::cerr << " = " << hash << "," << fsize; - std::cerr << std::endl; -#endif - info.fname = RsDirUtil::getTopDir(info.path); - - return true; - } - - return false; -}; - -int ftFiMonitor::watchPeriod() const -{ - return getPeriod() ; -} -void ftFiMonitor::setWatchPeriod(int seconds) -{ - setPeriod(seconds) ;// call FileIndexMonitor - IndicateConfigChanged() ; -} - -void ftFiMonitor::setRememberHashCacheDuration(uint32_t days) -{ - setRememberHashFilesDuration(days) ; // calls FileIndexMonitor - IndicateConfigChanged() ; -} -uint32_t ftFiMonitor::rememberHashCacheDuration() const -{ - return rememberHashFilesDuration() ; // calls FileIndexMonitor -} -void ftFiMonitor::setRememberHashCache(bool b) -{ - setRememberHashFiles(b) ; // calls FileIndexMonitor - IndicateConfigChanged() ; -} -bool ftFiMonitor::rememberHashCache() -{ - return rememberHashFiles() ; // calls FileIndexMonitor -} -void ftFiMonitor::clearHashCache() -{ - clearHashFiles() ; -} - -/******* LOAD / SAVE CONFIG List. - * - * - * - * - */ - -RsSerialiser *ftFiMonitor::setupSerialiser() -{ - RsSerialiser *rss = new RsSerialiser(); - - /* add in the types we need! */ - rss->addSerialType(new RsFileConfigSerialiser()); - rss->addSerialType(new RsGeneralConfigSerialiser()); - - return rss; -} - -const std::string hash_cache_duration_ss("HASH_CACHE_DURATION"); -const std::string hash_cache_ss("HASH_CACHE"); -const std::string watch_file_duration_ss("WATCH_FILES_DELAY"); - -bool ftFiMonitor::saveList(bool &cleanup, std::list& sList) -{ - - - cleanup = true; - -#ifdef DB_DEBUG - std::cerr << "ftFiMonitor::saveList()"; - std::cerr << std::endl; -#endif - - /* get list of directories */ - std::list dirList; - std::list::iterator it; - - getSharedDirectories(dirList); - - for(it = dirList.begin(); it != dirList.end(); ++it) - { - RsFileConfigItem *fi = new RsFileConfigItem(); - fi->file.path = (*it).filename ; - fi->file.name = (*it).virtualname ; - fi->flags = (*it).shareflags.toUInt32() ; - - for(std::list::const_iterator it2( (*it).parent_groups.begin());it2!=(*it).parent_groups.end();++it2) - fi->parent_groups.ids.insert(*it2) ; - - sList.push_back(fi); - } - - std::map configMap; - - /* basic control parameters */ - { - std::string s ; - rs_sprintf(s, "%lu", rememberHashFilesDuration()) ; - - configMap[hash_cache_duration_ss] = s ; - } - configMap[hash_cache_ss] = rememberHashFiles()?"YES":"NO" ; - - { - std::string s ; - rs_sprintf(s, "%d", watchPeriod()) ; - - configMap[watch_file_duration_ss] = s ; - } - - RsConfigKeyValueSet *rskv = new RsConfigKeyValueSet(); - - /* Convert to TLV */ - for(std::map::const_iterator mit = configMap.begin(); mit != configMap.end(); ++mit) - { - RsTlvKeyValue kv; - kv.key = mit->first; - kv.value = mit->second; - - rskv->tlvkvs.pairs.push_back(kv); - } - - /* Add KeyValue to saveList */ - sList.push_back(rskv); - - return true; -} - - -bool ftFiMonitor::loadList(std::list& load) -{ - /* for each item, check it exists .... - * - remove any that are dead (or flag?) - */ - static const FileStorageFlags PERMISSION_MASK = DIR_FLAGS_BROWSABLE_OTHERS | DIR_FLAGS_NETWORK_WIDE_OTHERS | DIR_FLAGS_BROWSABLE_GROUPS | DIR_FLAGS_NETWORK_WIDE_GROUPS ; - -#ifdef DEBUG_ELIST - std::cerr << "ftFiMonitor::loadList()"; - std::cerr << std::endl; -#endif - - std::list dirList; - - std::list::iterator it; - for(it = load.begin(); it != load.end(); ++it) - { - RsConfigKeyValueSet *rskv ; - /* switch on type */ - if (NULL != (rskv = dynamic_cast(*it))) - { - /* make into map */ - std::map configMap; - std::map::const_iterator mit ; - - for(std::list::const_iterator kit = rskv->tlvkvs.pairs.begin(); kit != rskv->tlvkvs.pairs.end(); ++kit) - { - configMap[kit->key] = kit->value; - } - - if (configMap.end() != (mit = configMap.find(hash_cache_duration_ss))) - { - uint32_t t=0 ; - if(sscanf(mit->second.c_str(),"%d",&t) == 1) - setRememberHashFilesDuration(t); - } - if(configMap.end() != (mit = configMap.find(hash_cache_ss))) - setRememberHashFiles( mit->second == "YES") ; - - if(configMap.end() != (mit = configMap.find(watch_file_duration_ss))) - { - int t=0 ; - if(sscanf(mit->second.c_str(),"%d",&t) == 1) - setWatchPeriod(t); - } - delete *it ; - continue ; - } - - // 07/05/2016 - This ensures backward compatibility. Can be removed in a few weeks. - RsFileConfigItem_deprecated *fib = dynamic_cast(*it); - if (fib) - { - /* ensure that it exists? */ - - SharedDirInfo info ; - info.filename = RsDirUtil::convertPathToUnix(fib->file.path); - info.virtualname = fib->file.name; - info.shareflags = FileStorageFlags(fib->flags) ; - info.shareflags &= PERMISSION_MASK ; - info.shareflags &= ~DIR_FLAGS_NETWORK_WIDE_GROUPS ; // disabling this flag for know, for consistency reasons - - for(std::list::const_iterator itt(fib->parent_groups.begin());itt!=fib->parent_groups.end();++itt) - { - RsGroupInfo ginfo; - - if(rsPeers->getGroupInfoByName(*itt,ginfo) ) - { - info.parent_groups.push_back(ginfo.id) ; - std::cerr << "(II) converted old group ID \"" << *itt << "\" into corresponding new group id " << ginfo.id << std::endl; - } - else - std::cerr << "(EE) cannot convert old group ID \"" << *itt << "\" into corresponding new group id: no candidate found. " << std::endl; - } - - dirList.push_back(info) ; - } - - RsFileConfigItem *fi = dynamic_cast(*it); - if (fi) - { - /* ensure that it exists? */ - - SharedDirInfo info ; - info.filename = RsDirUtil::convertPathToUnix(fi->file.path); - info.virtualname = fi->file.name; - info.shareflags = FileStorageFlags(fi->flags) ; - info.shareflags &= PERMISSION_MASK ; - info.shareflags &= ~DIR_FLAGS_NETWORK_WIDE_GROUPS ; // disabling this flag for know, for consistency reasons - - for(std::set::const_iterator itt(fi->parent_groups.ids.begin());itt!=fi->parent_groups.ids.end();++itt) - info.parent_groups.push_back(*itt) ; - - dirList.push_back(info) ; - } - - delete *it ; - } - - /* set directories */ - setSharedDirectories(dirList); - load.clear() ; - return true; -} - -void ftFiMonitor::updateShareFlags(const SharedDirInfo& info) -{ - std::cerr << "Updating share flags:" << std::endl; - std::cerr << " Directory : " << info.filename << std::endl; - std::cerr << " Virtual : " << info.virtualname << std::endl; - std::cerr << " Flags : " << info.shareflags << std::endl; - - FileIndexMonitor::updateShareFlags(info); - - /* flag for config */ - IndicateConfigChanged(); -} - -void ftFiMonitor::setSharedDirectories(const std::list& dirList) -{ - FileIndexMonitor::setSharedDirectories(dirList); - - /* flag for config */ - IndicateConfigChanged(); -} - - - -ftCacheStrapper::ftCacheStrapper(p3ServiceControl *sc, uint32_t ftServiceId) - :CacheStrapper(sc, ftServiceId) -{ - return; -} - - /* overloaded search function */ -bool ftCacheStrapper::search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const -{ - /* remove unused parameter warnings */ - (void) hintflags; - -#ifdef DB_DEBUG - std::cerr << "ftCacheStrapper::search(" << hash << "," << hintflags; - std::cerr << ")"; - std::cerr << std::endl; -#endif - - RsCacheData data; - if (findCache(hash, data)) - { -#ifdef DB_DEBUG - std::cerr << "ftCacheStrapper::search() found: "; - std::cerr << data.path << "/" << data.name; - std::cerr << " = " << data.hash << "," << data.size; - std::cerr << std::endl; -#endif - - /* ... */ - info.size = data.size; - info.fname = data.name; - info.path = data.path + "/" + data.name; - - return true; - } - return false; -} - diff --git a/libretroshare/src/ft/ftdbase.h b/libretroshare/src/ft/ftdbase.h deleted file mode 100644 index 091fa824e..000000000 --- a/libretroshare/src/ft/ftdbase.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * libretroshare/src/ft: ftdbase.h - * - * File Transfer for RetroShare. - * - * Copyright 2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef FT_DBASE_INTERFACE_HEADER -#define FT_DBASE_INTERFACE_HEADER - -/* - * ftdbase. - * - * Wrappers for the Cache/FiStore/FiMonitor classes. - * So they work in the ft world. - */ - -class p3LinkMgr ; -class p3PeerMgr ; -class p3ServiceControl ; - - -#include "ft/ftsearch.h" -#include "pqi/p3cfgmgr.h" - -#include "dbase/fistore.h" -#include "dbase/fimonitor.h" -#include "dbase/cachestrapper.h" - - -class ftFiStore: public FileIndexStore, public ftSearch -{ - public: - ftFiStore(CacheStrapper *cs, CacheTransfer *cft, p3PeerMgr *pm, - RsPeerId ownid, std::string cachedir); - - /* overloaded search function */ -virtual bool search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const; -}; - -class ftFiMonitor: public FileIndexMonitor, public ftSearch, public p3Config -{ - public: - ftFiMonitor(CacheStrapper *cs,std::string cachedir, const RsPeerId& pid,const std::string& config_dir); - - /* overloaded search function */ - virtual bool search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const; - virtual bool search(const RsFileHash &hash, FileSearchFlags hintflags, const RsPeerId& peer_id, FileInfo &info) const; - - /* overloaded set dirs enables config indication */ - virtual void setSharedDirectories(const std::list& dirList); - virtual void updateShareFlags(const SharedDirInfo& info) ; - - void setRememberHashCacheDuration(uint32_t days) ; - uint32_t rememberHashCacheDuration() const ; - void setRememberHashCache(bool) ; - bool rememberHashCache() ; - void clearHashCache() ; - void setWatchPeriod(int seconds) ; // can be negative, which means auto-check disabled. - int watchPeriod() const ; - - /*** - * Configuration - store shared directories - */ - protected: - -virtual RsSerialiser *setupSerialiser(); -virtual bool saveList(bool &cleanup, std::list&); -virtual bool loadList(std::list& load); - - -}; - -class ftCacheStrapper: public CacheStrapper, public ftSearch -{ - public: - ftCacheStrapper(p3ServiceControl *cm, uint32_t ftServiceId); - - /* overloaded search function */ -virtual bool search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const; - -}; - - -#endif - diff --git a/libretroshare/src/gxs/db_gixp.h b/libretroshare/src/gxs/db_gixp.h deleted file mode 100644 index ef7697d57..000000000 --- a/libretroshare/src/gxs/db_gixp.h +++ /dev/null @@ -1,158 +0,0 @@ -/* - * libretroshare/src/gxp: gxp.h - * - * General Exchange Protocol interface for RetroShare. - * - * Copyright 2011-2011 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef RS_GIXP_H -#define RS_GIXP_H - - -/************************************************************************ - * GIXP: General Identity Exchange Protocol. - * - * As we're always running into troubles with GPG signatures... we are going to - * create a layer of RSA Keys for the following properties: - * - * 1) RSA Keys can be Anonymous, Self-Signed with Pseudonym, Signed by GPG Key. - * - Anonymous & Pseudonym Keys will be shared network-wide (Hop by Hop). - - GPG signed Keys will only be shared if we can validate the signature - (providing similar behaviour to existing GPG Keys). - - GPG signed Keys can optionally be marked for Network-wide sharing. - * 2) These keys can be used anywhere, specifically in the protocols described below. - * 3) These keys can be used to sign, encrypt, verify & decrypt - * 4) Keys will never need to be directly accessed - stored in this class. - * 5) They will be cached locally and exchanged p2p, by pull request. - * 6) This class will use the generalised packet storage for efficient caching & loading. - * 7) Data will be stored encrypted. - * - * - *****/ - - -class gixp::key -{ - gxip::keyref mKeyId; - - PubKey *pubKey; - PrivateKey *privKey; /* NULL if non-existant */ -}; - - -/* As we want GPG signed profiles, to be usable as PSEUDONYMS further afield, - * we will split them out, and distribute them seperately. - * - * So a key can have multiple profiles associated with it. - * - They should always have a self-signed one. - * - optionally have a gpg-signed one. - */ - -class gixp::profile -{ - public: - - gxip::keyref mKeyId; - - std::string mName; - rstime_t mTimestamp; /* superseded by newer timestamps */ - uint32_t mProfileType; /* ANONYMOUS (no name, self-signed), PSEUDONYM (self-signed), GPG (name=gpgid, gpgsigned), REVOCATION?? */ - gpp::permissions mPermissions; - - gxip::signature mSignature; -}; - - -class gxip::keyref -{ - std::string keyId; -} - -class gxip::keyrefset -{ - std::list keyIds; -} - -class gxip::signature -{ - gxip::keyref signer; - std::string signature; -} - -class gxip::signset -{ - std::list signs; -}; - - -/* - * We will pinch an idea from Amplify & Briar... of using reputations to decide - * if we display or distribute messages. - * - * The Reputation will be associated with the Profile - It has to be stored - * independently of the messages - which will not be touched. - * - * This part of the code will have to be worked out. - */ - -class gxip::reputation -{ - gxip::keyref; - - int16_t score; /* -1000 => 1000 ??? */ - std::string comment; - - gxip::signature sign; -}; - - -/******* - * NOTES: - * 1) much of this is already implemented in libretroshare/src/distrib/distribsecurity.cc - * 2) Data types will need to be shoehorned into gxmp::signedmsg format for transport. - * 3) Likewise this class will sit above a gdp/gnp/gsp data handling. - */ - -class p3gixp -{ - bool createKey(gixp::profile, bool doGpgAlso); /* fills in mKeyId, and signature */ - - bool haveKey(keyId); - bool havePrivateKey(keyId); - bool requestKey(keyId); - - bool getProfile(keyId, gixp::profile &prof); /* generic profile - that can be distributed far and wide */ - bool getGpgProfile(keyId, gixp::profile &prof); /* personal profile - (normally) only shared with friends */ - - bool getReputations(keyId, std::list &reps); - int16_t getRepScore(keyId, uint32_t flags); - - /*** process data ***/ - bool sign(KeyId, Data, signature); - bool verify(KeyId, Data, signature); - bool decrypt(KeyId, Data, decryptedData); - bool encrypt(KeyId, Data, decryptedData); - -}; - -#endif /* RS_GIXP_H */ - - diff --git a/libretroshare/src/gxs/db_gmxp.h b/libretroshare/src/gxs/db_gmxp.h deleted file mode 100644 index 293afd808..000000000 --- a/libretroshare/src/gxs/db_gmxp.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * libretroshare/src/gxp: gxp.h - * - * General Exchange Protocol interface for RetroShare. - * - * Copyright 2011-2011 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef RS_GMXP_H -#define RS_GMXP_H - - -/************************************************************************ - * GMXP: General Message Exchange Protocol. - * - * The existing experiences of Forums & Channels have highlighted some - * significant limitations of the Cache-Based exchange system. Based - * on this initial understandings - an improved transport system will - * be design to provide a generalised message exchange foundation, - * which can be used to build new services... - * - * - * Key Properties: - * - * 1) Message independent: Should be able to be used for Forums, Channels - * Twitter, Photos, Task Tracking, Link Cloud, etc. - * 2) Easy to Use: Specify(Msg, Permissions, KeyId) only. - * 3) Efficient Network Transport. (in common with GIXP) - * 4) Efficient Cache System (in common with GIXP). - * 5) Uses Groups Feature (in common with GIXP). - * 6) Search Protocols. ( might need overloading at higher level). - * - *****/ - - -/****** - * NOTES: - * 1) Based on Forum/Channel Groups. - * 2) Will likely need to extend to handle info for other services. - * 3) Perhaps a more generalised class like gxmp::msg would be best with extra data. - * - */ - -class gxmp::group -{ - gxp::id grpId; - uint32_t grpType; /* FORUM, CHANNEL, TWITTER, etc */ - - uint32_t timestamp; - uint32_t grpFlags; - std::string grpName; - std::string grpDesc; - std::string grpCategory; - - RsTlvImage grpPixmap; - - gpp::permissions grpPermissions; - - gxip::keyref adminKey; - gxip::keyrefset publishKeys; - - gxip::signature adminSignature; -}; - - -/****** - * NOTES: - * 1) This represents the base of the Unpacked Msgs, it will be overloaded by all classes - * that want to use the service. It is difficult to go from gxmp::msg => gxmp::signedmsg - * so data should be stored in the signedmsg format. - * 2) All services will fundamentally use data types derived from this. - * 3) This packet is only serialised once at post time, typically it is deserialised by all nodes. - */ -class gmxp::link -{ - uint32_t linktype; - gxp::id msgId; -} - -class gmxp::msg -{ - gxp::id groupId; - gxp::id msgId; - - gxp::id parentId; /* for full threading */ - gxp::id threadId; /* top of thread Id */ - - gxp::id origMsgId; /* if a replacement msg, otherwise == msgId */ - gxp::id replacingMsgId; /* if a replacement msg, otherwise == NULL (for ordering) */ - - uint32_t msgtype; /* FORUM, CHANNEL, EVENT, COMMENT, VOTE, etc */ - uint32_t flags; /* Is this needed? */ - uint32_t timestamp; - - // New extensions - put these in the generic message, so we can handle search / linking for all services. - std::list hashtags; - std::list linked; - - gpp::permissions msgPermissions; - - gxip::signset signatures; // should this be a set, or a singleton? -}; - -class gmxp::group: public gxp::group -{ - ??? -}; - - -/****** - * NOTES: - * 1) This class will be based on p3distrib - which does most of this stuff already! - * 2) There are lots of virtual functions - which can be overloaded to customise behaviour. - * for clarity - these have not been shown here. - * - * 3) We need to extend this class to add search functionality... so you can discover new - * stuff from your friends. This will need to be an overloaded functionality as the - * search will be service specific. - */ - - -/* General Interface class which is extended by specific versions. - * - * This provides most of the generic search, and access functions. - * As we are going to end up with diamond style double inheritance. - * This function needs to be pure virtual.. so there is no disambiugation issues. - */ - -class rsGmxp -{ - /* create content */ - std::string createGroup(std::wstring name, std::wstring desc, uint32_t flags, unsigned char *pngImageData, uint32_t imageSize); - std::string publishMsg(RsDistribMsg *msg, bool personalSign); - - /* indicate interest in info */ - bool subscribeToGroup(const std::string &grpId, bool subscribe); - - /* search messages (TO DEFINE) */ - - /* extract messages (From p3Distrib Existing Methods) */ - - bool getAllGroupList(std::list &grpids); - bool getSubscribedGroupList(std::list &grpids); - bool getPublishGroupList(std::list &grpids); - void getPopularGroupList(uint32_t popMin, uint32_t popMax, std::list &grpids); - - bool getAllMsgList(const std::string& grpId, std::list &msgIds); - bool getParentMsgList(const std::string& grpId, - const std::string& pId, std::list &msgIds); - bool getTimePeriodMsgList(const std::string& grpId, uint32_t timeMin, - uint32_t timeMax, std::list &msgIds); - - GroupInfo *locked_getGroupInfo(const std::string& grpId); - RsDistribMsg *locked_getGroupMsg(const std::string& grpId, const std::string& msgId); - - void getGrpListPubKeyAvailable(std::list& grpList); - -}; - - -class p3gmxp -{ - p3gmxp(int serviceType, serialiser *); - - /* create content */ - std::string createGroup(std::wstring name, std::wstring desc, uint32_t flags, unsigned char *pngImageData, uint32_t imageSize); - std::string publishMsg(RsDistribMsg *msg, bool personalSign); - - /* indicate interest in info */ - bool subscribeToGroup(const std::string &grpId, bool subscribe); - - /* search messages (TO DEFINE) */ - - /* extract messages (From p3Distrib Existing Methods) */ - - bool getAllGroupList(std::list &grpids); - bool getSubscribedGroupList(std::list &grpids); - bool getPublishGroupList(std::list &grpids); - void getPopularGroupList(uint32_t popMin, uint32_t popMax, std::list &grpids); - - bool getAllMsgList(const std::string& grpId, std::list &msgIds); - bool getParentMsgList(const std::string& grpId, - const std::string& pId, std::list &msgIds); - bool getTimePeriodMsgList(const std::string& grpId, uint32_t timeMin, - uint32_t timeMax, std::list &msgIds); - - GroupInfo *locked_getGroupInfo(const std::string& grpId); - RsDistribMsg *locked_getGroupMsg(const std::string& grpId, const std::string& msgId); - - void getGrpListPubKeyAvailable(std::list& grpList); - -}; - - -#endif /* RS_GMXP_H */ - - diff --git a/libretroshare/src/gxs/db_gxp.h b/libretroshare/src/gxs/db_gxp.h deleted file mode 100644 index d536e1fce..000000000 --- a/libretroshare/src/gxs/db_gxp.h +++ /dev/null @@ -1,443 +0,0 @@ -/* - * libretroshare/src/gxp: gxp.h - * - * General Exchange Protocol interface for RetroShare. - * - * Copyright 2011-2011 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef RS_GXP_H -#define RS_GXP_H - - - -/************************************************************************ - * This File describes the following components for a generalised exchange protocol (GXP). - * - * GPP: General Permissions Protocol: Who is allowed access to what? - * GDP: General Data Protocol: High Level Interface for exchanging data. - * GSP: General Storage Protocol: Class implementing GDP for disk access. - * GNP: General Network Protocol: Class implementing GDP for network exchange. - * - * This will be the mechanism to enforce groups. - * No idea what the data types will look like. - * - *****/ - -/************************************************************************ - * GPP: General Permissions Protocol - * - * This will be the mechanism to enforce groups. - * No idea what the data types will look like. - * The real challenge here is to ensure that the permissions are universal, - * so they can be baked into the messages. - * - * PUBLIC: - * - * RESTRICTED: - * - * PUBLISHER_ONLY_SHARE: - * - * GROUP: list - * - * GROUP: signed by list - * - * SAME AS GROUP_DESCRIPTION: (for messages) - * - * These permissions will need to be coupled to local permissions... - * eg. I don't want Party Photos going to Work Collegues. - * - * The combination of both permissions will determine who things are shared with. - * - *****/ - -class gpp::group -{ - - -} - -class gpp::Permissions -{ - - - -}; - - -/************************************************************************ - * GDP: General Data Protocol - * - * Generic Data Interface used for both GNP and GSP - * - * Permissions are handled at this level... totally generic to all messages. - * - * gxmp::signedmsg represents the "original data" container format that will - * be tranported and stored by GSP / GNP cmodules. - *****/ - -class gxp::id -{ - std::string id; -}; - -/****** - * NOTES: - * 1) Based on Forum/Channel Groups. - * 2) Will likely need to extend to handle info for other services. - * 3) Perhaps a more generalised class like gxmp::msg would be best with extra data. - * - */ - -class gxmp::group -{ - gxp::id grpId; - uint32_t grpType; /* FORUM, CHANNEL, TWITTER, etc */ - - uint32_t timestamp; - uint32_t grpFlags; - std::string grpName; - std::string grpDesc; - std::string grpCategory; - - RsTlvImage grpPixmap; - - gpp::permissions grpPermissions; - - gxip::keyref adminKey; - gxip::keyrefset publishKeys; - - gxip::signature adminSignature; -}; - -/****** - * NOTES: - * 1) It is possible for the packet to be encrypted, rather than just signed. - * so the uncrypted data mustn't give away too much about whats in the msg. - * 2) This is based on the DistribSignedMsg format. - * 3) Combined signatures instead of explict publish/personal signs - - * to make it more general. Expect first signature == msgId. - * 4) Should the permissions be only a group level, or for individual msgs as well? - * - */ - -class gxp::signedmsg -{ - gxp::id groupId; /* high level groupings, e.g. specific forum, channel, or twitter user, etc. */ - gxp::id msgId; /* unique msgId within that group, normally signature of the message */ - - uint32_t timestamp; - gpp::permissions grpPermissions; - - gxp::data packet; /* compressed data */ - - gxip::signset signatures; -}; - - -class gdp::interface -{ - /* query for available groups & messages */ - int listgroups(std::list &grpIds); - /* response from listmsgs: -1 = invalid parameters, 0 = incomplete list, 1 = all known msgs */ - int listmsgs(const gdp::id grpId, std::list &msgIds, const rstime_t from, const rstime_t to, const int maxmsgs); - - /* response from requestMsg: YES (available immediately), RETRIEVING (known to exist), - * IN_REQUEST (might exist), NOT_AVAILABLE (still might exist) - * NB: NOT_AVAILABLE could mean that it will be retrievable later when other peers come online, or possibilly we are not allowed it. - */ - - int requestMsg(gdp::id groupId, gdp::id msgId, double &delay); - int getMsg(gdp::id groupId, gdp::id msgId, gdp::message &msg); - int storeMsg(const gdp::message &msg); - - /* search interface, is it here? or next level up */ - -}; - - -/************************************************************************ - * GSP: General Storage Protocol - * - * This will be the mechanism used to store both GIXP and GMXP data. - * - * This will have a decent index system - which is loaded immediately. - * meaning we know if a message exists or not. - * - * We will also implement a cache system, meaning recently accessed data - * is available immediately. - * - * - * - *****/ - -class gsp::storage: public gdp::interface -{ - /*** gdp::iterface *****/ - int requestMsg(gdp::id groupId, gdp::id msgId, double &delay); - - int getMsg(gdp::id groupId, gdp::id msgId, gdp::message &msg); - int storeMsg(const gdp::message &msg); - - int flagMsg(gxp::id grpId, gxp::id msgId, bool pleaseCache); - - - /*** IMPLEMENTATION DETAILS ****/ - - loadIndex(); - loadCache(); - - bool isInCache(gdp::id grpId, gdp::id msgId); - bool isInIndex(gdp::id grpId, gdp::id msgId); - void fetchToCache(gdp::id grpId, gdp::id msgId); - -}; - - - -/************************************************************************ - * GNP: General Network Protocol - * - * This will be the mechanism share data with peers. - * It will be designed and closely couple to GSP for effective data managment. - * - * This part will effectively interface with librs Network Service. - * This will also push message ids around - to indicate new messages. - * - * This would sit above the GSP, and push things into storage - * as they come over the network - * - * - *****/ - - -class gnp::exchange: public gdp::interface -{ - /*** gdp::iterface *****/ - int requestMsg(gdp::id groupId, gdp::id msgId, double &delay); - - int getMsg(gdp::id groupId, gdp::id msgId, gdp::message &msg); - int storeMsg(const gdp::message &msg); - - /*** IMPLEMENTATION DETAILS ****/ - - /* Get/Send Messages */ - getAvailableMsgs(gdp::id grpId, rstime_t from, rstime_t to); /* request over the network */ - sendAvailableMsgs(std::string peerId, gdp::id grpId, rstime_t from, rstime_t to); /* send to peers */ - - requestMessages(std::string peerId, gdp::id grpId, std::list msgIds); - sendMessages(std::string peerId, gdp::id grpId, std::list msgIds); /* send to peer, obviously permissions have been checked first */ - - /* Search the network */ - -}; - - -/************************************************************************ - * GIXP: General Identity Exchange Protocol. - * - * As we're always running into troubles with GPG signatures... we are going to - * create a layer of RSA Keys for the following properties: - * - * 1) RSA Keys can be Anonymous, Self-Signed with Pseudonym, Signed by GPG Key. - * - Anonymous & Pseudonym Keys will be shared network-wide (Hop by Hop). - - GPG signed Keys will only be shared if we can validate the signature - (providing similar behaviour to existing GPG Keys). - - GPG signed Keys can optionally be marked for Network-wide sharing. - * 2) These keys can be used anywhere, specifically in the protocols described below. - * 3) These keys can be used to sign, encrypt, verify & decrypt - * 4) Keys will never need to be directly accessed - stored in this class. - * 5) They will be cached locally and exchanged p2p, by pull request. - * 6) This class will use the generalised packet storage for efficient caching & loading. - * 7) Data will be stored encrypted. - *****/ - -class gixp::key -{ - gxip::keyref mKeyId; - - PubKey *pubKey; - PrivateKey *privKey; /* NULL if non-existant */ -}; - -class gixp::profile -{ - public: - - gxip::keyref mKeyId; - - std::string mPseudonym; - rstime_t mTimestamp; /* superseded by newer timestamps */ - uint32_t mProfileType; /* ANONYMOUS (no name, self-signed), PSEUDONYM (self-signed), GPG (name=gpgname, gpgsigned), REVOCATION?? */ - gpp::permissions mPermissions; - - gxip::signature mSignature; -}; - -class gxip::keyref -{ - std::string keyId; -} - -class gxip::keyrefset -{ - std::list keyIds; -} - -class gxip::signature -{ - gxip::keyref signer; - std::string signature; -} - -class gxip::signset -{ - std::list signs; -}; - -/******* - * NOTES: - * 1) much of this is already implemented in libretroshare/src/distrib/distribsecurity.cc - * 2) Data types will need to be shoehorned into gxmp::signedmsg format for transport. - * 3) Likewise this class will sit above a gdp/gnp/gsp data handling. - */ - -class p3gixp -{ - bool createKey(gixp::profile); /* fills in mKeyId, and signature */ - - bool haveKey(keyId); - bool havePrivateKey(keyId); - bool requestKey(keyId); - - gixp::profile getProfile(keyId); - - /*** process data ***/ - bool sign(KeyId, Data, signature); - bool verify(KeyId, Data, signature); - bool decrypt(KeyId, Data, decryptedData); - bool encrypt(KeyId, Data, decryptedData); - -}; - - -/************************************************************************ - * GMXP: General Message Exchange Protocol. - * - * The existing experiences of Forums & Channels have highlighted some - * significant limitations of the Cache-Based exchange system. Based - * on this initial understandings - an improved transport system will - * be design to provide a generalised message exchange foundation, - * which can be used to build new services... - * - * - * Key Properties: - * - * 1) Message independent: Should be able to be used for Forums, Channels - * Twitter, Photos, Task Tracking, Link Cloud, etc. - * 2) Easy to Use: Specify(Msg, Permissions, KeyId) only. - * 3) Efficient Network Transport. (in common with GIXP) - * 4) Efficient Cache System (in common with GIXP). - * 5) Uses Groups Feature (in common with GIXP). - * 6) Search Protocols. ( might need overloading at higher level). - * - *****/ - - -/****** - * NOTES: - * 1) This represents the base of the Unpacked Msgs, it will be overloaded by all classes - * that want to use the service. It is difficult to go from gxmp::msg => gxmp::signedmsg - * so data should be stored in the signedmsg format. - * 2) All services will fundamentally use data types derived from this. - * 3) This packet is only serialised once at post time, typically it is deserialised be all nodes. - */ - -class gxmp::msg -{ - gxp::id groupId; - gxp::id msgId; - - gxp::id parentId; /* for full threading */ - gxp::id threadId; /* top of thread Id */ - - gxp::id origMsgId; /* if a replacement msg, otherwise == msgId */ - gxp::id replacingMsgId; /* if a replacement msg, otherwise == NULL (for ordering) */ - - uint32_t type; /* FORUM, CHANNEL, EVENT, COMMENT, VOTE, etc */ - uint32_t flags; /* Is this needed? */ - uint32_t timestamp; - - gpp::permissions msgPermissions; - - gxip::signset signatures; -}; - - - -/****** - * NOTES: - * 1) This class will be based on p3distrib - which does most of this stuff already! - * 2) There are lots of virtual functions - which can be overloaded to customise behaviour. - * for clarity - these have not been shown here. - * - * 3) We need to extend this class to add search functionality... so you can discover new - * stuff from your friends. This will need to be an overloaded functionality as the - * search will be service specific. - */ - - -class p3gmxp -{ - p3gmxp(int serviceType, serialiser *); - - /* create content */ - std::string createGroup(std::wstring name, std::wstring desc, uint32_t flags, unsigned char *pngImageData, uint32_t imageSize); - std::string publishMsg(RsDistribMsg *msg, bool personalSign); - - /* indicate interest in info */ - bool subscribeToGroup(const std::string &grpId, bool subscribe); - - /* search messages (TO DEFINE) */ - - /* extract messages (From p3Distrib Existing Methods) */ - - bool getAllGroupList(std::list &grpids); - bool getSubscribedGroupList(std::list &grpids); - bool getPublishGroupList(std::list &grpids); - void getPopularGroupList(uint32_t popMin, uint32_t popMax, std::list &grpids); - - bool getAllMsgList(const std::string& grpId, std::list &msgIds); - bool getParentMsgList(const std::string& grpId, - const std::string& pId, std::list &msgIds); - bool getTimePeriodMsgList(const std::string& grpId, uint32_t timeMin, - uint32_t timeMax, std::list &msgIds); - - GroupInfo *locked_getGroupInfo(const std::string& grpId); - RsDistribMsg *locked_getGroupMsg(const std::string& grpId, const std::string& msgId); - - void getGrpListPubKeyAvailable(std::list& grpList); - -}; - - -#endif /* RS_GXP_H */ - - diff --git a/libretroshare/src/gxs/db_gxp_apps.h b/libretroshare/src/gxs/db_gxp_apps.h deleted file mode 100644 index d3d0455ba..000000000 --- a/libretroshare/src/gxs/db_gxp_apps.h +++ /dev/null @@ -1,385 +0,0 @@ -/* - * libretroshare/src/gxp: gxp_apps.h - * - * General Exchange Protocol interface for RetroShare. - * - * Copyright 2011-2011 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef RS_GXP_APPS_H -#define RS_GXP_APPS_H - - - -/************************************************************************ - * This File describes applications that will use the GXP protocols. - * - *****/ - - -/************************************************************************ - * Forums / Channels. - * - * The existing experiences of Forums & Channels have highlighted some - * significant limitations of the Cache-Based exchange system. The new - * and improved system will be based on GMXP. - * - * Existing Issues to deal with: - * 1) GPG Signatures take too long to verify (GPGme/gpg.exe issue) - * 2) Signatures are re-verified each startup. - * 3) Forum Messages are broadcast to all peers - excessive traffic/disk space. - * 4) Impossible to Edit Messages, or Comment on Channel Posts. - * - * Most of these issues (1-3) will be dealt with via GMXP GIXP system - * - * The data structures below are closely modelled on existing types. - * - *****/ - -class gxp::forum::msg: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; - //gxp::id threadId; - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR FORUM MSG ****/ - - std::string srcId; - std::string title; - std::string msg; - -}; - -class gxp::channel::msg: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; // NOT USED. - //gxp::id threadId; // NOT USED. - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR CHANNEL MSG ****/ - - std::wstring subject; - std::wstring message; - - RsTlvFileSet attachment; - RsTlvImage thumbnail; - -}; - - -/************************************************************************ - * Events. - * - * It is well known that Events & Photos are the two primary uses for - * Facebook. It is imperative that these are implemented in GXP. - * - *****/ - -class gxp::events::event: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; - //gxp::id threadId; - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR EVENT MSG ****/ - - location - time - repeats - invite list - number of places. - host - - -}; - -class gxp::events::reply: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; - //gxp::id threadId; - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR REPLY MSG ****/ - - bool amcoming; - -}; - - -/************************************************************************ - * Photos. - * - *****/ - -class gxp::PhotoAlbum: public gmxp::group -{ - Location - Period - Type - Photographer - Comments -}; - - - -class gxp::photos::photo: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; - //gxp::id threadId; - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR PHOTO MSG ****/ - - Location - Time - Type - Photographer - Comment - - FileLink. -}; - - -/************************************************************************ - * Wiki. - * - * Wiki pages are very similar to Forums... Just they are editable - * but anyone, and will replace the earlier version. - * - *****/ - - -class gxp::wiki::topic: public gmxp::group -{ - - -} - - -class gxp::wiki::page: public gmxp::msg -{ - /**** PROVIDED BY PARENT ***/ - //gxp::id groupId; - //gxp::id msgId; - - //gxp::id parentId; - //gxp::id threadId; - - //gxp::id origMsgId; - //gxp::id replacingMsgId; - - //uint32_t timestamp; - //uint32_t type; - //uint32_t flags; - - //gpp::permissions msgPermissions; - //gxp::signset signatures; - - /**** SPECIFIC FOR FORUM MSG ****/ - - Title - Format - Page - - Links - References - -}; - - -/************************************************************************ - * Links. - * - *****/ - -class gxp::Link -{ - - - - -}; - - - -/************************************************************************ - * Comments. - * - *****/ - -class gxp::Comment -{ - - - - -}; - - -/************************************************************************ - * Vote. - * - *****/ - -class gxp::Vote -{ - - - - -}; - - -/************************************************************************ - * Status - * - *****/ - -class gxp::Status -{ - - - - -}; - - - -/************************************************************************ - * Tasks - * - *****/ - -class gxp::Task -{ - - - - -}; - - -/************************************************************************ - * Tweet - * - *****/ - -class gxp::Tweet -{ - HashTags - - Content - - Links -}; - - -/************************************************************************ - * Library. - * - *****/ - -class gxp::Paper -{ - KeyWords - - Journal - - Authors - - Abstract - - References - - Similar Papers -}; - - - - - -#endif /* RS_GXP_H */ - - diff --git a/libretroshare/src/gxs/db_gxp_service.h b/libretroshare/src/gxs/db_gxp_service.h deleted file mode 100644 index 85755e06e..000000000 --- a/libretroshare/src/gxs/db_gxp_service.h +++ /dev/null @@ -1,104 +0,0 @@ - -/* Generalised Service Base Class. - * The base class interfaces with gixp, disk, net services. - */ - -class RsGxpLink -{ - uint32_t type; - std::string msgId; -} - -class RsGxpItem -{ - std::string msgId; - std::string origMsgId; - std::string groupId; - gxpTime time; - std::list hashtags; - std::list linked; - - RsGxpSignature mSignature; -}; - -class RsGxpGroup -{ - - - -}; - -class gxp_service -{ - public: - - requestItem(msgId); - - recv(RsGxpItem *item); - send(RsGxpItem *item); - - /****************************************************************************************************/ - // Event Callback for the service. - /****************************************************************************************************/ - - notify_groupChanged(); // Mainly for GUI display. - notify_newMessage(); // used for newsFeeds. - notify_duplicateMessage(); // Channels needs this for Downloading stuff, can probably be moved above. - locked_checkDistribMsg(); // required overload? - /****************************************************************************************************/ - // Must worry about sharing keys. - // Can gixp handle it? - // What interfaces do we need here? - /****************************************************************************************************/ - - /****************************************************************************************************/ - // Interface for Message Read Status - // At the moment this is overloaded to handle autodownload flags too. - // This is a configuration thing. - /****************************************************************************************************/ - - int flagItemRead(std::string id); - int flagItemUnread(std::string id); - int flagGroupRead(std::string id); - int flagGroupUnread(std::string id); - - /****************************************************************************************************/ - // External Interface for Data. - /****************************************************************************************************/ - - // Mesage Creation. - int createGroup(RsGxpGroup *grp); - int createItem(RsGxpItem *item); - - // Group Lists & Message Lists. - int getGroupsChanged(std::list &groupIds); - int getGroups(std::list &groupIds); - int getGroupList(std::string grpId, std::list &groupIds); - int getTimeRange(GxpTime from, GxpTime to, std::list &msgIds); - int getGroupTimeRange(std::string grpId, GxpTime from, GxpTime to, std::list &msgIds); - int getReplacementMsgs(std::string origId, std::list replaceIds); - - // Getting the Actual Data. - int haveItem(std::string msgId); - int requestItem(std::string msgId); - RsGxpItem *getMsg_locked(std::string msgId); - RsGxpGroup *getGroup_locked(std::string msgId); - - // Interface with GIXP Stuff... everything else should be behind the scenes. - RsGixpProfile *getProfile_locked(std::string id); - - // Immediate Search... - int searchReferringLinks(RsGxpLink link, std::list &msgIds); - int searchHashTags(std::list, std::list &msgIds); - - // Remote Search... - - private: - - // Reversed Index: for hash searching. - std::map > mSearchMap; -}; - - - - diff --git a/libretroshare/src/gxs/db_acadeeb.h b/libretroshare/src/unfinished/db_acadeeb.h similarity index 100% rename from libretroshare/src/gxs/db_acadeeb.h rename to libretroshare/src/unfinished/db_acadeeb.h diff --git a/libretroshare/src/gxs/db_wire.h b/libretroshare/src/unfinished/db_wire.h similarity index 100% rename from libretroshare/src/gxs/db_wire.h rename to libretroshare/src/unfinished/db_wire.h From 98bf2922cb6ae2dd956de33f7829db64202c3edf Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 14:44:45 +0100 Subject: [PATCH 15/26] removed old/unused files --- libretroshare/src/pqi/authgpgtest.cc | 408 --------------------- libretroshare/src/pqi/authgpgtest.h | 160 -------- libretroshare/src/pqi/authssltest.cc | 223 ----------- libretroshare/src/pqi/authssltest.h | 101 ----- libretroshare/src/retroshare/rspostedVEG.h | 151 -------- 5 files changed, 1043 deletions(-) delete mode 100644 libretroshare/src/pqi/authgpgtest.cc delete mode 100644 libretroshare/src/pqi/authgpgtest.h delete mode 100644 libretroshare/src/pqi/authssltest.cc delete mode 100644 libretroshare/src/pqi/authssltest.h delete mode 100644 libretroshare/src/retroshare/rspostedVEG.h diff --git a/libretroshare/src/pqi/authgpgtest.cc b/libretroshare/src/pqi/authgpgtest.cc deleted file mode 100644 index 36193fa26..000000000 --- a/libretroshare/src/pqi/authgpgtest.cc +++ /dev/null @@ -1,408 +0,0 @@ -/* - * libretroshare/src/ : authgpgtest.cc - * - * GPG interface for RetroShare. - * - * Copyright 2009-2010 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - * This is *THE* auth manager. It provides the web-of-trust via - * gpgme, and authenticates the certificates that are managed - * by the sublayer AuthSSL. - * - */ - -#include "pqi/authgpgtest.h" - -AuthGPGtest::AuthGPGtest() -{ - mOwnGPGId = "TEST_DUMMY_OWN_GPG_ID"; - return; -} - - /** - * @param ids list of gpg certificate ids (note, not the actual certificates) - */ -bool AuthGPGtest::availableGPGCertificatesWithPrivateKeys(std::list &ids) -{ - std::cerr << "AuthGPGtest::availableGPGCertificatesWithPrivateKeys()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::printKeys() -{ - std::cerr << "AuthGPGtest::printKeys()"; - std::cerr << std::endl; - return true; -} - - -/*********************************************************************************/ -/************************* STAGE 1 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 1: Initialisation.... As we are switching to OpenPGP the init functions - * will be different. Just move the initialisation functions over.... - * - * As GPGMe requires external calls to the GPG executable, which could potentially - * be expensive, We'll want to cache the GPG keys in this class. - * This should be done at initialisation, and saved in a map. - * (see storage at the end of the class) - * - ****/ -bool AuthGPGtest::active() -{ - std::cerr << "AuthGPGtest::active()"; - std::cerr << std::endl; - return true; -} - - - /* Initialize */ -bool AuthGPGtest::InitAuth() -{ - std::cerr << "AuthGPGtest::InitAuth()"; - std::cerr << std::endl; - return true; -} - - - /* Init by generating new Own PGP Cert, or selecting existing PGP Cert */ -int AuthGPGtest::GPGInit(const std::string& ownId) -{ - std::cerr << "AuthGPGtest::GPGInit(): new OwnId: " << ownId; - std::cerr << std::endl; - mOwnGPGId = ownId; - return true; -} - -bool AuthGPGtest::CloseAuth() -{ - std::cerr << "AuthGPGtest::CloseAuth()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::GeneratePGPCertificate(std::string name, std::string email, std::string passwd, std::string &pgpId, std::string &errString) -{ - std::cerr << "AuthGPGtest::GeneratePGPCertificate()"; - std::cerr << std::endl; - return true; -} - - -/*********************************************************************************/ -/************************* STAGE 3 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 3: These are some of the most commonly used functions in Retroshare. - * - * More commonly used functions. - * - * provide access to details in cache list. - * - ****/ -std::string getGPGName(const std::string &pgp_id) -{ - std::cerr << "AuthGPGtest::getGPGName()"; - std::cerr << std::endl; - return "DUMMY_NAME"; -} - -std::string getGPGEmail(const std::string &pgp_id) -{ - std::cerr << "AuthGPGtest::getGPGEmail()"; - std::cerr << std::endl; - return "DUMMY_EMAIL"; -} - - - /* PGP web of trust management */ -std::string AuthGPGtest::getGPGOwnId() -{ - std::cerr << "AuthGPGtest::getGPGOwnId()"; - std::cerr << std::endl; - return mOwnGPGId; -} - -std::string AuthGPGtest::getGPGOwnName() -{ - std::cerr << "AuthGPGtest::getGPGOwnName()"; - std::cerr << std::endl; - return "DUMMY_OWN_NAME"; -} - - -#if 0 -std::string AuthGPGtest::getGPGOwnEmail() -{ - std::cerr << "AuthGPGtest::getGPGOwnEmail()"; - std::cerr << std::endl; - return "DUMMY_OWN_EMAIL"; -} -#endif - -bool AuthGPGtest::getGPGDetails(const std::string& id, RsPeerDetails &d) -{ - std::cerr << "AuthGPGtest::getGPGDetails()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::getGPGAllList(std::list &ids) -{ - std::cerr << "AuthGPGtest::getGPGAllList()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::getGPGValidList(std::list &ids) -{ - std::cerr << "AuthGPGtest::getGPGValidList()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::getGPGAcceptedList(std::list &ids) -{ - std::cerr << "AuthGPGtest::getGPGAcceptedList()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::getGPGSignedList(std::list &ids) -{ - std::cerr << "AuthGPGtest::getGPGSignedList()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::isGPGValid(const std::string& id) -{ - std::cerr << "AuthGPGtest::isGPGValid()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::isGPGSigned(const std::string& id) -{ - std::cerr << "AuthGPGtest::isGPGSigned()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::isGPGAccepted(const std::string& id) -{ - std::cerr << "AuthGPGtest::isGPGAccepted()"; - std::cerr << std::endl; - return true; -} - -bool isGPGId(const std::string &id) -{ - std::cerr << "AuthGPGtest::isGPGId()"; - std::cerr << std::endl; - return true; -} - - -/*********************************************************************************/ -/************************* STAGE 4 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 4: Loading and Saving Certificates. (Strings and Files) - * - ****/ -bool AuthGPGtest::LoadCertificateFromString(const std::string& pem, std::string &gpg_id, - std::string& error_string) -{ - std::cerr << "AuthGPGtest::LoadCertificateFromString()"; - std::cerr << std::endl; - return true; -} - -std::string AuthGPGtest::SaveCertificateToString(const std::string& id) -{ - std::cerr << "AuthGPGtest::SaveCertificateToString()"; - std::cerr << std::endl; - return "NOT_A_CERTIFICATE"; -} - - -/*********************************************************************************/ -/************************* STAGE 6 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 6: Authentication, Trust and Signing. - * - * This is some of the harder functions, but they should have been - * done in gpgroot already. - * - ****/ -bool AuthGPGtest::setAcceptToConnectGPGCertificate(const std::string& gpg_id, - bool acceptance) -{ - std::cerr << "AuthGPGtest::setAcceptToConnectGPGCertificate()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::SignCertificateLevel0(const std::string& id) -{ - std::cerr << "AuthGPGtest::SignCertificateLevel0()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::RevokeCertificate(const std::string& id) -{ - std::cerr << "AuthGPGtest::RevokeCertificate()"; - std::cerr << std::endl; - return true; -} - -virtual bool TrustCertificate(const std::string &id, int trustlvl) -{ - std::cerr << "AuthGPGtest::TrustCertificate()"; - std::cerr << std::endl; - return true; -} -void AuthGPGtest::run() -{ - -} - -#if 0 -bool AuthGPGtest::TrustCertificateNone(std::string id) -{ - std::cerr << "AuthGPGtest::TrustCertificateNone()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::TrustCertificateMarginally(std::string id) -{ - std::cerr << "AuthGPGtest::TrustCertificateMarginally()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::TrustCertificateFully(std::string id) -{ - std::cerr << "AuthGPGtest::TrustCertificateFully()"; - std::cerr << std::endl; - return true; -} - -#endif - -bool AuthGPGtest::TrustCertificate(std::string id, int trustlvl) -{ - std::cerr << "AuthGPGtest::TrustCertificate()"; - std::cerr << std::endl; - return true; -} - - -/*********************************************************************************/ -/************************* STAGE 7 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 7: Signing Data. - * - * There should also be Encryption Functions... (do later). - * - ****/ -#if 0 -bool AuthGPGtest::SignData(std::string input, std::string &sign) -{ - std::cerr << "AuthGPGtest::SignData()"; - std::cerr << std::endl; - return false; -} - -bool AuthGPGtest::SignData(const void *data, const uint32_t len, std::string &sign) -{ - std::cerr << "AuthGPGtest::SignData()"; - std::cerr << std::endl; - return false; -} - -bool AuthGPGtest::SignDataBin(std::string input, unsigned char *sign, unsigned int *signlen) -{ - std::cerr << "AuthGPGtest::SignDataBin()"; - std::cerr << std::endl; - return false; -} -#endif - -bool AuthGPGtest::SignDataBin(const void *data, const uint32_t len, unsigned char *sign, unsigned int *signlen) -{ - std::cerr << "AuthGPGtest::SignDataBin()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::VerifySignBin(const void*, uint32_t, unsigned char*, unsigned int, const std::string& withfingerprint) -{ - std::cerr << "AuthGPGtest::VerifySignBin()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGtest::decryptText(gpgme_data_t CIPHER, gpgme_data_t PLAIN) -{ - std::cerr << "AuthGPGtest::decryptText()"; - std::cerr << std::endl; - return true; -} - -bool AuthGPGimpl::addService(AuthGPGService *service) -{ - std::cerr << "AuthGPGtest::addService()"; - std::cerr << std::endl; - return true; -} - -std::string AuthGPGtest::getGPGName(const std::string & pgp_id) -{ - std::cerr << "AuthGPGtest::getGPGName()"; - std::cerr << std::endl; - return std::string(""); -} - -bool AuthGPGtest::TrustCertificate(const std::string & id, int trustlvl) -{ -} - -bool AuthGPGtest::isGPGId(const std::string & id) -{ -} - -std::string AuthGPGtest::getGPGEmail(const std::string & pgp_id) -{ -} - -bool AuthGPGtest::encryptText(gpgme_data_t PLAIN, gpgme_data_t CIPHER) -{ - std::cerr << "AuthGPGtest::encryptText()"; - std::cerr << std::endl; - return false; -} - diff --git a/libretroshare/src/pqi/authgpgtest.h b/libretroshare/src/pqi/authgpgtest.h deleted file mode 100644 index dacb0f745..000000000 --- a/libretroshare/src/pqi/authgpgtest.h +++ /dev/null @@ -1,160 +0,0 @@ -/* - * libretroshare/src/ : authgpgtest.h - * - * GPG interface for RetroShare. - * - * Copyright 2009-2010 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - * This is *THE* auth manager. It provides the web-of-trust via - * gpgme, and authenticates the certificates that are managed - * by the sublayer AuthSSL. - * - */ - -#ifndef RS_GPG_AUTH_TEST_HEADER -#define RS_GPG_AUTH_TEST_HEADER - -#include "pqi/authgpg.h" - -/* override the default AuthGPG */ -void setAuthGPG(AuthGPG *newgpg); - -class AuthGPGtest: public AuthGPG -{ - - public: - AuthGPGtest(); - - /** - * @param ids list of gpg certificate ids (note, not the actual certificates) - */ -virtual bool availableGPGCertificatesWithPrivateKeys(std::list &ids); -virtual bool printKeys(); - -/*********************************************************************************/ -/************************* STAGE 1 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 1: Initialisation.... As we are switching to OpenPGP the init functions - * will be different. Just move the initialisation functions over.... - * - * As GPGMe requires external calls to the GPG executable, which could potentially - * be expensive, We'll want to cache the GPG keys in this class. - * This should be done at initialisation, and saved in a map. - * (see storage at the end of the class) - * - ****/ -virtual bool active(); - - /* Initialize */ -virtual bool InitAuth (); -virtual void run(); - - /* Init by generating new Own PGP Cert, or selecting existing PGP Cert */ -virtual int GPGInit(const std::string& ownId); -virtual bool CloseAuth(); -virtual bool GeneratePGPCertificate(std::string name, std::string email, std::string passwd, std::string &pgpId, std::string &errString); - -/*********************************************************************************/ -/************************* STAGE 3 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 3: These are some of the most commonly used functions in Retroshare. - * - * More commonly used functions. - * - * provide access to details in cache list. - * - ****/ -virtual std::string getGPGName(const std::string &pgp_id); -virtual std::string getGPGEmail(const std::string &pgp_id); - - /* PGP web of trust management */ -virtual std::string getGPGOwnId(); -virtual std::string getGPGOwnName(); - -//virtual std::string getGPGOwnEmail(); -virtual bool getGPGDetails(const std::string& id, RsPeerDetails &d); -virtual bool getGPGAllList(std::list &ids); -virtual bool getGPGValidList(std::list &ids); -virtual bool getGPGAcceptedList(std::list &ids); -virtual bool getGPGSignedList(std::list &ids); -virtual bool isGPGValid(const std::string& id); -virtual bool isGPGSigned(const std::string& id); -virtual bool isGPGAccepted(const std::string& id); -virtual bool isGPGId(const std::string &id); - -/*********************************************************************************/ -/************************* STAGE 4 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 4: Loading and Saving Certificates. (Strings and Files) - * - ****/ -virtual bool LoadCertificateFromString(const std::string& pem, std::string &gpg_id, - std::string& error_string); -virtual std::string SaveCertificateToString(const std::string& id); - -/*********************************************************************************/ -/************************* STAGE 6 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 6: Authentication, Trust and Signing. - * - * This is some of the harder functions, but they should have been - * done in gpgroot already. - * - ****/ -virtual bool setAcceptToConnectGPGCertificate(const std::string& gpg_id, - bool acceptance); //don't act on the gpg key, use a seperate set -virtual bool SignCertificateLevel0(const std::string& id); -virtual bool RevokeCertificate(const std::string& id); /* Particularly hard - leave for later */ -//virtual bool TrustCertificateNone(std::string id); -//virtual bool TrustCertificateMarginally(std::string id); -//virtual bool TrustCertificateFully(std::string id); -virtual bool TrustCertificate(const std::string &id, int trustlvl); //trustlvl is 2 for none, 3 for marginal and 4 for full trust - -/*********************************************************************************/ -/************************* STAGE 7 ***********************************************/ -/*********************************************************************************/ -/***** - * STAGE 7: Signing Data. - * - * There should also be Encryption Functions... (do later). - * - ****/ -//virtual bool SignData(std::string input, std::string &sign); -//virtual bool SignData(const void *data, const uint32_t len, std::string &sign); -//virtual bool SignDataBin(std::string input, unsigned char *sign, unsigned int *signlen); -virtual bool SignDataBin(const void *data, const uint32_t len, unsigned char *sign, unsigned int *signlen); -virtual bool VerifySignBin(const void*, uint32_t, unsigned char*, unsigned int, const std::string& withfingerprint); -virtual bool decryptText(gpgme_data_t CIPHER, gpgme_data_t PLAIN); -virtual bool encryptText(gpgme_data_t PLAIN, gpgme_data_t CIPHER); -//END of PGP public functions - -virtual bool addService(AuthGPGService *service); - private: - - std::string mOwnGPGId; -}; - - - - -#endif diff --git a/libretroshare/src/pqi/authssltest.cc b/libretroshare/src/pqi/authssltest.cc deleted file mode 100644 index a4a3d6a5e..000000000 --- a/libretroshare/src/pqi/authssltest.cc +++ /dev/null @@ -1,223 +0,0 @@ -/* - * libretroshare/src/pqi: authssltest.cc - * - * 3P/PQI network interface for RetroShare. - * - * Copyright 2004-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "pqi/authssltest.h" - -AuthSSLtest::AuthSSLtest() -{ - mOwnId = "abcdtestid12345678"; -} - - - /* Initialisation Functions (Unique) */ -bool AuthSSLtest::validateOwnCertificate(X509 *x509, EVP_PKEY *pkey) -{ - std::cerr << "AuthSSLtest::validateOwnCertificate()"; - std::cerr << std::endl; - return false; -} - - -bool AuthSSLtest::active() -{ - std::cerr << "AuthSSLtest::active()"; - std::cerr << std::endl; - return true; -} - -int AuthSSLtest::InitAuth(const char *srvr_cert, const char *priv_key, - const char *passwd) -{ - std::cerr << "AuthSSLtest::InitAuth()"; - std::cerr << std::endl; - return 1; -} - -bool AuthSSLtest::CloseAuth() -{ - std::cerr << "AuthSSLtest::AuthSSLtest::CloseAuth()"; - std::cerr << std::endl; - return 1; -} - - - /*********** Overloaded Functions from p3AuthMgr **********/ - - /* get Certificate Id */ -std::string AuthSSLtest::OwnId() -{ - std::cerr << "AuthSSLtest::OwnId"; - std::cerr << std::endl; - return mOwnId; -} - -std::string AuthSSLtest::getOwnLocation() -{ - std::cerr << "AuthSSLtest::getOwnLocation"; - std::cerr << std::endl; - return "TestVersion"; -} - -//bool getAllList(std::list &ids); -//bool getAuthenticatedList(std::list &ids); -//bool getUnknownList(std::list &ids); -//bool getSSLChildListOfGPGId(std::string gpg_id, std::list &ids); - - /* get Details from the Certificates */ -//bool isAuthenticated(std::string id); -//virtual std::string getName(std::string id); -//std::string getIssuerName(std::string id); -//std::string getGPGId(SSL_id id); -//bool getCertDetails(std::string id, sslcert &cert); - - /* Load/Save certificates */ -std::string AuthSSLtest::SaveOwnCertificateToString() -{ - std::cerr << "AuthSSLtest::SaveOwnCertificateToString()"; - std::cerr << std::endl; - return std::string(); -} - - - /* Sign / Encrypt / Verify Data */ -bool AuthSSLtest::SignData(std::string input, std::string &sign) -{ - std::cerr << "AuthSSLtest::SignData()"; - std::cerr << std::endl; - return false; -} - -bool AuthSSLtest::SignData(const void *data, const uint32_t len, std::string &sign) -{ - std::cerr << "AuthSSLtest::SignData()"; - std::cerr << std::endl; - return false; -} - - -bool AuthSSLtest::SignDataBin(std::string, unsigned char*, unsigned int*) -{ - std::cerr << "AuthSSLtest::SignDataBin()"; - std::cerr << std::endl; - return false; -} - -bool AuthSSLtest::SignDataBin(const void*, uint32_t, unsigned char*, unsigned int*) -{ - std::cerr << "AuthSSLtest::SignDataBin()"; - std::cerr << std::endl; - return false; -} - -bool AuthSSLtest::VerifyOwnSignBin(const void*, uint32_t, unsigned char*, unsigned int) -{ - std::cerr << "AuthSSLtest::VerifyOwnSignBin()"; - std::cerr << std::endl; - return false; -} - -bool AuthSSLtest::VerifySignBin(const void *data, const uint32_t len, - unsigned char *sign, unsigned int signlen, SSL_id sslId) -{ - std::cerr << "AuthSSLtest::VerifySignBin()"; - std::cerr << std::endl; - return false; -} - - - -// return : false if encrypt failed -bool AuthSSLtest::encrypt(void *&out, int &outlen, const void *in, int inlen, std::string peerId) -{ - std::cerr << "AuthSSLtest::encrypt()"; - std::cerr << std::endl; - return false; -} - -// return : false if decrypt fails -bool AuthSSLtest::decrypt(void *&out, int &outlen, const void *in, int inlen) -{ - std::cerr << "AuthSSLtest::decrypt()"; - std::cerr << std::endl; - return false; -} - - - -X509* AuthSSLtest::SignX509ReqWithGPG(X509_REQ *req, long days) -{ - std::cerr << "AuthSSLtest::SignX509ReqWithGPG"; - std::cerr << std::endl; - return NULL; -} - -bool AuthSSLtest::AuthX509WithGPG(X509 *x509) -{ - std::cerr << "AuthSSLtest::AuthX509WithGPG()"; - std::cerr << std::endl; - return false; -} - - - -int AuthSSLtest::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx) -{ - std::cerr << "AuthSSLtest::VerifyX509Callback()"; - std::cerr << std::endl; - return 0; -} - -bool AuthSSLtest::ValidateCertificate(X509 *x509, std::string &peerId) -{ - std::cerr << "AuthSSLtest::ValidateCertificate()"; - std::cerr << std::endl; - return false; -} - - - -SSL_CTX *AuthSSLtest::getCTX() -{ - std::cerr << "AuthSSLtest::getCTX()"; - std::cerr << std::endl; - return NULL; -} - - -/* Restored these functions: */ -bool AuthSSLtest::FailedCertificate(X509 *x509, bool incoming) -{ - std::cerr << "AuthSSLtest::FailedCertificate()"; - std::cerr << std::endl; - return false; -} - -bool AuthSSLtest::CheckCertificate(std::string peerId, X509 *x509) -{ - std::cerr << "AuthSSLtest::CheckCertificate()"; - std::cerr << std::endl; - return false; -} - diff --git a/libretroshare/src/pqi/authssltest.h b/libretroshare/src/pqi/authssltest.h deleted file mode 100644 index b395babe1..000000000 --- a/libretroshare/src/pqi/authssltest.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - * libretroshare/src/pqi: authssltest.h - * - * 3P/PQI network interface for RetroShare. - * - * Copyright 2009-2010 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#ifndef MRK_AUTH_SSL_TEST_HEADER -#define MRK_AUTH_SSL_TEST_HEADER - -#include "pqi/authssl.h" - -void setAuthSSL(AuthSSL *newssl); - -class AuthSSLtest: public AuthSSL -{ - public: - - AuthSSLtest(); - /* Initialisation Functions (Unique) */ -virtual bool validateOwnCertificate(X509 *x509, EVP_PKEY *pkey); - -virtual bool active(); -virtual int InitAuth(const char *srvr_cert, const char *priv_key, - const char *passwd); -virtual bool CloseAuth(); - - /*********** Overloaded Functions from p3AuthMgr **********/ - - /* get Certificate Id */ -virtual std::string OwnId(); -virtual std::string getOwnLocation(); -//virtual bool getAllList(std::list &ids); -//virtual bool getAuthenticatedList(std::list &ids); -//virtual bool getUnknownList(std::list &ids); -//virtual bool getSSLChildListOfGPGId(std::string gpg_id, std::list &ids); - - /* get Details from the Certificates */ -//virtual bool isAuthenticated(std::string id); -//virtual std::string getName(std::string id); -//virtual std::string getIssuerName(std::string id); -//virtual std::string getGPGId(SSL_id id); -//virtual bool getCertDetails(std::string id, sslcert &cert); - - /* Load/Save certificates */ -virtual std::string SaveOwnCertificateToString(); - - /* Sign / Encrypt / Verify Data */ -virtual bool SignData(std::string input, std::string &sign); -virtual bool SignData(const void *data, const uint32_t len, std::string &sign); - -virtual bool SignDataBin(std::string, unsigned char*, unsigned int*); -virtual bool SignDataBin(const void*, uint32_t, unsigned char*, unsigned int*); -virtual bool VerifyOwnSignBin(const void*, uint32_t, unsigned char*, unsigned int); -virtual bool VerifySignBin(const void *data, const uint32_t len, - unsigned char *sign, unsigned int signlen, SSL_id sslId); - -// return : false if encrypt failed -virtual bool encrypt(void *&out, int &outlen, const void *in, int inlen, std::string peerId); -// return : false if decrypt fails -virtual bool decrypt(void *&out, int &outlen, const void *in, int inlen); - - -virtual X509* SignX509ReqWithGPG(X509_REQ *req, long days); -virtual bool AuthX509WithGPG(X509 *x509); - - -virtual int VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx); -virtual bool ValidateCertificate(X509 *x509, std::string &peerId); /* validate + get id */ - - public: /* SSL specific functions used in pqissl/pqissllistener */ -virtual SSL_CTX *getCTX(); - -/* Restored these functions: */ -virtual bool FailedCertificate(X509 *x509, bool incoming); /* store for discovery */ -virtual bool CheckCertificate(std::string peerId, X509 *x509); /* check that they are exact match */ - - private: - - std::string mOwnId; -}; - -#endif // MRK_AUTH_SSL_TEST_HEADER diff --git a/libretroshare/src/retroshare/rspostedVEG.h b/libretroshare/src/retroshare/rspostedVEG.h deleted file mode 100644 index af617f10e..000000000 --- a/libretroshare/src/retroshare/rspostedVEG.h +++ /dev/null @@ -1,151 +0,0 @@ -#ifndef RETROSHARE_POSTED_GUI_INTERFACE_H -#define RETROSHARE_POSTED_GUI_INTERFACE_H - -/* - * libretroshare/src/retroshare: rsposted.h - * - * RetroShare C++ Interface. - * - * Copyright 2008-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include -#include -#include -#include - -/* The Main Interface Class - for information about your Peers */ -class RsPostedVEG; -extern RsPostedVEG *rsPostedVEG; - - -class RsPostedGroup -{ - public: - RsGroupMetaData mMeta; - RsPostedGroup() { return; } -}; - -class RsPostedMsg -{ - public: - RsPostedMsg(uint32_t t) - :postedType(t) { return; } - - RsMsgMetaData mMeta; - uint32_t postedType; -}; - -#define RSPOSTED_MSGTYPE_POST 0x0001 -#define RSPOSTED_MSGTYPE_VOTE 0x0002 -#define RSPOSTED_MSGTYPE_COMMENT 0x0004 - -#define RSPOSTED_PERIOD_YEAR 1 -#define RSPOSTED_PERIOD_MONTH 2 -#define RSPOSTED_PERIOD_WEEK 3 -#define RSPOSTED_PERIOD_DAY 4 -#define RSPOSTED_PERIOD_HOUR 5 - -#define RSPOSTED_VIEWMODE_LATEST 1 -#define RSPOSTED_VIEWMODE_TOP 2 -#define RSPOSTED_VIEWMODE_HOT 3 -#define RSPOSTED_VIEWMODE_COMMENTS 4 - - -class RsPostedPost: public RsPostedMsg -{ - public: - RsPostedPost(): RsPostedMsg(RSPOSTED_MSGTYPE_POST) - { - mMeta.mMsgFlags = RSPOSTED_MSGTYPE_POST; - return; - } - - std::string mLink; - std::string mNotes; -}; - - -class RsPostedVote: public RsPostedMsg -{ - public: - RsPostedVote(): RsPostedMsg(RSPOSTED_MSGTYPE_VOTE) - { - mMeta.mMsgFlags = RSPOSTED_MSGTYPE_VOTE; - return; - } -}; - - -class RsPostedComment: public RsPostedMsg -{ - public: - RsPostedComment(): RsPostedMsg(RSPOSTED_MSGTYPE_COMMENT) - { - mMeta.mMsgFlags = RSPOSTED_MSGTYPE_COMMENT; - return; - } - - std::string mComment; -}; - - -std::ostream &operator<<(std::ostream &out, const RsPostedGroup &group); -std::ostream &operator<<(std::ostream &out, const RsPostedPost &post); -std::ostream &operator<<(std::ostream &out, const RsPostedVote &vote); -std::ostream &operator<<(std::ostream &out, const RsPostedComment &comment); - - -class RsPostedVEG: public RsTokenServiceVEG -{ - public: - - RsPostedVEG() { return; } -virtual ~RsPostedVEG() { return; } - - /* Specific Service Data */ -virtual bool getGroup(const uint32_t &token, RsPostedGroup &group) = 0; -virtual bool getPost(const uint32_t &token, RsPostedPost &post) = 0; -virtual bool getComment(const uint32_t &token, RsPostedComment &comment) = 0; - -virtual bool submitGroup(uint32_t &token, RsPostedGroup &group, bool isNew) = 0; -virtual bool submitPost(uint32_t &token, RsPostedPost &post, bool isNew) = 0; -virtual bool submitVote(uint32_t &token, RsPostedVote &vote, bool isNew) = 0; -virtual bool submitComment(uint32_t &token, RsPostedComment &comment, bool isNew) = 0; - - // Special Ranking Request. -virtual bool requestRanking(uint32_t &token, std::string groupId) = 0; -virtual bool getRankedPost(const uint32_t &token, RsPostedPost &post) = 0; - -virtual bool extractPostedCache(const std::string &str, uint32_t &votes, uint32_t &comments) = 0; - - - // Control Ranking Calculations. -virtual bool setViewMode(uint32_t mode) = 0; -virtual bool setViewPeriod(uint32_t period) = 0; -virtual bool setViewRange(uint32_t first, uint32_t count) = 0; - - // exposed for testing... -virtual float calcPostScore(const RsMsgMetaData &meta) = 0; - -}; - - -#endif From 602bc36eec00a2cda7c5154082aa08d1b47763b6 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 14:45:05 +0100 Subject: [PATCH 16/26] fixed missing licenses in libretroshare --- libretroshare/src/crypto/chacha20.cpp | 11 +++-- libretroshare/src/deep_search/deep_search.h | 38 +++++++------- libretroshare/src/dht/p3bitdht_interface.cc | 6 +-- libretroshare/src/dht/p3bitdht_peernet.cc | 6 +-- libretroshare/src/dht/p3bitdht_peers.cc | 6 +-- libretroshare/src/dht/p3bitdht_relay.cc | 6 +-- .../src/grouter/grouterclientservice.h | 45 ++++++++--------- libretroshare/src/grouter/groutermatrix.cc | 45 ++++++++--------- libretroshare/src/grouter/groutermatrix.h | 45 ++++++++--------- libretroshare/src/gxs/rsgxsnettunnel.cc | 45 ++++++++--------- libretroshare/src/gxs/rsgxsnettunnel.h | 45 ++++++++--------- libretroshare/src/gxs/rsnxs.h | 48 +++++++++--------- libretroshare/src/jsonapi/jsonapi.cpp | 37 +++++++------- libretroshare/src/jsonapi/jsonapi.h | 38 +++++++------- libretroshare/src/jsonapi/jsonapiitems.h | 38 +++++++------- libretroshare/src/libretroshare.pro | 43 ++++++++-------- libretroshare/src/pgp/rscertificate.h | 20 -------- libretroshare/src/pqi/p3dhtmgr.cc | 45 ++++++++--------- libretroshare/src/pqi/p3dhtmgr.h | 46 ++++++++--------- libretroshare/src/pqi/p3linkmgr.cc | 1 + libretroshare/src/pqi/pqiservicemonitor.h | 45 ++++++++--------- libretroshare/src/retroshare/rsgrouter.h | 45 ++++++++--------- libretroshare/src/retroshare/rsgxscommon.h | 47 +++++++++--------- libretroshare/src/retroshare/rsgxsdistsync.h | 43 ++++++++-------- libretroshare/src/retroshare/rsgxsiface.h | 46 ++++++++--------- .../src/retroshare/rsgxsifacehelper.h | 49 +++++++++---------- libretroshare/src/retroshare/rsreputations.h | 45 ++++++++--------- 27 files changed, 445 insertions(+), 489 deletions(-) diff --git a/libretroshare/src/crypto/chacha20.cpp b/libretroshare/src/crypto/chacha20.cpp index 228162622..16745968b 100644 --- a/libretroshare/src/crypto/chacha20.cpp +++ b/libretroshare/src/crypto/chacha20.cpp @@ -1,24 +1,25 @@ /******************************************************************************* - * libretroshare/src/crypto: chacha20.cpp * + * libretroshare/src/crypto: chacha20.cc * * * * libretroshare: retroshare core library * * * - * Copyright 2016 by Mr.Alice * + * Copyright 2016 by Mr.Alice * * * * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * + * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of the * * License, or (at your option) any later version. * * * * This program 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 Affero General Public License for more details. * + * GNU Lesser General Public License for more details. * * * - * You should have received a copy of the GNU Affero General Public License * + * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * * * *******************************************************************************/ + #include #include #include diff --git a/libretroshare/src/deep_search/deep_search.h b/libretroshare/src/deep_search/deep_search.h index 5d2361342..b67c93055 100644 --- a/libretroshare/src/deep_search/deep_search.h +++ b/libretroshare/src/deep_search/deep_search.h @@ -1,21 +1,25 @@ +/******************************************************************************* + * libretroshare/src/crypto: crypto.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2018 Gioacchino Mazzurco * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once -/* - * RetroShare Content Search and Indexing. - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ #include "util/rstime.h" #include diff --git a/libretroshare/src/dht/p3bitdht_interface.cc b/libretroshare/src/dht/p3bitdht_interface.cc index b9a015bbd..b67ab8f53 100644 --- a/libretroshare/src/dht/p3bitdht_interface.cc +++ b/libretroshare/src/dht/p3bitdht_interface.cc @@ -6,16 +6,16 @@ * Copyright 2009-2011 by Robert Fernie * * * * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * + * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of the * * License, or (at your option) any later version. * * * * This program 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 Affero General Public License for more details. * + * GNU Lesser General Public License for more details. * * * - * You should have received a copy of the GNU Affero General Public License * + * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * * * *******************************************************************************/ diff --git a/libretroshare/src/dht/p3bitdht_peernet.cc b/libretroshare/src/dht/p3bitdht_peernet.cc index 3d13a591b..f0ef22b89 100644 --- a/libretroshare/src/dht/p3bitdht_peernet.cc +++ b/libretroshare/src/dht/p3bitdht_peernet.cc @@ -6,16 +6,16 @@ * Copyright 2009-2011 by Robert Fernie * * * * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * + * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of the * * License, or (at your option) any later version. * * * * This program 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 Affero General Public License for more details. * + * GNU Lesser General Public License for more details. * * * - * You should have received a copy of the GNU Affero General Public License * + * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * * * *******************************************************************************/ diff --git a/libretroshare/src/dht/p3bitdht_peers.cc b/libretroshare/src/dht/p3bitdht_peers.cc index 950b1bfd8..8c6e7d071 100644 --- a/libretroshare/src/dht/p3bitdht_peers.cc +++ b/libretroshare/src/dht/p3bitdht_peers.cc @@ -7,16 +7,16 @@ * Copyright (C) 2015-2018 Gioacchino Mazzurco * * * * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * + * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of the * * License, or (at your option) any later version. * * * * This program 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 Affero General Public License for more details. * + * GNU Lesser General Public License for more details. * * * - * You should have received a copy of the GNU Affero General Public License * + * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * * * *******************************************************************************/ diff --git a/libretroshare/src/dht/p3bitdht_relay.cc b/libretroshare/src/dht/p3bitdht_relay.cc index 8939da5c7..1fb2ed699 100644 --- a/libretroshare/src/dht/p3bitdht_relay.cc +++ b/libretroshare/src/dht/p3bitdht_relay.cc @@ -6,16 +6,16 @@ * Copyright 2009-2011 by Robert Fernie. * * * * This program is free software: you can redistribute it and/or modify * - * it under the terms of the GNU Affero General Public License as * + * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of the * * License, or (at your option) any later version. * * * * This program 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 Affero General Public License for more details. * + * GNU Lesser General Public License for more details. * * * - * You should have received a copy of the GNU Affero General Public License * + * You should have received a copy of the GNU Lesser General Public License * * along with this program. If not, see . * * * ******************************************************************************/ diff --git a/libretroshare/src/grouter/grouterclientservice.h b/libretroshare/src/grouter/grouterclientservice.h index 35c22614a..394f8421a 100644 --- a/libretroshare/src/grouter/grouterclientservice.h +++ b/libretroshare/src/grouter/grouterclientservice.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/grouter: grouterclientservice.h - * - * Services for RetroShare. - * - * Copyright 2013 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "csoler@users.sourceforge.net". - * - */ +/******************************************************************************* + * libretroshare/src/grouter: grouterclientservice.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2013 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ // This class is the parent class for any service that will use the global router to distribute its packets. // Typical representative clients include: diff --git a/libretroshare/src/grouter/groutermatrix.cc b/libretroshare/src/grouter/groutermatrix.cc index 57db502eb..b210f619e 100644 --- a/libretroshare/src/grouter/groutermatrix.cc +++ b/libretroshare/src/grouter/groutermatrix.cc @@ -1,27 +1,24 @@ -/* - * libretroshare/src/services: groutermatrix.cc - * - * Services for RetroShare. - * - * Copyright 2013 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "csoler@users.sourceforge.net". - * - */ +/******************************************************************************* + * libretroshare/src/grouter: groutermatrix.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2013 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "groutertypes.h" #include "groutermatrix.h" diff --git a/libretroshare/src/grouter/groutermatrix.h b/libretroshare/src/grouter/groutermatrix.h index 0a0f3d15e..7630b798d 100644 --- a/libretroshare/src/grouter/groutermatrix.h +++ b/libretroshare/src/grouter/groutermatrix.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/services: groutermatrix.h - * - * Services for RetroShare. - * - * Copyright 2013 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "csoler@users.sourceforge.net". - * - */ +/******************************************************************************* + * libretroshare/src/grouter: groutermatrix.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2013 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/libretroshare/src/gxs/rsgxsnettunnel.cc b/libretroshare/src/gxs/rsgxsnettunnel.cc index 5bd89900d..fda849e0b 100644 --- a/libretroshare/src/gxs/rsgxsnettunnel.cc +++ b/libretroshare/src/gxs/rsgxsnettunnel.cc @@ -1,27 +1,24 @@ -/* - * libretroshare/src/gxs: rsgxsnettunnel.cc - * - * General Data service, interface for RetroShare. - * - * Copyright 2018-2018 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare.project@gmail.com" - * - */ +/******************************************************************************* + * libretroshare/src/gxs: gxsnettunnel.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "util/rsdir.h" #include "util/rstime.h" diff --git a/libretroshare/src/gxs/rsgxsnettunnel.h b/libretroshare/src/gxs/rsgxsnettunnel.h index 145d68fdc..237bb9969 100644 --- a/libretroshare/src/gxs/rsgxsnettunnel.h +++ b/libretroshare/src/gxs/rsgxsnettunnel.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/gxs: rsgxsnettunnel.h - * - * General Data service, interface for RetroShare. - * - * Copyright 2018-2018 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare.project@gmail.com" - * - */ +/******************************************************************************* + * libretroshare/src/gxs: gxsnettunnel.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/libretroshare/src/gxs/rsnxs.h b/libretroshare/src/gxs/rsnxs.h index b94d46200..fdf268d5b 100644 --- a/libretroshare/src/gxs/rsnxs.h +++ b/libretroshare/src/gxs/rsnxs.h @@ -1,31 +1,29 @@ +/******************************************************************************* + * libretroshare/src/gxs: rsnxs.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2011-2011 by Robert Fernie * + * Copyright 2011-2011 by Christopher Evi-Parker * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RSGNP_H #define RSGNP_H -/* - * libretroshare/src/gxs: rsnxs.h - * - * Network Exchange Service interface for RetroShare. - * - * Copyright 2011-2011 by Robert Fernie, Christopher Evi-Prker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include #include "util/rstime.h" diff --git a/libretroshare/src/jsonapi/jsonapi.cpp b/libretroshare/src/jsonapi/jsonapi.cpp index ac398f92f..091d25d8c 100644 --- a/libretroshare/src/jsonapi/jsonapi.cpp +++ b/libretroshare/src/jsonapi/jsonapi.cpp @@ -1,20 +1,23 @@ -/* - * RetroShare JSON API - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ +/******************************************************************************* + * libretroshare/src/gxs: jsonapi.cpp * + * * + * RetroShare JSON API * + * Copyright (C) 2018 Gioacchino Mazzurco * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "jsonapi.h" diff --git a/libretroshare/src/jsonapi/jsonapi.h b/libretroshare/src/jsonapi/jsonapi.h index 6a8c3d94d..1622bf49b 100644 --- a/libretroshare/src/jsonapi/jsonapi.h +++ b/libretroshare/src/jsonapi/jsonapi.h @@ -1,20 +1,24 @@ -/* - * RetroShare JSON API - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ +/******************************************************************************* + * libretroshare/src/gxs: jsonapi.h * + * * + * RetroShare JSON API * + * Copyright (C) 2018 Gioacchino Mazzurco * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/libretroshare/src/jsonapi/jsonapiitems.h b/libretroshare/src/jsonapi/jsonapiitems.h index 7e26774f9..14173675d 100644 --- a/libretroshare/src/jsonapi/jsonapiitems.h +++ b/libretroshare/src/jsonapi/jsonapiitems.h @@ -1,20 +1,24 @@ -/* - * RetroShare JSON API - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ +/******************************************************************************* + * libretroshare/src/gxs: jsonapiitems.h * + * * + * RetroShare JSON API * + * Copyright (C) 2018 Gioacchino Mazzurco * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index f6094100e..703557cb7 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -403,6 +403,7 @@ HEADERS += pqi/authssl.h \ pqi/pqiperson.h \ pqi/pqipersongrp.h \ pqi/pqiservice.h \ + pqi/pqiservicemonitor.h \ pqi/pqissl.h \ pqi/pqissllistener.h \ pqi/pqisslpersongrp.h \ @@ -427,12 +428,12 @@ HEADERS += rsserver/p3face.h \ rsserver/p3serverconfig.h HEADERS += grouter/groutercache.h \ - grouter/rsgrouter.h \ + retroshare/rsgrouter.h \ grouter/grouteritems.h \ grouter/p3grouter.h \ grouter/rsgroutermatrix.h \ grouter/groutertypes.h \ - grouter/rsgrouterclient.h + grouter/grouterclientservice.h HEADERS += rsitems/rsitem.h \ rsitems/itempriorities.h \ @@ -707,44 +708,46 @@ DEFINES *= SQLITE_HAS_CODEC DEFINES *= GXS_ENABLE_SYNC_MSGS HEADERS += rsitems/rsnxsitems.h \ + rsitems/rsgxsitems.h \ + retroshare/rstokenservice.h \ + retroshare/rsgxsservice.h \ + retroshare/rsgxsflags.h \ + retroshare/rsgxsifacetypes.h \ + retroshare/rsgxsiface.h \ + retroshare/rsgxscommon.h \ + retroshare/rsgxsifacehelper.h \ + util/retrodb.h \ + util/rsdbbind.h \ + util/contentvalue.h \ + gxs/rsgxsutil.h \ + gxs/gxssecurity.h \ gxs/rsgds.h \ gxs/rsgxs.h \ gxs/rsdataservice.h \ gxs/rsgxsnetservice.h \ gxs/rsgxsnettunnel.h \ - retroshare/rsgxsflags.h \ - retroshare/rsgxsifacetypes.h \ gxs/rsgenexchange.h \ + gxs/rsnxs.h \ gxs/rsnxsobserver.h \ gxs/rsgxsdata.h \ - retroshare/rstokenservice.h \ gxs/rsgxsdataaccess.h \ - retroshare/rsgxsservice.h \ - rsitems/rsgxsitems.h \ - util/retrodb.h \ - util/rsdbbind.h \ - gxs/rsgxsutil.h \ - util/contentvalue.h \ - gxs/gxssecurity.h \ - gxs/rsgxsifacehelper.h \ gxs/gxstokenqueue.h \ gxs/rsgxsnetutils.h \ - gxs/rsgxsiface.h \ gxs/rsgxsrequesttypes.h SOURCES += rsitems/rsnxsitems.cc \ + rsitems/rsgxsitems.cc \ + util/retrodb.cc \ + util/contentvalue.cc \ + util/rsdbbind.cc \ + gxs/gxssecurity.cc \ + gxs/rsgxsdataaccess.cc \ gxs/rsdataservice.cc \ gxs/rsgenexchange.cc \ gxs/rsgxsnetservice.cc \ gxs/rsgxsnettunnel.cc \ gxs/rsgxsdata.cc \ - rsitems/rsgxsitems.cc \ - gxs/rsgxsdataaccess.cc \ - util/retrodb.cc \ - util/contentvalue.cc \ - util/rsdbbind.cc \ - gxs/gxssecurity.cc \ gxs/gxstokenqueue.cc \ gxs/rsgxsnetutils.cc \ gxs/rsgxsutil.cc \ diff --git a/libretroshare/src/pgp/rscertificate.h b/libretroshare/src/pgp/rscertificate.h index 986f5922c..6b8438b8c 100644 --- a/libretroshare/src/pgp/rscertificate.h +++ b/libretroshare/src/pgp/rscertificate.h @@ -21,26 +21,6 @@ *******************************************************************************/ #pragma once -#pragma once -/* - * RetroShare - * - * Copyright (C) 2012-2014 Cyril Soler - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program 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 Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - #include "retroshare/rstypes.h" #include "util/rsurl.h" diff --git a/libretroshare/src/pqi/p3dhtmgr.cc b/libretroshare/src/pqi/p3dhtmgr.cc index fa24fa324..d54a1cbf2 100644 --- a/libretroshare/src/pqi/p3dhtmgr.cc +++ b/libretroshare/src/pqi/p3dhtmgr.cc @@ -1,27 +1,24 @@ -/* - * libretroshare/src/pqi: p3dhtmgr.cc - * - * 3P/PQI network interface for RetroShare. - * - * Copyright 2004-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/pqi: p3dhtmgr.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2008 by Robert Fernie. * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/libretroshare/src/pqi/p3dhtmgr.h b/libretroshare/src/pqi/p3dhtmgr.h index c2b6675db..b0b2fb7b1 100644 --- a/libretroshare/src/pqi/p3dhtmgr.h +++ b/libretroshare/src/pqi/p3dhtmgr.h @@ -1,28 +1,24 @@ -/* - * libretroshare/src/pqi: p3dhtmgr.h - * - * 3P/PQI network interface for RetroShare. - * - * Copyright 2004-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/pqi: p3dhtmgr.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2008 by Robert Fernie. * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef MRK_P3_DHT_MANAGER_HEADER #define MRK_P3_DHT_MANAGER_HEADER diff --git a/libretroshare/src/pqi/p3linkmgr.cc b/libretroshare/src/pqi/p3linkmgr.cc index 1d12476fc..2110e23a8 100644 --- a/libretroshare/src/pqi/p3linkmgr.cc +++ b/libretroshare/src/pqi/p3linkmgr.cc @@ -20,6 +20,7 @@ * along with this program. If not, see . * * * *******************************************************************************/ + #include "pqi/p3linkmgr.h" #include "pqi/p3peermgr.h" diff --git a/libretroshare/src/pqi/pqiservicemonitor.h b/libretroshare/src/pqi/pqiservicemonitor.h index a7e1c87a5..c101feac4 100644 --- a/libretroshare/src/pqi/pqiservicemonitor.h +++ b/libretroshare/src/pqi/pqiservicemonitor.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/pqi: pqiservicemonitor.h - * - * 3P/PQI network interface for RetroShare. - * - * Copyright 2014 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/pqi: pqiservicemonitor.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2014 by Robert Fernie * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef PQI_SERVICE_MONITOR_H #define PQI_SERVICE_MONITOR_H diff --git a/libretroshare/src/retroshare/rsgrouter.h b/libretroshare/src/retroshare/rsgrouter.h index cfb83bea3..445b35d23 100644 --- a/libretroshare/src/retroshare/rsgrouter.h +++ b/libretroshare/src/retroshare/rsgrouter.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/services: rsgrouter.h - * - * Services for RetroShare. - * - * Copyright 2013 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "csoler@users.sourceforge.net". - * - */ +/******************************************************************************* + * libretroshare/src/retroshare: rsgrouter.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2013 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/libretroshare/src/retroshare/rsgxscommon.h b/libretroshare/src/retroshare/rsgxscommon.h index 57b17ed35..77989d170 100644 --- a/libretroshare/src/retroshare/rsgxscommon.h +++ b/libretroshare/src/retroshare/rsgxscommon.h @@ -1,31 +1,28 @@ +/******************************************************************************* + * libretroshare/src/retroshare: rsgxscommon.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2012 Robert Fernie * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RETROSHARE_GXS_COMMON_OBJS_INTERFACE_H #define RETROSHARE_GXS_COMMON_OBJS_INTERFACE_H -/* - * libretroshare/src/retroshare: rsgxscommong.h - * - * RetroShare C++ Interface. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include #include diff --git a/libretroshare/src/retroshare/rsgxsdistsync.h b/libretroshare/src/retroshare/rsgxsdistsync.h index fbee9213f..d65027d58 100644 --- a/libretroshare/src/retroshare/rsgxsdistsync.h +++ b/libretroshare/src/retroshare/rsgxsdistsync.h @@ -1,25 +1,24 @@ -/* - * RetroShare C++ Interface. - * - * Copyright 2018 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/retroshare: rsgxsdistsync.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2012 Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once diff --git a/libretroshare/src/retroshare/rsgxsiface.h b/libretroshare/src/retroshare/rsgxsiface.h index 70876861d..8b057501a 100644 --- a/libretroshare/src/retroshare/rsgxsiface.h +++ b/libretroshare/src/retroshare/rsgxsiface.h @@ -1,28 +1,24 @@ - -/* - * libretroshare/src/gxs/: rsgxsifaceimpl.h - * - * RetroShare GXS. RsGxsIface - * - * Copyright 2012 by Christopher Evi-Parker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/retroshare: rsgxsiface.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2012 by Christopher Evi-Parker * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef RSGXSIFACE_H_ #define RSGXSIFACE_H_ diff --git a/libretroshare/src/retroshare/rsgxsifacehelper.h b/libretroshare/src/retroshare/rsgxsifacehelper.h index 5a8c2d5fd..f5fc69f13 100644 --- a/libretroshare/src/retroshare/rsgxsifacehelper.h +++ b/libretroshare/src/retroshare/rsgxsifacehelper.h @@ -1,32 +1,29 @@ +/******************************************************************************* + * libretroshare/src/retroshare: rsgxsifacehelper.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2011 by Christopher Evi-Parker * + * Copyright (C) 2018 Gioacchino Mazzurco * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RSGXSIFACEIMPL_H #define RSGXSIFACEIMPL_H -/* - * libretroshare/src/gxs/: rsgxsifaceimpl.h - * - * RetroShare GXS. Convenience interface implementation - * - * Copyright 2012 by Christopher Evi-Parker - * Copyright (C) 2018 Gioacchino Mazzurco - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include diff --git a/libretroshare/src/retroshare/rsreputations.h b/libretroshare/src/retroshare/rsreputations.h index 105de420a..6f8c7ecaf 100644 --- a/libretroshare/src/retroshare/rsreputations.h +++ b/libretroshare/src/retroshare/rsreputations.h @@ -1,27 +1,24 @@ -/* - * libretroshare/src/services: rsreputation.h - * - * Services for RetroShare. - * - * Copyright 2015 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "csoler@users.sourceforge.net". - * - */ +/******************************************************************************* + * libretroshare/src/retroshare: rsreputations.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2015 by Cyril Soler * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #pragma once From ddca91b0c9b7b6c5224f009ed17de72ede0293e5 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 17:40:13 +0100 Subject: [PATCH 17/26] moved some files to unfinished and deleted soem unused files --- libretroshare/src/rsserver/p3photo.cc | 143 -------- libretroshare/src/rsserver/p3photo.h | 69 ---- libretroshare/src/rsserver/p3rank.cc | 104 ------ libretroshare/src/rsserver/p3rank.h | 64 ---- .../src/serialiser/rsmailtransportitems.cc | 345 ------------------ .../src/serialiser/rsmailtransportitems.h | 145 -------- libretroshare/src/serialiser/rstlvmail.cc | 265 -------------- libretroshare/src/serialiser/rstlvmail.h | 71 ---- .../mail/directmailservice.cc | 0 .../mail/directmailservice.h | 0 .../mail/mailtransport.cc | 0 .../mail/mailtransport.h | 0 .../src/{services => unfinished}/p3tunnel.cc | 0 .../src/{services => unfinished}/p3tunnel.h | 0 .../{serialiser => unfinished}/rstlvdsdv.cc | 0 .../{serialiser => unfinished}/rstlvdsdv.h | 0 16 files changed, 1206 deletions(-) delete mode 100644 libretroshare/src/rsserver/p3photo.cc delete mode 100644 libretroshare/src/rsserver/p3photo.h delete mode 100644 libretroshare/src/rsserver/p3rank.cc delete mode 100644 libretroshare/src/rsserver/p3rank.h delete mode 100644 libretroshare/src/serialiser/rsmailtransportitems.cc delete mode 100644 libretroshare/src/serialiser/rsmailtransportitems.h delete mode 100644 libretroshare/src/serialiser/rstlvmail.cc delete mode 100644 libretroshare/src/serialiser/rstlvmail.h rename libretroshare/src/{services => unfinished}/mail/directmailservice.cc (100%) rename libretroshare/src/{services => unfinished}/mail/directmailservice.h (100%) rename libretroshare/src/{services => unfinished}/mail/mailtransport.cc (100%) rename libretroshare/src/{services => unfinished}/mail/mailtransport.h (100%) rename libretroshare/src/{services => unfinished}/p3tunnel.cc (100%) rename libretroshare/src/{services => unfinished}/p3tunnel.h (100%) rename libretroshare/src/{serialiser => unfinished}/rstlvdsdv.cc (100%) rename libretroshare/src/{serialiser => unfinished}/rstlvdsdv.h (100%) diff --git a/libretroshare/src/rsserver/p3photo.cc b/libretroshare/src/rsserver/p3photo.cc deleted file mode 100644 index 788163257..000000000 --- a/libretroshare/src/rsserver/p3photo.cc +++ /dev/null @@ -1,143 +0,0 @@ -/* - * libretroshare/src/rsserver: p3photo.cc - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "rsserver/p3photo.h" -#include "services/p3photoservice.h" - -RsPhoto *rsPhoto = NULL; - - -RsPhotoDetails::RsPhotoDetails() -{ - return; -} - -RsPhotoShowDetails::RsPhotoShowDetails() -{ - return; -} - -p3Photo::p3Photo(p3PhotoService *p3ps) - :mPhoto(p3ps) -{ - return; -} - -p3Photo::~p3Photo() -{ - return; -} - - /* needs update? */ -bool p3Photo::updated() -{ - return mPhoto->updated(); -} - - /* access data */ -bool p3Photo::getPhotoList(std::string id, std::list &hashs) -{ - return mPhoto->getPhotoList(id, hashs); -} - -bool p3Photo::getShowList(std::string id, std::list &showIds) -{ - return mPhoto -> getShowList(id, showIds); -} - - -bool p3Photo::getShowDetails(std::string id, std::string showId, RsPhotoShowDetails &detail) -{ - return mPhoto -> getShowDetails(id, showId, detail); -} - - -bool p3Photo::getPhotoDetails(std::string id, std::string photoId, RsPhotoDetails &detail) -{ - return mPhoto -> getPhotoDetails(id, photoId, detail); -} - - - /* add / delete */ -std::string p3Photo::createShow(std::string name) -{ - return mPhoto -> createShow(name); -} - -bool p3Photo::deleteShow(std::string showId) -{ - return mPhoto -> deleteShow(showId); -} - -bool p3Photo::addPhotoToShow(std::string showId, std::string photoId, int16_t index) -{ - return mPhoto -> addPhotoToShow(showId, photoId, index); -} - -bool p3Photo::movePhotoInShow(std::string showId, std::string photoId, int16_t index) -{ - return mPhoto -> movePhotoInShow(showId, photoId, index); -} - -bool p3Photo::removePhotoFromShow(std::string showId, std::string photoId) -{ - return mPhoto -> removePhotoFromShow(showId, photoId); -} - - -std::string p3Photo::addPhoto(std::string path) /* add from file */ -{ - return mPhoto -> addPhoto(path); /* add from file */ -} - -bool p3Photo::addPhoto(std::string srcId, std::string photoId) /* add from peers photos */ -{ - return mPhoto -> addPhoto(srcId, photoId); /* add from peers photos */ - -} - -bool p3Photo::deletePhoto(std::string photoId) -{ - return mPhoto -> deletePhoto(photoId); -} - - - /* modify properties (TODO) */ -bool p3Photo::modifyShow(std::string showId, std::wstring name, std::wstring comment) -{ - return mPhoto -> modifyShow(showId, name, comment); -} - -bool p3Photo::modifyPhoto(std::string photoId, std::wstring name, std::wstring comment) -{ - return mPhoto -> modifyPhoto(photoId, name, comment); -} - -bool p3Photo::modifyShowComment(std::string showId, std::string photoId, std::wstring comment) -{ - return mPhoto -> modifyShowComment(showId, photoId, comment); -} - - diff --git a/libretroshare/src/rsserver/p3photo.h b/libretroshare/src/rsserver/p3photo.h deleted file mode 100644 index 897af193b..000000000 --- a/libretroshare/src/rsserver/p3photo.h +++ /dev/null @@ -1,69 +0,0 @@ -#ifndef RETROSHARE_P3_PHOTO_INTERFACE_H -#define RETROSHARE_P3_PHOTO_INTERFACE_H - -/* - * libretroshare/src/rsserver: p3photo.h - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "retroshare/rsphoto.h" -#include "services/p3photoservice.h" - -class p3Photo: public RsPhoto -{ - public: - - p3Photo(p3PhotoService *p3ps); -virtual ~p3Photo(); - - /* changed? */ -virtual bool updated(); - - /* access data */ -virtual bool getPhotoList(std::string id, std::list &hashs); -virtual bool getShowList(std::string id, std::list &showIds); -virtual bool getShowDetails(std::string id, std::string showId, RsPhotoShowDetails &detail); -virtual bool getPhotoDetails(std::string id, std::string photoId, RsPhotoDetails &detail); - - /* add / delete */ -virtual std::string createShow(std::string name); -virtual bool deleteShow(std::string showId); -virtual bool addPhotoToShow(std::string showId, std::string photoId, int16_t index); -virtual bool movePhotoInShow(std::string showId, std::string photoId, int16_t index); -virtual bool removePhotoFromShow(std::string showId, std::string photoId); - -virtual std::string addPhoto(std::string path); /* add from file */ -virtual bool addPhoto(std::string srcId, std::string photoId); /* add from peers photos */ -virtual bool deletePhoto(std::string photoId); - - /* modify properties (TODO) */ -virtual bool modifyShow(std::string showId, std::wstring name, std::wstring comment); -virtual bool modifyPhoto(std::string photoId, std::wstring name, std::wstring comment); -virtual bool modifyShowComment(std::string showId, std::string photoId, std::wstring comment); - - private: - - p3PhotoService *mPhoto; -}; - -#endif diff --git a/libretroshare/src/rsserver/p3rank.cc b/libretroshare/src/rsserver/p3rank.cc deleted file mode 100644 index 8dc613cff..000000000 --- a/libretroshare/src/rsserver/p3rank.cc +++ /dev/null @@ -1,104 +0,0 @@ -/* - * libretroshare/src/rsserver: p3rank.cc - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "rsserver/p3rank.h" - -RsRanks *rsRanks = NULL; - -p3Rank::p3Rank(p3Ranking *ranking) - :mRank(ranking) -{ - return; -} - -p3Rank::~p3Rank() -{ - return; -} - /* needs update? */ -bool p3Rank::updated() -{ - return mRank->updated(); -} - - /* Set Sort Methods */ -bool p3Rank::setSortPeriod(uint32_t period) -{ - return mRank->setSortPeriod(period); -} - -bool p3Rank::setSortMethod(uint32_t type) -{ - return mRank->setSortMethod(type); -} - -bool p3Rank::clearPeerFilter() -{ - return mRank->clearPeerFilter(); -} - -bool p3Rank::setPeerFilter(std::list peers) -{ - return mRank->setPeerFilter(peers); -} - - /* get Ids */ -uint32_t p3Rank::getRankingsCount() -{ - return mRank->getRankingsCount(); -} - -float p3Rank::getMaxRank() -{ - return mRank->getMaxRank(); -} - -bool p3Rank::getRankings(uint32_t first, uint32_t count, std::list &rids) -{ - return mRank->getRankings(first, count, rids); -} - -bool p3Rank::getRankDetails(std::string rid, RsRankDetails &details) -{ - return mRank->getRankDetails(rid, details); -} - - - /* Add New Comment / Msg */ -std::string p3Rank::newRankMsg(std::wstring link, std::wstring title, std::wstring comment, int32_t score) -{ - return mRank->newRankMsg(link, title, comment, score); -} - -bool p3Rank::updateComment(std::string rid, std::wstring comment, int32_t score) -{ - return mRank->updateComment(rid, comment, score); -} - -std::string p3Rank::anonRankMsg(std::string rid, std::wstring link, std::wstring title) -{ - return mRank->anonRankMsg(rid, link, title); -} - diff --git a/libretroshare/src/rsserver/p3rank.h b/libretroshare/src/rsserver/p3rank.h deleted file mode 100644 index cdf9bbfd5..000000000 --- a/libretroshare/src/rsserver/p3rank.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef RETROSHARE_P3_RANKING_INTERFACE_H -#define RETROSHARE_P3_RANKING_INTERFACE_H - -/* - * libretroshare/src/rsserver: p3rank.h - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "retroshare/rsrank.h" -#include "services/p3ranking.h" - -class p3Rank: public RsRanks -{ - public: - - p3Rank(p3Ranking *ranking); -virtual ~p3Rank(); - - /* needs update? */ -virtual bool updated(); - - /* Set Sort Methods */ -virtual bool setSortPeriod(uint32_t period); -virtual bool setSortMethod(uint32_t type); -virtual bool clearPeerFilter(); -virtual bool setPeerFilter(std::list peers); - - /* get Ids */ -virtual uint32_t getRankingsCount(); -virtual float getMaxRank(); -virtual bool getRankings(uint32_t first, uint32_t count, std::list &rids); -virtual bool getRankDetails(std::string rid, RsRankDetails &details); - - /* Add New Comment / Msg */ -virtual std::string newRankMsg(std::wstring link, std::wstring title, std::wstring comment, int32_t score); -virtual bool updateComment(std::string rid, std::wstring comment, int32_t score); -virtual std::string anonRankMsg(std::string rid, std::wstring link, std::wstring title); - - private: - - p3Ranking *mRank; -}; - -#endif diff --git a/libretroshare/src/serialiser/rsmailtransportitems.cc b/libretroshare/src/serialiser/rsmailtransportitems.cc deleted file mode 100644 index c7a64fd8e..000000000 --- a/libretroshare/src/serialiser/rsmailtransportitems.cc +++ /dev/null @@ -1,345 +0,0 @@ - -/* - * libretroshare/src/serialiser: rsmailtransportitems.cc - * - * RetroShare Serialiser. - * - * Copyright 2014 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include -#include "util/rstime.h" -#include "serialiser/rsbaseserial.h" -#include "serialiser/rsmailtransportitems.h" -#include "serialiser/rstlvbase.h" - -/*** -#define RSSERIAL_DEBUG 1 -***/ - -#include - -/*************************************************************************/ -// RsMailMimeItem - -bool RsMailChunkItem::isPartial() -{ - return (mPartCount != 1); -} - - -void RsMailChunkItem::clear() -{ - mMailId.TlvClear(); - mPartCount = 0; - mMailIndex = 0; - mWholeMailId.clear(); - mMessage.clear(); -} - -std::ostream &RsMailChunkItem::print(std::ostream &out, uint16_t indent) -{ - printRsItemBase(out, "RsMailChunkItem", indent); - uint16_t int_Indent = indent + 2; - - mMailId.print(out, int_Indent); - - printIndent(out, int_Indent); - out << "PartCount: " << mPartCount << std::endl; - printIndent(out, int_Indent); - out << "MailIndex: " << mMailIndex << std::endl; - - printIndent(out, int_Indent); - out << "WholeMailId: " << mWholeMailId.toStdString() << std::endl; - - printIndent(out, int_Indent); - out << "mMessage: " << mMessage << std::endl; - - printRsItemEnd(out, "RsMailChunkItem", indent); - return out; -} - -uint32_t RsMailChunkItem::serial_size() -{ - uint32_t s = 8; /* header */ - s += mMailId.TlvSize(); /* mMailId */ - s += 2; /* mPartCount */ - s += 2; /* mMailIndex */ - s += mWholeMailId.serial_size(); /* mRecvTime */ - s += GetTlvStringSize(mMessage); - - return s; -} - -/* serialise the data to the buffer */ -bool RsMailChunkItem::serialise(void *data, uint32_t& pktsize) -{ - uint32_t tlvsize = serial_size() ; - uint32_t offset = 0; - - if (pktsize < tlvsize) - return false; /* not enough space */ - - pktsize = tlvsize; - - bool ok = true; - - ok &= setRsItemHeader(data, tlvsize, PacketId(), tlvsize); - -#ifdef RSSERIAL_DEBUG - std::cerr << "RsMailChunkItem::serialise() Header: " << ok << std::endl; - std::cerr << "RsMailChunkItem::serialise() Size: " << tlvsize << std::endl; -#endif - - /* skip the header */ - offset += 8; - - /* add mandatory parts first */ - ok &= mMailId.SetTlv(data, tlvsize, &offset); - ok &= setRawUInt16(data, tlvsize, &offset, mPartCount); - ok &= setRawUInt16(data, tlvsize, &offset, mMailIndex); - ok &= mWholeMailId.serialise(data, tlvsize, offset); - ok &= SetTlvString(data, tlvsize, &offset, TLV_TYPE_STR_MSG, mMessage); - - if (offset != tlvsize) - { - ok = false; - std::cerr << "RsMailMimeSerialiser::serialiseItem() Size Error! " << std::endl; - } - - return ok; -} - -RsMailChunkItem *RsMailTransportSerialiser::deserialiseChunkItem(void *data, uint32_t *pktsize) -{ - /* get the type and size */ - uint32_t rstype = getRsItemId(data); - uint32_t rssize = getRsItemSize(data); - - uint32_t offset = 0; - - - if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) || - (mServiceType != getRsItemService(rstype)) || - (RS_PKT_SUBTYPE_MAIL_TRANSPORT_CHUNK != getRsItemSubType(rstype))) - { - return NULL; /* wrong type */ - } - - if (*pktsize < rssize) /* check size */ - return NULL; /* not enough data */ - - /* set the packet length */ - *pktsize = rssize; - - bool ok = true; - - /* ready to load */ - RsMailChunkItem *item = new RsMailChunkItem(mServiceType); - item->clear(); - - /* skip the header */ - offset += 8; - - /* get mandatory parts first */ - ok &= item->mMailId.GetTlv(data, rssize, &offset); - ok &= getRawUInt16(data, rssize, &offset, &(item->mPartCount)); - ok &= getRawUInt16(data, rssize, &offset, &(item->mMailIndex)); - ok &= item->mWholeMailId.deserialise(data, rssize, offset); - ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSG, item->mMessage); - - if (offset != rssize) - { - /* error */ - delete item; - return NULL; - } - - if (!ok) - { - delete item; - return NULL; - } - - return item; -} - - -void RsMailAckItem::clear() -{ - mMailId.TlvClear(); -} - -std::ostream& RsMailAckItem::print(std::ostream &out, uint16_t indent) -{ - printRsItemBase(out, "RsMailAckItem", indent); - uint16_t int_Indent = indent + 2; - - mMailId.print(out, int_Indent); - - printRsItemEnd(out, "RsMailAckItem", indent); - - return out; -} - -uint32_t RsMailAckItem::serial_size() -{ - uint32_t s = 8; /* header */ - - s += mMailId.TlvSize(); - return s; -} - - -bool RsMailAckItem::serialise(void *data, uint32_t& pktsize) -{ - uint32_t tlvsize = serial_size() ; - uint32_t offset = 0; - - if (pktsize < tlvsize) - return false; /* not enough space */ - - pktsize = tlvsize; - - bool ok = true; - - ok &= setRsItemHeader(data, tlvsize, PacketId(), tlvsize); - -#ifdef RSSERIAL_DEBUG - std::cerr << "RsMailAckItem::serialise() Header: " << ok << std::endl; - std::cerr << "RsMailAckItem::serialise() Size: " << tlvsize << std::endl; -#endif - - /* skip the header */ - offset += 8; - - /* add mandatory parts first */ - - ok &= mMailId.SetTlv(data, tlvsize, &offset); - - if (offset != tlvsize) - { - ok = false; - std::cerr << "RsMailAckItem::serialise() Size Error! " << std::endl; - } - - return ok; -} - - -RsMailAckItem* RsMailTransportSerialiser::deserialiseAckItem(void *data,uint32_t* pktsize) -{ - /* get the type and size */ - uint32_t rstype = getRsItemId(data); - uint32_t rssize = getRsItemSize(data); - - uint32_t offset = 0; - - - if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) || - (mServiceType != getRsItemService(rstype)) || - (RS_PKT_SUBTYPE_MAIL_TRANSPORT_ACK != getRsItemSubType(rstype))) - { - return NULL; /* wrong type */ - } - - if (*pktsize < rssize) /* check size */ - return NULL; /* not enough data */ - - /* set the packet length */ - *pktsize = rssize; - - bool ok = true; - - /* ready to load */ - RsMailAckItem *item = new RsMailAckItem(mServiceType); - item->clear(); - - /* skip the header */ - offset += 8; - - - /* get mandatory parts first */ - ok &= item->mMailId.GetTlv(data, rssize, &offset); - - if (offset != rssize) - { - /* error */ - delete item; - return NULL; - } - - if (!ok) - { - delete item; - return NULL; - } - - return item; -} - -/**************************/ - -RsItem* RsMailTransportSerialiser::deserialise(void *data, uint32_t *pktsize) -{ -#ifdef RSSERIAL_DEBUG - std::cerr << "RsMailTransportSerialiser::deserialise()" << std::endl; -#endif - - /* get the type and size */ - uint32_t rstype = getRsItemId(data); - - if ((RS_PKT_VERSION_SERVICE != getRsItemVersion(rstype)) || - (mServiceType != getRsItemService(rstype))) - { - return NULL; /* wrong type */ - } - - switch(getRsItemSubType(rstype)) - { - case RS_PKT_SUBTYPE_MAIL_TRANSPORT_CHUNK: - return deserialiseChunkItem(data, pktsize); - break; - - case RS_PKT_SUBTYPE_MAIL_TRANSPORT_ACK: - return deserialiseAckItem(data, pktsize); - break; - - default: - return NULL; - break; - } - - return NULL; -} - - -bool RsMailTransportSerialiser::serialise(RsItem *item, void *data, uint32_t *size){ - if (item->PacketService() != mServiceType) - { - return false; - } - return dynamic_cast(item)->serialise(data,*size); -} - - - -/*************************************************************************/ - diff --git a/libretroshare/src/serialiser/rsmailtransportitems.h b/libretroshare/src/serialiser/rsmailtransportitems.h deleted file mode 100644 index 69d872b7f..000000000 --- a/libretroshare/src/serialiser/rsmailtransportitems.h +++ /dev/null @@ -1,145 +0,0 @@ -#ifndef RS_MAIL_TRANSPORT_ITEMS_H -#define RS_MAIL_TRANSPORT_ITEMS_H - -/* - * libretroshare/src/serialiser: rsmailtransportitems.h - * - * RetroShare Serialiser. - * - * Copyright 2014-2014 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include - -#include "retroshare/rstypes.h" -#include "serialiser/rsserviceids.h" -#include "serialiser/rsserial.h" - -#include "serialiser/rstlvmail.h" - - -/**************************************************************************/ - -// for defining tags themselves and msg tags -const uint8_t RS_PKT_SUBTYPE_MAIL_TRANSPORT_CHUNK = 0x01; -const uint8_t RS_PKT_SUBTYPE_MAIL_TRANSPORT_ACK = 0x02; - -/**************************************************************************/ - -// These Types are generic - and usable by all MailTransport services. -// However they must be tweaked to indicate the Service ID before sending. - -class RsMailTransportItem: public RsItem -{ - public: - RsMailTransportItem(uint16_t service_type, uint8_t msg_subtype) : RsItem(RS_PKT_VERSION_SERVICE,service_type,msg_subtype) - { - setPriorityLevel(QOS_PRIORITY_RS_MAIL_ITEM) ; - } - - RsMailTransportItem(uint8_t msg_subtype) : RsItem(RS_PKT_VERSION_SERVICE,0,msg_subtype) - { - setPriorityLevel(QOS_PRIORITY_RS_MAIL_ITEM) ; - } - - virtual ~RsMailTransportItem() {} - virtual void clear() {} - virtual std::ostream& print(std::ostream &out, uint16_t indent = 0) = 0 ; - - virtual bool serialise(void *data,uint32_t& size) = 0 ; - virtual uint32_t serial_size() = 0 ; -}; - - -class RsMailChunkItem: public RsMailTransportItem -{ - public: - RsMailChunkItem() :RsMailTransportItem(RS_PKT_SUBTYPE_MAIL_TRANSPORT_CHUNK) {} - RsMailChunkItem(uint16_t service_type) :RsMailTransportItem(service_type, RS_PKT_SUBTYPE_MAIL_TRANSPORT_CHUNK) {} - - virtual ~RsMailChunkItem() {} - virtual void clear(); - - virtual bool serialise(void *data,uint32_t& size) ; - virtual uint32_t serial_size() ; - - virtual std::ostream &print(std::ostream &out, uint16_t indent = 0); - - // extra functions. - bool isPartial(); - - // Serialised. - RsTlvMailId mMailId; - - uint16_t mPartCount; - uint16_t mMailIndex; - RsMessageId mWholeMailId; - - std::string mMessage; -}; - - -class RsMailAckItem : public RsMailTransportItem -{ - public: - RsMailAckItem() :RsMailTransportItem(RS_PKT_SUBTYPE_MAIL_TRANSPORT_ACK) {} - RsMailAckItem(uint16_t service_type) :RsMailTransportItem(service_type, RS_PKT_SUBTYPE_MAIL_TRANSPORT_ACK) {} - - virtual std::ostream &print(std::ostream &out, uint16_t indent = 0); - - virtual bool serialise(void *data,uint32_t& size) ; - virtual uint32_t serial_size() ; - - virtual ~RsMailAckItem() {} - virtual void clear(); - - // serialised - RsTlvMailId mMailId; -}; - - -class RsMailTransportSerialiser: public RsSerialType -{ - public: - RsMailTransportSerialiser(uint16_t service_type) - :RsSerialType(RS_PKT_VERSION_SERVICE, service_type), - mServiceType(service_type) {} - - virtual ~RsMailTransportSerialiser() {} - - virtual uint32_t size(RsItem *item) - { - return dynamic_cast(item)->serial_size() ; - } - virtual bool serialise(RsItem *i, void *d, uint32_t *s); - virtual RsItem * deserialise(void *data, uint32_t *size); - - private: - virtual RsMailChunkItem *deserialiseChunkItem(void *data, uint32_t *size); - virtual RsMailAckItem *deserialiseAckItem(void *data, uint32_t *size); - - uint16_t mServiceType; -}; - -/**************************************************************************/ - -#endif /* RS_MAIL_TRANSPORT_ITEMS_H */ - - diff --git a/libretroshare/src/serialiser/rstlvmail.cc b/libretroshare/src/serialiser/rstlvmail.cc deleted file mode 100644 index 2071d56ec..000000000 --- a/libretroshare/src/serialiser/rstlvmail.cc +++ /dev/null @@ -1,265 +0,0 @@ - -/* - * libretroshare/src/serialiser: rstlvmsgs.cc - * - * RetroShare Serialiser. - * - * Copyright 2014 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -#include "serialiser/rstlvbase.h" -#include "serialiser/rstlvmail.h" -#include "serialiser/rsbaseserial.h" - -/************************************* RsTlvIpAddress ************************************/ - -RsTlvMailAddress::RsTlvMailAddress() - :RsTlvItem() -{ - return; -} - -void RsTlvMailAddress::TlvClear() -{ - mAddressType = 0; - mAddress.clear(); -} - -uint32_t RsTlvMailAddress::TlvSize() const -{ - uint32_t s = TLV_HEADER_SIZE; - s += 4; // TYPE. - s += GetTlvStringSize(mAddress); - return s; -} - -bool RsTlvMailAddress::SetTlv(void *data, uint32_t size, uint32_t *offset) const -{ - /* must check sizes */ - uint32_t tlvsize = TlvSize(); - uint32_t tlvend = *offset + tlvsize; - - if (size < tlvend) - return false; /* not enough space */ - - bool ok = true; - - /* start at data[offset] */ - /* add mandatory parts first */ - - ok &= SetTlvBase(data, tlvend, offset, TLV_TYPE_MSG_ADDRESS, tlvsize); - - ok &= setRawUInt32(data, tlvend, offset, mAddressType); - ok &= SetTlvString(data, tlvend, offset, TLV_TYPE_STR_MSG, mAddress); - return ok; - -} - - -bool RsTlvMailAddress::GetTlv(void *data, uint32_t size, uint32_t *offset) -{ - if (size < *offset + TLV_HEADER_SIZE) - return false; - - uint16_t tlvtype = GetTlvType( &(((uint8_t *) data)[*offset]) ); - uint32_t tlvsize = GetTlvSize( &(((uint8_t *) data)[*offset]) ); - uint32_t tlvend = *offset + tlvsize; - - if (size < tlvend) /* check size */ - return false; /* not enough space */ - - if (tlvtype != TLV_TYPE_MSG_ADDRESS) /* check type */ - return false; - - bool ok = true; - - /* ready to load */ - TlvClear(); - - /* skip the header */ - (*offset) += TLV_HEADER_SIZE; - - ok &= getRawUInt32(data, tlvend, offset, &(mAddressType)); - ok &= GetTlvString(data, tlvend, offset, TLV_TYPE_STR_MSG, mAddress); - - /*************************************************************************** - * NB: extra components could be added (for future expansion of the type). - * or be present (if this code is reading an extended version). - * - * We must chew up the extra characters to conform with TLV specifications - ***************************************************************************/ - if (*offset != tlvend) - { -#ifdef TLV_DEBUG - std::cerr << "RsTlvIpAddress::GetTlv() Warning extra bytes at end of item"; - std::cerr << std::endl; -#endif - *offset = tlvend; - } - - return ok; - -} - - -std::ostream &RsTlvMailAddress::print(std::ostream &out, uint16_t indent) const -{ - printBase(out, "RsTlvMailAddress", indent); - uint16_t int_Indent = indent + 2; - - printIndent(out, int_Indent); - out << "AddressType:" << mAddressType << std::endl; - printIndent(out, int_Indent); - out << "Address:" << mAddress << std::endl; - - printEnd(out, "RsTlvMailAddress", indent); - return out; -} - - - - -/************************************* RsTlvIpAddressInfo ************************************/ - -RsTlvMailId::RsTlvMailId() - :RsTlvItem(), mSentTime(0) -{ - mMailFrom.TlvClear(); - mMailDest.TlvClear(); - mMailId.clear(); - return; -} - -void RsTlvMailId::TlvClear() -{ - mMailFrom.TlvClear(); - mMailDest.TlvClear(); - mSentTime = 0; - mMailId.clear(); -} - -uint32_t RsTlvMailId::TlvSize() const -{ - uint32_t s = TLV_HEADER_SIZE; - - s += mMailFrom.TlvSize(); - s += mMailDest.TlvSize(); - s += 4; // SentTime - s += mMailId.serial_size(); - - return s; - -} - -bool RsTlvMailId::SetTlv(void *data, uint32_t size, uint32_t *offset) const -{ - /* must check sizes */ - uint32_t tlvsize = TlvSize(); - uint32_t tlvend = *offset + tlvsize; - - if (size < tlvend) - return false; /* not enough space */ - - bool ok = true; - - /* start at data[offset] */ - /* add mandatory parts first */ - - ok &= SetTlvBase(data, tlvend, offset, TLV_TYPE_MSG_ID, tlvsize); - - ok &= mMailFrom.SetTlv(data, tlvend, offset); - ok &= mMailDest.SetTlv(data, tlvend, offset); - ok &= setRawUInt32(data, tlvend, offset, mSentTime); - ok &= mMailId.serialise(data, tlvend, *offset); - - return ok; - -} - - -bool RsTlvMailId::GetTlv(void *data, uint32_t size, uint32_t *offset) -{ - if (size < *offset + TLV_HEADER_SIZE) - return false; - - uint16_t tlvtype = GetTlvType( &(((uint8_t *) data)[*offset]) ); - uint32_t tlvsize = GetTlvSize( &(((uint8_t *) data)[*offset]) ); - uint32_t tlvend = *offset + tlvsize; - - if (size < tlvend) /* check size */ - return false; /* not enough space */ - - if (tlvtype != TLV_TYPE_MSG_ID) /* check type */ - return false; - - bool ok = true; - - /* ready to load */ - TlvClear(); - - /* skip the header */ - (*offset) += TLV_HEADER_SIZE; - - ok &= mMailFrom.GetTlv(data, tlvend, offset); - ok &= mMailDest.GetTlv(data, tlvend, offset); - ok &= getRawUInt32(data, tlvend, offset, &(mSentTime)); - ok &= mMailId.deserialise(data, tlvend, *offset); - - - /*************************************************************************** - * NB: extra components could be added (for future expansion of the type). - * or be present (if this code is reading an extended version). - * - * We must chew up the extra characters to conform with TLV specifications - ***************************************************************************/ - if (*offset != tlvend) - { -#ifdef TLV_DEBUG - std::cerr << "RsTlvMailId::GetTlv() Warning extra bytes at end of item"; - std::cerr << std::endl; -#endif - *offset = tlvend; - } - - return ok; - -} - - -std::ostream &RsTlvMailId::print(std::ostream &out, uint16_t indent) const -{ - printBase(out, "RsTlvMailId", indent); - uint16_t int_Indent = indent + 2; - - mMailFrom.print(out, int_Indent); - mMailDest.print(out, int_Indent); - - printIndent(out, int_Indent); - out << "SentTime:" << mSentTime; - out << std::endl; - - printIndent(out, int_Indent); - out << "mMailId:" << mMailId.toStdString(); - out << std::endl; - - printEnd(out, "RsTlvMailId", indent); - return out; -} - diff --git a/libretroshare/src/serialiser/rstlvmail.h b/libretroshare/src/serialiser/rstlvmail.h deleted file mode 100644 index 5f9a650be..000000000 --- a/libretroshare/src/serialiser/rstlvmail.h +++ /dev/null @@ -1,71 +0,0 @@ -#pragma once - -/* - * libretroshare/src/serialiser: rstlvmail.h - * - * RetroShare Serialiser. - * - * Copyright 2014 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - -/******************************************************************* - * These are the Compound TLV structures that must be (un)packed. - ******************************************************************/ - -#include - -#include "serialiser/rstlvitem.h" -#include "util/rsnet.h" -#include - -class RsTlvMailAddress: public RsTlvItem -{ - public: - RsTlvMailAddress(); -virtual ~RsTlvMailAddress() { return; } -virtual uint32_t TlvSize() const; -virtual void TlvClear(); -virtual bool SetTlv(void *data, uint32_t size, uint32_t *offset) const; -virtual bool GetTlv(void *data, uint32_t size, uint32_t *offset); -virtual std::ostream &print(std::ostream &out, uint16_t indent) const; - - uint32_t mAddressType; - std::string mAddress; -}; - - -class RsTlvMailId: public RsTlvItem -{ - public: - RsTlvMailId(); -virtual ~RsTlvMailId() { return; } -virtual uint32_t TlvSize() const; -virtual void TlvClear(); -virtual bool SetTlv(void *data, uint32_t size, uint32_t *offset) const; -virtual bool GetTlv(void *data, uint32_t size, uint32_t *offset); -virtual std::ostream &print(std::ostream &out, uint16_t indent) const; - - RsTlvMailAddress mMailFrom; - RsTlvMailAddress mMailDest; - uint32_t mSentTime; - RsMessageId mMailId; -}; - - diff --git a/libretroshare/src/services/mail/directmailservice.cc b/libretroshare/src/unfinished/mail/directmailservice.cc similarity index 100% rename from libretroshare/src/services/mail/directmailservice.cc rename to libretroshare/src/unfinished/mail/directmailservice.cc diff --git a/libretroshare/src/services/mail/directmailservice.h b/libretroshare/src/unfinished/mail/directmailservice.h similarity index 100% rename from libretroshare/src/services/mail/directmailservice.h rename to libretroshare/src/unfinished/mail/directmailservice.h diff --git a/libretroshare/src/services/mail/mailtransport.cc b/libretroshare/src/unfinished/mail/mailtransport.cc similarity index 100% rename from libretroshare/src/services/mail/mailtransport.cc rename to libretroshare/src/unfinished/mail/mailtransport.cc diff --git a/libretroshare/src/services/mail/mailtransport.h b/libretroshare/src/unfinished/mail/mailtransport.h similarity index 100% rename from libretroshare/src/services/mail/mailtransport.h rename to libretroshare/src/unfinished/mail/mailtransport.h diff --git a/libretroshare/src/services/p3tunnel.cc b/libretroshare/src/unfinished/p3tunnel.cc similarity index 100% rename from libretroshare/src/services/p3tunnel.cc rename to libretroshare/src/unfinished/p3tunnel.cc diff --git a/libretroshare/src/services/p3tunnel.h b/libretroshare/src/unfinished/p3tunnel.h similarity index 100% rename from libretroshare/src/services/p3tunnel.h rename to libretroshare/src/unfinished/p3tunnel.h diff --git a/libretroshare/src/serialiser/rstlvdsdv.cc b/libretroshare/src/unfinished/rstlvdsdv.cc similarity index 100% rename from libretroshare/src/serialiser/rstlvdsdv.cc rename to libretroshare/src/unfinished/rstlvdsdv.cc diff --git a/libretroshare/src/serialiser/rstlvdsdv.h b/libretroshare/src/unfinished/rstlvdsdv.h similarity index 100% rename from libretroshare/src/serialiser/rstlvdsdv.h rename to libretroshare/src/unfinished/rstlvdsdv.h From 9c3d5acd8e6b9cb608411fcf97689fdf0daa9b37 Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 17:40:34 +0100 Subject: [PATCH 18/26] fixed license in libretroshare --- libretroshare/src/libretroshare.pro | 2 + libretroshare/src/retroshare/rstypes.h | 2 +- libretroshare/src/rsserver/p3face-config.cc | 47 +++++++++---------- libretroshare/src/rsserver/p3face-info.cc | 46 +++++++++--------- libretroshare/src/rsserver/p3face-server.cc | 47 +++++++++---------- libretroshare/src/rsserver/rsloginhandler.cc | 22 +++++++++ libretroshare/src/rsserver/rsloginhandler.h | 22 +++++++++ libretroshare/src/rsserver/rstypes.cc | 47 +++++++++---------- libretroshare/src/tcponudp/rsudpstack.h | 49 +++++++++----------- libretroshare/src/upnp/UPnPBase.cpp | 48 +++++++++---------- libretroshare/src/upnp/UPnPBase.h | 48 +++++++++---------- libretroshare/src/util/argstream.h | 42 ++++++++--------- libretroshare/src/util/rsexpr.cc | 46 +++++++++--------- 13 files changed, 241 insertions(+), 227 deletions(-) diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 703557cb7..6212dab30 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -101,6 +101,7 @@ HEADERS += tcponudp/udppeer.h \ tcponudp/tcpstream.h \ tcponudp/tou.h \ tcponudp/udprelay.h \ + tcponudp/rsudpstack.h \ pqi/pqissludp.h \ SOURCES += tcponudp/udppeer.cc \ @@ -493,6 +494,7 @@ HEADERS += util/folderiterator.h \ util/rsmemory.h \ util/smallobject.h \ util/rsdir.h \ + util/argstream.h \ util/rsdiscspace.h \ util/rsnet.h \ util/extaddrfinder.h \ diff --git a/libretroshare/src/retroshare/rstypes.h b/libretroshare/src/retroshare/rstypes.h index 137939fc8..1221f806c 100644 --- a/libretroshare/src/retroshare/rstypes.h +++ b/libretroshare/src/retroshare/rstypes.h @@ -1,5 +1,5 @@ /******************************************************************************* - * libretroshare/src/retroshare: rsturtle.h * + * libretroshare/src/rsserver: rstypes.h * * * * libretroshare: retroshare core library * * * diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc index da998a16a..8e4bf64cb 100644 --- a/libretroshare/src/rsserver/p3face-config.cc +++ b/libretroshare/src/rsserver/p3face-config.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: p3face-config.cc,v 1.4 2007-05-05 16:10:05 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: p3face-config.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2006 by Robert Fernie. * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "rsserver/p3face.h" diff --git a/libretroshare/src/rsserver/p3face-info.cc b/libretroshare/src/rsserver/p3face-info.cc index a94368a93..e3478aa4e 100644 --- a/libretroshare/src/rsserver/p3face-info.cc +++ b/libretroshare/src/rsserver/p3face-info.cc @@ -1,28 +1,24 @@ - -/* - * "$Id: p3face-info.cc,v 1.5 2007-04-15 18:45:23 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2015 by RetroShare Team. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * libretroshare/src/rsserver: p3face-info.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2015 by RetroShare Team * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "rsserver/p3face.h" #include diff --git a/libretroshare/src/rsserver/p3face-server.cc b/libretroshare/src/rsserver/p3face-server.cc index a66be6aa5..6d9581bc7 100644 --- a/libretroshare/src/rsserver/p3face-server.cc +++ b/libretroshare/src/rsserver/p3face-server.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: p3face-server.cc,v 1.5 2007-04-15 18:45:23 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: p3face-server.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2015 by Robert Fernie * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "util/rstime.h" #include "rsserver/p3face.h" diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc index 263d62ce3..96c72bf4d 100644 --- a/libretroshare/src/rsserver/rsloginhandler.cc +++ b/libretroshare/src/rsserver/rsloginhandler.cc @@ -1,3 +1,25 @@ +/******************************************************************************* + * libretroshare/src/rsserver: rsloginhandler.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 retroshare team * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #include #include #include diff --git a/libretroshare/src/rsserver/rsloginhandler.h b/libretroshare/src/rsserver/rsloginhandler.h index f3c6a5928..1c95a741b 100644 --- a/libretroshare/src/rsserver/rsloginhandler.h +++ b/libretroshare/src/rsserver/rsloginhandler.h @@ -1,3 +1,25 @@ +/******************************************************************************* + * libretroshare/src/rsserver: rsloginhandler.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2018 retroshare team * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include diff --git a/libretroshare/src/rsserver/rstypes.cc b/libretroshare/src/rsserver/rstypes.cc index d804bf6e9..1e6ec33ab 100644 --- a/libretroshare/src/rsserver/rstypes.cc +++ b/libretroshare/src/rsserver/rstypes.cc @@ -1,29 +1,24 @@ - -/* - * "$Id: rstypes.cc,v 1.2 2007-04-07 08:41:00 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/rsserver: rstypes.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ /* Insides of RetroShare interface. * only prints stuff out at the moment diff --git a/libretroshare/src/tcponudp/rsudpstack.h b/libretroshare/src/tcponudp/rsudpstack.h index ac1408a05..e72e67f5e 100644 --- a/libretroshare/src/tcponudp/rsudpstack.h +++ b/libretroshare/src/tcponudp/rsudpstack.h @@ -1,33 +1,28 @@ +/******************************************************************************* + * libretroshare/src/tcponudp: rsudpstack.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2012-2012 by Robert Fernie * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RS_UDP_STACK_RECEIVER_H #define RS_UDP_STACK_RECEIVER_H -/* - * tcponudp/rsudpstack.h - * - * libretroshare. - * - * Copyright 2010 by Robert Fernie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 3 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -/*******************************************************/ #ifdef RS_USE_BITDHT #include "udp/udpstack.h" diff --git a/libretroshare/src/upnp/UPnPBase.cpp b/libretroshare/src/upnp/UPnPBase.cpp index dd99a4bc8..75421b2f7 100644 --- a/libretroshare/src/upnp/UPnPBase.cpp +++ b/libretroshare/src/upnp/UPnPBase.cpp @@ -1,28 +1,26 @@ -// -// This file is part of the aMule Project. -// -// Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) -// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org ) -// Copyright (c) 2009-2010 Retroshare Team -// -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// You are also granted to use it with the LGPL License -// -// This program 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License or the LGPL -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -// - -//This file uses libupnp +/******************************************************************************* + * libretroshare/src/upnp: UPnPBase.cpp * + * * + * libretroshare: retroshare core library * + * * + * Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) * + * Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org)* + * Copyright (c) 2009-2010 Retroshare Team * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #define UPNP_C diff --git a/libretroshare/src/upnp/UPnPBase.h b/libretroshare/src/upnp/UPnPBase.h index 8fed1014b..59057c7e1 100644 --- a/libretroshare/src/upnp/UPnPBase.h +++ b/libretroshare/src/upnp/UPnPBase.h @@ -1,28 +1,26 @@ -// -// This file is part of the aMule Project. -// -// Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) -// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org ) -// Copyright (c) 2009-2010 Retroshare Team -// -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. -// You are also granted to use it with the LGPL License -// -// This program 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License or the LGPL -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -// - -//This file uses libupnp +/******************************************************************************* + * libretroshare/src/upnp: UPnPBase.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org ) * + * Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org)* + * Copyright (c) 2009-2010 Retroshare Team * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/libretroshare/src/util/argstream.h b/libretroshare/src/util/argstream.h index 1044effbd..ede11ec2e 100644 --- a/libretroshare/src/util/argstream.h +++ b/libretroshare/src/util/argstream.h @@ -1,24 +1,24 @@ -/* Copyright (C) 2004 Xavier Decoret - * - * argstream is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * This licence has been changed from GPL to LPGL, with permission - * of the original author. (August 2013). - * - */ +/******************************************************************************* + * libretroshare/src/util: argstream.h * + * * + * libretroshare: retroshare core library * + * * + * Copyright (C) 2004 Xavier Decoret * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef ARGSTREAM_H #define ARGSTREAM_H diff --git a/libretroshare/src/util/rsexpr.cc b/libretroshare/src/util/rsexpr.cc index 801e4fcb0..dff5a5fa5 100644 --- a/libretroshare/src/util/rsexpr.cc +++ b/libretroshare/src/util/rsexpr.cc @@ -1,28 +1,24 @@ -/* - * rs-core/src/dbase: rsexpr.cc - * - * RetroShare C++ Interface. - * - * Copyright 2007-2008 by Kashif Kaleem. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * libretroshare/src/retroshare: rsexpr.cc * + * * + * libretroshare: retroshare core library * + * * + * Copyright 2007-2008 by Kashif Kaleem * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "retroshare/rsexpr.h" #include "retroshare/rstypes.h" From ca3694accabecf86e9e4e552df246c840bdc72af Mon Sep 17 00:00:00 2001 From: csoler Date: Sat, 10 Nov 2018 23:03:44 +0100 Subject: [PATCH 19/26] re-licensed upnputil with permission from the author --- libretroshare/src/upnp/upnputil.c | 41 ++++++++++++++++-------------- libretroshare/src/upnp/upnputil.h | 42 +++++++++++++++++-------------- 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/libretroshare/src/upnp/upnputil.c b/libretroshare/src/upnp/upnputil.c index 8e9177451..0ee6bec42 100644 --- a/libretroshare/src/upnp/upnputil.c +++ b/libretroshare/src/upnp/upnputil.c @@ -1,22 +1,25 @@ -/************************************************************************************** - * MiniUPnPc * - * Copyright (c) 2005-2016, Thomas BERNARD * - * All rights reserved. * - * * - * Redistribution and use in source and binary forms, with or without * - * modification, are permitted provided that the following conditions are met: * - * * - * * Redistributions of source code must retain the above copyright notice, * - * this list of conditions and the following disclaimer. * - * * Redistributions in binary form must reproduce the above copyright notice, * - * this list of conditions and the following disclaimer in the documentation * - * and/or other materials provided with the distribution. * - * * The name of the author may not be used to endorse or promote products * - * derived from this software without specific prior written permission. * - * This software is subject to the conditions detailed in the * - * LICENCE file provided in this distribution. * - * * - **************************************************************************************/ +/******************************************************************************* + * libretroshare/src/upnp: upnputil.c * + * * + * libretroshare: retroshare core library * + * From MiniUPnPc, re-licensed with permission * + * * + * Copyright (c) 2005-2016, Thomas BERNARD * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ //this file uses miniupnp //From https://github.com/miniupnp/miniupnp/blob/master/miniupnpc/upnpc.c diff --git a/libretroshare/src/upnp/upnputil.h b/libretroshare/src/upnp/upnputil.h index 20339bb72..9586418a4 100644 --- a/libretroshare/src/upnp/upnputil.h +++ b/libretroshare/src/upnp/upnputil.h @@ -1,22 +1,26 @@ -/************************************************************************************** - * MiniUPnPc * - * Copyright (c) 2005-2016, Thomas BERNARD * - * All rights reserved. * - * * - * Redistribution and use in source and binary forms, with or without * - * modification, are permitted provided that the following conditions are met: * - * * - * * Redistributions of source code must retain the above copyright notice, * - * this list of conditions and the following disclaimer. * - * * Redistributions in binary form must reproduce the above copyright notice, * - * this list of conditions and the following disclaimer in the documentation * - * and/or other materials provided with the distribution. * - * * The name of the author may not be used to endorse or promote products * - * derived from this software without specific prior written permission. * - * This software is subject to the conditions detailed in the * - * LICENCE file provided in this distribution. * - * * - **************************************************************************************/ +/******************************************************************************* + * libretroshare/src/upnp: upnputil.h * + * * + * libretroshare: retroshare core library * + * From MiniUPnPc, re-licensed with permission * + * * + * Copyright (c) 2005-2016, Thomas BERNARD * + * * + * This program 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 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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. * + * * + * You should have received a copy of the GNU Lesser General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + //this file uses miniupnp #ifndef MINIUPNP_UTIL_H_ From 752337cbdb4fea7bc408cbcd5be6e9a799284d54 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 10:54:39 +0100 Subject: [PATCH 20/26] updated licensing in libretroshare and Debian packaging script --- build_scripts/Debian/debian/copyright | 16 ++++++++++++++++ build_scripts/Debian/debian_release_howto.txt | 2 +- build_scripts/Debian/makeSourcePackage.sh | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/build_scripts/Debian/debian/copyright b/build_scripts/Debian/debian/copyright index e230e1ad4..10d880b88 100644 --- a/build_scripts/Debian/debian/copyright +++ b/build_scripts/Debian/debian/copyright @@ -3,6 +3,22 @@ Upstream-Name: retroshare Upstream-Contact: retroshare.team@gmail.com Source: https://github.com/retroshare/retroshare +Files: libretroshare/* * +Copyright: Copyright 2007-2018, Retroshare Team +License: LGPL-3+ + This program 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 3 of the + License, or (at your option) any later version. + . + This program 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. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . + Files: * Copyright: Copyright 2007-2018, Retroshare Team License: GPL-2+ diff --git a/build_scripts/Debian/debian_release_howto.txt b/build_scripts/Debian/debian_release_howto.txt index 8e85d0b02..bb1b8dc87 100644 --- a/build_scripts/Debian/debian_release_howto.txt +++ b/build_scripts/Debian/debian_release_howto.txt @@ -80,7 +80,7 @@ Licensing issues: libretroshare | GPLv2,GPLv3 | | csoler,drbob,Mr-alice,Chris,Thunder | Some files unversionned. plugins/dlfcn_win32.cc | GPLv2.1 | L| Ramiro Polla | pqi/authgpg.h | GPLv2 | L| Raghu Dev R. | .cc is authed by drbob - upnp/UPnPBase.h | GPLv2 | | Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted + upnp/UPnPBase.h | GPLv2 | L| Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted. Re-licensed with permission util/pugiconfig.h | MIT | | Arseny Kapoulkyne | [unused file!] util/rsstring.h | GPLv2 | L| Thomas Kister | util/rswin.h | GPLv2 | L| Thomas Kister | diff --git a/build_scripts/Debian/makeSourcePackage.sh b/build_scripts/Debian/makeSourcePackage.sh index 30e6aa736..4d037d92f 100755 --- a/build_scripts/Debian/makeSourcePackage.sh +++ b/build_scripts/Debian/makeSourcePackage.sh @@ -124,6 +124,9 @@ if ! test "${nodl}" = "yes"; then # remove unised qml code, only needed on Android rm -rf ${workdir}/src/retroshare-qml-app/ rm -rf ${workdir}/src/librssimulator/ + rm -rf ${workdir}/src/libretroshare/tests/ + rm -rf ${workdir}/src/libretroshare/unfinished/ + rm -rf ${workdir}/src/libretroshare/unused/ rm -rf ${workdir}/src/retroshare-android-notify-service/ rm -rf ${workdir}/src/retroshare-android-service/ rm -rf ${workdir}/src/libretroshare/src/unused/ From 1d548586f087bf0d85ed75a04e48d99b28e970b1 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 11:20:56 +0100 Subject: [PATCH 21/26] improved debian copyright file --- build_scripts/Debian/debian/copyright | 102 +++++++++++++++----------- 1 file changed, 59 insertions(+), 43 deletions(-) diff --git a/build_scripts/Debian/debian/copyright b/build_scripts/Debian/debian/copyright index 10d880b88..a04818396 100644 --- a/build_scripts/Debian/debian/copyright +++ b/build_scripts/Debian/debian/copyright @@ -3,9 +3,37 @@ Upstream-Name: retroshare Upstream-Contact: retroshare.team@gmail.com Source: https://github.com/retroshare/retroshare +Files: openpgpsdk/* * +Copyright: Copyright 2005-2008 Ben Laurie, Rachel Willmer, Retroshare Team +License: Apache-2.0 + Files: libretroshare/* * Copyright: Copyright 2007-2018, Retroshare Team -License: LGPL-3+ +License: LGPLv3+ + +Files: retroshare-gui/* +Copyright: Copyright 2007-2018, Retroshare Team +License: AGPLv3+ + + +License: Apache-2.0 + Contributors: . The Contributors have asserted + their moral rights under the UK Copyright Design and Patents Act 1988 to + be recorded as the authors of this copyright work. + . + Licensed under the Apache License, Version 2.0 (the "License"); you may not + use this file except in compliance with the License. + . + You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + . + See the License for the specific language governing permissions and + limitations under the License. + +License: LGPLv3+ This program 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 3 of the @@ -18,48 +46,36 @@ License: LGPL-3+ . You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . - -Files: * -Copyright: Copyright 2007-2018, Retroshare Team -License: GPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + . + In addition, as a special exception, the copyright holders give permission to + link this program with the OpenSSL library (or with modified versions of + OpenSSL that use the same license as OpenSSL), and distribute linked + combinations including the two. + +License: AGPLv3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + . + This program 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. + . + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see . . - This program 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 General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - See /usr/share/common-licenses/GPL-2 on your Debian system. - . - In addition to these license terms, the author grants the following - additional rights: - . - If you modify this program, or any covered work, by linking or - combining it with the OpenSSL project's OpenSSL library (or a - modified version of that library), containing parts covered by the - terms of the OpenSSL or SSLeay licenses, the author - grants you additional permission to convey the resulting work. - Corresponding Source for a non-source form of such a combination - shall include the source code for the parts of OpenSSL used as well - as that of the covered work. - . - You may at your option choose to remove this additional permission from - the work, or from any part of it. - . - It is possible to build this program in a way that it loads OpenSSL - libraries at run-time. If doing so, the following notices are required - by the OpenSSL and SSLeay licenses: - . - This product includes software developed by the OpenSSL Project - for use in the OpenSSL Toolkit. (http://www.openssl.org/) - . - This product includes cryptographic software written by Eric Young - (eay@cryptsoft.com) + As a special exception, the copyright holders give permission to link the + code of portions of this program with the OpenSSL library under certain + conditions as described in each individual source file and distribute + linked combinations including the program with the OpenSSL library. You + must comply with the GNU Affero General Public License in all respects for + all of the code used other than as permitted herein. If you modify file(s) + with this exception, you may extend this exception to your version of the + file(s), but you are not obligated to do so. If you do not wish to do so, + delete this exception statement from your version. If you delete this + exception statement from all source files in the program, then also delete + it in the license file. From 7bc91e3ac6f0293fbd49ef0a8818d6ec6c57a6fd Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 11:21:34 +0100 Subject: [PATCH 22/26] moved qmake files in openpgpsdk to Apache-2.0 --- openpgpsdk/src/openpgpsdk.pro | 36 ++++++++++++++++-------------- openpgpsdk/src/use_openpgpsdk.pri | 37 +++++++++++++++++-------------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index 05d95af78..0be587191 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -1,21 +1,23 @@ -################################################################################ -# openpgpsdk.pro # -# Copyright (C) 2018, Retroshare team # +# +# Copyright (C) 2018, Retroshare team +# All rights reserved. +# Contributors: retroshare team. The Contributors have asserted +# their moral rights under the UK Copyright Design and Patents Act 1988 to +# be recorded as the authors of this copyright work. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. # # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU Affero General Public License as # -# published by the Free Software Foundation, either version 3 of the # -# License, or (at your option) any later version. # -# # -# This program 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. # -# # -# You should have received a copy of the GNU Lesser General Public License # -# along with this program. If not, see . # -################################################################################ - !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = lib diff --git a/openpgpsdk/src/use_openpgpsdk.pri b/openpgpsdk/src/use_openpgpsdk.pri index 800781a3c..ab66fb43b 100644 --- a/openpgpsdk/src/use_openpgpsdk.pri +++ b/openpgpsdk/src/use_openpgpsdk.pri @@ -1,20 +1,23 @@ -################################################################################ -# use_openpgpsdk.pri # -# Copyright (C) 2018, Retroshare team # -# # -# This program 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 3 of the # -# License, or (at your option) any later version. # -# # -# This program 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. # -# # -# You should have received a copy of the GNU Lesser General Public License # -# along with this program. If not, see . # -################################################################################ +# +# Copyright (C) 2018, Retroshare team +# All rights reserved. +# Contributors: retroshare team. The Contributors have asserted +# their moral rights under the UK Copyright Design and Patents Act 1988 to +# be recorded as the authors of this copyright work. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. +# +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# +# See the License for the specific language governing permissions and +# limitations under the License. +# DEPENDPATH *= $$system_path($$clean_path($${PWD}/../../openpgpsdk/src)) INCLUDEPATH *= $$system_path($$clean_path($${PWD}/../../openpgpsdk/src)) LIBS *= -L$$system_path($$clean_path($${OUT_PWD}/../../openpgpsdk/src/lib/)) -lops From cdcc796afc697cd05129fbc3e7042658ee96eec4 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 11:59:55 +0100 Subject: [PATCH 23/26] fixed licenses in plugins/VOIP --- plugins/VOIP/VOIPPlugin.h | 40 ++++++------ plugins/VOIP/interface/rsVOIP.h | 39 ++++++------ plugins/VOIP/p3Voip.h | 105 -------------------------------- 3 files changed, 39 insertions(+), 145 deletions(-) delete mode 100644 plugins/VOIP/p3Voip.h diff --git a/plugins/VOIP/VOIPPlugin.h b/plugins/VOIP/VOIPPlugin.h index f399f05b5..c09292f81 100644 --- a/plugins/VOIP/VOIPPlugin.h +++ b/plugins/VOIP/VOIPPlugin.h @@ -1,23 +1,23 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/VOIPPlugin.h * + * * + * Copyright 2015 by retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once /*VOIP*/ diff --git a/plugins/VOIP/interface/rsVOIP.h b/plugins/VOIP/interface/rsVOIP.h index 8b7fd3d7b..f5a159893 100644 --- a/plugins/VOIP/interface/rsVOIP.h +++ b/plugins/VOIP/interface/rsVOIP.h @@ -1,23 +1,22 @@ -/**************************************************************** - * RetroShare is distributed under the following license: - * - * Copyright (C) 2015 - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - ****************************************************************/ +/******************************************************************************* + * plugins/VOIP/interface/rsVOIP.h * + * * + * Copyright 2015 by retroshare team * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ // interface class for p3VOIP service // diff --git a/plugins/VOIP/p3Voip.h b/plugins/VOIP/p3Voip.h deleted file mode 100644 index ff532ec3e..000000000 --- a/plugins/VOIP/p3Voip.h +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Services for RetroShare. - * - * Copyright 2011-2012 by Cyril Soler - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - - -#pragma once - -#include -#include -#include - -#include "serialiser/rsmsgitems.h" -#include "services/p3service.h" -#include "retroshare/rsmsgs.h" -#include "plugins/rspqiservice.h" -#include "rsvoip.h" - -//!The basic VOIP service. - -class p3VoipService: public RsPQIService, public RsVoipServiceInterface -{ - public: - p3VoipService(RsPluginHandler *handler) - : RsPQIService(RS_SERVICE_TYPE_VOIP_PLUGIN,CONFIG_TYPE_VOIP_PLUGIN,0,handler) - {} - - /***** overloaded from p3Service *****/ - /*! - * This retrieves all chat msg items and also (important!) - * processes chat-status items that are in service item queue. chat msg item requests are also processed and not returned - * (important! also) notifications sent to notify base on receipt avatar, immediate status and custom status - * : notifyCustomState, notifyChatStatus, notifyPeerHasNewAvatar - * @see NotifyBase - */ - virtual int tick() { return 0 ;} -// virtual int status(); - - // /*************** pqiMonitor callback ***********************/ - // virtual void statusChange(const std::list &plist); - - /*! - * public chat sent to all peers - */ - int sendVoipData(const void *data,uint32_t size) { return 0 ;} - - // config values - - virtual int getVoipATransmit() const { return _atransmit ; } - virtual void setVoipATransmit(int) ; - virtual int getVoipVoiceHold() const { return _voice_hold ; } - virtual void setVoipVoiceHold(int) ; - virtual int getVoipfVADmin() const { return _vadmin ; } - virtual void setVoipfVADmin(int) ; - virtual int getVoipfVADmax() const { return _vadmax ; } - virtual void setVoipfVADmax(int) ; - virtual int getVoipiNoiseSuppress() const { return _noise_suppress ; } - virtual void setVoipiNoiseSuppress(int) ; - virtual int getVoipiMinLoudness() const { return _min_loudness ; } - virtual void setVoipiMinLoudness(int) ; - virtual bool getVoipEchoCancel() const { return _echo_cancel ; } - virtual void setVoipEchoCancel(bool) ; - - protected: - /************* from p3Config *******************/ - virtual RsSerialiser *setupSerialiser() ; - - /*! - * chat msg items and custom status are saved - */ - virtual bool saveList(bool& cleanup, std::list&) ; - virtual bool loadList(std::list& load) ; - - private: - //RsMutex mChatMtx; - - void receiveVoipQueue() {} - - int _atransmit ; - int _voice_hold ; - int _vadmin ; - int _vadmax ; - int _min_loudness ; - int _noise_suppress ; - bool _echo_cancel ; -}; - From d242b4299610aa3d81606d4b798e9e3ab40dc34d Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 12:00:30 +0100 Subject: [PATCH 24/26] improved Debian copyright file and packaging script --- build_scripts/Debian/debian/copyright | 34 ++--- build_scripts/Debian/debian_release_howto.txt | 122 +++++++++--------- build_scripts/Debian/makeSourcePackage.sh | 7 +- 3 files changed, 84 insertions(+), 79 deletions(-) diff --git a/build_scripts/Debian/debian/copyright b/build_scripts/Debian/debian/copyright index a04818396..3455cbebc 100644 --- a/build_scripts/Debian/debian/copyright +++ b/build_scripts/Debian/debian/copyright @@ -3,17 +3,17 @@ Upstream-Name: retroshare Upstream-Contact: retroshare.team@gmail.com Source: https://github.com/retroshare/retroshare -Files: openpgpsdk/* * -Copyright: Copyright 2005-2008 Ben Laurie, Rachel Willmer, Retroshare Team +Files: * +Copyright: 2007-2018, Retroshare Team +License: AGPL-3+ + +Files: openpgpsdk/* +Copyright: 2005-2008 Ben Laurie, Rachel Willmer, Retroshare Team License: Apache-2.0 -Files: libretroshare/* * -Copyright: Copyright 2007-2018, Retroshare Team -License: LGPLv3+ - -Files: retroshare-gui/* -Copyright: Copyright 2007-2018, Retroshare Team -License: AGPLv3+ +Files: libretroshare/* +Copyright: 2007-2018, Retroshare Team +License: LGPL-3+ License: Apache-2.0 @@ -33,38 +33,38 @@ License: Apache-2.0 See the License for the specific language governing permissions and limitations under the License. -License: LGPLv3+ +License: LGPL-3+ This program 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 3 of the License, or (at your option) any later version. - . + . This program 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. - . + . You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . - . + . In addition, as a special exception, the copyright holders give permission to link this program with the OpenSSL library (or with modified versions of OpenSSL that use the same license as OpenSSL), and distribute linked combinations including the two. -License: AGPLv3+ +License: AGPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - . + . This program 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. - . + . You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . + along with this program. If not, see . . As a special exception, the copyright holders give permission to link the code of portions of this program with the OpenSSL library under certain diff --git a/build_scripts/Debian/debian_release_howto.txt b/build_scripts/Debian/debian_release_howto.txt index bb1b8dc87..444eeda76 100644 --- a/build_scripts/Debian/debian_release_howto.txt +++ b/build_scripts/Debian/debian_release_howto.txt @@ -70,66 +70,68 @@ Licensing issues: D: delete d: delete in debian package to avoid licensing problems - Code part | Licenses | A| Authors | Comment - --------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- - libbitdht | GPLv3 | | drbob, csoler, Retroshare team | - bitdht/bencode.h | Public domain | | Mike Frysinger | - bitdht/bdrandom.h | GPLv2 | L| csoler | - --------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- - libresapi | GPLv3 | | G10H4ck, [], electron128 | Most files are unlicenced - libretroshare | GPLv2,GPLv3 | | csoler,drbob,Mr-alice,Chris,Thunder | Some files unversionned. - plugins/dlfcn_win32.cc | GPLv2.1 | L| Ramiro Polla | - pqi/authgpg.h | GPLv2 | L| Raghu Dev R. | .cc is authed by drbob - upnp/UPnPBase.h | GPLv2 | L| Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted. Re-licensed with permission - util/pugiconfig.h | MIT | | Arseny Kapoulkyne | [unused file!] - util/rsstring.h | GPLv2 | L| Thomas Kister | - util/rswin.h | GPLv2 | L| Thomas Kister | - util/rsversioninfo.h | [none] | | Alexandrut | - util/stacktrace.h | GPLv2 | R| Timo Bingmann, G10H4ck | - librssimulator | [None] |dA| No authors | - openpgpsdk | Apache | | Rachell Wilmer, Ben Laurie | - pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | will be deleted when creating debian package - plugins/feedreader | GPLv2 | A| Thunder | - plugins/VOIP | | | | - AudioInputConfig.h+ | All right reserved | A| Thorvald Natvig | Permission to re-license on 04/11/2018 - AudioStats.h+ | All right reserved | A| Thorvald Natvig | - AudioWizard.h+ | All right reserved | A| Thorvald Natvig | - SpeexProcessor.h | | | Peter Zotov | - retroshare-android-notify-* | GPLv3 | | G10H4ck | - retroshare-android-service | GPLv3 | | G10H4ck | - retroshare-gui/src | | | Thunder, csoler, drbob, crypton | - control/* | GPLv2 | | Matt Edman, crypton, Justin Hiple | [Unused code] - common/ElideLabel.h | BSD | | Qt Toolkit | - common/FlowLayout.h | BSD | | Qt Toolkit | Is that really Qt code?? Qt examples can be used. - common/html.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/rwindow.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/vmessagebox.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - common/PictureFlow | unclear | | Ariya Hidayat (@kde.org) | [Unused code] - elastic/* | LGPL | | Trolltech | - FileTransfer/FTIWidget | GPLv2 | | defnax, lsn752 | - FileTransfer/xprogressb | GPLv2 | | Xesc | - help/browser.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - images/retroshare_win.rc.h | GPLv2 | | crypton | [Unused code] - msgs/textformat.h | GPLv3 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented - settings/rsettings.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - statistics/BandwidthGraphW.h| GPLv2 | | Matt Edman, defnax, Justin Hiple | - statistics/dhtgraph.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | - toaster/MessageToaster.h | GPLv3 | | Xesc | - toaster/DownloadToaster.h | GPLv3 | | Xesc | - About{Widget,Dialog}.h | GPLv2 | | Unipro, Russia | Very small file. - linetypes.h | GPLv2 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented - mainpagestack.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - land/langagesupport.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - util/log.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - idle/idle.h | GPLv2 | | Justin Karneges | May be re-implemented - TorControl/* |* Public domaine | | John Brooks | Code from Ricochet.im - util/HandleRichText.h | GPLv2 | | Thomas Kister | - util/misc.h | GPLv2 | | defnax, Christophe Dumez | - util/printpreview.h | GPLv2 | | Trolltech example | - util/retrosharewin32.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - util/stringutil.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - rshare.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | - retroshare-nogui/* | GPLv2 | | drbob | + Code part | Licenses | A| Authors | Comment + ------------------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- + libbitdht | GPLv3 | | drbob, csoler, Retroshare team | + bitdht/bencode.h | Public domain | | Mike Frysinger | + bitdht/bdrandom.h | GPLv2 | L| csoler | + ------------------------------------------+------------------------+--+----------------------------------------------+------------------------------------------------- + libresapi | GPLv3 | | G10H4ck, [], electron128 | Most files are unlicenced + src/api/json.h | MIT | | Jeff Weinstein (jeff.weinstein at gmail) | + src/api/webui-src/app/mithril.min.js | MIT | | Leo Horie | + libretroshare | GPLv2,GPLv3 | | csoler,drbob,Mr-alice,Chris,Thunder | Some files unversionned. + plugins/dlfcn_win32.cc | GPLv2.1 | L| Ramiro Polla | + pqi/authgpg.h | GPLv2 | L| Raghu Dev R. | .cc is authed by drbob + upnp/UPnPBase.h | GPLv2 | L| Marcelo Roberto Jimenez, aMule Team | other code in upnp/ not copyrighted. Re-licensed with permission 10/11/2018 + util/pugiconfig.h | MIT | | Arseny Kapoulkyne | [unused file!] + util/rsstring.h | GPLv2 | L| Thomas Kister | + util/rswin.h | GPLv2 | L| Thomas Kister | + util/rsversioninfo.h | [none] | | Alexandrut | + util/stacktrace.h | GPLv2 | R| Timo Bingmann, G10H4ck | + librssimulator | [None] |dA| No authors | + openpgpsdk | Apache | | Rachell Wilmer, Ben Laurie | + pegmarkdown | All right reserved | | Daniel Jalkut - Code currently unused | will be deleted when creating debian package + plugins/feedreader | GPLv2 | A| Thunder | + plugins/VOIP | | | | + AudioInputConfig.h+ | All right reserved | A| Thorvald Natvig | Permission to re-license on 04/11/2018 + AudioStats.h+ | All right reserved | A| Thorvald Natvig | + AudioWizard.h+ | All right reserved | A| Thorvald Natvig | + SpeexProcessor.h | | | Peter Zotov | + retroshare-android-notify-* | GPLv3 | | G10H4ck | + retroshare-android-service | GPLv3 | | G10H4ck | + retroshare-gui/src | | | Thunder, csoler, drbob, crypton | + control/* | GPLv2 | | Matt Edman, crypton, Justin Hiple | [Unused code] + common/ElideLabel.h | BSD | | Qt Toolkit | + common/FlowLayout.h | BSD | | Qt Toolkit | Is that really Qt code?? Qt examples can be used. + common/html.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/rwindow.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/vmessagebox.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + common/PictureFlow | unclear | | Ariya Hidayat (@kde.org) | [Unused code] + elastic/* | LGPL | | Trolltech | + FileTransfer/FTIWidget | GPLv2 | | defnax, lsn752 | + FileTransfer/xprogressb | GPLv2 | | Xesc | + help/browser.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + images/retroshare_win.rc.h | GPLv2 | | crypton | [Unused code] + msgs/textformat.h | GPLv3 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented + settings/rsettings.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + statistics/BandwidthGraphW.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + statistics/dhtgraph.h | GPLv2 | | Matt Edman, defnax, Justin Hiple | + toaster/MessageToaster.h | GPLv3 | | Xesc | + toaster/DownloadToaster.h | GPLv3 | | Xesc | + About{Widget,Dialog}.h | GPLv2 | | Unipro, Russia | Very small file. + linetypes.h | GPLv2 | | Merdhah Momeny, Golnaz Nilieh | very simple .h. Can be re-implemented + mainpagestack.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + land/langagesupport.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + util/log.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + idle/idle.h | GPLv2 | | Justin Karneges | May be re-implemented + TorControl/* |* Public domaine | | John Brooks | Code from Ricochet.im + util/HandleRichText.h | GPLv2 | | Thomas Kister | + util/misc.h | GPLv2 | | defnax, Christophe Dumez | + util/printpreview.h | GPLv2 | | Trolltech example | + util/retrosharewin32.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + util/stringutil.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + rshare.h | GPLv2 | | Matt Edman, crypton, Justin Hiple | + retroshare-nogui/* | GPLv2 | | drbob | Plan: move to GPLv3 with OpenSSL exception diff --git a/build_scripts/Debian/makeSourcePackage.sh b/build_scripts/Debian/makeSourcePackage.sh index 4d037d92f..08ff949ea 100755 --- a/build_scripts/Debian/makeSourcePackage.sh +++ b/build_scripts/Debian/makeSourcePackage.sh @@ -165,12 +165,15 @@ else cp -r debian/* ${workdir}/debian/ rm -rf ${workdir}/src/retroshare-qml-app/ + rm -rf ${workdir}/src/librssimulator/ + rm -rf ${workdir}/src/libretroshare/tests/ + rm -rf ${workdir}/src/libretroshare/unfinished/ + rm -rf ${workdir}/src/libretroshare/unused/ rm -rf ${workdir}/src/retroshare-android-notify-service/ rm -rf ${workdir}/src/retroshare-android-service/ - rm -rf ${workdir}/src/librssimulator/ - rm -rf ${workdir}/src/unittests/ rm -rf ${workdir}/src/libretroshare/src/unused/ rm -rf ${workdir}/src/pegmarkdown/ + rm -rf ${workdir}/src/unittests/ rm -rf ${workdir}/src/build_scripts/ rm -f ${workdir}/debian/*~ rm -f ${workdir}/debian/.*.sw? From e95b8e4c55c32e2946c904dc77021d1c51441c51 Mon Sep 17 00:00:00 2001 From: csoler Date: Sun, 11 Nov 2018 12:11:54 +0100 Subject: [PATCH 25/26] fixed license in retroshare-nogui --- retroshare-nogui/src/TerminalApiClient.cpp | 21 ++++++++++ retroshare-nogui/src/TerminalApiClient.h | 22 ++++++++++ retroshare-nogui/src/introserver.cc | 45 ++++++++++----------- retroshare-nogui/src/introserver.h | 44 ++++++++++---------- retroshare-nogui/src/notifytxt.cc | 45 ++++++++++----------- retroshare-nogui/src/notifytxt.h | 47 ++++++++++------------ retroshare-nogui/src/retroshare-nogui.pro | 18 +++++++++ retroshare-nogui/src/retroshare.cc | 46 ++++++++++----------- 8 files changed, 167 insertions(+), 121 deletions(-) diff --git a/retroshare-nogui/src/TerminalApiClient.cpp b/retroshare-nogui/src/TerminalApiClient.cpp index b90ed7dbc..d29b0e059 100644 --- a/retroshare-nogui/src/TerminalApiClient.cpp +++ b/retroshare-nogui/src/TerminalApiClient.cpp @@ -1,3 +1,24 @@ +/******************************************************************************* + * retroshare-nogui/src/TerminalApiClient.cpp * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "TerminalApiClient.h" #include diff --git a/retroshare-nogui/src/TerminalApiClient.h b/retroshare-nogui/src/TerminalApiClient.h index 1fbbb2bed..fd423c59a 100644 --- a/retroshare-nogui/src/TerminalApiClient.h +++ b/retroshare-nogui/src/TerminalApiClient.h @@ -1,3 +1,25 @@ +/******************************************************************************* + * retroshare-nogui/src/TerminalApiClient.h * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #pragma once #include #include diff --git a/retroshare-nogui/src/introserver.cc b/retroshare-nogui/src/introserver.cc index bc373c2da..c263d75ae 100644 --- a/retroshare-nogui/src/introserver.cc +++ b/retroshare-nogui/src/introserver.cc @@ -1,27 +1,24 @@ - -/* - * RetroShare C++ Interface. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - +/******************************************************************************* + * retroshare-nogui/src/introserver.h * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2012-2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include diff --git a/retroshare-nogui/src/introserver.h b/retroshare-nogui/src/introserver.h index ebd2bc9dc..1cf278005 100644 --- a/retroshare-nogui/src/introserver.h +++ b/retroshare-nogui/src/introserver.h @@ -1,26 +1,24 @@ - -/* - * RetroShare C++ Interface. - * - * Copyright 2012-2012 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2.1 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * retroshare-nogui/src/introserver.h * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2012-2012 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #ifndef RS_INTRO_SERVER_H #define RS_INTRO_SERVER_H diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc index d6d4741c4..44bb267c5 100644 --- a/retroshare-nogui/src/notifytxt.cc +++ b/retroshare-nogui/src/notifytxt.cc @@ -1,27 +1,24 @@ -/* - * "$Id: notifytxt.cc,v 1.1 2007-02-19 20:08:30 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * retroshare-nogui/src/notifytxt.cc * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include #include "notifytxt.h" diff --git a/retroshare-nogui/src/notifytxt.h b/retroshare-nogui/src/notifytxt.h index 17dcbc409..b5174528c 100644 --- a/retroshare-nogui/src/notifytxt.h +++ b/retroshare-nogui/src/notifytxt.h @@ -1,30 +1,27 @@ +/******************************************************************************* + * retroshare-nogui/src/notifytxt.h * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ + #ifndef RSIFACE_NOTIFY_TXT_H #define RSIFACE_NOTIFY_TXT_H -/* - * "$Id: notifytxt.h,v 1.1 2007-02-19 20:08:30 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ - #include #include diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro index ef335e48f..8758f36c5 100644 --- a/retroshare-nogui/src/retroshare-nogui.pro +++ b/retroshare-nogui/src/retroshare-nogui.pro @@ -1,3 +1,21 @@ +################################################################################ +# retroshare-nogui.pri # +# Copyright (C) 2018, Retroshare team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU Affero General Public License as # +# published by the Free Software Foundation, either version 3 of the # +# License, or (at your option) any later version. # +# # +# This program 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. # +# # +# You should have received a copy of the GNU Lesser General Public License # +# along with this program. If not, see . # +################################################################################ + !include("../../retroshare.pri"): error("Could not include file ../../retroshare.pri") TEMPLATE = app diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc index cbc86355d..4b5307c50 100644 --- a/retroshare-nogui/src/retroshare.cc +++ b/retroshare-nogui/src/retroshare.cc @@ -1,28 +1,24 @@ - -/* - * "$Id: retroshare.cc,v 1.4 2007-04-21 19:08:51 rmf24 Exp $" - * - * RetroShare C++ Interface. - * - * Copyright 2004-2006 by Robert Fernie. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License Version 2 as published by the Free Software Foundation. - * - * 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA. - * - * Please report all bugs and problems to "retroshare@lunamutt.com". - * - */ +/******************************************************************************* + * retroshare-nogui/src/retroshare.cc * + * * + * retroshare-nogui: headless version of retroshare * + * * + * Copyright 2004-2006 by Robert Fernie * + * * + * This program is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * This program 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 Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with this program. If not, see . * + * * + *******************************************************************************/ #include "retroshare/rsiface.h" #include "retroshare/rsinit.h" From b8d2d9cade4449d0b3fc86a93573b156423cb631 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Mon, 5 Nov 2018 00:19:45 +0100 Subject: [PATCH 26/26] Print stack trace on crash --- libretroshare/src/util/stacktrace.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libretroshare/src/util/stacktrace.h b/libretroshare/src/util/stacktrace.h index aa0702dd8..cf3a74e1f 100644 --- a/libretroshare/src/util/stacktrace.h +++ b/libretroshare/src/util/stacktrace.h @@ -23,6 +23,7 @@ #include #include #include +#include #if defined(__linux__) && defined(__GLIBC__)