Merge pull request #24 from StefanYohansson/chore/folder-structure

Update folder structure to clarify file responsabilities
StefanYohansson · Mar 19, 2020 · 571ffa5 · 571ffa5
2 parents fcad1fd + b46fd36
commit 571ffa5
Show file tree

Hide file tree

Showing 19 changed files with 11 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,16 +11,19 @@ if (PKG_CONFIG_FOUND)
   include_directories(${PJSIP_INCLUDE_DIRS})
 endif()
 
+include_directories(src/telephony)
+include_directories(src/gui)
+
 set(ktelephone_SRC
   src/main.cpp
-  src/ktelephonemanager.cpp
-  src/ktelephoneguide.cpp
-  src/ktelephone.cpp
-  src/ktelephonepreferences.cpp
-  src/mycall.cpp
-  src/ua.cpp
-  src/uamanager.cpp
-  src/ktelephonecall.cpp
+  src/gui/ktelephonemanager.cpp
+  src/gui/ktelephoneguide.cpp
+  src/gui/ktelephone.cpp
+  src/gui/ktelephonepreferences.cpp
+  src/gui/ktelephonecall.cpp
+  src/telephony/mycall.cpp
+  src/telephony/ua.cpp
+  src/telephony/uamanager.cpp
 )
 
 qt5_wrap_ui(ktelephone_SRC src/ui/ktelephone.ui src/ui/startguide.ui src/ui/settings.ui src/ui/call.ui)

diff --git a/src/ktelephone.cpp → src/gui/ktelephone.cpp b/src/ktelephone.cpp → src/gui/ktelephone.cpp
diff --git a/src/ktelephone.h → src/gui/ktelephone.h b/src/ktelephone.h → src/gui/ktelephone.h
diff --git a/src/ktelephonecall.cpp → src/gui/ktelephonecall.cpp b/src/ktelephonecall.cpp → src/gui/ktelephonecall.cpp
diff --git a/src/ktelephonecall.h → src/gui/ktelephonecall.h b/src/ktelephonecall.h → src/gui/ktelephonecall.h
diff --git a/src/ktelephoneguide.cpp → src/gui/ktelephoneguide.cpp b/src/ktelephoneguide.cpp → src/gui/ktelephoneguide.cpp
diff --git a/src/ktelephoneguide.h → src/gui/ktelephoneguide.h b/src/ktelephoneguide.h → src/gui/ktelephoneguide.h
diff --git a/src/ktelephonehelp.cpp → src/gui/ktelephonehelp.cpp b/src/ktelephonehelp.cpp → src/gui/ktelephonehelp.cpp
diff --git a/src/ktelephonehelp.h → src/gui/ktelephonehelp.h b/src/ktelephonehelp.h → src/gui/ktelephonehelp.h
diff --git a/src/ktelephonemanager.cpp → src/gui/ktelephonemanager.cpp b/src/ktelephonemanager.cpp → src/gui/ktelephonemanager.cpp
diff --git a/src/ktelephonemanager.h → src/gui/ktelephonemanager.h b/src/ktelephonemanager.h → src/gui/ktelephonemanager.h
diff --git a/src/ktelephonepreferences.cpp → src/gui/ktelephonepreferences.cpp b/src/ktelephonepreferences.cpp → src/gui/ktelephonepreferences.cpp
diff --git a/src/ktelephonepreferences.h → src/gui/ktelephonepreferences.h b/src/ktelephonepreferences.h → src/gui/ktelephonepreferences.h
diff --git a/src/mycall.cpp → src/telephony/mycall.cpp b/src/mycall.cpp → src/telephony/mycall.cpp
diff --git a/src/mycall.h → src/telephony/mycall.h b/src/mycall.h → src/telephony/mycall.h
diff --git a/src/ua.cpp → src/telephony/ua.cpp b/src/ua.cpp → src/telephony/ua.cpp
diff --git a/src/ua.h → src/telephony/ua.h b/src/ua.h → src/telephony/ua.h
diff --git a/src/uamanager.cpp → src/telephony/uamanager.cpp b/src/uamanager.cpp → src/telephony/uamanager.cpp
diff --git a/src/uamanager.h → src/telephony/uamanager.h b/src/uamanager.h → src/telephony/uamanager.h