Restrukturering av filsystem

Saeterprosjekt.pro

@@ -1,5 +1,17 @@
-TEMPLATE = subdirs
+QT       += core gui
 
-CONFIG += ordered
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-SUBDIRS += src
+CONFIG += c++11
+RC_ICONS = saeterprosjekt.ico
+
+include(src/core/core.pri)
+include(src/mainwidgets/mainwidgets.pri)
+include(src/uidialogs/maindialogs/maindialogs.pri)
+include(src/uidialogs/widgetdialogs/kunde/kundedialoger.pri)
+include(src/uidialogs/widgetdialogs/prosjekt/prosjektdialoger.pri)
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /opt/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target

Saeterprosjekt.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.15.0, 2021-09-21T11:59:51. -->
+<!-- Written by QtCreator 4.15.0, 2021-09-28T22:59:07. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -99,8 +99,8 @@
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -137,8 +137,8 @@
     <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -177,8 +177,8 @@
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
     <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:\Users\heno\Documents\qt prosjekter\build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -294,14 +294,14 @@
     <valuelist type="QVariantList" key="CustomOutputParsers"/>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/src/core/core.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/Saeterprosjekt.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/src/core/core.pro</value>
+    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">C:/Users/heno/Documents/qt prosjekter/Saeterprosjekt/Saeterprosjekt.pro</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/heno/Documents/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug/src/core</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">C:/Users/heno/Documents/qt prosjekter/build-Saeterprosjekt-Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>

src/core/core.pri

@@ -0,0 +1,31 @@
+INCLUDEPATH += \
+	$$PWD/../mainwidgets \
+	$$PWD/../uidialogs/maindialogs \
+	$$PWD/../uidialogs/widgetdialogs/kunde \
+	$$PWD/../uidialogs/widgetdialogs/prosjekt
+DEPENDPATH += \
+	$$PWD/../mainwidgets \
+	$$PWD/../uidialogs/maindialogs \
+	$$PWD/../uidialogs/widgetdialogs/kunde \
+	$$PWD/../uidialogs/widgetdialogs/prosjekt
+
+SOURCES += \
+    $$PWD/main.cpp \
+    $$PWD/mainwindow.cpp  \
+    $$PWD/arbeidshest.cpp \
+    $$PWD/datahandler.cpp \
+    $$PWD/datatypes.cpp \
+    $$PWD/globals.cpp 
+
+HEADERS += \
+    $$PWD/mainwindow.h  \
+    $$PWD/arbeidshest.h \
+    $$PWD/datahandler.h \
+    $$PWD/datatypes.h \
+    $$PWD/globals.h 
+
+FORMS += \
+    $$PWD/mainwindow.ui  
+
+RESOURCES += \
+    $$PWD/../../resources.qrc

src/core/core.pro

@@ -1,66 +0,0 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++11
-RC_ICONS = saeterprosjekt.ico
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
-    $$PWD/main.cpp \
-    $$PWD/mainwindow.cpp  \
-    arbeidshest.cpp \
-    datahandler.cpp \
-    datatypes.cpp \
-    globals.cpp \
-    innstillingdialog.cpp \
-    kundewidget.cpp \
-    nykundedialog.cpp \
-    nyttprosjektdialog.cpp \
-    omdialog.cpp \
-    prosjektwidget.cpp \
-    redigerkundedialog.cpp \
-    redigerprosjektdialog.cpp \
-    varsledialog.cpp \
-    velgkundeprosjektdialog.cpp
-
-HEADERS += \
-    $$PWD/mainwindow.h  \
-    arbeidshest.h \
-    datahandler.h \
-    datatypes.h \
-    globals.h \
-    innstillingdialog.h \
-    kundewidget.h \
-    nykundedialog.h \
-    nyttprosjektdialog.h \
-    omdialog.h \
-    prosjektwidget.h \
-    redigerkundedialog.h \
-    redigerprosjektdialog.h \
-    varsledialog.h \
-    velgkundeprosjektdialog.h
-
-FORMS += \
-    $$PWD/mainwindow.ui  \
-    innstillingdialog.ui \
-    kundewidget.ui \
-    nykundedialog.ui \
-    nyttprosjektdialog.ui \
-    omdialog.ui \
-    prosjektwidget.ui \
-    redigerkundedialog.ui \
-    redigerprosjektdialog.ui \
-    varsledialog.ui \
-    velgkundeprosjektdialog.ui
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-RESOURCES += \
-    $$PWD/../../resources.qrc

src/mainwidgets/mainwidgets.pri

@@ -0,0 +1,21 @@
+INCLUDEPATH += \
+	$$PWD/../core \
+	$$PWD/../uidialogs/widgetdialogs/kunde
+DEPENDPATH += \
+	$$PWD/../core \
+	$$PWD/../uidialogs/widgetdialogs/kunde
+
+SOURCES += \
+    $$PWD/kundewidget.cpp \
+    $$PWD/prosjektwidget.cpp
+
+HEADERS += \
+    $$PWD/kundewidget.h \
+    $$PWD/prosjektwidget.h 
+
+FORMS += \
+    $$PWD/kundewidget.ui \
+    $$PWD/prosjektwidget.ui
+	
+RESOURCES += \
+    $$PWD/../../resources.qrc

src/src.pro

@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS += core

src/uidialogs/maindialogs/maindialogs.pri

@@ -0,0 +1,24 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+    $$PWD/innstillingdialog.cpp \
+    $$PWD/omdialog.cpp \
+    $$PWD/varsledialog.cpp 
+
+HEADERS += \
+	$$PWD/innstillingdialog.h \
+    $$PWD/omdialog.h \
+    $$PWD/varsledialog.h 
+
+FORMS += \
+    $$PWD/innstillingdialog.ui \
+    $$PWD/omdialog.ui \
+    $$PWD/varsledialog.ui
+
+RESOURCES += \
+    $$PWD/../../../resources.qrc

src/uidialogs/widgetdialogs/kunde/kundedialoger.pri

@@ -0,0 +1,24 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+       $$PWD/nykundedialog.cpp \
+	   $$PWD/redigerkundedialog.cpp \
+	   $$PWD/velgkundeprosjektdialog.cpp
+
+HEADERS += \
+	$$PWD/nykundedialog.h \
+	$$PWD/redigerkundedialog.h \
+	$$PWD/velgkundeprosjektdialog.h
+
+FORMS += \
+    $$PWD/nykundedialog.ui \
+	$$PWD/redigerkundedialog.ui \
+	$$PWD/velgkundeprosjektdialog.ui
+
+RESOURCES += \
+    $$PWD/../../../../resources.qrc

src/uidialogs/widgetdialogs/prosjekt/prosjektdialoger.pri

@@ -0,0 +1,21 @@
+INCLUDEPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+DEPENDPATH += \
+	$$PWD/../../core \
+	$$PWD/../../mainwidgets
+
+SOURCES += \
+    $$PWD/nyttprosjektdialog.cpp \
+    $$PWD/redigerprosjektdialog.cpp
+
+HEADERS += \
+    $$PWD/nyttprosjektdialog.h \
+    $$PWD/redigerprosjektdialog.h
+
+FORMS += \
+    $$PWD/nyttprosjektdialog.ui \
+    $$PWD/redigerprosjektdialog.ui
+
+RESOURCES += \
+    $$PWD/../../../../resources.qrc