diff options
author | Karel Kočí <cynerd@email.cz> | 2017-09-02 15:34:07 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2017-09-02 15:34:07 +0200 |
commit | 375607d9969896c894fa2642ce4a0b8b519a2adb (patch) | |
tree | cb947a843d85f1cd278da15cff432c849986166c /qtmips_machine/instruction.h | |
parent | 82884b3ef726889f837542d2b5e98e2cd8246c00 (diff) | |
download | qtmips-375607d9969896c894fa2642ce4a0b8b519a2adb.tar.gz qtmips-375607d9969896c894fa2642ce4a0b8b519a2adb.tar.bz2 qtmips-375607d9969896c894fa2642ce4a0b8b519a2adb.zip |
Use QString and QVector instead of std ones and more
Diffstat (limited to 'qtmips_machine/instruction.h')
-rw-r--r-- | qtmips_machine/instruction.h | 12 |
1 files changed, 6 insertions, 6 deletions
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 <vector> -#include <string> +#include <qstring.h> +#include <qvector.h> #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<std::string> to_strs() = 0; // Returns all fields of instructions in string + virtual QVector<QString> 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<std::string> to_strs(); + QVector<QString> 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<std::string> to_strs(); + QVector<QString> 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<std::string> to_strs(); + QVector<QString> to_strs(); protected: std::uint32_t address; }; |