diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/models/updatelistmodel.h | 2 | ||||
| -rw-r--r-- | src/gui/windows/charcreatedialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/logindialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/registerdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp | 3 |
6 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/models/updatelistmodel.h b/src/gui/models/updatelistmodel.h index e2424cb7b..7601488ba 100644 --- a/src/gui/models/updatelistmodel.h +++ b/src/gui/models/updatelistmodel.h @@ -25,8 +25,6 @@ #include "gui/models/listmodel.h" -#include "net/serverinfo.h" - #include "utils/stringvector.h" #include "localconsts.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 01132aa86..a61008c6c 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -284,7 +284,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, } else { - mGender = Being::intToGender(forceGender); + mGender = Being::intToGender(CAST_U8(forceGender)); mPlayer->setGender(mGender); } } diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 17ab4ad7c..798964945 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -43,7 +43,6 @@ #include "net/charserverhandler.h" #include "net/logindata.h" #include "net/loginhandler.h" -#include "net/serverinfo.h" #include "net/updatetypeoperators.h" #include "utils/delete2.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 90fbebebc..e89700e5b 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -647,7 +647,7 @@ void NpcDialog::action(const ActionEvent &event) { if (cmd == *it) { - npcHandler->listInput(mNpcId, cnt + 1); + npcHandler->listInput(mNpcId, CAST_U8(cnt + 1)); printText = mItems[cnt]; if (mInputState != NPC_INPUT_ITEM && diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 3c4fe5ed2..b3cecc424 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -279,7 +279,7 @@ void RegisterDialog::action(const ActionEvent &event) else { mLoginData->gender = Being::intToGender( - features.getIntValue("forceAccountGender")); + CAST_U8(features.getIntValue("forceAccountGender"))); } if (mEmailField) diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 1a4359849..66887a258 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -967,7 +967,8 @@ void UpdaterWindow::logic() } else { - mDownloadStatus = UpdateDownloadStatus::UPDATE_COMPLETE; + mDownloadStatus = + UpdateDownloadStatus::UPDATE_COMPLETE; } } } |