aboutsummaryrefslogtreecommitdiff
path: root/include/aotextedit.h
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2020-05-02 21:29:06 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-05-02 21:29:06 -0500
commitbbdad2a40d8f02fe738830d9cf66ad4ec2fa86cf (patch)
tree8e8892d24684f005b0e18624677957791e1738b7 /include/aotextedit.h
parent1e2d71fb96ca85fa50c172c2f1cf22b2620bacd2 (diff)
parent992c0b14e155059a7e22ad72c0309b620c850a46 (diff)
Merge branch '2.7-rc'
Includes full code reformat. # Conflicts: # src/aomusicplayer.cpp # src/path_functions.cpp
Diffstat (limited to 'include/aotextedit.h')
-rw-r--r--include/aotextedit.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/aotextedit.h b/include/aotextedit.h
index 85909c6..8d876f1 100644
--- a/include/aotextedit.h
+++ b/include/aotextedit.h
@@ -3,8 +3,7 @@
#include <QPlainTextEdit>
-class AOTextEdit : public QPlainTextEdit
-{
+class AOTextEdit : public QPlainTextEdit {
Q_OBJECT
public:
AOTextEdit(QWidget *parent);
@@ -17,7 +16,6 @@ signals:
private slots:
void on_enter_pressed();
-
};
#endif // AOTEXTEDIT_H