From 375607d9969896c894fa2642ce4a0b8b519a2adb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 2 Sep 2017 15:34:07 +0200 Subject: Use QString and QVector instead of std ones and more --- qtmips_machine/instruction.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'qtmips_machine/instruction.h') diff --git a/qtmips_machine/instruction.h b/qtmips_machine/instruction.h index d276a83..99a3ba4 100644 --- a/qtmips_machine/instruction.h +++ b/qtmips_machine/instruction.h @@ -1,8 +1,8 @@ #ifndef INSTRUCTION_H #define INSTRUCTION_H -#include -#include +#include +#include #include "registers.h" #include "memory.h" @@ -14,14 +14,14 @@ public: //virtual void memory(Memory *mem) = 0; // Read or write to memory //virtual void write_back(Registers *regs) = 0; // Write results to registers - virtual std::vector to_strs() = 0; // Returns all fields of instructions in string + virtual QVector to_strs() = 0; // Returns all fields of instructions in string }; class InstructionR : public Instruction { public: InstructionR(std::uint8_t rs, std::uint8_t rd, std::uint8_t rt, std::uint8_t sa); - std::vector to_strs(); + QVector to_strs(); protected: std::uint8_t rs, rd, rt, sa; }; @@ -30,7 +30,7 @@ class InstructionI : public Instruction { public: InstructionI(std::uint8_t rs, std::uint8_t rt, std::uint16_t immediate); - std::vector to_strs(); + QVector to_strs(); protected: std::uint8_t rs, rt; std::uint16_t immediate; @@ -40,7 +40,7 @@ class InstructionJ : public Instruction { public: InstructionJ(std::uint32_t address); - std::vector to_strs(); + QVector to_strs(); protected: std::uint32_t address; }; -- cgit v1.2.3