diff options
135 files changed, 192 insertions, 2538 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bc5f61..5dda9e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,30 +22,17 @@ ELSE(MCGGIT_WC_REVISION MATCHES "NOTFOUND") message("Git revision: " ${MCGGIT_WC_REVISION}) ENDIF(MCGGIT_WC_REVISION MATCHES "NOTFOUND") -SET(USE_QT5 OFF CACHE PATH "Do the Qt5 build") - -IF(USE_QT5) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - set(CMAKE_AUTOMOC ON) - find_package(Qt5Core REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5LinguistTools REQUIRED) - qt5_add_translation(fqterm_qm_files - ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/ui_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/protocol_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/common_zh_CN.ts - ) -ELSE(USE_QT5) - find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork QtScript QtXml REQUIRED) - include(${QT_USE_FILE}) - qt4_add_translation(fqterm_qm_files - ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/ui_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/protocol_zh_CN.ts - ${CMAKE_SOURCE_DIR}/res/dict/common_zh_CN.ts - ) -ENDIF(USE_QT5) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5LinguistTools REQUIRED) +qt5_add_translation(fqterm_qm_files + ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts + ${CMAKE_SOURCE_DIR}/res/dict/ui_zh_CN.ts + ${CMAKE_SOURCE_DIR}/res/dict/protocol_zh_CN.ts + ${CMAKE_SOURCE_DIR}/res/dict/common_zh_CN.ts + ) add_custom_target(fqterm_qm_target DEPENDS ${fqterm_qm_files} @@ -59,24 +46,6 @@ else (PYTHONLIBS_FOUND) SET(PYTHON_LIB) endif (PYTHONLIBS_FOUND) -if (NOT USE_QT5) - IF(WIN32) - FILE(READ ${QT_LIBRARY_DIR}/QtCore.prl FQ_CORE_QT_CONFIG) - ELSE(WIN32) - IF(APPLE) - FILE(READ ${QT_LIBRARY_DIR}/QtCore.framework/QtCore.prl FQ_CORE_QT_CONFIG) - ELSE(APPLE) - FILE(READ ${QT_LIBRARY_DIR}/libQtCore.prl FQ_CORE_QT_CONFIG) - ENDIF(APPLE) - ENDIF(WIN32) - - IF(NOT FQ_CORE_QT_CONFIG MATCHES "static") - SET(FQTERM_USE_STATIC_QT false) - ELSE(NOT FQ_CORE_QT_CONFIG MATCHES "static") - SET(FQTERM_USE_STATIC_QT true) - ENDIF(NOT FQ_CORE_QT_CONFIG MATCHES "static") -endif(NOT USE_QT5) - SET(SUB_CMAKELIST "UNKNOWN") ADD_DEFINITIONS(-D "FQTERM_VERSION_STRING=\\\"${FQTERM_VERSION}\\\"") diff --git a/CMakeLists.txt.linux b/CMakeLists.txt.linux index ea457f5..1c890d5 100644 --- a/CMakeLists.txt.linux +++ b/CMakeLists.txt.linux @@ -32,23 +32,13 @@ IF (WITH_ASAN) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address") ENDIF(WITH_ASAN) -IF(USE_QT5) - find_package(Qt5Core REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Script REQUIRED) - find_package(Qt5Multimedia REQUIRED) - find_package(Qt5Xml REQUIRED) -ELSE(USE_QT5) -ENDIF(USE_QT5) - -IF(NOT USE_QT5) - include_directories( - ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} - ) -ENDIF(NOT USE_QT5) +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Script REQUIRED) +find_package(Qt5Multimedia REQUIRED) +find_package(Qt5Xml REQUIRED) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src/common ${CMAKE_CURRENT_SOURCE_DIR}/src/protocol @@ -89,9 +79,7 @@ target_link_libraries(fqterm.bin X11 ) -IF(USE_QT5) - target_link_libraries(fqterm.bin Qt5::Core Qt5::Widgets) -ENDIF(USE_QT5) +target_link_libraries(fqterm.bin Qt5::Core Qt5::Widgets) add_dependencies(fqterm.bin fqterm_main @@ -33,21 +33,20 @@ git clone https://github.com/mytbk/fqterm.git # 假设FQTerm源码目录为fqterm mkdir build cd build -# 用cmake生成Makefile,默认为Qt4版本，Qt5版本请添加-DUSE_QT5=1参数 cmake ../fqterm make # 以root身份安装，以下用sudo获取root权限 sudo make install ``` -在 macOS (Sierra) 中编译建议使用 Qt5 分支，利用 HomeBrew 安装依赖。目前支持并不完善。 +在 macOS (Sierra) 中编译，利用 HomeBrew 安装依赖。目前支持并不完善。 ```shell brew install openssl qt5 mkdir build cd build CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake \ OPENSSL_ROOT_DIR=/usr/local/opt/openssl \ -cmake ../fqterm -DUSE_QT5=1 +cmake ../fqterm make make install ``` diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index cc4a354..2f4f14e 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -24,24 +24,13 @@ set(fqterm_common_SRCS fqterm_shortcuthelper.cpp ) -if(USE_QT5) - set(CMAKE_INCLUDE_CURRENT_DIR ON) - find_package(Qt5Core REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Multimedia REQUIRED) -else(USE_QT5) - include_directories( - ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ) -endif(USE_QT5) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Multimedia REQUIRED) add_library(fqterm_common ${fqterm_common_SRCS} ) -if(USE_QT5) - target_link_libraries(fqterm_common Qt5::Core Qt5::Widgets Qt5::Multimedia) -endif(USE_QT5) +target_link_libraries(fqterm_common Qt5::Core Qt5::Widgets Qt5::Multimedia) diff --git a/src/common/common.cpp b/src/common/common.cpp index ec08bef..56ecaaa 100644 --- a/src/common/common.cpp +++ b/src/common/common.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdlib.h> diff --git a/src/common/common.h b/src/common/common.h index 5720ddc..09861cd 100644 --- a/src/common/common.h +++ b/src/common/common.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_COMMON_H #define FQTERM_COMMON_H diff --git a/src/common/fqterm.h b/src/common/fqterm.h index 3fad56f..0789895 100644 --- a/src/common/fqterm.h +++ b/src/common/fqterm.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_GLOBAL_H #define FQTERM_GLOBAL_H diff --git a/src/common/fqterm_config.cpp b/src/common/fqterm_config.cpp index 19e0db4..c9fa26c 100644 --- a/src/common/fqterm_config.cpp +++ b/src/common/fqterm_config.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QTextStream> #include <QFile> diff --git a/src/common/fqterm_config.h b/src/common/fqterm_config.h index 2f88602..4884920 100644 --- a/src/common/fqterm_config.h +++ b/src/common/fqterm_config.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_CFG_H #define FQTERM_CFG_H diff --git a/src/common/fqterm_exif_extractor.cpp b/src/common/fqterm_exif_extractor.cpp index 87ff209..71c6dd1 100644 --- a/src/common/fqterm_exif_extractor.cpp +++ b/src/common/fqterm_exif_extractor.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_exif_extractor.h" diff --git a/src/common/fqterm_exif_extractor.h b/src/common/fqterm_exif_extractor.h index ae96849..c553108 100644 --- a/src/common/fqterm_exif_extractor.h +++ b/src/common/fqterm_exif_extractor.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_EXIF_EXTRACTOR #define FQTERM_EXIF_EXTRACTOR diff --git a/src/common/fqterm_filedialog.cpp b/src/common/fqterm_filedialog.cpp index a5c97ac..b148684 100644 --- a/src/common/fqterm_filedialog.cpp +++ b/src/common/fqterm_filedialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_filedialog.h" #include "fqterm_trace.h" diff --git a/src/common/fqterm_filedialog.h b/src/common/fqterm_filedialog.h index de97e17..c811f40 100644 --- a/src/common/fqterm_filedialog.h +++ b/src/common/fqterm_filedialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_FILEDIALOG_H #define FQTERM_FILEDIALOG_H diff --git a/src/common/fqterm_font.cpp b/src/common/fqterm_font.cpp index b7eb771..df46ccf 100644 --- a/src/common/fqterm_font.cpp +++ b/src/common/fqterm_font.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <list> #include <set> diff --git a/src/common/fqterm_font.h b/src/common/fqterm_font.h index 7d28ffb..28344a7 100644 --- a/src/common/fqterm_font.h +++ b/src/common/fqterm_font.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_FONT_H #define FQTERM_FONT_H diff --git a/src/common/fqterm_param.cpp b/src/common/fqterm_param.cpp index 52e5707..274f2e8 100644 --- a/src/common/fqterm_param.cpp +++ b/src/common/fqterm_param.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_param.h" #include "fqterm_font.h" diff --git a/src/common/fqterm_param.h b/src/common/fqterm_param.h index 61b5725..1faa377 100644 --- a/src/common/fqterm_param.h +++ b/src/common/fqterm_param.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_PARAM_H #define FQTERM_PARAM_H diff --git a/src/common/fqterm_path.cpp b/src/common/fqterm_path.cpp index f3265eb..e0ea9df 100644 --- a/src/common/fqterm_path.cpp +++ b/src/common/fqterm_path.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifdef WIN32 #include <windows.h> diff --git a/src/common/fqterm_path.h b/src/common/fqterm_path.h index 8c92d92..fbf5821 100644 --- a/src/common/fqterm_path.h +++ b/src/common/fqterm_path.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_PATH_H #define FQTERM_PATH_H diff --git a/src/common/fqterm_shortcuthelper.cpp b/src/common/fqterm_shortcuthelper.cpp index 432ddb2..b5633da 100644 --- a/src/common/fqterm_shortcuthelper.cpp +++ b/src/common/fqterm_shortcuthelper.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_shortcuthelper.h" #include "fqterm_config.h" #include "fqterm_path.h" diff --git a/src/common/fqterm_shortcuthelper.h b/src/common/fqterm_shortcuthelper.h index 03ecc4a..6364d4e 100644 --- a/src/common/fqterm_shortcuthelper.h +++ b/src/common/fqterm_shortcuthelper.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __FQTERM_SHORTCUTHELPER__ #define __FQTERM_SHORTCUTHELPER__ diff --git a/src/common/fqterm_sound.cpp b/src/common/fqterm_sound.cpp index 9fd13a1..fcf65af 100644 --- a/src/common/fqterm_sound.cpp +++ b/src/common/fqterm_sound.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QSound> #include <QFile> diff --git a/src/common/fqterm_sound.h b/src/common/fqterm_sound.h index ab18645..0065dc7 100644 --- a/src/common/fqterm_sound.h +++ b/src/common/fqterm_sound.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SOUND_H #define FQTERM_SOUND_H diff --git a/src/common/fqterm_trace.cpp b/src/common/fqterm_trace.cpp index ef0a808..7ca5eed 100644 --- a/src/common/fqterm_trace.cpp +++ b/src/common/fqterm_trace.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <string> diff --git a/src/common/fqterm_trace.h b/src/common/fqterm_trace.h index 6c2ffbe..0f29b80 100644 --- a/src/common/fqterm_trace.h +++ b/src/common/fqterm_trace.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_TRACE_H #define FQTERM_TRACE_H diff --git a/src/fqterm/CMakeLists.txt b/src/fqterm/CMakeLists.txt index 80bc734..72f9fa7 100644 --- a/src/fqterm/CMakeLists.txt +++ b/src/fqterm/CMakeLists.txt @@ -28,10 +28,8 @@ ELSE(WIN32) set(global_shortcut_impl_SRCS 3rdparty/qxtglobalshortcut_mac.cpp) ELSE(APPLE) set(global_shortcut_impl_SRCS 3rdparty/qxtglobalshortcut_x11.cpp) - IF(USE_QT5) - find_package(Qt5X11Extras REQUIRED) - set(QXTLIB Qt5::X11Extras) - ENDIF(USE_QT5) + find_package(Qt5X11Extras REQUIRED) + set(QXTLIB Qt5::X11Extras) ENDIF(APPLE) ENDIF(WIN32) set(GLOBAL_SHORTCUT_SRC @@ -53,22 +51,15 @@ set(3rdparty_SRCS ${GLOBAL_SHORTCUT_SRC} ) -if(USE_QT5) - find_package(Qt5Core REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Script REQUIRED) +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Script REQUIRED) - qt5_create_translation(fqterm_qm_file - ${fqterm_SRCS} - ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts - ) -else(USE_QT5) - qt4_create_translation(fqterm_qm_file - ${fqterm_SRCS} - ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts - ) -endif(USE_QT5) +qt5_create_translation(fqterm_qm_file + ${fqterm_SRCS} + ${CMAKE_SOURCE_DIR}/res/dict/fqterm_zh_CN.ts + ) include_directories( ${QT_INCLUDE_DIR} @@ -100,13 +91,11 @@ add_dependencies(fqterm_main fqterm_utilities ) -if(USE_QT5) - target_link_libraries( - fqterm_main - Qt5::Core - Qt5::Widgets - Qt5::Network - Qt5::Script - ${QXTLIB} - ) -endif(USE_QT5) +target_link_libraries( + fqterm_main + Qt5::Core + Qt5::Widgets + Qt5::Network + Qt5::Script + ${QXTLIB} + ) diff --git a/src/fqterm/fqterm_frame.cpp b/src/fqterm/fqterm_frame.cpp index 79ff517..f5f2908 100644 --- a/src/fqterm/fqterm_frame.cpp +++ b/src/fqterm/fqterm_frame.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #if !defined(WIN32) #include <unistd.h> diff --git a/src/fqterm/fqterm_frame.h b/src/fqterm/fqterm_frame.h index c3f36f7..4e55ee2 100644 --- a/src/fqterm/fqterm_frame.h +++ b/src/fqterm/fqterm_frame.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_FRAME_H #define FQTERM_FRAME_H diff --git a/src/fqterm/fqterm_python.cpp b/src/fqterm/fqterm_python.cpp index fcb071f..f6a66c5 100644 --- a/src/fqterm/fqterm_python.cpp +++ b/src/fqterm/fqterm_python.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/fqterm/fqterm_python.h b/src/fqterm/fqterm_python.h index bad6b04..5e00515 100644 --- a/src/fqterm/fqterm_python.h +++ b/src/fqterm/fqterm_python.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_PYTHON_H #define FQTERM_PYTHON_H diff --git a/src/fqterm/fqterm_screen.cpp b/src/fqterm/fqterm_screen.cpp index 897a928..5215a7b 100644 --- a/src/fqterm/fqterm_screen.cpp +++ b/src/fqterm/fqterm_screen.cpp @@ -1,22 +1,4 @@ -/**************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later @@ -315,14 +297,14 @@ void FQTermScreen::setFontMetrics() { QFontMetrics englishFM(*englishFont_); // FIXME: find a typical character for the current language. - int cn = nonEnglishFM.width(QChar(0x4e2D)); - int en = englishFM.width('W'); + int cn = nonEnglishFM.horizontalAdvance(QChar(0x4e2D)); + int en = englishFM.horizontalAdvance('W'); int pix_size = nonEnglishFont_->pixelSize(); while (cn % 2 && pix_size > 10) { nonEnglishFont_->setPixelSize(--pix_size); nonEnglishFM = QFontMetrics(*nonEnglishFont_); - cn = nonEnglishFM.width(QChar(0x4e2D)); + cn = nonEnglishFM.horizontalAdvance(QChar(0x4e2D)); } pix_size = englishFont_->pixelSize(); @@ -330,7 +312,7 @@ void FQTermScreen::setFontMetrics() { --pix_size; englishFont_->setPixelSize(pix_size); englishFM = QFontMetrics(*englishFont_); - en = englishFM.width('W'); + en = englishFM.horizontalAdvance('W'); /* #ifndef __APPLE__ //FIXME: correctly draw chars with left/right bearing. @@ -351,7 +333,7 @@ void FQTermScreen::setFontMetrics() { cnLetterSpacing_ = qMax(charWidth_ * 2 - cn, 0.0); enLetterSpacing_ = qMax(charWidth_ - en, 0.0); - spLetterSpacing_ = qMax(charWidth_ - englishFM.width(' '), 0.0); + spLetterSpacing_ = qMax(charWidth_ - englishFM.horizontalAdvance(' '), 0.0); fontAscent_ = qMax(englishFM.ascent(), nonEnglishFM.ascent()); fontDescent_ = qMax(englishFM.descent(), nonEnglishFM.descent()); @@ -1583,11 +1565,11 @@ void FQTermScreen::updateFixedPitchInfo() { cnFont.setPixelSize(cnPixelSize); enFont.setPixelSize(enPixelSize); QString cnTestString = QString::fromUtf8("\xe5\x9c\xb0\xe6\x96\xb9\xe6\x94\xbf\xe5\xba\x9c"); - cnFixedPitch_ = (QFontMetrics(cnFont).width(cnTestString) == - cnTestString.length() * QFontMetrics(cnFont).width(cnTestString.at(0))); + cnFixedPitch_ = (QFontMetrics(cnFont).horizontalAdvance(cnTestString) == + cnTestString.length() * QFontMetrics(cnFont).horizontalAdvance(cnTestString.at(0))); QString enTestString = QString::fromUtf8("www.newsmth.net"); enFixedPitch_ = QFontInfo(enFont).fixedPitch() && - (QFontMetrics(enFont).width(enTestString) == enTestString.length() * QFontMetrics(enFont).width(enTestString.at(0))); + (QFontMetrics(enFont).horizontalAdvance(enTestString) == enTestString.length() * QFontMetrics(enFont).horizontalAdvance(enTestString.at(0))); FQ_TRACE("font", 10) << "\nenglish: " << enFixedPitch_ << "\n chinese: " << cnFixedPitch_; diff --git a/src/fqterm/fqterm_screen.h b/src/fqterm/fqterm_screen.h index 5c65142..9658ec5 100644 --- a/src/fqterm/fqterm_screen.h +++ b/src/fqterm/fqterm_screen.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SCREEN_H #define FQTERM_SCREEN_H diff --git a/src/fqterm/fqterm_scriptengine.cpp b/src/fqterm/fqterm_scriptengine.cpp index 15f4ee1..7fc1e1d 100644 --- a/src/fqterm/fqterm_scriptengine.cpp +++ b/src/fqterm/fqterm_scriptengine.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/fqterm/fqterm_scriptengine.h b/src/fqterm/fqterm_scriptengine.h index 2b7337f..406b608 100644 --- a/src/fqterm/fqterm_scriptengine.h +++ b/src/fqterm/fqterm_scriptengine.h @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SCRIPTENGINE_H #define FQTERM_SCRIPTENGINE_H diff --git a/src/fqterm/fqterm_window.cpp b/src/fqterm/fqterm_window.cpp index bd44e70..0f2d5ec 100644 --- a/src/fqterm/fqterm_window.cpp +++ b/src/fqterm/fqterm_window.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/fqterm/fqterm_window.h b/src/fqterm/fqterm_window.h index 377af4f..f4b57f1 100644 --- a/src/fqterm/fqterm_window.h +++ b/src/fqterm/fqterm_window.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_WINDOW_H #define FQTERM_WINDOW_H diff --git a/src/fqterm/fqterm_wndmgr.cpp b/src/fqterm/fqterm_wndmgr.cpp index 9cd6847..c1309c8 100644 --- a/src/fqterm/fqterm_wndmgr.cpp +++ b/src/fqterm/fqterm_wndmgr.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later ///////////////////////////////////////////////////////////////// //TODO: This class has too many overlap with MDI Area. @@ -222,7 +204,7 @@ FQTermWindow* FQTermWndMgr::newWindow( const FQTermParam ¶m, FQTermConfig* c | Qt::WindowSystemMenuHint)); subWindow->show(); } - tabBar_->setTabData(idx, qVariantFromValue((QObject*)window)); + tabBar_->setTabData(idx, QVariant::fromValue((QObject*)window)); FQ_VERIFY(connect(window, SIGNAL(destroyed(QObject*)), this ,SLOT(onSubWindowClosed(QObject*)))); FQ_VERIFY(connect(window, SIGNAL(resizeSignal(FQTermWindow*)), @@ -241,7 +223,7 @@ FQTermWindow* FQTermWndMgr::newWindow( const FQTermParam ¶m, FQTermConfig* c void FQTermWndMgr::onSubWindowClosed(QObject* obj) { for (int i = 0; i < tabBar_->count(); ++i) { - if (tabBar_->tabData(i) == qVariantFromValue(obj)) { + if (tabBar_->tabData(i) == QVariant::fromValue(obj)) { if (count() == 0) { termFrame_->enableMenuToolBar(false); } diff --git a/src/fqterm/fqterm_wndmgr.h b/src/fqterm/fqterm_wndmgr.h index 5038d8f..42fabad 100644 --- a/src/fqterm/fqterm_wndmgr.h +++ b/src/fqterm/fqterm_wndmgr.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_WND_MGR_H #define FQTERM_WND_MGR_H diff --git a/src/fqterm/main.cpp b/src/fqterm/main.cpp index 08378fa..5e3467f 100644 --- a/src/fqterm/main.cpp +++ b/src/fqterm/main.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdlib.h> diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt index 0b505af..ddd7707 100644 --- a/src/protocol/CMakeLists.txt +++ b/src/protocol/CMakeLists.txt @@ -52,11 +52,8 @@ set(internal_SRCS internal/fqterm_ssh_channel.cpp ) -if(USE_QT5) - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) -else(USE_QT5) -endif(USE_QT5) +find_package(Qt5Core REQUIRED) +find_package(Qt5Network REQUIRED) include_directories( ${QT_INCLUDE_DIR} @@ -77,6 +74,4 @@ add_dependencies(fqterm_protocol fqterm_common ) -if(USE_QT5) - target_link_libraries(fqterm_protocol Qt5::Core Qt5::Network) -endif(USE_QT5) +target_link_libraries(fqterm_protocol Qt5::Core Qt5::Network) diff --git a/src/protocol/fqterm_socket.h b/src/protocol/fqterm_socket.h index 1759073..3938b34 100644 --- a/src/protocol/fqterm_socket.h +++ b/src/protocol/fqterm_socket.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SOCKET_H #define FQTERM_SOCKET_H diff --git a/src/protocol/fqterm_socket_private.cpp b/src/protocol/fqterm_socket_private.cpp index a3ee9e3..d4edf01 100644 --- a/src/protocol/fqterm_socket_private.cpp +++ b/src/protocol/fqterm_socket_private.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdlib.h> #include <ctype.h> diff --git a/src/protocol/fqterm_ssh_socket.cpp b/src/protocol/fqterm_ssh_socket.cpp index 12cecbc..a6759ad 100644 --- a/src/protocol/fqterm_ssh_socket.cpp +++ b/src/protocol/fqterm_ssh_socket.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_ssh_socket.h" #include "fqterm_ssh_packet.h" diff --git a/src/protocol/fqterm_ssh_socket.h b/src/protocol/fqterm_ssh_socket.h index 29ac251..a4b80a6 100644 --- a/src/protocol/fqterm_ssh_socket.h +++ b/src/protocol/fqterm_ssh_socket.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_SOCKET_H #define FQTERM_SSH_SOCKET_H diff --git a/src/protocol/internal/fqterm_ssh1_packet.cpp b/src/protocol/internal/fqterm_ssh1_packet.cpp index eda4fd1..fa2b33e 100644 --- a/src/protocol/internal/fqterm_ssh1_packet.cpp +++ b/src/protocol/internal/fqterm_ssh1_packet.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_trace.h" #include "fqterm_ssh1_packet.h" diff --git a/src/protocol/internal/fqterm_ssh1_packet.h b/src/protocol/internal/fqterm_ssh1_packet.h index f15ea57..c5cc639 100644 --- a/src/protocol/internal/fqterm_ssh1_packet.h +++ b/src/protocol/internal/fqterm_ssh1_packet.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH1_PACKET_H #define FQTERM_SSH1_PACKET_H diff --git a/src/protocol/internal/fqterm_ssh2_kex.cpp b/src/protocol/internal/fqterm_ssh2_kex.cpp index c2d7c28..1d1f20e 100644 --- a/src/protocol/internal/fqterm_ssh2_kex.cpp +++ b/src/protocol/internal/fqterm_ssh2_kex.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <vector> diff --git a/src/protocol/internal/fqterm_ssh2_kex.h b/src/protocol/internal/fqterm_ssh2_kex.h index 3b59cd7..df4d980 100644 --- a/src/protocol/internal/fqterm_ssh2_kex.h +++ b/src/protocol/internal/fqterm_ssh2_kex.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH2_KEX_H #define FQTERM_SSH2_KEX_H diff --git a/src/protocol/internal/fqterm_ssh2_packet.cpp b/src/protocol/internal/fqterm_ssh2_packet.cpp index edcee34..c93da8d 100644 --- a/src/protocol/internal/fqterm_ssh2_packet.cpp +++ b/src/protocol/internal/fqterm_ssh2_packet.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_trace.h" #include "fqterm_ssh2_packet.h" diff --git a/src/protocol/internal/fqterm_ssh2_packet.h b/src/protocol/internal/fqterm_ssh2_packet.h index f79f7cf..d0d40ed 100644 --- a/src/protocol/internal/fqterm_ssh2_packet.h +++ b/src/protocol/internal/fqterm_ssh2_packet.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH2_PACKET_H #define FQTERM_SSH2_PACKET_H diff --git a/src/protocol/internal/fqterm_ssh_auth.cpp b/src/protocol/internal/fqterm_ssh_auth.cpp index d063d14..ab5dda7 100644 --- a/src/protocol/internal/fqterm_ssh_auth.cpp +++ b/src/protocol/internal/fqterm_ssh_auth.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QString> diff --git a/src/protocol/internal/fqterm_ssh_auth.h b/src/protocol/internal/fqterm_ssh_auth.h index 6152a71..5beab95 100644 --- a/src/protocol/internal/fqterm_ssh_auth.h +++ b/src/protocol/internal/fqterm_ssh_auth.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_AUTH_H #define FQTERM_SSH_AUTH_H diff --git a/src/protocol/internal/fqterm_ssh_channel.cpp b/src/protocol/internal/fqterm_ssh_channel.cpp index 9db2efb..7bb4b73 100644 --- a/src/protocol/internal/fqterm_ssh_channel.cpp +++ b/src/protocol/internal/fqterm_ssh_channel.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_ssh_channel.h" #include "fqterm_ssh_const.h" diff --git a/src/protocol/internal/fqterm_ssh_channel.h b/src/protocol/internal/fqterm_ssh_channel.h index b0673ba..d424c9c 100644 --- a/src/protocol/internal/fqterm_ssh_channel.h +++ b/src/protocol/internal/fqterm_ssh_channel.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_CHANNEL_H #define FQTERM_SSH_CHANNEL_H diff --git a/src/protocol/internal/fqterm_ssh_const.h b/src/protocol/internal/fqterm_ssh_const.h index 412760e..e31e5bb 100644 --- a/src/protocol/internal/fqterm_ssh_const.h +++ b/src/protocol/internal/fqterm_ssh_const.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERMCONST_H #define FQTERMCONST_H diff --git a/src/protocol/internal/fqterm_ssh_kex.cpp b/src/protocol/internal/fqterm_ssh_kex.cpp index 32db7d0..7b539dd 100644 --- a/src/protocol/internal/fqterm_ssh_kex.cpp +++ b/src/protocol/internal/fqterm_ssh_kex.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_ssh_kex.h" #include "fqterm_trace.h" diff --git a/src/protocol/internal/fqterm_ssh_kex.h b/src/protocol/internal/fqterm_ssh_kex.h index bb668a6..d2ec595 100644 --- a/src/protocol/internal/fqterm_ssh_kex.h +++ b/src/protocol/internal/fqterm_ssh_kex.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_KEX_H #define FQTERM_SSH_KEX_H diff --git a/src/protocol/internal/fqterm_ssh_packet.cpp b/src/protocol/internal/fqterm_ssh_packet.cpp index 2adf471..99b602a 100644 --- a/src/protocol/internal/fqterm_ssh_packet.cpp +++ b/src/protocol/internal/fqterm_ssh_packet.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_trace.h" #include "fqterm_ssh_packet.h" diff --git a/src/protocol/internal/fqterm_ssh_packet.h b/src/protocol/internal/fqterm_ssh_packet.h index 3020d6b..9766e87 100644 --- a/src/protocol/internal/fqterm_ssh_packet.h +++ b/src/protocol/internal/fqterm_ssh_packet.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_PACKET_H #define FQTERM_SSH_PACKET_H diff --git a/src/protocol/internal/fqterm_ssh_types.h b/src/protocol/internal/fqterm_ssh_types.h index c10bfac..6b27872 100644 --- a/src/protocol/internal/fqterm_ssh_types.h +++ b/src/protocol/internal/fqterm_ssh_types.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_TYPES_H #define FQTERM_SSH_TYPES_H diff --git a/src/terminal/CMakeLists.txt b/src/terminal/CMakeLists.txt index 5abe2c6..26deb8b 100644 --- a/src/terminal/CMakeLists.txt +++ b/src/terminal/CMakeLists.txt @@ -42,10 +42,7 @@ add_dependencies(fqterm_terminal fqterm_utilities ) -if(USE_QT5) - find_package(Qt5Core REQUIRED) - find_package(Qt5Network REQUIRED) - find_package(Qt5Widgets REQUIRED) - target_link_libraries(fqterm_terminal Qt5::Core Qt5::Widgets Qt5::Network) -else(USE_QT5) -endif(USE_QT5) +find_package(Qt5Core REQUIRED) +find_package(Qt5Network REQUIRED) +find_package(Qt5Widgets REQUIRED) +target_link_libraries(fqterm_terminal Qt5::Core Qt5::Widgets Qt5::Network) diff --git a/src/terminal/fqterm_buffer.cpp b/src/terminal/fqterm_buffer.cpp index 1a79f61..eda2180 100644 --- a/src/terminal/fqterm_buffer.cpp +++ b/src/terminal/fqterm_buffer.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <algorithm> #include <map> diff --git a/src/terminal/fqterm_buffer.h b/src/terminal/fqterm_buffer.h index 6cd9e1a..e316032 100644 --- a/src/terminal/fqterm_buffer.h +++ b/src/terminal/fqterm_buffer.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_BUFFER_H #define FQTERM_BUFFER_H diff --git a/src/terminal/fqterm_session.cpp b/src/terminal/fqterm_session.cpp index bf39a7a..e54c4f7 100644 --- a/src/terminal/fqterm_session.cpp +++ b/src/terminal/fqterm_session.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm.h" #include "common.h" diff --git a/src/terminal/fqterm_session.h b/src/terminal/fqterm_session.h index 03e1b22..25af7b5 100644 --- a/src/terminal/fqterm_session.h +++ b/src/terminal/fqterm_session.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SESSION_H #define FQTERM_SESSION_H diff --git a/src/terminal/fqterm_text_line.cpp b/src/terminal/fqterm_text_line.cpp index ed6d164..7add65a 100644 --- a/src/terminal/fqterm_text_line.cpp +++ b/src/terminal/fqterm_text_line.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdio.h> #include <QRegExp> diff --git a/src/terminal/fqterm_text_line.h b/src/terminal/fqterm_text_line.h index cb47d4d..07c3d62 100644 --- a/src/terminal/fqterm_text_line.h +++ b/src/terminal/fqterm_text_line.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_TEXTLINE_H #define FQTERM_TEXTLINE_H diff --git a/src/terminal/internal/fqterm_decode.cpp b/src/terminal/internal/fqterm_decode.cpp index e88be45..707204f 100644 --- a/src/terminal/internal/fqterm_decode.cpp +++ b/src/terminal/internal/fqterm_decode.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QByteArray> diff --git a/src/terminal/internal/fqterm_decode.h b/src/terminal/internal/fqterm_decode.h index 86fe942..0880668 100644 --- a/src/terminal/internal/fqterm_decode.h +++ b/src/terminal/internal/fqterm_decode.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_DECODE_H #define FQTERM_DECODE_H diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp index 179082c..ee1c0dc 100644 --- a/src/terminal/internal/fqterm_telnet.cpp +++ b/src/terminal/internal/fqterm_telnet.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdio.h> #include <stdlib.h> diff --git a/src/terminal/internal/fqterm_telnet.h b/src/terminal/internal/fqterm_telnet.h index 5f6447c..74ea15e 100644 --- a/src/terminal/internal/fqterm_telnet.h +++ b/src/terminal/internal/fqterm_telnet.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_TELNET_H #define FQTERM_TELNET_H diff --git a/src/terminal/internal/fqterm_zmodem.cpp b/src/terminal/internal/fqterm_zmodem.cpp index f67cd4b..35a46b6 100644 --- a/src/terminal/internal/fqterm_zmodem.cpp +++ b/src/terminal/internal/fqterm_zmodem.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QApplication> #include <QString> diff --git a/src/terminal/internal/fqterm_zmodem.h b/src/terminal/internal/fqterm_zmodem.h index 9d166c9..455e622 100644 --- a/src/terminal/internal/fqterm_zmodem.h +++ b/src/terminal/internal/fqterm_zmodem.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_ZMODEM_H #define FQTERM_ZMODEM_H diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index c42c262..e5c9a07 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -85,7 +85,6 @@ set(fqterm_ui_UIS defineescape.ui ) -if(USE_QT5) qt5_wrap_ui(fqterm_ui_UIS_H ${fqterm_ui_UIS} ) @@ -99,17 +98,6 @@ qt5_create_translation(fqterm_ui_qm_file ${fqterm_ui_SRCS} ${CMAKE_SOURCE_DIR}/res/dict/ui_zh_CN.ts ) -else(USE_QT5) -qt4_wrap_ui(fqterm_ui_UIS_H - ${fqterm_ui_UIS} -) - -qt4_create_translation(fqterm_ui_qm_file - ${fqterm_ui_UIS} - ${fqterm_ui_SRCS} - ${CMAKE_SOURCE_DIR}/res/dict/ui_zh_CN.ts -) -endif(USE_QT5) include_directories( ${QT_INCLUDE_DIR} @@ -134,6 +122,4 @@ IF(NOT MCGGIT_WC_REVISION MATCHES "NOTFOUND") ADD_DEFINITIONS(-D "FQTERM_GIT_REVISION=\\\"${MCGGIT_WC_REVISION}\\\"") ENDIF(NOT MCGGIT_WC_REVISION MATCHES "NOTFOUND") -if(USE_QT5) - target_link_libraries(fqterm_ui Qt5::Core Qt5::Widgets) -endif(USE_QT5) +target_link_libraries(fqterm_ui Qt5::Core Qt5::Widgets) diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp index 9fcd0ce..973f547 100644 --- a/src/ui/aboutdialog.cpp +++ b/src/ui/aboutdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QPixmap> #include <QFile> diff --git a/src/ui/aboutdialog.h b/src/ui/aboutdialog.h index ebc13bb..e47297e 100644 --- a/src/ui/aboutdialog.h +++ b/src/ui/aboutdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_ABOUT_DIALOG_H #define FQTERM_ABOUT_DIALOG_H diff --git a/src/ui/addrdialog.cpp b/src/ui/addrdialog.cpp index 5c6d2f3..2cf7faa 100644 --- a/src/ui/addrdialog.cpp +++ b/src/ui/addrdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QPixmap> #include <QMessageBox> diff --git a/src/ui/addrdialog.h b/src/ui/addrdialog.h index 5cc7e76..41483a5 100644 --- a/src/ui/addrdialog.h +++ b/src/ui/addrdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_ADDR_DIALOG_H #define FQTERM_ADDR_DIALOG_H diff --git a/src/ui/articledialog.cpp b/src/ui/articledialog.cpp index 42df905..2f9c71b 100644 --- a/src/ui/articledialog.cpp +++ b/src/ui/articledialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "articledialog.h" #include <QFileDialog> diff --git a/src/ui/articledialog.h b/src/ui/articledialog.h index 755b906..4056f53 100644 --- a/src/ui/articledialog.h +++ b/src/ui/articledialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_ARTICLEDIALOG_H #define FQTERM_ARTICLEDIALOG_H diff --git a/src/ui/defineescape.cpp b/src/ui/defineescape.cpp index 2421018..dd797cb 100644 --- a/src/ui/defineescape.cpp +++ b/src/ui/defineescape.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "defineescape.h" #include "fqterm.h" diff --git a/src/ui/defineescape.h b/src/ui/defineescape.h index 88367d9..2c74fb4 100644 --- a/src/ui/defineescape.h +++ b/src/ui/defineescape.h @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __FQTERM_DEFINEESCAPE__ #define __FQTERM_DEFINEESCAPE__ diff --git a/src/ui/fqterm_time_label.cpp b/src/ui/fqterm_time_label.cpp index c8e3ff3..d1c9b8a 100644 --- a/src/ui/fqterm_time_label.cpp +++ b/src/ui/fqterm_time_label.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_time_label.h" diff --git a/src/ui/fqterm_time_label.h b/src/ui/fqterm_time_label.h index 3e82a6e..6865ada 100644 --- a/src/ui/fqterm_time_label.h +++ b/src/ui/fqterm_time_label.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_TIME_LABEL_H #define FQTERM_TIME_LABEL_H diff --git a/src/ui/fqterm_tool_button.cpp b/src/ui/fqterm_tool_button.cpp index 4680e6f..c2ce6a0 100644 --- a/src/ui/fqterm_tool_button.cpp +++ b/src/ui/fqterm_tool_button.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_tool_button.h" #include "fqterm_trace.h" diff --git a/src/ui/fqterm_tool_button.h b/src/ui/fqterm_tool_button.h index 56f5626..e2b9276 100644 --- a/src/ui/fqterm_tool_button.h +++ b/src/ui/fqterm_tool_button.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_TOOL_BUTTON_H #define FQTERM_TOOL_BUTTON_H diff --git a/src/ui/imageviewer/CMakeLists.txt b/src/ui/imageviewer/CMakeLists.txt index d8cf46a..54f087c 100644 --- a/src/ui/imageviewer/CMakeLists.txt +++ b/src/ui/imageviewer/CMakeLists.txt @@ -31,6 +31,4 @@ include_directories( add_library(fqterm_imageviewer ${fqterm_imageviewer_SRCS}) -if(USE_QT5) - target_link_libraries(fqterm_imageviewer Qt5::Core Qt5::Widgets) -endif(USE_QT5) +target_link_libraries(fqterm_imageviewer Qt5::Core Qt5::Widgets) diff --git a/src/ui/imageviewer/fqterm_canvas.cpp b/src/ui/imageviewer/fqterm_canvas.cpp index 82fc971..0a967a9 100644 --- a/src/ui/imageviewer/fqterm_canvas.cpp +++ b/src/ui/imageviewer/fqterm_canvas.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QCloseEvent> #include <QKeyEvent> diff --git a/src/ui/imageviewer/fqterm_canvas.h b/src/ui/imageviewer/fqterm_canvas.h index 5941700..d76e580 100644 --- a/src/ui/imageviewer/fqterm_canvas.h +++ b/src/ui/imageviewer/fqterm_canvas.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_CANVAS_H #define FQTERM_CANVAS_H diff --git a/src/ui/imageviewer/imageviewer.cpp b/src/ui/imageviewer/imageviewer.cpp index 3292dd6..310ae05 100644 --- a/src/ui/imageviewer/imageviewer.cpp +++ b/src/ui/imageviewer/imageviewer.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QAction> #include <QBuffer> diff --git a/src/ui/imageviewer/imageviewer.h b/src/ui/imageviewer/imageviewer.h index 1948633..7b03e0f 100644 --- a/src/ui/imageviewer/imageviewer.h +++ b/src/ui/imageviewer/imageviewer.h @@ -1,23 +1,4 @@ - -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef IMAGE_VIERWER_H #define IMAGE_VIERWER_H diff --git a/src/ui/imageviewer/pictureflow.cpp b/src/ui/imageviewer/pictureflow.cpp index cd749f0..fc6767b 100644 --- a/src/ui/imageviewer/pictureflow.cpp +++ b/src/ui/imageviewer/pictureflow.cpp @@ -1,23 +1,4 @@ - -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later /* PictureFlow - animated image show widget diff --git a/src/ui/imageviewer/pictureflow.h b/src/ui/imageviewer/pictureflow.h index c9cf5aa..53d755b 100644 --- a/src/ui/imageviewer/pictureflow.h +++ b/src/ui/imageviewer/pictureflow.h @@ -1,23 +1,4 @@ - -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later /* PictureFlow - animated image show widget diff --git a/src/ui/iplookup.cpp b/src/ui/iplookup.cpp index cc81ce5..edbbb0c 100644 --- a/src/ui/iplookup.cpp +++ b/src/ui/iplookup.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "iplookup.h" #include "fqterm_ip_location.h" diff --git a/src/ui/iplookup.h b/src/ui/iplookup.h index 38dc94a..61b9343 100644 --- a/src/ui/iplookup.h +++ b/src/ui/iplookup.h @@ -1,22 +1,4 @@ -/*************************************************************************** -* fqterm, a terminal emulator for both BBS and *nix. * -* Copyright (C) 2008 fqterm development group. * -* * -* 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * -***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __FQTERM_IPLOOKUP__ #define __FQTERM_IPLOOKUP__ diff --git a/src/ui/keydialog.cpp b/src/ui/keydialog.cpp index 2f2ac65..8883a68 100644 --- a/src/ui/keydialog.cpp +++ b/src/ui/keydialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QFileDialog> diff --git a/src/ui/keydialog.h b/src/ui/keydialog.h index 7d3e2cf..42c2a32 100644 --- a/src/ui/keydialog.h +++ b/src/ui/keydialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_KEY_DIALOG_H #define FQTERM_KEY_DIALOG_H diff --git a/src/ui/msgdialog.cpp b/src/ui/msgdialog.cpp index de89ab7..2b47966 100644 --- a/src/ui/msgdialog.cpp +++ b/src/ui/msgdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdio.h> diff --git a/src/ui/msgdialog.h b/src/ui/msgdialog.h index b33976e..5a8f9bb 100644 --- a/src/ui/msgdialog.h +++ b/src/ui/msgdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_MSGDIALOG_H #define FQTERM_MSGDIALOG_H diff --git a/src/ui/osdmessage.cpp b/src/ui/osdmessage.cpp index 1b0883f..4099454 100644 --- a/src/ui/osdmessage.cpp +++ b/src/ui/osdmessage.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QPaintEvent> #include <QCursor> diff --git a/src/ui/osdmessage.h b/src/ui/osdmessage.h index fe29d4d..3cef746 100644 --- a/src/ui/osdmessage.h +++ b/src/ui/osdmessage.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_OSD_MESSAGE_H #define FQTERM_OSD_MESSAGE_H diff --git a/src/ui/overlayWidget.cpp b/src/ui/overlayWidget.cpp index 74f0659..1758635 100644 --- a/src/ui/overlayWidget.cpp +++ b/src/ui/overlayWidget.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QPoint> #include <QFrame> diff --git a/src/ui/overlayWidget.h b/src/ui/overlayWidget.h index edab3f6..7cf2931 100644 --- a/src/ui/overlayWidget.h +++ b/src/ui/overlayWidget.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERMOVERLAYWIDGET_H #define FQTERMOVERLAYWIDGET_H diff --git a/src/ui/popupMessage.cpp b/src/ui/popupMessage.cpp index 7723029..2dab0e0 100644 --- a/src/ui/popupMessage.cpp +++ b/src/ui/popupMessage.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QVBoxLayout> #include <QPixmap> diff --git a/src/ui/popupMessage.h b/src/ui/popupMessage.h index 1877b1c..857fc03 100644 --- a/src/ui/popupMessage.h +++ b/src/ui/popupMessage.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later //WARNING this is not meant for use outside this unit! diff --git a/src/ui/popwidget.cpp b/src/ui/popwidget.cpp index d8b5b87..489026a 100644 --- a/src/ui/popwidget.cpp +++ b/src/ui/popwidget.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "popwidget.h" diff --git a/src/ui/popwidget.h b/src/ui/popwidget.h index dc090f9..4c16cba 100644 --- a/src/ui/popwidget.h +++ b/src/ui/popwidget.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_POP_WIDGET_H #define FQTERM_POP_WIDGET_H diff --git a/src/ui/prefdialog.cpp b/src/ui/prefdialog.cpp index 0ddffdf..c9248d7 100644 --- a/src/ui/prefdialog.cpp +++ b/src/ui/prefdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QCloseEvent> #include <QComboBox> diff --git a/src/ui/prefdialog.h b/src/ui/prefdialog.h index 846dd0a..2cb7dad 100644 --- a/src/ui/prefdialog.h +++ b/src/ui/prefdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_PREF_DIALOG_H #define FQTERM_PREF_DIALOG_H diff --git a/src/ui/progressBar.cpp b/src/ui/progressBar.cpp index 9da0479..4d4efad 100644 --- a/src/ui/progressBar.cpp +++ b/src/ui/progressBar.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QLabel> #include <QPixmap> diff --git a/src/ui/progressBar.h b/src/ui/progressBar.h index 9c2f539..47a63aa 100644 --- a/src/ui/progressBar.h +++ b/src/ui/progressBar.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later //WARNING this is not meant for use outside this unit! diff --git a/src/ui/quickdialog.cpp b/src/ui/quickdialog.cpp index 889d95d..c14b24b 100644 --- a/src/ui/quickdialog.cpp +++ b/src/ui/quickdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <stdio.h> diff --git a/src/ui/quickdialog.h b/src/ui/quickdialog.h index 31f8633..e292d94 100644 --- a/src/ui/quickdialog.h +++ b/src/ui/quickdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_QUICK_DIALOG_H #define FQTERM_QUICK_DIALOG_H diff --git a/src/ui/schemadialog.cpp b/src/ui/schemadialog.cpp index 52aa09b..0a58da6 100644 --- a/src/ui/schemadialog.cpp +++ b/src/ui/schemadialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QFileDialog> #include <QColorDialog> diff --git a/src/ui/schemadialog.h b/src/ui/schemadialog.h index a6d5c4e..212930a 100644 --- a/src/ui/schemadialog.h +++ b/src/ui/schemadialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SCHEMADIALOG_H #define FQTERM_SCHEMADIALOG_H diff --git a/src/ui/shortcutdialog.cpp b/src/ui/shortcutdialog.cpp index 4339ed2..7944e81 100644 --- a/src/ui/shortcutdialog.cpp +++ b/src/ui/shortcutdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "shortcutdialog.h" #include "fqterm_shortcuthelper.h" diff --git a/src/ui/shortcutdialog.h b/src/ui/shortcutdialog.h index df9439f..1c678f3 100644 --- a/src/ui/shortcutdialog.h +++ b/src/ui/shortcutdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SHORTCUT_DIALOG_H #define FQTERM_SHORTCUT_DIALOG_H diff --git a/src/ui/sitemanager.cpp b/src/ui/sitemanager.cpp index d7c0e28..02e37cc 100644 --- a/src/ui/sitemanager.cpp +++ b/src/ui/sitemanager.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QTextCharFormat> #include <QDialog> diff --git a/src/ui/sitemanager.h b/src/ui/sitemanager.h index 8e38eb6..11f6cc6 100644 --- a/src/ui/sitemanager.h +++ b/src/ui/sitemanager.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SITEMANGER_H #define FQTERM_SITEMANGER_H diff --git a/src/ui/soundconf.cpp b/src/ui/soundconf.cpp index d42456c..cf4f92c 100644 --- a/src/ui/soundconf.cpp +++ b/src/ui/soundconf.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QMessageBox> #include <QFileDialog> diff --git a/src/ui/soundconf.h b/src/ui/soundconf.h index 6f2527c..b695229 100644 --- a/src/ui/soundconf.h +++ b/src/ui/soundconf.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SOUND_CONF_H #define FQTERM_SOUND_CONF_H diff --git a/src/ui/sshlogindialog.cpp b/src/ui/sshlogindialog.cpp index 3b46a54..1f1e5d8 100644 --- a/src/ui/sshlogindialog.cpp +++ b/src/ui/sshlogindialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QString> #include <QLineEdit> diff --git a/src/ui/sshlogindialog.h b/src/ui/sshlogindialog.h index 72e5578..b0b1362 100644 --- a/src/ui/sshlogindialog.h +++ b/src/ui/sshlogindialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_SSH_LOGIN_H #define FQTERM_SSH_LOGIN_H diff --git a/src/ui/statusBar.cpp b/src/ui/statusBar.cpp index b15084a..f68996b 100644 --- a/src/ui/statusBar.cpp +++ b/src/ui/statusBar.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QPaintEvent> #include <QEvent> diff --git a/src/ui/statusBar.h b/src/ui/statusBar.h index 9737f90..f82c6a3 100644 --- a/src/ui/statusBar.h +++ b/src/ui/statusBar.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_STATUSBAR_H #define FQTERM_STATUSBAR_H diff --git a/src/ui/zmodemdialog.cpp b/src/ui/zmodemdialog.cpp index 04d02a6..3188dd3 100644 --- a/src/ui/zmodemdialog.cpp +++ b/src/ui/zmodemdialog.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QMessageBox> diff --git a/src/ui/zmodemdialog.h b/src/ui/zmodemdialog.h index bbd7b77..d95fb0b 100644 --- a/src/ui/zmodemdialog.h +++ b/src/ui/zmodemdialog.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_ZMODEM_DIALOG_H #define FQTERM_ZMODEM_DIALOG_H diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index 8470516..a657b18 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -28,10 +28,7 @@ add_dependencies(fqterm_utilities fqterm_common ) -if(USE_QT5) - find_package(Qt5Core REQUIRED) - find_package(Qt5Widgets REQUIRED) - find_package(Qt5Network REQUIRED) - target_link_libraries(fqterm_utilities Qt5::Core Qt5::Widgets Qt5::Network) -else(USE_QT5) -endif(USE_QT5) +find_package(Qt5Core REQUIRED) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5Network REQUIRED) +target_link_libraries(fqterm_utilities Qt5::Core Qt5::Widgets Qt5::Network) diff --git a/src/utilities/fqterm_convert.cpp b/src/utilities/fqterm_convert.cpp index 3ac821d..31325b8 100644 --- a/src/utilities/fqterm_convert.cpp +++ b/src/utilities/fqterm_convert.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm_convert.h" diff --git a/src/utilities/fqterm_convert.h b/src/utilities/fqterm_convert.h index d7b226c..9205699 100644 --- a/src/utilities/fqterm_convert.h +++ b/src/utilities/fqterm_convert.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_CONVERT_H #define FQTERM_CONVERT_H diff --git a/src/utilities/fqterm_http.cpp b/src/utilities/fqterm_http.cpp index 7ea61cc..62ae985 100644 --- a/src/utilities/fqterm_http.cpp +++ b/src/utilities/fqterm_http.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include "fqterm.h" #include "fqterm_path.h" diff --git a/src/utilities/fqterm_http.h b/src/utilities/fqterm_http.h index 4c029d9..9d7b4a9 100644 --- a/src/utilities/fqterm_http.h +++ b/src/utilities/fqterm_http.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_HTTP_H #define FQTERM_HTTP_H diff --git a/src/utilities/fqterm_ip_location.cpp b/src/utilities/fqterm_ip_location.cpp index ab1eef3..1ec3f9b 100644 --- a/src/utilities/fqterm_ip_location.cpp +++ b/src/utilities/fqterm_ip_location.cpp @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #include <QString> #include <QRegExp> diff --git a/src/utilities/fqterm_ip_location.h b/src/utilities/fqterm_ip_location.h index 55de36b..7f6a1c8 100644 --- a/src/utilities/fqterm_ip_location.h +++ b/src/utilities/fqterm_ip_location.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_IPLOCATION_H #define FQTERM_IPLOCATION_H diff --git a/src/utilities/fqwcwidth.h b/src/utilities/fqwcwidth.h index 2ef6a8d..449affc 100644 --- a/src/utilities/fqwcwidth.h +++ b/src/utilities/fqwcwidth.h @@ -1,22 +1,4 @@ -/*************************************************************************** - * fqterm, a terminal emulator for both BBS and *nix. * - * Copyright (C) 2008 fqterm development group. * - * * - * 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 St, Fifth Floor, Boston, MA 02110-1301 USA. * - ***************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef FQTERM_FQWCWIDTH_H #define FQTERM_FQWCWIDTH_H |