Skip to content

Commit

Permalink
Fixes header includes syntax for linux
Browse files Browse the repository at this point in the history
Adds ProccessListloader
  • Loading branch information
gustavo4passos committed May 17, 2019
1 parent eeb6884 commit 6a33cf5
Show file tree
Hide file tree
Showing 29 changed files with 13,446 additions and 8,849 deletions.
82 changes: 43 additions & 39 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,39 +1,43 @@
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Executable folders
debug/
release/

# vscode files
.vscode/
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Executable folders
bin/
debug/
release/

# Objects folder
build/

# vscode files
.vscode/
42 changes: 21 additions & 21 deletions .qmake.stash
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 6
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++ \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++/mingw32 \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++/backward \
c:/mingw/lib/gcc/mingw32/6.3.0/include \
c:/mingw/include \
c:/mingw/lib/gcc/mingw32/6.3.0/include-fixed
QMAKE_CXX.LIBDIRS = \
c:/mingw/lib/gcc/mingw32/6.3.0 \
c:/mingw/lib/gcc \
c:/mingw/mingw32/lib \
c:/mingw/lib
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 6
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++ \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++/mingw32 \
c:/mingw/lib/gcc/mingw32/6.3.0/include/c++/backward \
c:/mingw/lib/gcc/mingw32/6.3.0/include \
c:/mingw/include \
c:/mingw/lib/gcc/mingw32/6.3.0/include-fixed
QMAKE_CXX.LIBDIRS = \
c:/mingw/lib/gcc/mingw32/6.3.0 \
c:/mingw/lib/gcc \
c:/mingw/mingw32/lib \
c:/mingw/lib
4,463 changes: 4,023 additions & 440 deletions Makefile

Large diffs are not rendered by default.

7,405 changes: 3,939 additions & 3,466 deletions Makefile.Debug

Large diffs are not rendered by default.

7,405 changes: 3,939 additions & 3,466 deletions Makefile.Release

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# QTOS
Proccess Scheduling and Memory Management Simulator Using QT
# QTOS
Proccess Scheduling and Memory Management Simulator Using QT
10 changes: 0 additions & 10 deletions object_script.main.Debug

This file was deleted.

10 changes: 0 additions & 10 deletions object_script.main.Release

This file was deleted.

10 changes: 0 additions & 10 deletions object_script.os-scheduling-simulator.Debug

This file was deleted.

10 changes: 0 additions & 10 deletions object_script.os-scheduling-simulator.Release

This file was deleted.

40 changes: 22 additions & 18 deletions project.pro
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
HEADERS += src/mainwindow.h
HEADERS += src/proccessbox.h
HEADERS += src/operatingsystem.h
HEADERS += src/memory.h
HEADERS += src/scheduler.h
HEADERS += src/proccesslist.h
SOURCES += src/main.cpp
SOURCES += src/mainwindow.cpp
SOURCES += src/proccessbox.cpp
SOURCES += src/operatingsystem.cpp
SOURCES += src/proccess.cpp
SOURCES += src/scheduler.cpp
SOURCES += src/proccesslist.cpp

QT += core
QT += widgets

TARGET = os-scheduling-simulator
HEADERS += src/mainwindow.h
HEADERS += src/proccessbox.h
HEADERS += src/operatingsystem.h
HEADERS += src/memory.h
HEADERS += src/scheduler.h
HEADERS += src/proccesslist.h
HEADERS += src/proccesslistloader.h
SOURCES += src/main.cpp
SOURCES += src/mainwindow.cpp
SOURCES += src/proccessbox.cpp
SOURCES += src/operatingsystem.cpp
SOURCES += src/proccess.cpp
SOURCES += src/scheduler.cpp
SOURCES += src/proccesslist.cpp
SOURCES += src/proccesslistloader.cpp

QT += core
QT += widgets

TARGET = os-scheduling-simulator
DESTDIR = ./bin
OBJECTS_DIR = ./build
28 changes: 16 additions & 12 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
#include <QtWidgets\QApplication>
#include "mainwindow.h"
#include "operatingsystem.h"

int main(int argc, char* args[])
{
QApplication app(argc, args);
MainWindow mainWindow;
mainWindow.show();

return app.exec();
}
#include <QtWidgets/QApplication>
#include "mainwindow.h"
#include "operatingsystem.h"

int main(int argc, char* args[])
{
OperatingSystem os = OperatingSystem(2, 1, SchedulingAlgorithm::FIFO);
os.AddProccess(1, 4, 3, 2);
os.AddProccess(2, 3, 3, 2);

QApplication app(argc, args);
MainWindow mainWindow;
mainWindow.show();

return app.exec();
}
Loading

0 comments on commit 6a33cf5

Please sign in to comment.