refactor(KeySequence): move KeySequence to common
This commit is contained in:
parent
a0a368928c
commit
78724254d1
12 changed files with 14 additions and 14 deletions
|
|
@ -15,6 +15,8 @@ add_library(common STATIC
|
||||||
ExitCodes.h
|
ExitCodes.h
|
||||||
I18N.h
|
I18N.h
|
||||||
I18N.cpp
|
I18N.cpp
|
||||||
|
KeySequence.h
|
||||||
|
KeySequence.cpp
|
||||||
LogLevel.h
|
LogLevel.h
|
||||||
NetworkProtocol.h
|
NetworkProtocol.h
|
||||||
PlatformInfo.h
|
PlatformInfo.h
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "KeySequence.h"
|
#include "common/KeySequence.h"
|
||||||
|
|
||||||
#include <QList>
|
#include <QList>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
|
||||||
|
|
@ -23,8 +23,6 @@ add_library(${target} STATIC
|
||||||
FileTail.h
|
FileTail.h
|
||||||
Hotkey.cpp
|
Hotkey.cpp
|
||||||
Hotkey.h
|
Hotkey.h
|
||||||
KeySequence.cpp
|
|
||||||
KeySequence.h
|
|
||||||
Logger.cpp
|
Logger.cpp
|
||||||
Logger.h
|
Logger.h
|
||||||
MainWindow.cpp
|
MainWindow.cpp
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
#include <QTextStream>
|
#include <QTextStream>
|
||||||
|
|
||||||
#include "Action.h"
|
#include "Action.h"
|
||||||
#include "KeySequence.h"
|
#include "common/KeySequence.h"
|
||||||
|
|
||||||
class HotkeyDialog;
|
class HotkeyDialog;
|
||||||
class ServerConfigDialog;
|
class ServerConfigDialog;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
#include "Action.h"
|
#include "Action.h"
|
||||||
#include "Hotkey.h"
|
#include "Hotkey.h"
|
||||||
#include "KeySequence.h"
|
#include "common/KeySequence.h"
|
||||||
#include "config/ServerConfig.h"
|
#include "config/ServerConfig.h"
|
||||||
|
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
#include <QPushButton>
|
#include <QPushButton>
|
||||||
|
|
||||||
#include "KeySequence.h"
|
#include "common/KeySequence.h"
|
||||||
|
|
||||||
class KeySequenceWidget : public QPushButton
|
class KeySequenceWidget : public QPushButton
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -21,3 +21,10 @@ create_test(
|
||||||
SOURCE I18NTests.cpp
|
SOURCE I18NTests.cpp
|
||||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/common"
|
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/common"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
create_test(
|
||||||
|
NAME KeySequenceTests
|
||||||
|
DEPENDS common
|
||||||
|
SOURCE KeySequenceTests.cpp
|
||||||
|
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/common"
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include "KeySequenceTests.h"
|
#include "KeySequenceTests.h"
|
||||||
|
|
||||||
#include "gui/KeySequence.h"
|
#include "common/KeySequence.h"
|
||||||
|
|
||||||
void KeySequenceTests::toString_controlShiftPlus_usesNamedPlus()
|
void KeySequenceTests::toString_controlShiftPlus_usesNamedPlus()
|
||||||
{
|
{
|
||||||
|
|
@ -10,10 +10,3 @@ create_test(
|
||||||
SOURCE LoggerTests.cpp
|
SOURCE LoggerTests.cpp
|
||||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/gui"
|
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/gui"
|
||||||
)
|
)
|
||||||
|
|
||||||
create_test(
|
|
||||||
NAME KeySequenceTests
|
|
||||||
DEPENDS gui
|
|
||||||
SOURCE KeySequenceTests.cpp
|
|
||||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/gui"
|
|
||||||
)
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue