From e24e924d2bb16a9686d887358871bed0c45dc0bc Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 30 May 2018 15:42:33 +0200 Subject: [PATCH] Renamed Channel Analyzer NG to Channel Analyzer (2) --- plugins/channelrx/CMakeLists.txt | 2 +- .../CMakeLists.txt | 26 +++++++++---------- .../chanalyzer.cpp | 0 .../{chanalyzerng => chanalyzer}/chanalyzer.h | 0 .../chanalyzergui.cpp | 2 +- .../chanalyzergui.h | 0 .../chanalyzergui.ui} | 0 .../chanalyzerng.pro | 0 .../chanalyzerplugin.cpp | 0 .../chanalyzerplugin.h | 0 .../chanalyzersettings.cpp | 0 .../chanalyzersettings.h | 0 .../{chanalyzerng => chanalyzer}/readme.md | 0 13 files changed, 15 insertions(+), 15 deletions(-) rename plugins/channelrx/{chanalyzerng => chanalyzer}/CMakeLists.txt (50%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzer.cpp (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzer.h (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzergui.cpp (99%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzergui.h (100%) rename plugins/channelrx/{chanalyzerng/chanalyzernggui.ui => chanalyzer/chanalyzergui.ui} (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzerng.pro (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzerplugin.cpp (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzerplugin.h (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzersettings.cpp (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/chanalyzersettings.h (100%) rename plugins/channelrx/{chanalyzerng => chanalyzer}/readme.md (100%) diff --git a/plugins/channelrx/CMakeLists.txt b/plugins/channelrx/CMakeLists.txt index 099c9afd3..66b1f515f 100644 --- a/plugins/channelrx/CMakeLists.txt +++ b/plugins/channelrx/CMakeLists.txt @@ -7,7 +7,7 @@ add_subdirectory(demodnfm) add_subdirectory(demodssb) add_subdirectory(udpsrc) add_subdirectory(demodwfm) -add_subdirectory(chanalyzerng) +add_subdirectory(chanalyzer) add_subdirectory(demodatv) if(LIBDSDCC_FOUND AND LIBMBE_FOUND) diff --git a/plugins/channelrx/chanalyzerng/CMakeLists.txt b/plugins/channelrx/chanalyzer/CMakeLists.txt similarity index 50% rename from plugins/channelrx/chanalyzerng/CMakeLists.txt rename to plugins/channelrx/chanalyzer/CMakeLists.txt index 80aab5475..b749209a4 100644 --- a/plugins/channelrx/chanalyzerng/CMakeLists.txt +++ b/plugins/channelrx/chanalyzer/CMakeLists.txt @@ -1,21 +1,21 @@ -project(chanalyzerng) +project(chanalyzer) -set(chanalyzerng_SOURCES +set(chanalyzer_SOURCES chanalyzer.cpp chanalyzergui.cpp chanalyzerplugin.cpp chanalyzersettings.cpp ) -set(chanalyzerng_HEADERS +set(chanalyzer_HEADERS chanalyzer.h chanalyzergui.h chanalyzerplugin.h chanalyzersettings.h ) -set(chanalyzerng_FORMS - chanalyzernggui.ui +set(chanalyzer_FORMS + chanalyzergui.ui ) include_directories( @@ -29,20 +29,20 @@ add_definitions(-DQT_PLUGIN) add_definitions(-DQT_SHARED) #qt5_wrap_cpp(chanalyzer_HEADERS_MOC ${chanalyzer_HEADERS}) -qt5_wrap_ui(chanalyzerng_FORMS_HEADERS ${chanalyzerng_FORMS}) +qt5_wrap_ui(chanalyzer_FORMS_HEADERS ${chanalyzer_FORMS}) -add_library(chanalyzerng SHARED - ${chanalyzerng_SOURCES} - ${chanalyzerng_HEADERS_MOC} - ${chanalyzerng_FORMS_HEADERS} +add_library(chanalyzer SHARED + ${chanalyzer_SOURCES} + ${chanalyzer_HEADERS_MOC} + ${chanalyzer_FORMS_HEADERS} ) -target_link_libraries(chanalyzerng +target_link_libraries(chanalyzer ${QT_LIBRARIES} sdrbase sdrgui ) -qt5_use_modules(chanalyzerng Core Widgets ) +qt5_use_modules(chanalyzer Core Widgets ) -install(TARGETS chanalyzerng DESTINATION lib/plugins/channelrx) +install(TARGETS chanalyzer DESTINATION lib/plugins/channelrx) diff --git a/plugins/channelrx/chanalyzerng/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzer.cpp rename to plugins/channelrx/chanalyzer/chanalyzer.cpp diff --git a/plugins/channelrx/chanalyzerng/chanalyzer.h b/plugins/channelrx/chanalyzer/chanalyzer.h similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzer.h rename to plugins/channelrx/chanalyzer/chanalyzer.h diff --git a/plugins/channelrx/chanalyzerng/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp similarity index 99% rename from plugins/channelrx/chanalyzerng/chanalyzergui.cpp rename to plugins/channelrx/chanalyzer/chanalyzergui.cpp index 860839bd9..a340f6888 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -21,7 +21,7 @@ #include #include "dsp/threadedbasebandsamplesink.h" -#include "ui_chanalyzernggui.h" +#include "ui_chanalyzergui.h" #include "dsp/spectrumscopengcombovis.h" #include "dsp/spectrumvis.h" #include "dsp/scopevis.h" diff --git a/plugins/channelrx/chanalyzerng/chanalyzergui.h b/plugins/channelrx/chanalyzer/chanalyzergui.h similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzergui.h rename to plugins/channelrx/chanalyzer/chanalyzergui.h diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.ui b/plugins/channelrx/chanalyzer/chanalyzergui.ui similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzernggui.ui rename to plugins/channelrx/chanalyzer/chanalyzergui.ui diff --git a/plugins/channelrx/chanalyzerng/chanalyzerng.pro b/plugins/channelrx/chanalyzer/chanalyzerng.pro similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzerng.pro rename to plugins/channelrx/chanalyzer/chanalyzerng.pro diff --git a/plugins/channelrx/chanalyzerng/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzerplugin.cpp rename to plugins/channelrx/chanalyzer/chanalyzerplugin.cpp diff --git a/plugins/channelrx/chanalyzerng/chanalyzerplugin.h b/plugins/channelrx/chanalyzer/chanalyzerplugin.h similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzerplugin.h rename to plugins/channelrx/chanalyzer/chanalyzerplugin.h diff --git a/plugins/channelrx/chanalyzerng/chanalyzersettings.cpp b/plugins/channelrx/chanalyzer/chanalyzersettings.cpp similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzersettings.cpp rename to plugins/channelrx/chanalyzer/chanalyzersettings.cpp diff --git a/plugins/channelrx/chanalyzerng/chanalyzersettings.h b/plugins/channelrx/chanalyzer/chanalyzersettings.h similarity index 100% rename from plugins/channelrx/chanalyzerng/chanalyzersettings.h rename to plugins/channelrx/chanalyzer/chanalyzersettings.h diff --git a/plugins/channelrx/chanalyzerng/readme.md b/plugins/channelrx/chanalyzer/readme.md similarity index 100% rename from plugins/channelrx/chanalyzerng/readme.md rename to plugins/channelrx/chanalyzer/readme.md