refactor: rm src/lib/common/copyright, add to src/lib/common/constants
This commit is contained in:
parent
4a83eb711f
commit
c05a87b716
5 changed files with 8 additions and 32 deletions
|
|
@ -20,7 +20,6 @@
|
||||||
#include "AboutDialog.h"
|
#include "AboutDialog.h"
|
||||||
|
|
||||||
#include "common/constants.h"
|
#include "common/constants.h"
|
||||||
#include "common/copyright.h"
|
|
||||||
#include "gui/style_utils.h"
|
#include "gui/style_utils.h"
|
||||||
|
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
|
|
@ -55,7 +54,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent)
|
||||||
auto lblLogo = new QLabel(this);
|
auto lblLogo = new QLabel(this);
|
||||||
lblLogo->setPixmap(deskflow::gui::isDarkMode() ? s_darkLogo : s_lightLogo);
|
lblLogo->setPixmap(deskflow::gui::isDarkMode() ? s_darkLogo : s_lightLogo);
|
||||||
|
|
||||||
auto lblCopyright = new QLabel(QString::fromStdString(deskflow::kCopyright));
|
auto lblCopyright = new QLabel(kCopyright, this);
|
||||||
|
|
||||||
auto boldFont = font();
|
auto boldFont = font();
|
||||||
boldFont.setBold(true);
|
boldFont.setBold(true);
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@ configure_file(constants.h.in constants.h @ONLY)
|
||||||
add_library(common INTERFACE
|
add_library(common INTERFACE
|
||||||
basic_types.h
|
basic_types.h
|
||||||
common.h
|
common.h
|
||||||
copyright.h
|
|
||||||
IInterface.h
|
IInterface.h
|
||||||
ipc.h
|
ipc.h
|
||||||
stdbitset.h
|
stdbitset.h
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,12 @@ const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@";
|
||||||
const auto kVersion = "@CMAKE_PROJECT_VERSION@";
|
const auto kVersion = "@CMAKE_PROJECT_VERSION@";
|
||||||
const auto kVersionGitSha = "@GIT_SHA_SHORT@";
|
const auto kVersionGitSha = "@GIT_SHA_SHORT@";
|
||||||
|
|
||||||
|
const auto kCopyright = //
|
||||||
|
"Copyright (C) 2024 Deskflow Developers\n"
|
||||||
|
"Copyright (C) 2012-2024 Symless Ltd.\n"
|
||||||
|
"Copyright (C) 2009-2012 Nick Bolton\n"
|
||||||
|
"Copyright (C) 2002-2009 Chris Schoeneman";
|
||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
const auto kDebugBuild = true;
|
const auto kDebugBuild = true;
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
/*
|
|
||||||
* Deskflow -- mouse and keyboard sharing utility
|
|
||||||
* Copyright (C) 2024 Symless Ltd.
|
|
||||||
*
|
|
||||||
* This package is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* found in the file LICENSE that should have accompanied this file.
|
|
||||||
*
|
|
||||||
* This package is distributed in the hope that 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, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace deskflow {
|
|
||||||
|
|
||||||
const auto kCopyright = //
|
|
||||||
"Copyright (C) 2024 Deskflow Developers\n"
|
|
||||||
"Copyright (C) 2012-2024 Symless Ltd.\n"
|
|
||||||
"Copyright (C) 2009-2012 Nick Bolton\n"
|
|
||||||
"Copyright (C) 2002-2009 Chris Schoeneman";
|
|
||||||
} // namespace deskflow
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
#include "base/XBase.h"
|
#include "base/XBase.h"
|
||||||
#include "base/log_outputters.h"
|
#include "base/log_outputters.h"
|
||||||
#include "common/constants.h"
|
#include "common/constants.h"
|
||||||
#include "common/copyright.h"
|
|
||||||
#include "common/ipc.h"
|
#include "common/ipc.h"
|
||||||
#include "deskflow/ArgsBase.h"
|
#include "deskflow/ArgsBase.h"
|
||||||
#include "deskflow/Config.h"
|
#include "deskflow/Config.h"
|
||||||
|
|
@ -96,7 +95,7 @@ void App::version()
|
||||||
std::vector<char> buffer(kBufferLength);
|
std::vector<char> buffer(kBufferLength);
|
||||||
std::snprintf( // NOSONAR
|
std::snprintf( // NOSONAR
|
||||||
buffer.data(), kBufferLength, "%s v%s, protocol v%d.%d\n%s", //
|
buffer.data(), kBufferLength, "%s v%s, protocol v%d.%d\n%s", //
|
||||||
argsBase().m_pname, kVersion, kProtocolMajorVersion, kProtocolMinorVersion, deskflow::kCopyright
|
argsBase().m_pname, kVersion, kProtocolMajorVersion, kProtocolMinorVersion, kCopyright
|
||||||
);
|
);
|
||||||
|
|
||||||
std::cout << std::string(buffer.data()) << std::endl;
|
std::cout << std::string(buffer.data()) << std::endl;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue