From 0a42e2b0ac73e401cc49a14043062602774eb0b5 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 11 Sep 2018 16:50:55 +0200 Subject: [PATCH] Rename daemonsrc to daemonsource --- plugins/channeltx/CMakeLists.txt | 2 +- .../CMakeLists.txt | 22 +++++++++---------- .../daemonsource.cpp} | 4 ++-- .../daemonsource.h} | 2 +- .../daemonsourcegui.cpp} | 6 ++--- .../daemonsourcegui.h} | 2 +- .../daemonsourcegui.ui} | 0 .../daemonsourceplugin.cpp} | 6 ++--- .../daemonsourceplugin.h} | 0 .../daemonsourcesettings.cpp} | 4 +--- .../daemonsourcesettings.h} | 0 .../daemonsourcethread.cpp} | 2 +- .../daemonsourcethread.h} | 0 pluginssrv/channeltx/CMakeLists.txt | 2 +- .../CMakeLists.txt | 18 +++++++-------- 15 files changed, 34 insertions(+), 36 deletions(-) rename plugins/channeltx/{daemonsrc => daemonsource}/CMakeLists.txt (77%) rename plugins/channeltx/{daemonsrc/daemonsrc.cpp => daemonsource/daemonsource.cpp} (99%) rename plugins/channeltx/{daemonsrc/daemonsrc.h => daemonsource/daemonsource.h} (99%) rename plugins/channeltx/{daemonsrc/daemonsrcgui.cpp => daemonsource/daemonsourcegui.cpp} (99%) rename plugins/channeltx/{daemonsrc/daemonsrcgui.h => daemonsource/daemonsourcegui.h} (99%) rename plugins/channeltx/{daemonsrc/daemonsrcgui.ui => daemonsource/daemonsourcegui.ui} (100%) rename plugins/channeltx/{daemonsrc/daemonsrcplugin.cpp => daemonsource/daemonsourceplugin.cpp} (96%) rename plugins/channeltx/{daemonsrc/daemonsrcplugin.h => daemonsource/daemonsourceplugin.h} (100%) rename plugins/channeltx/{daemonsrc/daemonsrcsettings.cpp => daemonsource/daemonsourcesettings.cpp} (97%) rename plugins/channeltx/{daemonsrc/daemonsrcsettings.h => daemonsource/daemonsourcesettings.h} (100%) rename plugins/channeltx/{daemonsrc/daemonsrcthread.cpp => daemonsource/daemonsourcethread.cpp} (99%) rename plugins/channeltx/{daemonsrc/daemonsrcthread.h => daemonsource/daemonsourcethread.h} (100%) rename pluginssrv/channeltx/{daemonsrc => daemonsource}/CMakeLists.txt (64%) diff --git a/plugins/channeltx/CMakeLists.txt b/plugins/channeltx/CMakeLists.txt index 75e3cb345..c1586843c 100644 --- a/plugins/channeltx/CMakeLists.txt +++ b/plugins/channeltx/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(udpsink) find_package(CM256cc) if(CM256CC_FOUND) - add_subdirectory(daemonsrc) + add_subdirectory(daemonsource) endif(CM256CC_FOUND) find_package(OpenCV) diff --git a/plugins/channeltx/daemonsrc/CMakeLists.txt b/plugins/channeltx/daemonsource/CMakeLists.txt similarity index 77% rename from plugins/channeltx/daemonsrc/CMakeLists.txt rename to plugins/channeltx/daemonsource/CMakeLists.txt index 0353c457f..bbea60488 100644 --- a/plugins/channeltx/daemonsrc/CMakeLists.txt +++ b/plugins/channeltx/daemonsource/CMakeLists.txt @@ -3,23 +3,23 @@ project(daemonsrc) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(daemonsrc_SOURCES - daemonsrc.cpp - daemonsrcthread.cpp - daemonsrcgui.cpp - daemonsrcplugin.cpp - daemonsrcsettings.cpp + daemonsource.cpp + daemonsourcethread.cpp + daemonsourcegui.cpp + daemonsourceplugin.cpp + daemonsourcesettings.cpp ) set(daemonsrc_HEADERS - daemonsrc.h - daemonsrcthread.h - daemonsrcgui.h - daemonsrcplugin.h - daemonsrcsettings.h + daemonsource.h + daemonsourcethread.h + daemonsourcegui.h + daemonsourceplugin.h + daemonsourcesettings.h ) set(daemonsrc_FORMS - daemonsrcgui.ui + daemonsourcegui.ui ) include_directories( diff --git a/plugins/channeltx/daemonsrc/daemonsrc.cpp b/plugins/channeltx/daemonsource/daemonsource.cpp similarity index 99% rename from plugins/channeltx/daemonsrc/daemonsrc.cpp rename to plugins/channeltx/daemonsource/daemonsource.cpp index 8c13d760e..b336fb7c5 100644 --- a/plugins/channeltx/daemonsrc/daemonsrc.cpp +++ b/plugins/channeltx/daemonsource/daemonsource.cpp @@ -30,8 +30,8 @@ #include "dsp/upchannelizer.h" #include "dsp/threadedbasebandsamplesource.h" -#include "daemonsrcthread.h" -#include "daemonsrc.h" +#include "daemonsourcethread.h" +#include "daemonsource.h" MESSAGE_CLASS_DEFINITION(DaemonSource::MsgSampleRateNotification, Message) MESSAGE_CLASS_DEFINITION(DaemonSource::MsgConfigureDaemonSource, Message) diff --git a/plugins/channeltx/daemonsrc/daemonsrc.h b/plugins/channeltx/daemonsource/daemonsource.h similarity index 99% rename from plugins/channeltx/daemonsrc/daemonsrc.h rename to plugins/channeltx/daemonsource/daemonsource.h index 1558b0f48..25237fa25 100644 --- a/plugins/channeltx/daemonsrc/daemonsrc.h +++ b/plugins/channeltx/daemonsource/daemonsource.h @@ -25,7 +25,7 @@ #include "channel/channelsourceapi.h" #include "util/message.h" -#include "daemonsrcsettings.h" +#include "daemonsourcesettings.h" #include "channel/sdrdaemondataqueue.h" #include "channel/sdrdaemondatablock.h" #include "channel/sdrdaemondatareadqueue.h" diff --git a/plugins/channeltx/daemonsrc/daemonsrcgui.cpp b/plugins/channeltx/daemonsource/daemonsourcegui.cpp similarity index 99% rename from plugins/channeltx/daemonsrc/daemonsrcgui.cpp rename to plugins/channeltx/daemonsource/daemonsourcegui.cpp index b74fd5f04..10ba93ba5 100644 --- a/plugins/channeltx/daemonsrc/daemonsrcgui.cpp +++ b/plugins/channeltx/daemonsource/daemonsourcegui.cpp @@ -19,9 +19,9 @@ #include "gui/basicchannelsettingsdialog.h" #include "mainwindow.h" -#include "daemonsrc.h" -#include "ui_daemonsrcgui.h" -#include "daemonsrcgui.h" +#include "daemonsource.h" +#include "ui_daemonsourcegui.h" +#include "daemonsourcegui.h" DaemonSourceGUI* DaemonSourceGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx) { diff --git a/plugins/channeltx/daemonsrc/daemonsrcgui.h b/plugins/channeltx/daemonsource/daemonsourcegui.h similarity index 99% rename from plugins/channeltx/daemonsrc/daemonsrcgui.h rename to plugins/channeltx/daemonsource/daemonsourcegui.h index baf656ac9..f77c10404 100644 --- a/plugins/channeltx/daemonsrc/daemonsrcgui.h +++ b/plugins/channeltx/daemonsource/daemonsourcegui.h @@ -24,7 +24,7 @@ #include "gui/rollupwidget.h" #include "util/messagequeue.h" -#include "daemonsrcsettings.h" +#include "daemonsourcesettings.h" class PluginAPI; class DeviceUISet; diff --git a/plugins/channeltx/daemonsrc/daemonsrcgui.ui b/plugins/channeltx/daemonsource/daemonsourcegui.ui similarity index 100% rename from plugins/channeltx/daemonsrc/daemonsrcgui.ui rename to plugins/channeltx/daemonsource/daemonsourcegui.ui diff --git a/plugins/channeltx/daemonsrc/daemonsrcplugin.cpp b/plugins/channeltx/daemonsource/daemonsourceplugin.cpp similarity index 96% rename from plugins/channeltx/daemonsrc/daemonsrcplugin.cpp rename to plugins/channeltx/daemonsource/daemonsourceplugin.cpp index d1ce2307b..805ad8e89 100644 --- a/plugins/channeltx/daemonsrc/daemonsrcplugin.cpp +++ b/plugins/channeltx/daemonsource/daemonsourceplugin.cpp @@ -18,10 +18,10 @@ #include "plugin/pluginapi.h" #ifndef SERVER_MODE -#include "daemonsrcgui.h" +#include "daemonsourcegui.h" #endif -#include "daemonsrc.h" -#include "daemonsrcplugin.h" +#include "daemonsource.h" +#include "daemonsourceplugin.h" const PluginDescriptor DaemonSourcePlugin::m_pluginDescriptor = { QString("Daemon channel source"), diff --git a/plugins/channeltx/daemonsrc/daemonsrcplugin.h b/plugins/channeltx/daemonsource/daemonsourceplugin.h similarity index 100% rename from plugins/channeltx/daemonsrc/daemonsrcplugin.h rename to plugins/channeltx/daemonsource/daemonsourceplugin.h diff --git a/plugins/channeltx/daemonsrc/daemonsrcsettings.cpp b/plugins/channeltx/daemonsource/daemonsourcesettings.cpp similarity index 97% rename from plugins/channeltx/daemonsrc/daemonsrcsettings.cpp rename to plugins/channeltx/daemonsource/daemonsourcesettings.cpp index 411282c74..e55462390 100644 --- a/plugins/channeltx/daemonsrc/daemonsrcsettings.cpp +++ b/plugins/channeltx/daemonsource/daemonsourcesettings.cpp @@ -14,13 +14,11 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "daemonsrcsettings.h" - #include #include "util/simpleserializer.h" #include "settings/serializable.h" -#include "daemonsrcsettings.h" +#include "daemonsourcesettings.h" DaemonSourceSettings::DaemonSourceSettings() { diff --git a/plugins/channeltx/daemonsrc/daemonsrcsettings.h b/plugins/channeltx/daemonsource/daemonsourcesettings.h similarity index 100% rename from plugins/channeltx/daemonsrc/daemonsrcsettings.h rename to plugins/channeltx/daemonsource/daemonsourcesettings.h diff --git a/plugins/channeltx/daemonsrc/daemonsrcthread.cpp b/plugins/channeltx/daemonsource/daemonsourcethread.cpp similarity index 99% rename from plugins/channeltx/daemonsrc/daemonsrcthread.cpp rename to plugins/channeltx/daemonsource/daemonsourcethread.cpp index 27d69d65f..4feb60ef4 100644 --- a/plugins/channeltx/daemonsrc/daemonsrcthread.cpp +++ b/plugins/channeltx/daemonsource/daemonsourcethread.cpp @@ -22,7 +22,7 @@ #include "channel/sdrdaemondataqueue.h" #include "channel/sdrdaemondatablock.h" -#include "daemonsrcthread.h" +#include "daemonsourcethread.h" MESSAGE_CLASS_DEFINITION(DaemonSourceThread::MsgStartStop, Message) MESSAGE_CLASS_DEFINITION(DaemonSourceThread::MsgDataBind, Message) diff --git a/plugins/channeltx/daemonsrc/daemonsrcthread.h b/plugins/channeltx/daemonsource/daemonsourcethread.h similarity index 100% rename from plugins/channeltx/daemonsrc/daemonsrcthread.h rename to plugins/channeltx/daemonsource/daemonsourcethread.h diff --git a/pluginssrv/channeltx/CMakeLists.txt b/pluginssrv/channeltx/CMakeLists.txt index 512390995..76c3291d2 100644 --- a/pluginssrv/channeltx/CMakeLists.txt +++ b/pluginssrv/channeltx/CMakeLists.txt @@ -8,7 +8,7 @@ add_subdirectory(udpsink) find_package(CM256cc) if(CM256CC_FOUND) - add_subdirectory(daemonsrc) + add_subdirectory(daemonsource) endif() find_package(OpenCV) diff --git a/pluginssrv/channeltx/daemonsrc/CMakeLists.txt b/pluginssrv/channeltx/daemonsource/CMakeLists.txt similarity index 64% rename from pluginssrv/channeltx/daemonsrc/CMakeLists.txt rename to pluginssrv/channeltx/daemonsource/CMakeLists.txt index 2121a9fee..a8cc94b39 100644 --- a/pluginssrv/channeltx/daemonsrc/CMakeLists.txt +++ b/pluginssrv/channeltx/daemonsource/CMakeLists.txt @@ -1,20 +1,20 @@ project(daemonsrc) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -set(PLUGIN_PREFIX "../../../plugins/channeltx/daemonsrc") +set(PLUGIN_PREFIX "../../../plugins/channeltx/daemonsource") set(daemonsrc_SOURCES - ${PLUGIN_PREFIX}/daemonsrc.cpp - ${PLUGIN_PREFIX}/daemonsrcthread.cpp - ${PLUGIN_PREFIX}/daemonsrcplugin.cpp - ${PLUGIN_PREFIX}/daemonsrcsettings.cpp + ${PLUGIN_PREFIX}/daemonsource.cpp + ${PLUGIN_PREFIX}/daemonsourcethread.cpp + ${PLUGIN_PREFIX}/daemonsourceplugin.cpp + ${PLUGIN_PREFIX}/daemonsourcesettings.cpp ) set(daemonsrc_HEADERS - ${PLUGIN_PREFIX}/daemonsrc.h - ${PLUGIN_PREFIX}/daemonsrcthread.h - ${PLUGIN_PREFIX}/daemonsrcplugin.h - ${PLUGIN_PREFIX}/daemonsrcsettings.h + ${PLUGIN_PREFIX}/daemonsource.h + ${PLUGIN_PREFIX}/daemonsourcethread.h + ${PLUGIN_PREFIX}/daemonsourceplugin.h + ${PLUGIN_PREFIX}/daemonsourcesettings.h ) include_directories(