Skip to content

Commit

Permalink
[iss-267]
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 85be7c2
Author: joaquin.f.fernandez <[email protected]>
Date:   Mon Sep 30 16:58:17 2024 -0300

    Updated gui header files.

commit d076904
Author: joaquin.f.fernandez <[email protected]>
Date:   Mon Sep 30 16:13:19 2024 -0300

    Update headers in files.

commit 369c7f3
Author: joaquin.f.fernandez <[email protected]>
Date:   Mon Sep 30 13:44:13 2024 -0300

    Modify header files extension.
  • Loading branch information
joaquinffernandez committed Oct 1, 2024
1 parent e6149be commit 33e6277
Show file tree
Hide file tree
Showing 259 changed files with 1,125 additions and 1,149 deletions.
2 changes: 1 addition & 1 deletion src/gui/codeeditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

#include <QtGui>

#include "codeeditor.h"
#include "codeeditor.hpp"

CodeEditor::CodeEditor(QWidget *parent) : QPlainTextEdit(parent)
{
Expand Down
File renamed without changes.
3 changes: 2 additions & 1 deletion src/gui/comboboxdelegate.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
******************************************************************************/

#include "comboboxdelegate.h"
#include <QComboBox>

#include "comboboxdelegate.hpp"

ComboBoxDelegate::ComboBoxDelegate(QObject *parent) : QItemDelegate(parent) {}

QWidget *ComboBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex & /* index */) const
Expand Down
File renamed without changes.
5 changes: 3 additions & 2 deletions src/gui/editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
******************************************************************************/

#include "editor.h"
ModelEditor* Editor::_instance = NULL;
#include "editor.hpp"

ModelEditor* Editor::_instance = nullptr;
3 changes: 2 additions & 1 deletion src/gui/editor.h → src/gui/editor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
#pragma once

#include <QtGui>
#include <modeleditor.h>

#include <modeleditor.hpp>

class Editor {
public:
Expand Down
2 changes: 1 addition & 1 deletion src/gui/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <QApplication>
#include <QDir>

#include <mmomegui.h>
#include <mmomegui.hpp>

int main(int argc, char *argv[])
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/mmohighlight.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <QtGui>

#include "mmohighlight.h"
#include "mmohighlight.hpp"

MmoHighlighter::MmoHighlighter(QTextDocument *parent, h_type file) : QSyntaxHighlighter(parent)
{
Expand Down
File renamed without changes.
22 changes: 11 additions & 11 deletions src/gui/mmome.pro
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ SOURCES += main.cpp \
comboboxdelegate.cpp

# Headers.
HEADERS += mmomegui.h \
modeleditor.h \
mmohighlight.h \
treemodel.h \
editor.h \
codeeditor.h \
modelinfo.h \
runform.h \
utils.h \
settings.h \
comboboxdelegate.h
HEADERS += mmomegui.hpp \
modeleditor.hpp \
mmohighlight.hpp \
treemodel.hpp \
editor.hpp \
codeeditor.hpp \
modelinfo.hpp \
runform.hpp \
utils.hpp \
settings.hpp \
comboboxdelegate.hpp

# Forms.
FORMS += $$UI_DIR/mmomegui.ui \
Expand Down
22 changes: 10 additions & 12 deletions src/gui/mmomegui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,21 @@
******************************************************************************/

#include <sys/types.h>
#include <signal.h>

#include <QMdiSubWindow>
#include <QFileDialog>
#include <QMessageBox>
#include <Qt>

#include <mmomegui.h>
#include <editor.h>
#include <treemodel.h>
#include <utils.h>
#include <comboboxdelegate.h>
#include <runform.h>
#include <settings.h>

#ifdef Q_OS_LINUX
#include <sys/types.h>
#include <signal.h>
#endif
#include <mmomegui.hpp>
#include <editor.hpp>
#include <treemodel.hpp>
#include <utils.hpp>
#include <comboboxdelegate.hpp>
#include <runform.hpp>
#include <settings.hpp>

#define SLASH '/'

Expand Down
File renamed without changes.
9 changes: 5 additions & 4 deletions src/gui/modeleditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@
#include <QFileDialog>
#include <QMessageBox>
#include <Qt>
#include <modeleditor.h>
#include <mmohighlight.h>
#include <modelinfo.h>
#include <codeeditor.h>

#include <modeleditor.hpp>
#include <mmohighlight.hpp>
#include <modelinfo.hpp>
#include <codeeditor.hpp>

ModelEditor::ModelEditor(QWidget *parent, QString name)
: QDialog(parent),
Expand Down
3 changes: 2 additions & 1 deletion src/gui/modeleditor.h → src/gui/modeleditor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
#include <QTabWidget>
#include <QTextCursor>
#include <ui/ui_modeleditor.h>
#include <utils.h>

#include <utils.hpp>

class ModelInfo;
class MmoHighlighter;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/modelinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <QFileInfo>

#include "modelinfo.h"
#include "modelinfo.hpp"

ModelInfo::ModelInfo(QString fullname)
{
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/gui/runform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <QtGui>
#include <QListView>

#include <runform.h>
#include <utils.h>
#include <runform.hpp>
#include <utils.hpp>

RunDlg::RunDlg(QWidget *parent) : QDialog(parent)
{
Expand Down
3 changes: 2 additions & 1 deletion src/gui/runform.h → src/gui/runform.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@

#include <QtGui>
#include "./ui/ui_run.h"
#include "utils.h"

#include "utils.hpp"

class RunDlg : public QDialog, public Ui::RunForm {
Q_OBJECT
Expand Down
4 changes: 2 additions & 2 deletions src/gui/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <QtGui>
#include <Qt>

#include <settings.h>
#include <utils.h>
#include <settings.hpp>
#include <utils.hpp>

SettingsDlg::SettingsDlg(QWidget *parent) : QDialog(parent)
{
Expand Down
13 changes: 2 additions & 11 deletions src/gui/settings.h → src/gui/settings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,13 @@

#include <QtGui>
#include "./ui/ui_settings.h"
#include "utils.h"

/**
*
*/
#include "utils.hpp"

class SettingsDlg : public QDialog, public Ui::Settings {
Q_OBJECT
public:
/**
*
* @param parent
*/
SettingsDlg(QWidget *parent = NULL);
/**
*
*/
~SettingsDlg();
private slots:
void _save();
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/gui/treemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include <QDir>
#include <QFileInfo>

#include "treemodel.h"
#include "comboboxdelegate.h"
#include "treemodel.hpp"
#include "comboboxdelegate.hpp"

TreeModel::TreeModel(const QStringList &headers, QObject *parent) : QStandardItemModel(parent) { setHorizontalHeaderLabels(headers); }

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/gui/utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
******************************************************************************/

#include "utils.h"
#include "utils.hpp"

QString Utils::appCommand(AppCmds cmd)
{
Expand Down
File renamed without changes.
22 changes: 11 additions & 11 deletions src/mmoc/ast/ast_builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
#include <list>
#include <string>

#include "ast_builder.h"
#include "ast_builder.hpp"
#include <ast/parser/mocc_parser.h>
#include "ast_types.h"
#include "../util/ast_util.h"
#include "class.h"
#include "composition.h"
#include "element.h"
#include "equation.h"
#include "expression.h"
#include "modification.h"
#include "statement.h"
#include "stored_definition.h"
#include "ast_types.hpp"
#include "../util/ast_util.hpp"
#include "class.hpp"
#include "composition.hpp"
#include "element.hpp"
#include "equation.hpp"
#include "expression.hpp"
#include "modification.hpp"
#include "statement.hpp"
#include "stored_definition.hpp"

class MCC_Parser;
class MCC_Lexer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <string>

#include "ast_types.h"
#include "ast_types.hpp"

/* Constructors */
AST_ArgumentList newAST_ArgumentList();
Expand Down
2 changes: 1 addition & 1 deletion src/mmoc/ast/ast_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
******************************************************************************/

#include "ast_node.h"
#include "ast_node.hpp"

#include <iostream>
#include <sstream>
Expand Down
4 changes: 2 additions & 2 deletions src/mmoc/ast/ast_node.h → src/mmoc/ast/ast_node.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#pragma once

#include "../util/macros.h"
#include "../util/util_types.h"
#include "../util/macros.hpp"
#include "../util/util_types.hpp"

class AST_Visitor;

Expand Down
4 changes: 2 additions & 2 deletions src/mmoc/ast/ast_printer.h → src/mmoc/ast/ast_printer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#pragme once

#include <ast/ast_types.h>
#include <util/macros.h>
#include <ast/ast_types.hpp>
#include <util/macros.hpp>

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion src/mmoc/ast/ast_types.h → src/mmoc/ast/ast_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <set>
#include <string>

#include "../util/macros.h"
#include "../util/macros.hpp"

#define MAKE_SPACE \
for (int __i = 0; __i < block; __i++) ret << " ";
Expand Down
10 changes: 5 additions & 5 deletions src/mmoc/ast/class.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
******************************************************************************/

#include "class.h"
#include "class.hpp"

#include <stddef.h>
#include <iostream>
#include <list>

#include "../util/ast_util.h"
#include "ast_builder.h"
#include "composition.h"
#include "element.h"
#include "../util/ast_util.hpp"
#include "ast_builder.hpp"
#include "composition.hpp"
#include "element.hpp"

AST_Class_::AST_Class_(AST_String n, AST_Composition comp)
: _name(n), _composition(comp), _father(nullptr), _basic(false), _encapsulated(false), _final(false), _prefix()
Expand Down
8 changes: 4 additions & 4 deletions src/mmoc/ast/class.h → src/mmoc/ast/class.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
#ifndef AST_CLASS_H_
#define AST_CLASS_H_

#include "../util/macros.h"
#include "../util/util_types.h"
#include "ast_node.h"
#include "ast_types.h"
#include "../util/macros.hpp"
#include "../util/util_types.hpp"
#include "ast_node.hpp"
#include "ast_types.hpp"

class AST_Class_ : public AST_Node_ {
public:
Expand Down
16 changes: 8 additions & 8 deletions src/mmoc/ast/composition.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
******************************************************************************/

#include "composition.h"
#include "composition.hpp"

#include <iostream>
#include <list>

#include "../util/ast_util.h"
#include "ast_builder.h"
#include "element.h"
#include "equation.h"
#include "expression.h"
#include "modification.h"
#include "statement.h"
#include "../util/ast_util.hpp"
#include "ast_builder.hpp"
#include "element.hpp"
#include "equation.hpp"
#include "expression.hpp"
#include "modification.hpp"
#include "statement.hpp"

/* Composition Class */

Expand Down
8 changes: 4 additions & 4 deletions src/mmoc/ast/composition.h → src/mmoc/ast/composition.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

#include <string>

#include "../util/macros.h"
#include "../util/util_types.h"
#include "ast_node.h"
#include "ast_types.h"
#include "../util/macros.hpp"
#include "../util/util_types.hpp"
#include "ast_node.hpp"
#include "ast_types.hpp"

class AST_CompositionElement_;

Expand Down
Loading

0 comments on commit 33e6277

Please sign in to comment.