Rename namespace, start working on Qt Parser

yqxu · Dec 19, 2016 · 6cae0c4 · 6cae0c4
1 parent 6e9c2f8
commit 6cae0c4
Show file tree

Hide file tree

Showing 179 changed files with 278 additions and 350 deletions.
diff --git a/sigviewer.pro b/sigviewer.pro
@@ -2,6 +2,15 @@ TEMPLATE = app
 DESTDIR = bin
 TARGET = sigviewer
 
+VERSION_MAJOR = 0
+VERSION_MINOR = 6
+VERSION_BUILD = 0
+
+DEFINES += \
+    "VERSION_MAJOR=$$VERSION_MAJOR" \
+    "VERSION_MINOR=$$VERSION_MINOR" \
+    "VERSION_BUILD=$$VERSION_BUILD"
+
 QT += core gui widgets xml
 
 BUILD_DIR = $$PWD/tmp
@@ -64,7 +73,7 @@ HEADERS += \
     $$PWD/src/tab_context.h
 
 SOURCES += \
-    $$PWD/src/main/sigviewer.cpp \
+    $$PWD/src/main.cpp \
     $$PWD/src/application_context_impl.cpp \
     $$PWD/src/file_context.cpp \
     $$PWD/src/tab_context.cpp
diff --git a/src/application_context_impl.cpp b/src/application_context_impl.cpp
@@ -24,7 +24,7 @@
 
 #include <QDebug>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/application_context_impl.h b/src/application_context_impl.h
@@ -29,7 +29,7 @@
 #include <QObject>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/base/application_states.h b/src/base/application_states.h
@@ -20,7 +20,7 @@
 #ifndef APPLICATION_STATES_H
 #define APPLICATION_STATES_H
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 enum ApplicationState

diff --git a/src/base/data_block.cpp b/src/base/data_block.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <cmath>
 
-namespace SigViewer_ {
+namespace sigviewer {
 
 size_t DataBlock::instance_count_ = 0;
 

diff --git a/src/base/data_block.h b/src/base/data_block.h
@@ -29,7 +29,7 @@
 #include <QSharedPointer>
 #include <QMap>
 
-namespace SigViewer_ {
+namespace sigviewer {
 
 //-------------------------------------------------------------------------
 /// DataBlock

diff --git a/src/base/exception.cpp b/src/base/exception.cpp
@@ -19,7 +19,7 @@
 
 #include "exception.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/base/exception.h b/src/base/exception.h
@@ -23,7 +23,7 @@
 #include <exception>
 #include <string>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class Exception : public std::exception

diff --git a/src/base/fixed_data_block.cpp b/src/base/fixed_data_block.cpp
@@ -24,7 +24,7 @@
 #include <algorithm>
 #include <cmath>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-------------------------------------------------------------------------------------------------

diff --git a/src/base/fixed_data_block.h b/src/base/fixed_data_block.h
@@ -28,7 +28,7 @@
 #include <QVector>
 #include <QSharedPointer>
 
-namespace SigViewer_ {
+namespace sigviewer {
 
 //-------------------------------------------------------------------------
 /// FixedDataBlock

diff --git a/src/base/math_utils.cpp b/src/base/math_utils.cpp
@@ -22,7 +22,7 @@
 #include <QDebug>
 #include <cmath>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 namespace MathUtils_

diff --git a/src/base/math_utils.h b/src/base/math_utils.h
@@ -22,7 +22,7 @@
 
 #include "sigviewer_user_types.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 namespace MathUtils_

diff --git a/src/base/signal_channel.cpp b/src/base/signal_channel.cpp
@@ -19,7 +19,7 @@
 
 #include "signal_channel.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/base/signal_channel.h b/src/base/signal_channel.h
@@ -26,7 +26,7 @@
 #include <QString>
 #include <QMutex>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/base/signal_event.cpp b/src/base/signal_event.cpp
@@ -19,7 +19,7 @@
 
 #include "signal_event.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 // constructor

diff --git a/src/base/signal_event.h b/src/base/signal_event.h
@@ -22,7 +22,7 @@
 
 #include "sigviewer_user_types.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 // SignalEvent

diff --git a/src/base/sigviewer_user_types.h b/src/base/sigviewer_user_types.h
@@ -22,7 +22,7 @@
 
 #include <stddef.h>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 enum ScaleMode
@@ -50,7 +50,7 @@ typedef unsigned __int64 uint64_t;
 #include <inttypes.h>
 #endif
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 typedef int8_t   int8;

diff --git a/src/base/tab_states.h b/src/base/tab_states.h
@@ -20,7 +20,7 @@
 #ifndef TAB_STATES_H
 #define TAB_STATES_H
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 enum TabSelectionState

diff --git a/src/command_executer.h b/src/command_executer.h
@@ -22,7 +22,7 @@
 
 #include <QUndoCommand>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class CommandExecuter

diff --git a/src/commands/convert_file_command.cpp b/src/commands/convert_file_command.cpp
@@ -23,7 +23,7 @@
 #include "file_handling/file_signal_writer_factory.h"
 #include "gui/progress_bar.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/commands/convert_file_command.h b/src/commands/convert_file_command.h
@@ -24,7 +24,7 @@
 
 #include <QString>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class ConvertFileCommand

diff --git a/src/commands/open_file_command.cpp b/src/commands/open_file_command.cpp
@@ -28,7 +28,7 @@
 #include <QDir>
 #include <QSettings>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/commands/open_file_command.h b/src/commands/open_file_command.h
@@ -24,7 +24,7 @@
 
 #include <QString>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class OpenFileCommand

diff --git a/src/editing_commands/change_channel_undo_command.cpp b/src/editing_commands/change_channel_undo_command.cpp
@@ -20,7 +20,7 @@
 #include "change_channel_undo_command.h"
 #include "file_handling/event_manager.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/change_channel_undo_command.h b/src/editing_commands/change_channel_undo_command.h
@@ -26,7 +26,7 @@
 #include <QUndoCommand>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class ChangeChannelUndoCommand : public QUndoCommand

diff --git a/src/editing_commands/change_type_undo_command.cpp b/src/editing_commands/change_type_undo_command.cpp
@@ -20,7 +20,7 @@
 #include "change_type_undo_command.h"
 #include "file_handling/event_manager.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/change_type_undo_command.h b/src/editing_commands/change_type_undo_command.h
@@ -27,7 +27,7 @@
 #include <QSharedPointer>
 #include <QObject>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class ChangeTypeUndoCommand : public QUndoCommand

diff --git a/src/editing_commands/delete_event_undo_command.cpp b/src/editing_commands/delete_event_undo_command.cpp
@@ -20,7 +20,7 @@
 #include "delete_event_undo_command.h"
 #include "file_handling/event_manager.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/delete_event_undo_command.h b/src/editing_commands/delete_event_undo_command.h
@@ -26,7 +26,7 @@
 #include <QUndoCommand>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class DeleteEventUndoCommand : public QUndoCommand

diff --git a/src/editing_commands/macro_undo_command.cpp b/src/editing_commands/macro_undo_command.cpp
@@ -19,7 +19,7 @@
 
 #include "macro_undo_command.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/macro_undo_command.h b/src/editing_commands/macro_undo_command.h
@@ -23,7 +23,7 @@
 #include <QUndoCommand>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class MacroUndoCommand : public QUndoCommand

diff --git a/src/editing_commands/new_event_undo_command.cpp b/src/editing_commands/new_event_undo_command.cpp
@@ -19,7 +19,7 @@
 
 #include "new_event_undo_command.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/new_event_undo_command.h b/src/editing_commands/new_event_undo_command.h
@@ -26,7 +26,7 @@
 #include <QUndoCommand>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class NewEventUndoCommand : public QUndoCommand

diff --git a/src/editing_commands/resize_event_undo_command.cpp b/src/editing_commands/resize_event_undo_command.cpp
@@ -20,7 +20,7 @@
 #include "resize_event_undo_command.h"
 #include "file_handling/event_manager.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/editing_commands/resize_event_undo_command.h b/src/editing_commands/resize_event_undo_command.h
@@ -26,7 +26,7 @@
 #include <QSharedPointer>
 #include <QUndoCommand>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 class ResizeEventUndoCommand : public QUndoCommand

diff --git a/src/file_context.cpp b/src/file_context.cpp
@@ -22,7 +22,7 @@
 #include <QDir>
 #include <QDebug>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/file_context.h b/src/file_context.h
@@ -30,7 +30,7 @@
 #include <QString>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 

diff --git a/src/file_handling/basic_header.cpp b/src/file_handling/basic_header.cpp
@@ -21,7 +21,7 @@
 
 #include "basic_header.h"
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/file_handling/basic_header.h b/src/file_handling/basic_header.h
@@ -30,7 +30,7 @@
 #include <QMap>
 #include <QSharedPointer>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------

diff --git a/src/file_handling/channel_manager.cpp b/src/file_handling/channel_manager.cpp
@@ -23,7 +23,7 @@
 
 #include <limits>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-------------------------------------------------------------------------

diff --git a/src/file_handling/channel_manager.h b/src/file_handling/channel_manager.h
@@ -27,7 +27,7 @@
 #include <set>
 #include <map>
 
-namespace SigViewer_
+namespace sigviewer
 {
 
 //-----------------------------------------------------------------------------