summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt5
-rw-r--r--externals/qhexedit/CMakeLists.txt21
-rw-r--r--externals/qhexedit/commands.cpp115
-rw-r--r--externals/qhexedit/commands.h70
-rw-r--r--externals/qhexedit/license.txt502
-rw-r--r--externals/qhexedit/qhexedit.cpp180
-rw-r--r--externals/qhexedit/qhexedit.h240
-rw-r--r--externals/qhexedit/qhexedit_p.cpp857
-rw-r--r--externals/qhexedit/qhexedit_p.h128
-rw-r--r--externals/qhexedit/xbytearray.cpp167
-rw-r--r--externals/qhexedit/xbytearray.h66
-rw-r--r--src/citra_qt/CMakeLists.txt4
-rw-r--r--src/citra_qt/debugger/ramview.cpp12
-rw-r--r--src/citra_qt/debugger/ramview.h17
-rw-r--r--src/citra_qt/main.cpp3
15 files changed, 2 insertions, 2385 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a1fd492..ce9a29032 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,11 +271,6 @@ if (MSVC)
endif()
# process subdirectories
-if(ENABLE_QT)
- include_directories(externals/qhexedit)
- add_subdirectory(externals/qhexedit)
-endif()
-
add_subdirectory(externals/soundtouch)
enable_testing()
diff --git a/externals/qhexedit/CMakeLists.txt b/externals/qhexedit/CMakeLists.txt
deleted file mode 100644
index e7470dfe4..000000000
--- a/externals/qhexedit/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(SRCS
- commands.cpp
- qhexedit.cpp
- qhexedit_p.cpp
- xbytearray.cpp
- )
-
-set(HEADERS
- commands.h
- qhexedit.h
- qhexedit_p.h
- xbytearray.h
- )
-
-create_directory_groups(${SRCS} ${HEADERS})
-
-add_library(qhexedit STATIC ${SRCS} ${HEADERS})
-target_link_libraries(qhexedit ${CITRA_QT_LIBS})
diff --git a/externals/qhexedit/commands.cpp b/externals/qhexedit/commands.cpp
deleted file mode 100644
index 303091d1d..000000000
--- a/externals/qhexedit/commands.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "commands.h"
-
-CharCommand::CharCommand(XByteArray * xData, Cmd cmd, int charPos, char newChar, QUndoCommand *parent)
- : QUndoCommand(parent)
-{
- _xData = xData;
- _charPos = charPos;
- _newChar = newChar;
- _cmd = cmd;
-}
-
-bool CharCommand::mergeWith(const QUndoCommand *command)
-{
- const CharCommand *nextCommand = static_cast<const CharCommand *>(command);
- bool result = false;
-
- if (_cmd != remove)
- {
- if (nextCommand->_cmd == replace)
- if (nextCommand->_charPos == _charPos)
- {
- _newChar = nextCommand->_newChar;
- result = true;
- }
- }
- return result;
-}
-
-void CharCommand::undo()
-{
- switch (_cmd)
- {
- case insert:
- _xData->remove(_charPos, 1);
- break;
- case replace:
- _xData->replace(_charPos, _oldChar);
- _xData->setDataChanged(_charPos, _wasChanged);
- break;
- case remove:
- _xData->insert(_charPos, _oldChar);
- _xData->setDataChanged(_charPos, _wasChanged);
- break;
- }
-}
-
-void CharCommand::redo()
-{
- switch (_cmd)
- {
- case insert:
- _xData->insert(_charPos, _newChar);
- break;
- case replace:
- _oldChar = _xData->data()[_charPos];
- _wasChanged = _xData->dataChanged(_charPos);
- _xData->replace(_charPos, _newChar);
- break;
- case remove:
- _oldChar = _xData->data()[_charPos];
- _wasChanged = _xData->dataChanged(_charPos);
- _xData->remove(_charPos, 1);
- break;
- }
-}
-
-
-
-ArrayCommand::ArrayCommand(XByteArray * xData, Cmd cmd, int baPos, QByteArray newBa, int len, QUndoCommand *parent)
- : QUndoCommand(parent)
-{
- _cmd = cmd;
- _xData = xData;
- _baPos = baPos;
- _newBa = newBa;
- _len = len;
-}
-
-void ArrayCommand::undo()
-{
- switch (_cmd)
- {
- case insert:
- _xData->remove(_baPos, _newBa.length());
- break;
- case replace:
- _xData->replace(_baPos, _oldBa);
- _xData->setDataChanged(_baPos, _wasChanged);
- break;
- case remove:
- _xData->insert(_baPos, _oldBa);
- _xData->setDataChanged(_baPos, _wasChanged);
- break;
- }
-}
-
-void ArrayCommand::redo()
-{
- switch (_cmd)
- {
- case insert:
- _xData->insert(_baPos, _newBa);
- break;
- case replace:
- _oldBa = _xData->data().mid(_baPos, _len);
- _wasChanged = _xData->dataChanged(_baPos, _len);
- _xData->replace(_baPos, _newBa);
- break;
- case remove:
- _oldBa = _xData->data().mid(_baPos, _len);
- _wasChanged = _xData->dataChanged(_baPos, _len);
- _xData->remove(_baPos, _len);
- break;
- }
-}
diff --git a/externals/qhexedit/commands.h b/externals/qhexedit/commands.h
deleted file mode 100644
index 9931b3fb5..000000000
--- a/externals/qhexedit/commands.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef COMMANDS_H
-#define COMMANDS_H
-
-/** \cond docNever */
-
-#include <QUndoCommand>
-
-#include "xbytearray.h"
-
-/*! CharCommand is a class to prived undo/redo functionality in QHexEdit.
-A QUndoCommand represents a single editing action on a document. CharCommand
-is responsable for manipulations on single chars. It can insert. replace and
-remove characters. A manipulation stores allways to actions
-1. redo (or do) action
-2. undo action.
-
-CharCommand also supports command compression via mergeWidht(). This allows
-the user to execute a undo command contation e.g. 3 steps in a single command.
-If you for example insert a new byt "34" this means for the editor doing 3
-steps: insert a "00", replace it with "03" and the replace it with "34". These
-3 steps are combined into a single step, insert a "34".
-*/
-class CharCommand : public QUndoCommand
-{
-public:
- enum { Id = 1234 };
- enum Cmd {insert, remove, replace};
-
- CharCommand(XByteArray * xData, Cmd cmd, int charPos, char newChar,
- QUndoCommand *parent=0);
-
- void undo();
- void redo();
- bool mergeWith(const QUndoCommand *command);
- int id() const { return Id; }
-
-private:
- XByteArray * _xData;
- int _charPos;
- bool _wasChanged;
- char _newChar;
- char _oldChar;
- Cmd _cmd;
-};
-
-/*! ArrayCommand provides undo/redo functionality for handling binary strings. It
-can undo/redo insert, replace and remove binary strins (QByteArrays).
-*/
-class ArrayCommand : public QUndoCommand
-{
-public:
- enum Cmd {insert, remove, replace};
- ArrayCommand(XByteArray * xData, Cmd cmd, int baPos, QByteArray newBa=QByteArray(), int len=0,
- QUndoCommand *parent=0);
- void undo();
- void redo();
-
-private:
- Cmd _cmd;
- XByteArray * _xData;
- int _baPos;
- int _len;
- QByteArray _wasChanged;
- QByteArray _newBa;
- QByteArray _oldBa;
-};
-
-/** \endcond docNever */
-
-#endif // COMMANDS_H
diff --git a/externals/qhexedit/license.txt b/externals/qhexedit/license.txt
deleted file mode 100644
index f166cc57b..000000000
--- a/externals/qhexedit/license.txt
+++ /dev/null
@@ -1,502 +0,0 @@
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
-written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
- To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it! \ No newline at end of file
diff --git a/externals/qhexedit/qhexedit.cpp b/externals/qhexedit/qhexedit.cpp
deleted file mode 100644
index b12624e08..000000000
--- a/externals/qhexedit/qhexedit.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#include <QtGui>
-
-#include "qhexedit.h"
-
-
-QHexEdit::QHexEdit(QWidget *parent) : QScrollArea(parent)
-{
- qHexEdit_p = new QHexEditPrivate(this);
- setWidget(qHexEdit_p);
- setWidgetResizable(true);
-
- connect(qHexEdit_p, SIGNAL(currentAddressChanged(int)), this, SIGNAL(currentAddressChanged(int)));
- connect(qHexEdit_p, SIGNAL(currentSizeChanged(int)), this, SIGNAL(currentSizeChanged(int)));
- connect(qHexEdit_p, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
- connect(qHexEdit_p, SIGNAL(overwriteModeChanged(bool)), this, SIGNAL(overwriteModeChanged(bool)));
- setFocusPolicy(Qt::NoFocus);
-}
-
-int QHexEdit::indexOf(const QByteArray & ba, int from) const
-{
- return qHexEdit_p->indexOf(ba, from);
-}
-
-void QHexEdit::insert(int i, const QByteArray & ba)
-{
- qHexEdit_p->insert(i, ba);
-}
-
-void QHexEdit::insert(int i, char ch)
-{
- qHexEdit_p->insert(i, ch);
-}
-
-int QHexEdit::lastIndexOf(const QByteArray & ba, int from) const
-{
- return qHexEdit_p->lastIndexOf(ba, from);
-}
-
-void QHexEdit::remove(int pos, int len)
-{
- qHexEdit_p->remove(pos, len);
-}
-
-void QHexEdit::replace( int pos, int len, const QByteArray & after)
-{
- qHexEdit_p->replace(pos, len, after);
-}
-
-QString QHexEdit::toReadableString()
-{
- return qHexEdit_p->toRedableString();
-}
-
-QString QHexEdit::selectionToReadableString()
-{
- return qHexEdit_p->selectionToReadableString();
-}
-
-void QHexEdit::setAddressArea(bool addressArea)
-{
- qHexEdit_p->setAddressArea(addressArea);
-}
-
-void QHexEdit::redo()
-{
- qHexEdit_p->redo();
-}
-
-void QHexEdit::undo()
-{
- qHexEdit_p->undo();
-}
-
-void QHexEdit::setAddressWidth(int addressWidth)
-{
- qHexEdit_p->setAddressWidth(addressWidth);
-}
-
-void QHexEdit::setAsciiArea(bool asciiArea)
-{
- qHexEdit_p->setAsciiArea(asciiArea);
-}
-
-void QHexEdit::setHighlighting(bool mode)
-{
- qHexEdit_p->setHighlighting(mode);
-}
-
-void QHexEdit::setAddressOffset(int offset)
-{
- qHexEdit_p->setAddressOffset(offset);
-}
-
-int QHexEdit::addressOffset()
-{
- return qHexEdit_p->addressOffset();
-}
-
-void QHexEdit::setCursorPosition(int cursorPos)
-{
- // cursorPos in QHexEditPrivate is the position of the textcoursor without
- // blanks, means bytePos*2
- qHexEdit_p->setCursorPos(cursorPos*2);
-}
-
-int QHexEdit::cursorPosition()
-{
- return qHexEdit_p->cursorPos() / 2;
-}
-
-
-void QHexEdit::setData(const QByteArray &data)
-{
- qHexEdit_p->setData(data);
-}
-
-QByteArray QHexEdit::data()
-{
- return qHexEdit_p->data();
-}
-
-void QHexEdit::setAddressAreaColor(const QColor &color)
-{
- qHexEdit_p->setAddressAreaColor(color);
-}
-
-QColor QHexEdit::addressAreaColor()
-{
- return qHexEdit_p->addressAreaColor();
-}
-
-void QHexEdit::setHighlightingColor(const QColor &color)
-{
- qHexEdit_p->setHighlightingColor(color);
-}
-
-QColor QHexEdit::highlightingColor()
-{
- return qHexEdit_p->highlightingColor();
-}
-
-void QHexEdit::setSelectionColor(const QColor &color)
-{
- qHexEdit_p->setSelectionColor(color);
-}
-
-QColor QHexEdit::selectionColor()
-{
- return qHexEdit_p->selectionColor();
-}
-
-void QHexEdit::setOverwriteMode(bool overwriteMode)
-{
- qHexEdit_p->setOverwriteMode(overwriteMode);
-}
-
-bool QHexEdit::overwriteMode()
-{
- return qHexEdit_p->overwriteMode();
-}
-
-void QHexEdit::setReadOnly(bool readOnly)
-{
- qHexEdit_p->setReadOnly(readOnly);
-}
-
-bool QHexEdit::isReadOnly()
-{
- return qHexEdit_p->isReadOnly();
-}
-
-void QHexEdit::setFont(const QFont &font)
-{
- qHexEdit_p->setFont(font);
-}
-
-const QFont & QHexEdit::font() const
-{
- return qHexEdit_p->font();
-}
diff --git a/externals/qhexedit/qhexedit.h b/externals/qhexedit/qhexedit.h
deleted file mode 100644
index 15b6d7603..000000000
--- a/externals/qhexedit/qhexedit.h
+++ /dev/null
@@ -1,240 +0,0 @@
-// Original author: Winfried Simon
-// See http://code.google.com/p/qhexedit2/
-// Huge thanks!
-
-#ifndef QHEXEDIT_H
-#define QHEXEDIT_H
-
-#include <QtGui>
-#include "qhexedit_p.h"
-
-/** \mainpage
-QHexEdit is a binary editor widget for Qt.
-
-\version Version 0.6.3
-\image html hexedit.png
-*/
-
-
-/*! QHexEdit is a hex editor widget written in C++ for the Qt (Qt4) framework.
-It is a simple editor for binary data, just like QPlainTextEdit is for text
-data. There are sip configuration files included, so it is easy to create
-bindings for PyQt and you can use this widget also in python.
-
-QHexEdit takes the data of a QByteArray (setData()) and shows it. You can use
-the mouse or the keyboard to navigate inside the widget. If you hit the keys
-(0..9, a..f) you will change the data. Changed data is highlighted and can be
-accessed via data().
-
-Normaly QHexEdit works in the overwrite Mode. You can set overwriteMode(false)
-and insert data. In this case the size of data() increases. It is also possible
-to delete bytes (del or backspace), here the size of data decreases.
-
-You can select data with keyboard hits or mouse movements. The copy-key will
-copy the selected data into the clipboard. The cut-key copies also but delets
-it afterwards. In overwrite mode, the paste function overwrites the content of
-the (does not change the length) data. In insert mode, clipboard data will be
-inserted. The clipboard content is expected in ASCII Hex notation. Unknown
-characters will be ignored.
-
-QHexEdit comes with undo/redo functionality. All changes can be undone, by
-pressing the undo-key (usually ctr-z). They can also be redone afterwards.
-The undo/redo framework is cleared, when setData() sets up a new
-content for the editor. You can search data inside the content with indexOf()
-and lastIndexOf(). The replace() function is to change located subdata. This
-'replaced' data can also be undone by the undo/redo framework.
-
-This widget can only handle small amounts of data. The size has to be below 10
-megabytes, otherwise the scroll sliders ard not shown and you can't scroll any
-more.
-*/
- class QHexEdit : public QScrollArea
-{
- Q_OBJECT
- /*! Property data holds the content of QHexEdit. Call setData() to set the
- content of QHexEdit, data() returns the actual content.
- */
- Q_PROPERTY(QByteArray data READ data WRITE setData)
-
- /*! Property addressOffset is added to the Numbers of the Address Area.
- A offset in the address area (left side) is sometimes usefull, whe you show
- only a segment of a complete memory picture. With setAddressOffset() you set
- this property - with addressOffset() you get the actual value.
- */
- Q_PROPERTY(int addressOffset READ addressOffset WRITE setAddressOffset)
-
- /*! Property address area color sets (setAddressAreaColor()) the backgorund
- color of address areas. You can also read the color (addressaAreaColor()).
- */
- Q_PROPERTY(QColor addressAreaColor READ addressAreaColor WRITE setAddressAreaColor)
-
- /*! Porperty cursorPosition sets or gets the position of the editor cursor
- in QHexEdit.
- */
- Q_PROPERTY(int cursorPosition READ cursorPosition WRITE setCursorPosition)
-
- /*! Property highlighting color sets (setHighlightingColor()) the backgorund
- color of highlighted text areas. You can also read the color
- (highlightingColor()).
- */
- Q_PROPERTY(QColor highlightingColor READ highlightingColor WRITE setHighlightingColor)
-
- /*! Property selection color sets (setSelectionColor()) the backgorund
- color of selected text areas. You can also read the color
- (selectionColor()).
- */
- Q_PROPERTY(QColor selectionColor READ selectionColor WRITE setSelectionColor)
-
- /*! Porperty overwrite mode sets (setOverwriteMode()) or gets (overwriteMode()) the mode
- in which the editor works. In overwrite mode the user will overwrite existing data. The
- size of data will be constant. In insert mode the size will grow, when inserting
- new data.
- */
- Q_PROPERTY(bool overwriteMode READ overwriteMode WRITE setOverwriteMode)
-
- /*! Porperty readOnly sets (setReadOnly()) or gets (isReadOnly) the mode
- in which the editor works. In readonly mode the the user can only navigate
- through the data and select data; modifying is not possible. This
- property's default is false.
- */
- Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
-
- /*! Set the font of the widget. Please use fixed width fonts like Mono or Courier.*/
- Q_PROPERTY(QFont font READ font WRITE setFont)
-
-
-public:
- /*! Creates an instance of QHexEdit.
- \param parent Parent widget of QHexEdit.
- */
- QHexEdit(QWidget *parent = 0);
-
- /*! Returns the index position of the first occurrence
- of the byte array ba in this byte array, searching forward from index position
- from. Returns -1 if ba could not be found. In addition to this functionality
- of QByteArray the cursorposition is set to the end of found bytearray and
- it will be selected.
-
- */
- int indexOf(const QByteArray & ba, int from = 0) const;
-
- /*! Inserts a byte array.
- \param i Index position, where to insert
- \param ba byte array, which is to insert
- In overwrite mode, the existing data will be overwritten, in insertmode ba will be
- inserted and size of data grows.
- */
- void insert(int i, const QByteArray & ba);
-
- /*! Inserts a char.
- \param i Index position, where to insert
- \param ch Char, which is to insert
- In overwrite mode, the existing data will be overwritten, in insertmode ba will be
- inserted and size of data grows.
- */
- void insert(int i, char ch);
-
- /*! Returns the index position of the last occurrence
- of the byte array ba in this byte array, searching backwards from index position
- from. Returns -1 if ba could not be found. In addition to this functionality
- of QByteArray the cursorposition is set to the beginning of found bytearray and
- it will be selected.
-
- */
- int lastIndexOf(const QByteArray & ba, int from = 0) const;
-
- /*! Removes len bytes from the content.
- \param pos Index position, where to remove
- \param len Amount of bytes to remove
- In overwrite mode, the existing bytes will be overwriten with 0x00.
- */
- void remove(int pos, int len=1);
-
- /*! Replaces len bytes from index position pos with the byte array after.
- */
- void replace( int pos, int len, const QByteArray & after);
-
- /*! Gives back a formatted image of the content of QHexEdit
- */
- QString toReadableString();
-
- /*! Gives back a formatted image of the selected content of QHexEdit
- */
- QString selectionToReadableString();
-
- /*! \cond docNever */
- void setAddressOffset(int offset);
- int addressOffset();
- void setCursorPosition(int cusorPos);
- int cursorPosition();
- void setData(QByteArray const &data);
- QByteArray data();
- void setAddressAreaColor(QColor const &color);
- QColor addressAreaColor();
- void setHighlightingColor(QColor const &color);
- QColor highlightingColor();
- void setSelectionColor(QColor const &color);
- QColor selectionColor();
- void setOverwriteMode(bool);
- bool overwriteMode();
- void setReadOnly(bool);
- bool isReadOnly();
- const QFont &font() const;
- void setFont(const QFont &);
- /*! \endcond docNever */
-
-public slots:
- /*! Redoes the last operation. If there is no operation to redo, i.e.
- there is no redo step in the undo/redo history, nothing happens.
- */
- void redo();
-
- /*! Set the minimum width of the address area.
- \param addressWidth Width in characters.
- */
- void setAddressWidth(int addressWidth);
-
- /*! Switch the address area on or off.
- \param addressArea true (show it), false (hide it).
- */
- void setAddressArea(bool addressArea);
-
- /*! Switch the ascii area on or off.
- \param asciiArea true (show it), false (hide it).
- */
- void setAsciiArea(bool asciiArea);
-
- /*! Switch the highlighting feature on or of.
- \param mode true (show it), false (hide it).
- */
- void setHighlighting(bool mode);
-
- /*! Undoes the last operation. If there is no operation to undo, i.e.
- there is no undo step in the undo/redo history, nothing happens.
- */
- void undo();
-
-signals:
-
- /*! Contains the address, where the cursor is located. */
- void currentAddressChanged(int address);
-
- /*! Contains the size of the data to edit. */
- void currentSizeChanged(int size);
-
- /*! The signal is emited every time, the data is changed. */
- void dataChanged();
-
- /*! The signal is emited every time, the overwrite mode is changed. */
- void overwriteModeChanged(bool state);
-
-private:
- /*! \cond docNever */
- QHexEditPrivate *qHexEdit_p;
- QHBoxLayout *layout;
- QScrollArea *scrollArea;
- /*! \endcond docNever */
-};
-
-#endif
-
diff --git a/externals/qhexedit/qhexedit_p.cpp b/externals/qhexedit/qhexedit_p.cpp
deleted file mode 100644
index 2a6885de8..000000000
--- a/externals/qhexedit/qhexedit_p.cpp
+++ /dev/null
@@ -1,857 +0,0 @@
-#include "qhexedit_p.h"
-#include "commands.h"
-
-const int HEXCHARS_IN_LINE = 47;
-const int GAP_ADR_HEX = 10;
-const int GAP_HEX_ASCII = 16;
-const int BYTES_PER_LINE = 16;
-
-QHexEditPrivate::QHexEditPrivate(QScrollArea *parent) : QWidget(parent)
-{
- _undoStack = new QUndoStack(this);
-
- _scrollArea = parent;
- setAddressWidth(4);
- setAddressOffset(0);
- setAddressArea(true);
- setAsciiArea(true);
- setHighlighting(true);
- setOverwriteMode(true);
- setReadOnly(false);
- setAddressAreaColor(QColor(0xd4, 0xd4, 0xd4, 0xff));
- setHighlightingColor(QColor(0xff, 0xff, 0x99, 0xff));
- setSelectionColor(QColor(0x6d, 0x9e, 0xff, 0xff));
- setFont(QFont("Courier", 10));
-
- _size = 0;
- resetSelection(0);
-
- setFocusPolicy(Qt::StrongFocus);
-
- connect(&_cursorTimer, SIGNAL(timeout()), this, SLOT(updateCursor()));
- _cursorTimer.setInterval(500);
- _cursorTimer.start();
-}
-
-void QHexEditPrivate::setAddressOffset(int offset)
-{
- _xData.setAddressOffset(offset);
- adjust();
-}
-
-int QHexEditPrivate::addressOffset()
-{
- return _xData.addressOffset();
-}
-
-void QHexEditPrivate::setData(const QByteArray &data)
-{
- _xData.setData(data);
- _undoStack->clear();
- adjust();
- setCursorPos(0);
-}
-
-QByteArray QHexEditPrivate::data()
-{
- return _xData.data();
-}
-
-void QHexEditPrivate::setAddressAreaColor(const QColor &color)
-{
- _addressAreaColor = color;
- update();
-}
-
-QColor QHexEditPrivate::addressAreaColor()
-{
- return _addressAreaColor;
-}
-
-void QHexEditPrivate::setHighlightingColor(const QColor &color)
-{
- _highlightingColor = color;
- update();
-}
-
-QColor QHexEditPrivate::highlightingColor()
-{
- return _highlightingColor;
-}
-
-void QHexEditPrivate::setSelectionColor(const QColor &color)
-{
- _selectionColor = color;
- update();
-}
-
-QColor QHexEditPrivate::selectionColor()
-{
- return _selectionColor;
-}
-
-void QHexEditPrivate::setReadOnly(bool readOnly)
-{
- _readOnly = readOnly;
-}
-
-bool QHexEditPrivate::isReadOnly()
-{
- return _readOnly;
-}
-
-XByteArray & QHexEditPrivate::xData()
-{
- return _xData;
-}
-
-int QHexEditPrivate::indexOf(const QByteArray & ba, int from)
-{
- if (from > (_xData.data().length() - 1))
- from = _xData.data().length() - 1;
- int idx = _xData.data().indexOf(ba, from);
- if (idx > -1)
- {
- int curPos = idx*2;
- setCursorPos(curPos + ba.length()*2);
- resetSelection(curPos);
- setSelection(curPos + ba.length()*2);
- ensureVisible();
- }
- return idx;
-}
-
-void QHexEditPrivate::insert(int index, const QByteArray & ba)
-{
- if (ba.length() > 0)
- {
- if (_overwriteMode)
- {
- QUndoCommand *arrayCommand= new ArrayCommand(&_xData, ArrayCommand::replace, index, ba, ba.length());
- _undoStack->push(arrayCommand);
- emit dataChanged();
- }
- else
- {
- QUndoCommand *arrayCommand= new ArrayCommand(&_xData, ArrayCommand::insert, index, ba, ba.length());
- _undoStack->push(arrayCommand);
- emit dataChanged();
- }
- }
-}
-
-void QHexEditPrivate::insert(int index, char ch)
-{
- QUndoCommand *charCommand = new CharCommand(&_xData, CharCommand::insert, index, ch);
- _undoStack->push(charCommand);
- emit dataChanged();
-}
-
-int QHexEditPrivate::lastIndexOf(const QByteArray & ba, int from)
-{
- from -= ba.length();
- if (from < 0)
- from = 0;
- int idx = _xData.data().lastIndexOf(ba, from);
- if (idx > -1)
- {
- int curPos = idx*2;
- setCursorPos(curPos);
- resetSelection(curPos);
- setSelection(curPos + ba.length()*2);
- ensureVisible();
- }
- return idx;
-}
-
-void QHexEditPrivate::remove(int index, int len)
-{
- if (len > 0)
- {
- if (len == 1)
- {
- if (_overwriteMode)
- {
- QUndoCommand *charCommand = new CharCommand(&_xData, CharCommand::replace, index, char(0));
- _undoStack->push(charCommand);
- emit dataChanged();
- }
- else
- {
- QUndoCommand *charCommand = new CharCommand(&_xData, CharCommand::remove, index, char(0));
- _undoStack->push(charCommand);
- emit dataChanged();
- }
- }
- else
- {
- QByteArray ba = QByteArray(len, char(0));
- if (_overwriteMode)
- {
- QUndoCommand *arrayCommand = new ArrayCommand(&_xData, ArrayCommand::replace, index, ba, ba.length());
- _undoStack->push(arrayCommand);
- emit dataChanged();
- }
- else
- {
- QUndoCommand *arrayCommand= new ArrayCommand(&_xData, ArrayCommand::remove, index, ba, len);
- _undoStack->push(arrayCommand);
- emit dataChanged();
- }
- }
- }
-}
-
-void QHexEditPrivate::replace(int index, char ch)
-{
- QUndoCommand *charCommand = new CharCommand(&_xData, CharCommand::replace, index, ch);
- _undoStack->push(charCommand);
- resetSelection();
- emit dataChanged();
-}
-
-void QHexEditPrivate::replace(int index, const QByteArray & ba)
-{
- QUndoCommand *arrayCommand= new ArrayCommand(&_xData, ArrayCommand::replace, index, ba, ba.length());
- _undoStack->push(arrayCommand);
- resetSelection();
- emit dataChanged();
-}
-
-void QHexEditPrivate::replace(int pos, int len, const QByteArray &after)
-{
- QUndoCommand *arrayCommand= new ArrayCommand(&_xData, ArrayCommand::replace, pos, after, len);
- _undoStack->push(arrayCommand);
- resetSelection();
- emit dataChanged();
-}
-
-void QHexEditPrivate::setAddressArea(bool addressArea)
-{
- _addressArea = addressArea;
- adjust();
-
- setCursorPos(_cursorPosition);
-}
-
-void QHexEditPrivate::setAddressWidth(int addressWidth)
-{
- _xData.setAddressWidth(addressWidth);
-
- setCursorPos(_cursorPosition);
-}
-
-void QHexEditPrivate::setAsciiArea(bool asciiArea)
-{
- _asciiArea = asciiArea;
- adjust();
-}
-
-void QHexEditPrivate::setFont(const QFont &font)
-{
- QWidget::setFont(font);
- adjust();
-}
-
-void QHexEditPrivate::setHighlighting(bool mode)
-{
- _highlighting = mode;
- update();
-}
-
-void QHexEditPrivate::setOverwriteMode(bool overwriteMode)
-{
- _overwriteMode = overwriteMode;
-}
-
-bool QHexEditPrivate::overwriteMode()
-{
- return _overwriteMode;
-}
-
-void QHexEditPrivate::redo()
-{
- _undoStack->redo();
- emit dataChanged();
- setCursorPos(_cursorPosition);
- update();
-}
-
-void QHexEditPrivate::undo()
-{
- _undoStack->undo();
- emit dataChanged();
- setCursorPos(_cursorPosition);
- update();
-}
-
-QString QHexEditPrivate::toRedableString()
-{
- return _xData.toRedableString();
-}
-
-
-QString QHexEditPrivate::selectionToReadableString()
-{
- return _xData.toRedableString(getSelectionBegin(), getSelectionEnd());
-}
-
-void QHexEditPrivate::keyPressEvent(QKeyEvent *event)
-{
- int charX = (_cursorX - _xPosHex) / _charWidth;
- int posX = (charX / 3) * 2 + (charX % 3);
- int posBa = (_cursorY / _charHeight) * BYTES_PER_LINE + posX / 2;
-
-
-/*****************************************************************************/
-/* Cursor movements */
-/*****************************************************************************/
-
- if (event->matches(QKeySequence::MoveToNextChar))
- {
- setCursorPos(_cursorPosition + 1);
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToPreviousChar))
- {
- setCursorPos(_cursorPosition - 1);
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToEndOfLine))
- {
- setCursorPos(_cursorPosition | (2 * BYTES_PER_LINE -1));
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToStartOfLine))
- {
- setCursorPos(_cursorPosition - (_cursorPosition % (2 * BYTES_PER_LINE)));
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToPreviousLine))
- {
- setCursorPos(_cursorPosition - (2 * BYTES_PER_LINE));
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToNextLine))
- {
- setCursorPos(_cursorPosition + (2 * BYTES_PER_LINE));
- resetSelection(_cursorPosition);
- }
-
- if (event->matches(QKeySequence::MoveToNextPage))
- {
- setCursorPos(_cursorPosition + (((_scrollArea->viewport()->height() / _charHeight) - 1) * 2 * BYTES_PER_LINE));
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToPreviousPage))
- {
- setCursorPos(_cursorPosition - (((_scrollArea->viewport()->height() / _charHeight) - 1) * 2 * BYTES_PER_LINE));
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToEndOfDocument))
- {
- setCursorPos(_xData.size() * 2);
- resetSelection(_cursorPosition);
- }
- if (event->matches(QKeySequence::MoveToStartOfDocument))
- {
- setCursorPos(0);
- resetSelection(_cursorPosition);
- }
-
-/*****************************************************************************/
-/* Select commands */
-/*****************************************************************************/
- if (event->matches(QKeySequence::SelectAll))
- {
- resetSelection(0);
- setSelection(2*_xData.size() + 1);
- }
- if (event->matches(QKeySequence::SelectNextChar))
- {
- int pos = _cursorPosition + 1;
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectPreviousChar))
- {
- int pos = _cursorPosition - 1;
- setSelection(pos);
- setCursorPos(pos);
- }
- if (event->matches(QKeySequence::SelectEndOfLine))
- {
- int pos = _cursorPosition - (_cursorPosition % (2 * BYTES_PER_LINE)) + (2 * BYTES_PER_LINE);
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectStartOfLine))
- {
- int pos = _cursorPosition - (_cursorPosition % (2 * BYTES_PER_LINE));
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectPreviousLine))
- {
- int pos = _cursorPosition - (2 * BYTES_PER_LINE);
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectNextLine))
- {
- int pos = _cursorPosition + (2 * BYTES_PER_LINE);
- setCursorPos(pos);
- setSelection(pos);
- }
-
- if (event->matches(QKeySequence::SelectNextPage))
- {
- int pos = _cursorPosition + (((_scrollArea->viewport()->height() / _charHeight) - 1) * 2 * BYTES_PER_LINE);
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectPreviousPage))
- {
- int pos = _cursorPosition - (((_scrollArea->viewport()->height() / _charHeight) - 1) * 2 * BYTES_PER_LINE);
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectEndOfDocument))
- {
- int pos = _xData.size() * 2;
- setCursorPos(pos);
- setSelection(pos);
- }
- if (event->matches(QKeySequence::SelectStartOfDocument))
- {
- int pos = 0;
- setCursorPos(pos);
- setSelection(pos);
- }
-
-/*****************************************************************************/
-/* Edit Commands */
-/*****************************************************************************/
-if (!_readOnly)
-{
- /* Hex input */
- int key = int(event->text()[0].toLatin1());
- if ((key>='0' && key<='9') || (key>='a' && key <= 'f'))
- {
- if (getSelectionBegin() != getSelectionEnd())
- {
- posBa = getSelectionBegin();
- remove(posBa, getSelectionEnd() - posBa);
- setCursorPos(2*posBa);
- resetSelection(2*posBa);
- }
-
- // If insert mode, then insert a byte
- if (_overwriteMode == false)
- if ((charX % 3) == 0)
- {
- insert(posBa, char(0));
- }
-
- // Change content
- if (_xData.size() > 0)
- {
- QByteArray hexValue = _xData.data().mid(posBa, 1).toHex();
- if ((charX % 3) == 0)
- hexValue[0] = key;
- else
- hexValue[1] = key;
-
- replace(posBa, QByteArray().fromHex(hexValue)[0]);
-
- setCursorPos(_cursorPosition + 1);
- resetSelection(_cursorPosition);
- }
- }
-
- /* Cut & Paste */
- if (event->matches(QKeySequence::Cut))
- {
- QString result = QString();
- for (int idx = getSelectionBegin(); idx < getSelectionEnd(); idx++)
- {
- result += _xData.data().mid(idx, 1).toHex() + " ";
- if ((idx % 16) == 15)
- result.append("\n");
- }
- remove(getSelectionBegin(), getSelectionEnd() - getSelectionBegin());
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->setText(result);
- setCursorPos(getSelectionBegin());
- resetSelection(getSelectionBegin());
- }
-
- if (event->matches(QKeySequence::Paste))
- {
- QClipboard *clipboard = QApplication::clipboard();
- QByteArray ba = QByteArray().fromHex(clipboard->text().toLatin1());
- insert(_cursorPosition / 2, ba);
- setCursorPos(_cursorPosition + 2 * ba.length());
- resetSelection(getSelectionBegin());
- }
-
-
- /* Delete char */
- if (event->matches(QKeySequence::Delete))
- {
- if (getSelectionBegin() != getSelectionEnd())
- {
- posBa = getSelectionBegin();
- remove(posBa, getSelectionEnd() - posBa);
- setCursorPos(2*posBa);
- resetSelection(2*posBa);
- }
- else
- {
- if (_overwriteMode)
- replace(posBa, char(0));
- else
- remove(posBa, 1);
- }
- }
-
- /* Backspace */
- if ((event->key() == Qt::Key_Backspace) && (event->modifiers() == Qt::NoModifier))
- {
- if (getSelectionBegin() != getSelectionEnd())
- {
- posBa = getSelectionBegin();
- remove(posBa, getSelectionEnd() - posBa);
- setCursorPos(2*posBa);
- resetSelection(2*posBa);
- }
- else
- {
- if (posBa > 0)
- {
- if (_overwriteMode)
- replace(posBa - 1, char(0));
- else
- remove(posBa - 1, 1);
- setCursorPos(_cursorPosition - 2);
- }
- }
- }
-
- /* undo */
- if (event->matches(QKeySequence::Undo))
- {
- undo();
- }
-
- /* redo */
- if (event->matches(QKeySequence::Redo))
- {
- redo();
- }
-
- }
-
- if (event->matches(QKeySequence::Copy))
- {
- QString result = QString();
- for (int idx = getSelectionBegin(); idx < getSelectionEnd(); idx++)
- {
- result += _xData.data().mid(idx, 1).toHex() + " ";
- if ((idx % 16) == 15)
- result.append('\n');
- }
- QClipboard *clipboard = QApplication::clipboard();
- clipboard->setText(result);
- }
-
- // Switch between insert/overwrite mode
- if ((event->key() == Qt::Key_Insert) && (event->modifiers() == Qt::NoModifier))
- {
- _overwriteMode = !_overwriteMode;
- setCursorPos(_cursorPosition);
- overwriteModeChanged(_overwriteMode);
- }
-
- ensureVisible();
- update();
-}
-
-void QHexEditPrivate::mouseMoveEvent(QMouseEvent * event)
-{
- _blink = false;
- update();
- int actPos = cursorPos(event->pos());
- setCursorPos(actPos);
- setSelection(actPos);
-}
-
-void QHexEditPrivate::mousePressEvent(QMouseEvent * event)
-{
- _blink = false;
- update();
- int cPos = cursorPos(event->pos());
- resetSelection(cPos);
- setCursorPos(cPos);
-}
-
-void QHexEditPrivate::paintEvent(QPaintEvent *event)
-{
- QPainter painter(this);
-
- // draw some patterns if needed
- painter.fillRect(event->rect(), this->palette().color(QPalette::Base));
- if (_addressArea)
- painter.fillRect(QRect(_xPosAdr, event->rect().top(), _xPosHex - GAP_ADR_HEX + 2, height()), _addressAreaColor);
- if (_asciiArea)
- {
- int linePos = _xPosAscii - (GAP_HEX_ASCII / 2);
- painter.setPen(Qt::gray);
- painter.drawLine(linePos, event->rect().top(), linePos, height());
- }
-
- painter.setPen(this->palette().color(QPalette::WindowText));
-
- // calc position
- int firstLineIdx = ((event->rect().top()/ _charHeight) - _charHeight) * BYTES_PER_LINE;
- if (firstLineIdx < 0)
- firstLineIdx = 0;
- int lastLineIdx = ((event->rect().bottom() / _charHeight) + _charHeight) * BYTES_PER_LINE;
- if (lastLineIdx > _xData.size())
- lastLineIdx = _xData.size();
- int yPosStart = ((firstLineIdx) / BYTES_PER_LINE) * _charHeight + _charHeight;
-
- // paint address area
- if (_addressArea)
- {
- for (int lineIdx = firstLineIdx, yPos = yPosStart; lineIdx < lastLineIdx; lineIdx += BYTES_PER_LINE, yPos +=_charHeight)
- {
- QString address = QString("%1")
- .arg(lineIdx + _xData.addressOffset(), _xData.realAddressNumbers(), 16, QChar('0'));
- painter.drawText(_xPosAdr, yPos, address);
- }
- }
-
- // paint hex area
- QByteArray hexBa(_xData.data().mid(firstLineIdx, lastLineIdx - firstLineIdx + 1).toHex());
- QBrush highLighted = QBrush(_highlightingColor);
- QPen colHighlighted = QPen(this->palette().color(QPalette::WindowText));
- QBrush selected = QBrush(_selectionColor);
- QPen colSelected = QPen(Qt::white);
- QPen colStandard = QPen(this->palette().color(QPalette::WindowText));
-
- painter.setBackgroundMode(Qt::TransparentMode);
-
- for (int lineIdx = firstLineIdx, yPos = yPosStart; lineIdx < lastLineIdx; lineIdx += BYTES_PER_LINE, yPos +=_charHeight)
- {
- QByteArray hex;
- int xPos = _xPosHex;
- for (int colIdx = 0; ((lineIdx + colIdx) < _xData.size() && (colIdx < BYTES_PER_LINE)); colIdx++)
- {
- int posBa = lineIdx + colIdx;
- if ((getSelectionBegin() <= posBa) && (getSelectionEnd() > posBa))
- {
- painter.setBackground(selected);
- painter.setBackgroundMode(Qt::OpaqueMode);
- painter.setPen(colSelected);
- }
- else
- {
- if (_highlighting)
- {
- // hilight diff bytes
- painter.setBackground(highLighted);
- if (_xData.dataChanged(posBa))
- {
- painter.setPen(colHighlighted);
- painter.setBackgroundMode(Qt::OpaqueMode);
- }
- else
- {
- painter.setPen(colStandard);
- painter.setBackgroundMode(Qt::TransparentMode);
- }
- }
- }
-
- // render hex value
- if (colIdx == 0)
- {
- hex = hexBa.mid((lineIdx - firstLineIdx) * 2, 2);
- painter.drawText(xPos, yPos, hex);
- xPos += 2 * _charWidth;
- } else {
- hex = hexBa.mid((lineIdx + colIdx - firstLineIdx) * 2, 2).prepend(" ");
- painter.drawText(xPos, yPos, hex);
- xPos += 3 * _charWidth;
- }
-
- }
- }
- painter.setBackgroundMode(Qt::TransparentMode);
- painter.setPen(this->palette().color(QPalette::WindowText));
-
- // paint ascii area
- if (_asciiArea)
- {
- for (int lineIdx = firstLineIdx, yPos = yPosStart; lineIdx < lastLineIdx; lineIdx += BYTES_PER_LINE, yPos +=_charHeight)
- {
- int xPosAscii = _xPosAscii;
- for (int colIdx = 0; ((lineIdx + colIdx) < _xData.size() && (colIdx < BYTES_PER_LINE)); colIdx++)
- {
- painter.drawText(xPosAscii, yPos, _xData.asciiChar(lineIdx + colIdx));
- xPosAscii += _charWidth;
- }
- }
- }
-
- // paint cursor
- if (_blink && !_readOnly && hasFocus())
- {
- if (_overwriteMode)
- painter.fillRect(_cursorX, _cursorY + _charHeight - 2, _charWidth, 2, this->palette().color(QPalette::WindowText));
- else
- painter.fillRect(_cursorX, _cursorY, 2, _charHeight, this->palette().color(QPalette::WindowText));
- }
-
- if (_size != _xData.size())
- {
- _size = _xData.size();
- emit currentSizeChanged(_size);
- }
-}
-
-void QHexEditPrivate::setCursorPos(int position)
-{
- // delete cursor
- _blink = false;
- update();
-
- // cursor in range?
- if (_overwriteMode)
- {
- if (position > (_xData.size() * 2 - 1))
- position = _xData.size() * 2 - 1;
- } else {
- if (position > (_xData.size() * 2))
- position = _xData.size() * 2;
- }
-
- if (position < 0)
- position = 0;
-
- // calc position
- _cursorPosition = position;
- _cursorY = (position / (2 * BYTES_PER_LINE)) * _charHeight + 4;
- int x = (position % (2 * BYTES_PER_LINE));
- _cursorX = (((x / 2) * 3) + (x % 2)) * _charWidth + _xPosHex;
-
- // immiadately draw cursor
- _blink = true;
- update();
- emit currentAddressChanged(_cursorPosition/2);
-}
-
-int QHexEditPrivate::cursorPos(QPoint pos)
-{
- int result = -1;
- // find char under cursor
- if ((pos.x() >= _xPosHex) && (pos.x() < (_xPosHex + HEXCHARS_IN_LINE * _charWidth)))
- {
- int x = (pos.x() - _xPosHex) / _charWidth;
- if ((x % 3) == 0)
- x = (x / 3) * 2;
- else
- x = ((x / 3) * 2) + 1;
- int y = ((pos.y() - 3) / _charHeight) * 2 * BYTES_PER_LINE;
- result = x + y;
- }
- return result;
-}
-
-int QHexEditPrivate::cursorPos()
-{
- return _cursorPosition;
-}
-
-void QHexEditPrivate::resetSelection()
-{
- _selectionBegin = _selectionInit;
- _selectionEnd = _selectionInit;
-}
-
-void QHexEditPrivate::resetSelection(int pos)
-{
- if (pos < 0)
- pos = 0;
- pos = pos / 2;
- _selectionInit = pos;
- _selectionBegin = pos;
- _selectionEnd = pos;
-}
-
-void QHexEditPrivate::setSelection(int pos)
-{
- if (pos < 0)
- pos = 0;
- pos = pos / 2;
- if (pos >= _selectionInit)
- {
- _selectionEnd = pos;
- _selectionBegin = _selectionInit;
- }
- else
- {
- _selectionBegin = pos;
- _selectionEnd = _selectionInit;
- }
-}
-
-int QHexEditPrivate::getSelectionBegin()
-{
- return _selectionBegin;
-}
-
-int QHexEditPrivate::getSelectionEnd()
-{
- return _selectionEnd;
-}
-
-
-void QHexEditPrivate::updateCursor()
-{
- if (_blink)
- _blink = false;
- else
- _blink = true;
- update(_cursorX, _cursorY, _charWidth, _charHeight);
-}
-
-void QHexEditPrivate::adjust()
-{
- _charWidth = fontMetrics().width(QLatin1Char('9'));
- _charHeight = fontMetrics().height();
-
- _xPosAdr = 0;
- if (_addressArea)
- _xPosHex = _xData.realAddressNumbers()*_charWidth + GAP_ADR_HEX;
- else
- _xPosHex = 0;
- _xPosAscii = _xPosHex + HEXCHARS_IN_LINE * _charWidth + GAP_HEX_ASCII;
-
- // tell QAbstractScollbar, how big we are
- setMinimumHeight(((_xData.size()/16 + 1) * _charHeight) + 5);
- if(_asciiArea)
- setMinimumWidth(_xPosAscii + (BYTES_PER_LINE * _charWidth));
- else
- setMinimumWidth(_xPosHex + HEXCHARS_IN_LINE * _charWidth);
-
- update();
-}
-
-void QHexEditPrivate::ensureVisible()
-{
- // scrolls to cursorx, cusory (which are set by setCursorPos)
- // x-margin is 3 pixels, y-margin is half of charHeight
- _scrollArea->ensureVisible(_cursorX, _cursorY + _charHeight/2, 3, _charHeight/2 + 2);
-}
diff --git a/externals/qhexedit/qhexedit_p.h b/externals/qhexedit/qhexedit_p.h
deleted file mode 100644
index 1c2c11cc2..000000000
--- a/externals/qhexedit/qhexedit_p.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef QHEXEDIT_P_H
-#define QHEXEDIT_P_H
-
-/** \cond docNever */
-
-
-#include <QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets>
-#endif
-#include "xbytearray.h"
-
-class QHexEditPrivate : public QWidget
-{
-Q_OBJECT
-
-public:
- QHexEditPrivate(QScrollArea *parent);
-
- void setAddressAreaColor(QColor const &color);
- QColor addressAreaColor();
-
- void setAddressOffset(int offset);
- int addressOffset();
-
- void setCursorPos(int position);
- int cursorPos();
-
- void setData(QByteArray const &data);
- QByteArray data();
-
- void setHighlightingColor(QColor const &color);
- QColor highlightingColor();
-
- void setOverwriteMode(bool overwriteMode);
- bool overwriteMode();
-
- void setReadOnly(bool readOnly);
- bool isReadOnly();
-
- void setSelectionColor(QColor const &color);
- QColor selectionColor();
-
- XByteArray & xData();
-
- int indexOf(const QByteArray & ba, int from = 0);
- void insert(int index, const QByteArray & ba);
- void insert(int index, char ch);
- int lastIndexOf(const QByteArray & ba, int from = 0);
- void remove(int index, int len=1);
- void replace(int index, char ch);
- void replace(int index, const QByteArray & ba);
- void replace(int pos, int len, const QByteArray & after);
-
- void setAddressArea(bool addressArea);
- void setAddressWidth(int addressWidth);
- void setAsciiArea(bool asciiArea);
- void setHighlighting(bool mode);
- virtual void setFont(const QFont &font);
-
- void undo();
- void redo();
-
- QString toRedableString();
- QString selectionToReadableString();
-
-signals:
- void currentAddressChanged(int address);
- void currentSizeChanged(int size);
- void dataChanged();
- void overwriteModeChanged(bool state);
-
-protected:
- void keyPressEvent(QKeyEvent * event);
- void mouseMoveEvent(QMouseEvent * event);
- void mousePressEvent(QMouseEvent * event);
-
- void paintEvent(QPaintEvent *event);
-
- int cursorPos(QPoint pos); // calc cursorpos from graphics position. DOES NOT STORE POSITION
-
- void resetSelection(int pos); // set selectionStart and selectionEnd to pos
- void resetSelection(); // set selectionEnd to selectionStart
- void setSelection(int pos); // set min (if below init) or max (if greater init)
- int getSelectionBegin();
- int getSelectionEnd();
-
-
-private slots:
- void updateCursor();
-
-private:
- void adjust();
- void ensureVisible();
-
- QColor _addressAreaColor;
- QColor _highlightingColor;
- QColor _selectionColor;
- QScrollArea *_scrollArea;
- QTimer _cursorTimer;
- QUndoStack *_undoStack;
-
- XByteArray _xData; // Hält den Inhalt des Hex Editors
-
- bool _blink; // true: then cursor blinks
- bool _renderingRequired; // Flag to store that rendering is necessary
- bool _addressArea; // left area of QHexEdit
- bool _asciiArea; // medium area
- bool _highlighting; // highlighting of changed bytes
- bool _overwriteMode;
- bool _readOnly; // true: the user can only look and navigate
-
- int _charWidth, _charHeight; // char dimensions (dpendend on font)
- int _cursorX, _cursorY; // graphics position of the cursor
- int _cursorPosition; // character positioin in stream (on byte ends in to steps)
- int _xPosAdr, _xPosHex, _xPosAscii; // graphics x-position of the areas
-
- int _selectionBegin; // First selected char
- int _selectionEnd; // Last selected char
- int _selectionInit; // That's, where we pressed the mouse button
-
- int _size;
-};
-
-/** \endcond docNever */
-
-#endif
-
diff --git a/externals/qhexedit/xbytearray.cpp b/externals/qhexedit/xbytearray.cpp
deleted file mode 100644
index 09a04cfeb..000000000
--- a/externals/qhexedit/xbytearray.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-#include "xbytearray.h"
-
-XByteArray::XByteArray()
-{
- _oldSize = -99;
- _addressNumbers = 4;
- _addressOffset = 0;
-
-}
-
-int XByteArray::addressOffset()
-{
- return _addressOffset;
-}
-
-void XByteArray::setAddressOffset(int offset)
-{
- _addressOffset = offset;
-}
-
-int XByteArray::addressWidth()
-{
- return _addressNumbers;
-}
-
-void XByteArray::setAddressWidth(int width)
-{
- if ((width >= 0) && (width<=6))
- {
- _addressNumbers = width;
- }
-}
-
-QByteArray & XByteArray::data()
-{
- return _data;
-}
-
-void XByteArray::setData(QByteArray data)
-{
- _data = data;
- _changedData = QByteArray(data.length(), char(0));
-}
-
-bool XByteArray::dataChanged(int i)
-{
- return bool(_changedData[i]);
-}
-
-QByteArray XByteArray::dataChanged(int i, int len)
-{
- return _changedData.mid(i, len);
-}
-
-void XByteArray::setDataChanged(int i, bool state)
-{
- _changedData[i] = char(state);
-}
-
-void XByteArray::setDataChanged(int i, const QByteArray & state)
-{
- int length = state.length();
- int len;
- if ((i + length) > _changedData.length())
- len = _changedData.length() - i;
- else
- len = length;
- _changedData.replace(i, len, state);
-}
-
-int XByteArray::realAddressNumbers()
-{
- if (_oldSize != _data.size())
- {
- // is addressNumbers wide enought?
- QString test = QString("%1")
- .arg(_data.size() + _addressOffset, _addressNumbers, 16, QChar('0'));
- _realAddressNumbers = test.size();
- }
- return _realAddressNumbers;
-}
-
-int XByteArray::size()
-{
- return _data.size();
-}
-
-QByteArray & XByteArray::insert(int i, char ch)
-{
- _data.insert(i, ch);
- _changedData.insert(i, char(1));
- return _data;
-}
-
-QByteArray & XByteArray::insert(int i, const QByteArray & ba)
-{
- _data.insert(i, ba);
- _changedData.insert(i, QByteArray(ba.length(), char(1)));
- return _data;
-}
-
-QByteArray & XByteArray::remove(int i, int len)
-{
- _data.remove(i, len);
- _changedData.remove(i, len);
- return _data;
-}
-
-QByteArray & XByteArray::replace(int index, char ch)
-{
- _data[index] = ch;
- _changedData[index] = char(1);
- return _data;
-}
-
-QByteArray & XByteArray::replace(int index, const QByteArray & ba)
-{
- int len = ba.length();
- return replace(index, len, ba);
-}
-
-QByteArray & XByteArray::replace(int index, int length, const QByteArray & ba)
-{
- int len;
- if ((index + length) > _data.length())
- len = _data.length() - index;
- else
- len = length;
- _data.replace(index, len, ba.mid(0, len));
- _changedData.replace(index, len, QByteArray(len, char(1)));
- return _data;
-}
-
-QChar XByteArray::asciiChar(int index)
-{
- char ch = _data[index];
- if ((ch < 0x20) || (ch > 0x7e))
- ch = '.';
- return QChar(ch);
-}
-
-QString XByteArray::toRedableString(int start, int end)
-{
- int adrWidth = realAddressNumbers();
- if (_addressNumbers > adrWidth)
- adrWidth = _addressNumbers;
- if (end < 0)
- end = _data.size();
-
- QString result;
- for (int i=start; i < end; i += 16)
- {
- QString adrStr = QString("%1").arg(_addressOffset + i, adrWidth, 16, QChar('0'));
- QString hexStr;
- QString ascStr;
- for (int j=0; j<16; j++)
- {
- if ((i + j) < _data.size())
- {
- hexStr.append(" ").append(_data.mid(i+j, 1).toHex());
- ascStr.append(asciiChar(i+j));
- }
- }
- result += adrStr + " " + QString("%1").arg(hexStr, -48) + " " + QString("%1").arg(ascStr, -17) + "\n";
- }
- return result;
-}
diff --git a/externals/qhexedit/xbytearray.h b/externals/qhexedit/xbytearray.h
deleted file mode 100644
index 2b67c61b8..000000000
--- a/externals/qhexedit/xbytearray.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef XBYTEARRAY_H
-#define XBYTEARRAY_H
-
-/** \cond docNever */
-
-#include <QtCore>
-
-/*! XByteArray represents the content of QHexEcit.
-XByteArray comprehend the data itself and informations to store if it was
-changed. The QHexEdit component uses these informations to perform nice
-rendering of the data
-
-XByteArray also provides some functionality to insert, replace and remove
-single chars and QByteArras. Additionally some functions support rendering
-and converting to readable strings.
-*/
-class XByteArray
-{
-public:
- explicit XByteArray();
-
- int addressOffset();
- void setAddressOffset(int offset);
-
- int addressWidth();
- void setAddressWidth(int width);
-
- QByteArray & data();
- void setData(QByteArray data);
-
- bool dataChanged(int i);
- QByteArray dataChanged(int i, int len);
- void setDataChanged(int i, bool state);
- void setDataChanged(int i, const QByteArray & state);
-
- int realAddressNumbers();
- int size();
-
- QByteArray & insert(int i, char ch);
- QByteArray & insert(int i, const QByteArray & ba);
-
- QByteArray & remove(int pos, int len);
-
- QByteArray & replace(int index, char ch);
- QByteArray & replace(int index, const QByteArray & ba);
- QByteArray & replace(int index, int length, const QByteArray & ba);
-
- QChar asciiChar(int index);
- QString toRedableString(int start=0, int end=-1);
-
-signals:
-
-public slots:
-
-private:
- QByteArray _data;
- QByteArray _changedData;
-
- int _addressNumbers; // wanted width of address area
- int _addressOffset; // will be added to the real addres inside bytearray
- int _realAddressNumbers; // real width of address area (can be greater then wanted width)
- int _oldSize; // size of data
-};
-
-/** \endcond docNever */
-#endif // XBYTEARRAY_H
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 93f1c339d..d4460bf01 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -14,7 +14,6 @@ set(SRCS
debugger/graphics/graphics_tracing.cpp
debugger/graphics/graphics_vertex_shader.cpp
debugger/profiler.cpp
- debugger/ramview.cpp
debugger/registers.cpp
debugger/wait_tree.cpp
util/spinbox.cpp
@@ -48,7 +47,6 @@ set(HEADERS
debugger/graphics/graphics_tracing.h
debugger/graphics/graphics_vertex_shader.h
debugger/profiler.h
- debugger/ramview.h
debugger/registers.h
debugger/wait_tree.h
util/spinbox.h
@@ -100,7 +98,7 @@ if (APPLE)
else()
add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
endif()
-target_link_libraries(citra-qt core video_core audio_core common qhexedit)
+target_link_libraries(citra-qt core video_core audio_core common)
target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads)
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
deleted file mode 100644
index 10a09dda8..000000000
--- a/src/citra_qt/debugger/ramview.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include "citra_qt/debugger/ramview.h"
-
-GRamView::GRamView(QWidget* parent) : QHexEdit(parent) {}
-
-void GRamView::OnCPUStepped() {
- // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams...
- // setData(QByteArray((const char*)Mem_RAM,sizeof(Mem_RAM)/8));
-}
diff --git a/src/citra_qt/debugger/ramview.h b/src/citra_qt/debugger/ramview.h
deleted file mode 100644
index d01cea93b..000000000
--- a/src/citra_qt/debugger/ramview.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "qhexedit.h"
-
-class GRamView : public QHexEdit {
- Q_OBJECT
-
-public:
- explicit GRamView(QWidget* parent = nullptr);
-
-public slots:
- void OnCPUStepped();
-};
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 6d59cf640..f765c0147 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -12,6 +12,7 @@
#include <QFileDialog>
#include <QMessageBox>
#include <QtGui>
+#include <QtWidgets>
#include "citra_qt/bootmanager.h"
#include "citra_qt/config.h"
#include "citra_qt/configure_dialog.h"
@@ -24,7 +25,6 @@
#include "citra_qt/debugger/graphics/graphics_tracing.h"
#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
#include "citra_qt/debugger/profiler.h"
-#include "citra_qt/debugger/ramview.h"
#include "citra_qt/debugger/registers.h"
#include "citra_qt/debugger/wait_tree.h"
#include "citra_qt/game_list.h"
@@ -46,7 +46,6 @@
#include "core/gdbstub/gdbstub.h"
#include "core/loader/loader.h"
#include "core/settings.h"
-#include "qhexedit.h"
#include "video_core/video_core.h"
#ifdef QT_STATICPLUGIN