[Scummvm-git-logs] scummvm master -> a5b33530224b3c97eee8331cafd28dd258b5266c

sev- noreply at scummvm.org
Thu Oct 26 23:16:36 UTC 2023 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a5b3353022 ALL: Decrease header dependency for gui_options.h


Commit: a5b33530224b3c97eee8331cafd28dd258b5266c
    https://github.com/scummvm/scummvm/commit/a5b33530224b3c97eee8331cafd28dd258b5266c
Author: Aditya (adityamurali003 at gmail.com)
Date: 2023-10-27T01:16:32+02:00

Commit Message:
ALL: Decrease header dependency for gui_options.h

Now the number of times the header file gui_options.h
is added is much smaller.

Changed paths:
    common/language.cpp
    engines/glk/adrift/detection_tables.h
    engines/glk/agt/detection_tables.h
    engines/glk/alan3/detection_tables.h
    engines/glk/archetype/detection_tables.h
    engines/glk/comprehend/detection_tables.h
    engines/glk/glulx/detection_tables.h
    engines/glk/hugo/detection_tables.h
    engines/glk/jacl/detection_tables.h
    engines/glk/magnetic/detection_tables.h
    engines/glk/quest/detection_tables.h
    engines/glk/scott/detection_tables.h
    engines/glk/tads/detection_tables.h
    engines/glk/zcode/detection_tables.h
    engines/metaengine.cpp
    engines/mohawk/dialogs.cpp
    engines/mohawk/myst.cpp
    engines/mohawk/riven.cpp
    engines/neverhood/dialogs.cpp
    engines/queen/detection.cpp
    engines/queen/display.cpp
    engines/scumm/metaengine.cpp
    engines/supernova/detection.cpp
    engines/supernova/metaengine.cpp
    engines/sword1/detection.cpp
    engines/sword2/metaengine.cpp
    engines/tetraedge/metaengine.cpp
    gui/launcher.cpp


diff --git a/common/language.cpp b/common/language.cpp
index 6ee8cc3d017..6db4d8927ce 100644
--- a/common/language.cpp
+++ b/common/language.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "common/language.h"
-#include "common/gui_options.h"
 #include "common/str.h"
 #include "common/algorithm.h"
 
diff --git a/engines/glk/adrift/detection_tables.h b/engines/glk/adrift/detection_tables.h
index f62b8668e92..55fde84f9b6 100644
--- a/engines/glk/adrift/detection_tables.h
+++ b/engines/glk/adrift/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/agt/detection_tables.h b/engines/glk/agt/detection_tables.h
index 130e1e78e06..aa4ac65b74c 100644
--- a/engines/glk/agt/detection_tables.h
+++ b/engines/glk/agt/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/alan3/detection_tables.h b/engines/glk/alan3/detection_tables.h
index 6b5d3b841b2..c10023a8571 100644
--- a/engines/glk/alan3/detection_tables.h
+++ b/engines/glk/alan3/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/archetype/detection_tables.h b/engines/glk/archetype/detection_tables.h
index 4086f49fca9..37f3fba90d0 100644
--- a/engines/glk/archetype/detection_tables.h
+++ b/engines/glk/archetype/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/comprehend/detection_tables.h b/engines/glk/comprehend/detection_tables.h
index 20ba570f555..71245b2ac0e 100644
--- a/engines/glk/comprehend/detection_tables.h
+++ b/engines/glk/comprehend/detection_tables.h
@@ -19,7 +19,6 @@
  *
  */
 
-#include "common/gui_options.h"
 #include "common/language.h"
 #include "engines/game.h"
 
diff --git a/engines/glk/glulx/detection_tables.h b/engines/glk/glulx/detection_tables.h
index f089a7851a6..7de9ae8f33a 100644
--- a/engines/glk/glulx/detection_tables.h
+++ b/engines/glk/glulx/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/hugo/detection_tables.h b/engines/glk/hugo/detection_tables.h
index 46c63449c59..78d859bc8af 100644
--- a/engines/glk/hugo/detection_tables.h
+++ b/engines/glk/hugo/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/jacl/detection_tables.h b/engines/glk/jacl/detection_tables.h
index 0d5f670beb3..ce4bca2fc4f 100644
--- a/engines/glk/jacl/detection_tables.h
+++ b/engines/glk/jacl/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/magnetic/detection_tables.h b/engines/glk/magnetic/detection_tables.h
index 35f6d5257f9..f6ac48bb7f5 100644
--- a/engines/glk/magnetic/detection_tables.h
+++ b/engines/glk/magnetic/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/quest/detection_tables.h b/engines/glk/quest/detection_tables.h
index d3b454aef21..4e9442c6aef 100644
--- a/engines/glk/quest/detection_tables.h
+++ b/engines/glk/quest/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/scott/detection_tables.h b/engines/glk/scott/detection_tables.h
index c1ecad4b3f8..f63077daeb5 100644
--- a/engines/glk/scott/detection_tables.h
+++ b/engines/glk/scott/detection_tables.h
@@ -30,7 +30,7 @@
  * https://github.com/angstsmurf/spatterlight/tree/master/terps/scott
  */
 
-#include "common/gui_options.h"
+
 #include "common/language.h"
 #include "engines/game.h"
 
diff --git a/engines/glk/tads/detection_tables.h b/engines/glk/tads/detection_tables.h
index 7881b049e1d..5a73cd76c20 100644
--- a/engines/glk/tads/detection_tables.h
+++ b/engines/glk/tads/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/glk/zcode/detection_tables.h b/engines/glk/zcode/detection_tables.h
index 46b91d25619..db476858d98 100644
--- a/engines/glk/zcode/detection_tables.h
+++ b/engines/glk/zcode/detection_tables.h
@@ -20,7 +20,6 @@
  */
 
 #include "engines/game.h"
-#include "common/gui_options.h"
 #include "common/language.h"
 
 namespace Glk {
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index da13682a029..25593c931c1 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -25,7 +25,6 @@
 #include "backends/keymapper/keymap.h"
 #include "backends/keymapper/standard-actions.h"
 
-#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/translation.h"
diff --git a/engines/mohawk/dialogs.cpp b/engines/mohawk/dialogs.cpp
index 4238c51d522..9b937d99bce 100644
--- a/engines/mohawk/dialogs.cpp
+++ b/engines/mohawk/dialogs.cpp
@@ -29,7 +29,6 @@
 #include "gui/widget.h"
 #include "gui/widgets/popup.h"
 
-#include "common/gui_options.h"
 #include "common/system.h"
 #include "common/translation.h"
 
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index 7a1e2a16bbb..b613cc6ea1d 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -25,7 +25,6 @@
 
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
-#include "common/gui_options.h"
 #include "common/system.h"
 #include "common/translation.h"
 #include "common/textconsole.h"
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 3b609a16852..8118b22c927 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -22,7 +22,6 @@
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/events.h"
-#include "common/gui_options.h"
 #include "common/keyboard.h"
 #include "common/translation.h"
 #include "common/system.h"
diff --git a/engines/neverhood/dialogs.cpp b/engines/neverhood/dialogs.cpp
index b147e92a32f..17f37bbd10f 100644
--- a/engines/neverhood/dialogs.cpp
+++ b/engines/neverhood/dialogs.cpp
@@ -29,7 +29,6 @@
 #include "gui/widget.h"
 #include "gui/widgets/popup.h"
 
-#include "common/gui_options.h"
 #include "common/system.h"
 #include "common/translation.h"
 
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 2b06cd41fbf..eda4fa2d053 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -23,7 +23,6 @@
 
 #include "engines/advancedDetector.h"
 
-#include "common/gui_options.h"
 #include "common/file.h"
 
 #include "queen/defs.h"
diff --git a/engines/queen/display.cpp b/engines/queen/display.cpp
index 768339c0cce..ccd6e5af2f7 100644
--- a/engines/queen/display.cpp
+++ b/engines/queen/display.cpp
@@ -25,7 +25,6 @@
 #include "common/events.h"
 #include "common/stream.h"
 #include "common/memstream.h"
-
 #include "graphics/cursorman.h"
 #include "graphics/palette.h"
 #include "graphics/surface.h"
diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index 835189a89a0..f33955eaaf1 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -24,7 +24,6 @@
 #include "common/savefile.h"
 #include "common/config-manager.h"
 #include "common/translation.h"
-#include "common/gui_options.h"
 #include "common/md5.h"
 
 #include "audio/mididrv.h"
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index e787112a381..16aa40669d6 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -21,7 +21,6 @@
 
 #include "base/plugins.h"
 #include "common/file.h"
-#include "common/gui_options.h"
 #include "engines/advancedDetector.h"
 #include "supernova/supernova.h"
 #include "supernova/detection.h"
diff --git a/engines/supernova/metaengine.cpp b/engines/supernova/metaengine.cpp
index 316fba84d67..0905eab7c48 100644
--- a/engines/supernova/metaengine.cpp
+++ b/engines/supernova/metaengine.cpp
@@ -21,7 +21,6 @@
 
 #include "base/plugins.h"
 #include "common/file.h"
-#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/translation.h"
diff --git a/engines/sword1/detection.cpp b/engines/sword1/detection.cpp
index c9a2f0bdf79..9b5e05e8bb3 100644
--- a/engines/sword1/detection.cpp
+++ b/engines/sword1/detection.cpp
@@ -22,7 +22,6 @@
 #include "base/plugins.h"
 
 #include "common/fs.h"
-#include "common/gui_options.h"
 
 #include "engines/advancedDetector.h"
 #include "engines/obsolete.h"
diff --git a/engines/sword2/metaengine.cpp b/engines/sword2/metaengine.cpp
index 91194b96e8e..6f6b771936d 100644
--- a/engines/sword2/metaengine.cpp
+++ b/engines/sword2/metaengine.cpp
@@ -28,7 +28,6 @@
 #include "common/events.h"
 #include "common/file.h"
 #include "common/fs.h"
-#include "common/gui_options.h"
 #include "common/savefile.h"
 #include "common/system.h"
 #include "common/translation.h"
diff --git a/engines/tetraedge/metaengine.cpp b/engines/tetraedge/metaengine.cpp
index cf56aa448bd..fc7a16c9b0d 100644
--- a/engines/tetraedge/metaengine.cpp
+++ b/engines/tetraedge/metaengine.cpp
@@ -24,7 +24,6 @@
 #include "tetraedge/tetraedge.h"
 #include "common/str-array.h"
 #include "common/translation.h"
-#include "common/gui_options.h"
 
 static const ADExtraGuiOptionsMap optionsList[] = {
 	{
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index d1b48487501..3956b674e42 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -24,7 +24,6 @@
 #include "common/config-manager.h"
 #include "common/events.h"
 #include "common/fs.h"
-#include "common/gui_options.h"
 #include "common/util.h"
 #include "common/system.h"
 #include "common/translation.h"

More information about the Scummvm-git-logs mailing list