From 491695e60e95668e8170e290388f976190859314 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 5 Oct 2017 23:28:34 +0300 Subject: remove extra includes if build without tmwa support. --- src/gui/popups/itempopup.cpp | 2 ++ src/gui/windows/buydialog.cpp | 2 ++ src/gui/windows/charselectdialog.cpp | 2 ++ src/gui/windows/textcommandeditor.cpp | 6 +++++- src/gui/windows/whoisonline.cpp | 4 ++-- 5 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src/gui') diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index eedead83d..28de3b641 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -35,7 +35,9 @@ #include "gui/widgets/textbox.h" #include "net/beinghandler.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "utils/foreach.h" #include "utils/gettext.h" diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index fe980dd33..db1dc6e50 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -30,7 +30,9 @@ #include "enums/gui/layouttype.h" #include "gui/windows/setupwindow.h" +#ifdef TMWA_SUPPORT #include "gui/windows/tradewindow.h" +#endif // TMWA_SUPPORT #include "gui/models/shopitems.h" #include "gui/models/sortlistmodelbuy.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 39ceaef64..5a0a02acb 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -45,7 +45,9 @@ #include "net/character.h" #include "net/charserverhandler.h" #include "net/logindata.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif // TMWA_SUPPORT #include "net/serverfeatures.h" #include "utils/foreach.h" diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 5c8ee1357..88d88af8a 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -28,7 +28,6 @@ #include "input/keyboardconfig.h" #include "gui/models/iconsmodel.h" -#include "gui/models/magicschoolmodel.h" #include "gui/models/targettypemodel.h" #include "gui/widgets/button.h" @@ -37,7 +36,12 @@ #include "gui/widgets/inttextfield.h" #include "gui/widgets/label.h" #include "gui/widgets/layoutcell.h" + +#ifdef TMWA_SUPPORT +#include "gui/models/magicschoolmodel.h" + #include "gui/widgets/radiobutton.h" +#endif // TMWA_SUPPORT #include "utils/delete2.h" diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 35d930c4c..e123d3941 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -59,9 +59,9 @@ #include "utils/gettext.h" #include "utils/sdlhelper.h" +#ifdef TMWA_SUPPORT #include "net/net.h" - -#ifndef TMWA_SUPPORT +#else // TMWA_SUPPORT #include #endif // TMWA_SUPPORT -- cgit v1.2.3-60-g2f50