Rename ui function file

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
 )
  
 #===============================================================================

DSView/pv/dialogs/dsdialog.cpp

@@ -30,7 +30,7 @@
 #include <QAbstractButton>
 #include "../dsvdef.h"
 #include "../config/appconfig.h"
-#include "../ui/fun.h"
+#include "../ui/fn.h"
 
 namespace pv {
 namespace dialogs {

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 {

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;

DSView/pv/dock/measuredock.cpp

@@ -39,7 +39,7 @@
 #include <QObject>
 #include <QPainter> 
 #include "../appcontrol.h"
-#include "../ui/fun.h"
+#include "../ui/fn.h"
 
 using namespace boost;
 

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;
 

DSView/pv/dock/searchcombobox.cpp

@@ -27,7 +27,7 @@
 #include <QScrollBar>
 #include "../config/appconfig.h"
 #include "../appcontrol.h"
-#include "../ui/fun.h"
+#include "../ui/fn.h"
 
 //----------------------ComboButtonItem
 

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 {

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 {

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 {

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 {

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"

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 {

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 {

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 <assert.h>
 #include <QPushButton>
 #include <QToolButton>

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 <QFont>
 

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[] =

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;
 

DSView/pv/view/ruler.cpp

@@ -39,9 +39,9 @@
 #include <QStyleOption>
 #include "../appcontrol.h"
 #include "../config/appconfig.h"
-#include "../ui/fun.h"
- 
- 
+#include "../ui/fn.h"
+
+
 using namespace std;
 using namespace Qt;
 

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;
 

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 {