From 909268a2a458ec207840df47df625ede2de87823 Mon Sep 17 00:00:00 2001 From: dreamsourcelabTAI Date: Tue, 13 Jun 2023 14:47:25 +0800 Subject: [PATCH] Rename ui function file --- CMakeLists.txt | 4 ++-- DSView/pv/dialogs/dsdialog.cpp | 2 +- DSView/pv/dialogs/dsmessagebox.cpp | 2 +- DSView/pv/dock/dsotriggerdock.cpp | 2 +- DSView/pv/dock/measuredock.cpp | 2 +- DSView/pv/dock/protocoldock.cpp | 2 +- DSView/pv/dock/searchcombobox.cpp | 2 +- DSView/pv/dock/searchdock.cpp | 2 +- DSView/pv/dock/triggerdock.cpp | 2 +- DSView/pv/toolbars/filebar.cpp | 2 +- DSView/pv/toolbars/logobar.cpp | 2 +- DSView/pv/toolbars/samplingbar.cpp | 2 +- DSView/pv/toolbars/titlebar.cpp | 2 +- DSView/pv/toolbars/trigbar.cpp | 2 +- DSView/pv/ui/{fun.cpp => fn.cpp} | 2 +- DSView/pv/ui/{fun.h => fn.h} | 4 ++-- DSView/pv/view/devmode.cpp | 2 +- DSView/pv/view/header.cpp | 2 +- DSView/pv/view/ruler.cpp | 6 +++--- DSView/pv/view/viewport.cpp | 2 +- DSView/pv/view/viewstatus.cpp | 3 +-- 21 files changed, 25 insertions(+), 26 deletions(-) rename DSView/pv/ui/{fun.cpp => fn.cpp} (99%) rename DSView/pv/ui/{fun.h => fn.h} (96%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8fe5cb63..bf09a9fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,7 +345,7 @@ set(DSView_SOURCES DSView/pv/utility/array.cpp DSView/pv/deviceagent.cpp DSView/pv/ui/langresource.cpp - DSView/pv/ui/fun.cpp + DSView/pv/ui/fn.cpp ) set(DSView_HEADERS @@ -438,7 +438,7 @@ set(DSView_HEADERS DSView/pv/utility/path.h DSView/pv/utility/array.h DSView/pv/deviceagent.h - DSView/pv/ui/fun.h + DSView/pv/ui/fn.h ) #=============================================================================== diff --git a/DSView/pv/dialogs/dsdialog.cpp b/DSView/pv/dialogs/dsdialog.cpp index 71c1cacb..4a410e3e 100644 --- a/DSView/pv/dialogs/dsdialog.cpp +++ b/DSView/pv/dialogs/dsdialog.cpp @@ -30,7 +30,7 @@ #include #include "../dsvdef.h" #include "../config/appconfig.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace dialogs { diff --git a/DSView/pv/dialogs/dsmessagebox.cpp b/DSView/pv/dialogs/dsmessagebox.cpp index 38f32c96..05e0f3f9 100644 --- a/DSView/pv/dialogs/dsmessagebox.cpp +++ b/DSView/pv/dialogs/dsmessagebox.cpp @@ -31,7 +31,7 @@ #include "../dsvdef.h" #include "../ui/langresource.h" #include "../config/appconfig.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace dialogs { diff --git a/DSView/pv/dock/dsotriggerdock.cpp b/DSView/pv/dock/dsotriggerdock.cpp index abfaa670..6fe99753 100644 --- a/DSView/pv/dock/dsotriggerdock.cpp +++ b/DSView/pv/dock/dsotriggerdock.cpp @@ -36,7 +36,7 @@ #include "../log.h" #include "../ui/msgbox.h" #include "../config/appconfig.h" -#include "../ui/fun.h" +#include "../ui/fn.h" using namespace boost; using namespace std; diff --git a/DSView/pv/dock/measuredock.cpp b/DSView/pv/dock/measuredock.cpp index f6928687..00ba8e95 100644 --- a/DSView/pv/dock/measuredock.cpp +++ b/DSView/pv/dock/measuredock.cpp @@ -39,7 +39,7 @@ #include #include #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" using namespace boost; diff --git a/DSView/pv/dock/protocoldock.cpp b/DSView/pv/dock/protocoldock.cpp index bad191e2..dd337d21 100644 --- a/DSView/pv/dock/protocoldock.cpp +++ b/DSView/pv/dock/protocoldock.cpp @@ -54,7 +54,7 @@ #include "../log.h" #include "../ui/langresource.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" using namespace std; diff --git a/DSView/pv/dock/searchcombobox.cpp b/DSView/pv/dock/searchcombobox.cpp index 19c18eef..261eb398 100644 --- a/DSView/pv/dock/searchcombobox.cpp +++ b/DSView/pv/dock/searchcombobox.cpp @@ -27,7 +27,7 @@ #include #include "../config/appconfig.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" //----------------------ComboButtonItem diff --git a/DSView/pv/dock/searchdock.cpp b/DSView/pv/dock/searchdock.cpp index bf4cf1e0..a5cd1c15 100644 --- a/DSView/pv/dock/searchdock.cpp +++ b/DSView/pv/dock/searchdock.cpp @@ -42,7 +42,7 @@ #include "../ui/langresource.h" #include "../ui/msgbox.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace dock { diff --git a/DSView/pv/dock/triggerdock.cpp b/DSView/pv/dock/triggerdock.cpp index e36a3d88..832cec71 100644 --- a/DSView/pv/dock/triggerdock.cpp +++ b/DSView/pv/dock/triggerdock.cpp @@ -45,7 +45,7 @@ #include "../log.h" #include "../data/decode/annotationrestable.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace dock { diff --git a/DSView/pv/toolbars/filebar.cpp b/DSView/pv/toolbars/filebar.cpp index 769a51ee..a8b9bdf1 100644 --- a/DSView/pv/toolbars/filebar.cpp +++ b/DSView/pv/toolbars/filebar.cpp @@ -31,7 +31,7 @@ #include "../utility/path.h" #include "../ui/langresource.h" #include "../log.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace toolbars { diff --git a/DSView/pv/toolbars/logobar.cpp b/DSView/pv/toolbars/logobar.cpp index a307be0f..f6120e18 100644 --- a/DSView/pv/toolbars/logobar.cpp +++ b/DSView/pv/toolbars/logobar.cpp @@ -46,7 +46,7 @@ #include "../log.h" #include "../ui/langresource.h" #include "../ui/msgbox.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace toolbars { diff --git a/DSView/pv/toolbars/samplingbar.cpp b/DSView/pv/toolbars/samplingbar.cpp index 656ae573..943011ac 100644 --- a/DSView/pv/toolbars/samplingbar.cpp +++ b/DSView/pv/toolbars/samplingbar.cpp @@ -38,7 +38,7 @@ #include "../ui/msgbox.h" #include "../ui/langresource.h" #include "../view/view.h" -#include "../ui/fun.h" +#include "../ui/fn.h" #define SINGLE_ACTION_ICON "/once.svg" #define REPEAT_ACTION_ICON "/repeat.svg" diff --git a/DSView/pv/toolbars/titlebar.cpp b/DSView/pv/toolbars/titlebar.cpp index c1c00b37..dd810154 100644 --- a/DSView/pv/toolbars/titlebar.cpp +++ b/DSView/pv/toolbars/titlebar.cpp @@ -34,7 +34,7 @@ #include "../config/appconfig.h" #include "../appcontrol.h" #include "../dsvdef.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace toolbars { diff --git a/DSView/pv/toolbars/trigbar.cpp b/DSView/pv/toolbars/trigbar.cpp index 6c0851a7..02f7b500 100644 --- a/DSView/pv/toolbars/trigbar.cpp +++ b/DSView/pv/toolbars/trigbar.cpp @@ -33,7 +33,7 @@ #include "../dialogs/applicationpardlg.h" #include "../ui/langresource.h" #include "../config/appconfig.h" -#include "../ui/fun.h" +#include "../ui/fn.h" namespace pv { namespace toolbars { diff --git a/DSView/pv/ui/fun.cpp b/DSView/pv/ui/fn.cpp similarity index 99% rename from DSView/pv/ui/fun.cpp rename to DSView/pv/ui/fn.cpp index 27a8b545..3dda6890 100644 --- a/DSView/pv/ui/fun.cpp +++ b/DSView/pv/ui/fn.cpp @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "fun.h" +#include "fn.h" #include #include #include diff --git a/DSView/pv/ui/fun.h b/DSView/pv/ui/fn.h similarity index 96% rename from DSView/pv/ui/fun.h rename to DSView/pv/ui/fn.h index 29468b46..68458902 100644 --- a/DSView/pv/ui/fun.h +++ b/DSView/pv/ui/fn.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UI_FUN_H -#define _UI_FUN_H +#ifndef _UI_FN_H +#define _UI_FN_H #include diff --git a/DSView/pv/view/devmode.cpp b/DSView/pv/view/devmode.cpp index f018deeb..4afd8641 100644 --- a/DSView/pv/view/devmode.cpp +++ b/DSView/pv/view/devmode.cpp @@ -36,7 +36,7 @@ #include "../log.h" #include "../ui/langresource.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" static const struct dev_mode_name dev_mode_name_list[] = diff --git a/DSView/pv/view/header.cpp b/DSView/pv/view/header.cpp index cceed736..9f32ce5b 100644 --- a/DSView/pv/view/header.cpp +++ b/DSView/pv/view/header.cpp @@ -46,7 +46,7 @@ #include "../ui/langresource.h" #include "../appcontrol.h" #include "../config/appconfig.h" -#include "../ui/fun.h" +#include "../ui/fn.h" using namespace std; diff --git a/DSView/pv/view/ruler.cpp b/DSView/pv/view/ruler.cpp index bc5adc60..96fb9af8 100644 --- a/DSView/pv/view/ruler.cpp +++ b/DSView/pv/view/ruler.cpp @@ -39,9 +39,9 @@ #include #include "../appcontrol.h" #include "../config/appconfig.h" -#include "../ui/fun.h" - - +#include "../ui/fn.h" + + using namespace std; using namespace Qt; diff --git a/DSView/pv/view/viewport.cpp b/DSView/pv/view/viewport.cpp index b404ecb0..97793312 100644 --- a/DSView/pv/view/viewport.cpp +++ b/DSView/pv/view/viewport.cpp @@ -44,7 +44,7 @@ #include "../appcontrol.h" #include "../log.h" #include "../ui/langresource.h" -#include "../ui/fun.h" +#include "../ui/fn.h" using namespace std; diff --git a/DSView/pv/view/viewstatus.cpp b/DSView/pv/view/viewstatus.cpp index 41806fe7..8a1738b8 100644 --- a/DSView/pv/view/viewstatus.cpp +++ b/DSView/pv/view/viewstatus.cpp @@ -39,9 +39,8 @@ #include "../log.h" #include "../config/appconfig.h" #include "../appcontrol.h" -#include "../ui/fun.h" +#include "../ui/fn.h" - using namespace std; namespace pv {