# HG changeset patch # User Hasan Yavuz Ă–ZDERYA # Date 2016-02-28 13:53:11 # Node ID bdc33b5c53c6e9fc917292464ea6a2cf1fb6a022 # Parent c65e4fbe5d6d6ce6c9f63309283e6a30d51fad42 moved all source files (.h, .cpp, .ui) to src/ directory diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,17 +49,17 @@ else (QWT_USE_STATIC) endif (QWT_USE_STATIC) # includes -include_directories(${QWT_INCLUDE_DIR}) +include_directories("./src" ${QWT_INCLUDE_DIR}) # wrap UI and resource files qt5_wrap_ui(UI_FILES - mainwindow.ui - portcontrol.ui - about_dialog.ui - snapshotview.ui - commandpanel.ui - commandwidget.ui - dataformatpanel.ui + src/mainwindow.ui + src/portcontrol.ui + src/about_dialog.ui + src/snapshotview.ui + src/commandpanel.ui + src/commandwidget.ui + src/dataformatpanel.ui ) if (WIN32) @@ -69,29 +69,29 @@ else (WIN32) endif (WIN32) add_executable(${PROGRAM_NAME} WIN32 - main.cpp - mainwindow.cpp - portcontrol.cpp - plot.cpp - zoomer.cpp - hidabletabwidget.cpp - framebuffer.cpp - scalepicker.cpp - scalezoomer.cpp - portlist.cpp - snapshot.cpp - snapshotview.cpp - snapshotmanager.cpp - plotsnapshotoverlay.cpp - commandpanel.cpp - commandwidget.cpp - commandedit.cpp - dataformatpanel.cpp - tooltipfilter.cpp - sneakylineedit.cpp + src/main.cpp + src/mainwindow.cpp + src/portcontrol.cpp + src/plot.cpp + src/zoomer.cpp + src/hidabletabwidget.cpp + src/framebuffer.cpp + src/scalepicker.cpp + src/scalezoomer.cpp + src/portlist.cpp + src/snapshot.cpp + src/snapshotview.cpp + src/snapshotmanager.cpp + src/plotsnapshotoverlay.cpp + src/commandpanel.cpp + src/commandwidget.cpp + src/commandedit.cpp + src/dataformatpanel.cpp + src/tooltipfilter.cpp + src/sneakylineedit.cpp + misc/windows_icon.rc ${UI_FILES} ${RES_FILES} - misc/windows_icon.rc ) # Use the Widgets module from Qt 5. @@ -140,7 +140,7 @@ endif (NOT VERSION_REVISION) message("SCM revision: ${VERSION_REVISION}") # configure version file -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/version.h") +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/version.h") # add make run target add_custom_target(run diff --git a/serialplot.pro b/serialplot.pro --- a/serialplot.pro +++ b/serialplot.pro @@ -32,59 +32,61 @@ TEMPLATE = app CONFIG += qwt - -SOURCES += main.cpp\ - mainwindow.cpp \ - portcontrol.cpp \ - plot.cpp \ - zoomer.cpp \ - hidabletabwidget.cpp \ - framebuffer.cpp \ - scalepicker.cpp \ - scalezoomer.cpp \ - portlist.cpp \ - snapshotview.cpp \ - snapshotmanager.cpp \ - snapshot.cpp \ - plotsnapshotoverlay.cpp \ - commandpanel.cpp \ - commandwidget.cpp \ - commandedit.cpp \ - dataformatpanel.cpp \ - tooltipfilter.cpp \ - sneakylineedit.cpp +SOURCES += \ + src/main.cpp\ + src/mainwindow.cpp \ + src/portcontrol.cpp \ + src/plot.cpp \ + src/zoomer.cpp \ + src/hidabletabwidget.cpp \ + src/framebuffer.cpp \ + src/scalepicker.cpp \ + src/scalezoomer.cpp \ + src/portlist.cpp \ + src/snapshotview.cpp \ + src/snapshotmanager.cpp \ + src/snapshot.cpp \ + src/plotsnapshotoverlay.cpp \ + src/commandpanel.cpp \ + src/commandwidget.cpp \ + src/commandedit.cpp \ + src/dataformatpanel.cpp \ + src/tooltipfilter.cpp \ + src/sneakylineedit.cpp -HEADERS += mainwindow.h \ - utils.h \ - portcontrol.h \ - floatswap.h \ - plot.h \ - zoomer.h \ - hidabletabwidget.h \ - framebuffer.h \ - scalepicker.h \ - scalezoomer.h \ - portlist.h \ - snapshotview.h \ - snapshotmanager.h \ - snapshot.h \ - plotsnapshotoverlay.h \ - commandpanel.h \ - commandwidget.h \ - commandedit.h \ - dataformatpanel.h \ - tooltipfilter.h \ - sneakylineedit.h +HEADERS += \ + src/mainwindow.h \ + src/utils.h \ + src/portcontrol.h \ + src/floatswap.h \ + src/plot.h \ + src/zoomer.h \ + src/hidabletabwidget.h \ + src/framebuffer.h \ + src/scalepicker.h \ + src/scalezoomer.h \ + src/portlist.h \ + src/snapshotview.h \ + src/snapshotmanager.h \ + src/snapshot.h \ + src/plotsnapshotoverlay.h \ + src/commandpanel.h \ + src/commandwidget.h \ + src/commandedit.h \ + src/dataformatpanel.h \ + src/tooltipfilter.h \ + src/sneakylineedit.h -FORMS += mainwindow.ui \ - about_dialog.ui \ - portcontrol.ui \ - snapshotview.ui \ - commandpanel.ui \ - commandwidget.ui \ - dataformatpanel.ui +FORMS += \ + src/mainwindow.ui \ + src/about_dialog.ui \ + src/portcontrol.ui \ + src/snapshotview.ui \ + src/commandpanel.ui \ + src/commandwidget.ui \ + src/dataformatpanel.ui -INCLUDEPATH += qmake/ +INCLUDEPATH += qmake/ src/ CONFIG += c++11 diff --git a/about_dialog.ui b/src/about_dialog.ui rename from about_dialog.ui rename to src/about_dialog.ui diff --git a/commandedit.cpp b/src/commandedit.cpp rename from commandedit.cpp rename to src/commandedit.cpp diff --git a/commandedit.h b/src/commandedit.h rename from commandedit.h rename to src/commandedit.h diff --git a/commandpanel.cpp b/src/commandpanel.cpp rename from commandpanel.cpp rename to src/commandpanel.cpp diff --git a/commandpanel.h b/src/commandpanel.h rename from commandpanel.h rename to src/commandpanel.h diff --git a/commandpanel.ui b/src/commandpanel.ui rename from commandpanel.ui rename to src/commandpanel.ui diff --git a/commandwidget.cpp b/src/commandwidget.cpp rename from commandwidget.cpp rename to src/commandwidget.cpp diff --git a/commandwidget.h b/src/commandwidget.h rename from commandwidget.h rename to src/commandwidget.h diff --git a/commandwidget.ui b/src/commandwidget.ui rename from commandwidget.ui rename to src/commandwidget.ui diff --git a/dataformatpanel.cpp b/src/dataformatpanel.cpp rename from dataformatpanel.cpp rename to src/dataformatpanel.cpp diff --git a/dataformatpanel.h b/src/dataformatpanel.h rename from dataformatpanel.h rename to src/dataformatpanel.h diff --git a/dataformatpanel.ui b/src/dataformatpanel.ui rename from dataformatpanel.ui rename to src/dataformatpanel.ui diff --git a/floatswap.h b/src/floatswap.h rename from floatswap.h rename to src/floatswap.h diff --git a/framebuffer.cpp b/src/framebuffer.cpp rename from framebuffer.cpp rename to src/framebuffer.cpp diff --git a/framebuffer.h b/src/framebuffer.h rename from framebuffer.h rename to src/framebuffer.h diff --git a/hidabletabwidget.cpp b/src/hidabletabwidget.cpp rename from hidabletabwidget.cpp rename to src/hidabletabwidget.cpp diff --git a/hidabletabwidget.h b/src/hidabletabwidget.h rename from hidabletabwidget.h rename to src/hidabletabwidget.h diff --git a/main.cpp b/src/main.cpp rename from main.cpp rename to src/main.cpp diff --git a/mainwindow.cpp b/src/mainwindow.cpp rename from mainwindow.cpp rename to src/mainwindow.cpp diff --git a/mainwindow.h b/src/mainwindow.h rename from mainwindow.h rename to src/mainwindow.h diff --git a/mainwindow.ui b/src/mainwindow.ui rename from mainwindow.ui rename to src/mainwindow.ui diff --git a/plot.cpp b/src/plot.cpp rename from plot.cpp rename to src/plot.cpp diff --git a/plot.h b/src/plot.h rename from plot.h rename to src/plot.h diff --git a/plotsnapshotoverlay.cpp b/src/plotsnapshotoverlay.cpp rename from plotsnapshotoverlay.cpp rename to src/plotsnapshotoverlay.cpp diff --git a/plotsnapshotoverlay.h b/src/plotsnapshotoverlay.h rename from plotsnapshotoverlay.h rename to src/plotsnapshotoverlay.h diff --git a/portcontrol.cpp b/src/portcontrol.cpp rename from portcontrol.cpp rename to src/portcontrol.cpp diff --git a/portcontrol.h b/src/portcontrol.h rename from portcontrol.h rename to src/portcontrol.h diff --git a/portcontrol.ui b/src/portcontrol.ui rename from portcontrol.ui rename to src/portcontrol.ui diff --git a/portlist.cpp b/src/portlist.cpp rename from portlist.cpp rename to src/portlist.cpp diff --git a/portlist.h b/src/portlist.h rename from portlist.h rename to src/portlist.h diff --git a/scalepicker.cpp b/src/scalepicker.cpp rename from scalepicker.cpp rename to src/scalepicker.cpp diff --git a/scalepicker.h b/src/scalepicker.h rename from scalepicker.h rename to src/scalepicker.h diff --git a/scalezoomer.cpp b/src/scalezoomer.cpp rename from scalezoomer.cpp rename to src/scalezoomer.cpp diff --git a/scalezoomer.h b/src/scalezoomer.h rename from scalezoomer.h rename to src/scalezoomer.h diff --git a/snapshot.cpp b/src/snapshot.cpp rename from snapshot.cpp rename to src/snapshot.cpp diff --git a/snapshot.h b/src/snapshot.h rename from snapshot.h rename to src/snapshot.h diff --git a/snapshotmanager.cpp b/src/snapshotmanager.cpp rename from snapshotmanager.cpp rename to src/snapshotmanager.cpp diff --git a/snapshotmanager.h b/src/snapshotmanager.h rename from snapshotmanager.h rename to src/snapshotmanager.h diff --git a/snapshotview.cpp b/src/snapshotview.cpp rename from snapshotview.cpp rename to src/snapshotview.cpp diff --git a/snapshotview.h b/src/snapshotview.h rename from snapshotview.h rename to src/snapshotview.h diff --git a/snapshotview.ui b/src/snapshotview.ui rename from snapshotview.ui rename to src/snapshotview.ui diff --git a/sneakylineedit.cpp b/src/sneakylineedit.cpp rename from sneakylineedit.cpp rename to src/sneakylineedit.cpp diff --git a/sneakylineedit.h b/src/sneakylineedit.h rename from sneakylineedit.h rename to src/sneakylineedit.h diff --git a/tooltipfilter.cpp b/src/tooltipfilter.cpp rename from tooltipfilter.cpp rename to src/tooltipfilter.cpp diff --git a/tooltipfilter.h b/src/tooltipfilter.h rename from tooltipfilter.h rename to src/tooltipfilter.h diff --git a/utils.h b/src/utils.h rename from utils.h rename to src/utils.h diff --git a/version.h.in b/src/version.h.in rename from version.h.in rename to src/version.h.in diff --git a/zoomer.cpp b/src/zoomer.cpp rename from zoomer.cpp rename to src/zoomer.cpp diff --git a/zoomer.h b/src/zoomer.h rename from zoomer.h rename to src/zoomer.h