optimize some includes (and fix some for old g++)

CE-Programming · Sep 5, 2024 · 2f237a0 · 2f237a0
1 parent ddd1470
commit 2f237a0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 22 deletions.
diff --git a/gui/qt/mainwindow.cpp b/gui/qt/mainwindow.cpp
@@ -4,29 +4,17 @@
 #include "sendinghandler.h"
 #include "visualizerwidget.h"
 #include "dockwidget.h"
-#include "searchwidget.h"
 #include "basiccodeviewerwindow.h"
 #include "capture/animated-png.h"
+#include "keypad/qtkeypadbridge.h"
 #include "tivars_lib_cpp/src/TIModels.h"
 #include "tivars_lib_cpp/src/TIVarTypes.h"
 #include "tivars_lib_cpp/src/TypeHandlers/TypeHandlers.h"
 #include "../../core/emu.h"
 #include "../../core/asic.h"
 #include "../../core/cpu.h"
-#include "../../core/misc.h"
 #include "../../core/mem.h"
 #include "../../core/extras.h"
-#include "../../core/interrupt.h"
-#include "../../core/keypad.h"
-#include "../../core/control.h"
-#include "../../core/flash.h"
-#include "../../core/lcd.h"
-#include "../../core/spi.h"
-#include "../../core/backlight.h"
-#include "../../core/timers.h"
-#include "../../core/usb/usb.h"
-#include "../../core/realclock.h"
-#include "../../core/sha256.h"
 #include "../../core/link.h"
 #include "../../tests/autotester/crc32.hpp"
 #include "../../tests/autotester/autotester.h"
@@ -35,21 +23,21 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QBuffer>
 #include <QtCore/QProcess>
+#include <QtGui/QFont>
 #include <QtGui/QWindow>
 #include <QtGui/QDesktopServices>
 #include <QtGui/QClipboard>
 #include <QtGui/QScreen>
 #include <QShortcut> /* Different module in Qt5 vs Qt6 */
 #include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QProgressDialog>
 #include <QtWidgets/QInputDialog>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QScrollBar>
-#include <QtNetwork/QNetworkAccessManager>
+#include <QtWidgets/QMessageBox>
 #include <QtNetwork/QNetworkReply>
 #include <fstream>
 #include <iostream>
-#include <math.h>
+#include <cmath>
 
 #ifdef Q_OS_MACX
     #include "os/mac/kdmactouchbar.h"

diff --git a/gui/qt/mainwindow.h b/gui/qt/mainwindow.h
@@ -10,9 +10,7 @@
 #include "keyhistorywidget.h"
 #include "dockwidget.h"
 #include "datawidget.h"
-#include "basiccodeviewerwindow.h"
 #include "vartablemodel.h"
-#include "keypad/qtkeypadbridge.h"
 #include "debugger/hexwidget.h"
 #include "debugger/disasm.h"
 #include "capture/animated-png.h"
@@ -30,11 +28,11 @@
 #include <QtCore/QTimer>
 #include <QtCore/QPointer>
 #include <QtGui/QTextCursor>
-#include <QtGui/QFont>
-#include <QtWidgets/QMessageBox>
 #include <QtCore/QTranslator>
 #include <QtCore/QStandardPaths>
 
+#include <functional>
+
 #ifdef PNG_WRITE_APNG_SUPPORTED
 class RecordingThread : public QThread {
     Q_OBJECT

diff --git a/gui/qt/settings.cpp b/gui/qt/settings.cpp
@@ -3,11 +3,10 @@
 #include "sendinghandler.h"
 #include "dockwidget.h"
 #include "utils.h"
+#include "keypad/qtkeypadbridge.h"
 
-#include "../../core/schedule.h"
 #include "../../core/cpu.h"
 #include "../../core/emu.h"
-#include "../../core/link.h"
 #include "../../core/debug/debug.h"
 
 #include <cmath>