Skip to content

Commit 4566b44

Browse files
committed
Remove redundant RTE:: prefixes
1 parent 0d9d14f commit 4566b44

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

Source/Entities/PieSlice.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ int PieSlice::Save(Writer& writer) const {
146146
return 0;
147147
}
148148

149-
BITMAP* RTE::PieSlice::GetAppropriateIcon(bool sliceIsSelected) const {
149+
BITMAP* PieSlice::GetAppropriateIcon(bool sliceIsSelected) const {
150150
if (int iconFrameCount = m_Icon->GetFrameCount(); iconFrameCount > 0) {
151151
if (!IsEnabled() && iconFrameCount > 2) {
152152
return m_Icon->GetBitmaps8()[2];

Source/GUI/GUIListPanel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ void GUIListPanel::ScrollDown() {
637637
if (m_VertScroll->_GetVisible()) {
638638
int scrollValueToAdd = sensitivity;
639639
if (!m_Items.empty()) {
640-
RTE::GUIListPanel::Item* item = m_Items.back();
640+
GUIListPanel::Item* item = m_Items.back();
641641
int maximumScrollDistance = GetStackHeight(item) + GetItemHeight(item) - (m_VertScroll->GetPageSize() + m_VertScroll->GetValue());
642642
scrollValueToAdd = std::clamp(maximumScrollDistance, 0, scrollValueToAdd);
643643
}
@@ -652,7 +652,7 @@ void GUIListPanel::ScrollTo(int position) {
652652

653653
// TODO this was copied from MaxShadow's work. I'm not quite sure of the point of it tbh.
654654
if (!m_Items.empty()) {
655-
RTE::GUIListPanel::Item* item = m_Items.back();
655+
GUIListPanel::Item* item = m_Items.back();
656656
int allItemsHeight = GetStackHeight(item) + GetItemHeight(item);
657657
if (position + m_VertScroll->GetPageSize() > allItemsHeight) {
658658
m_VertScroll->SetValue(allItemsHeight - m_VertScroll->GetPageSize());

Source/GUI/GUITextPanel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ void GUITextPanel::DoSelection(int Start, int End) {
455455
m_SelectionWidth = std::min(m_SelectionWidth, m_Width);
456456
}
457457

458-
int RTE::GUITextPanel::GetStartOfNextCharacterGroup(const std::string_view& stringToCheck, int currentIndex) const {
458+
int GUITextPanel::GetStartOfNextCharacterGroup(const std::string_view& stringToCheck, int currentIndex) const {
459459
auto isNormalCharacter = [](char charToCheck) {
460460
return (std::isalnum(charToCheck) || charToCheck == '_');
461461
};
@@ -475,7 +475,7 @@ int RTE::GUITextPanel::GetStartOfNextCharacterGroup(const std::string_view& stri
475475
return std::distance(stringToCheck.cbegin(), currentIterator);
476476
}
477477

478-
int RTE::GUITextPanel::GetStartOfPreviousCharacterGroup(const std::string_view& stringToCheck, int currentIndex) const {
478+
int GUITextPanel::GetStartOfPreviousCharacterGroup(const std::string_view& stringToCheck, int currentIndex) const {
479479
auto isNormalCharacter = [](char charToCheck) {
480480
return (std::isalnum(charToCheck) || charToCheck == '_');
481481
};

Source/Managers/AudioMan.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void AudioMan::Update() {
156156
if (IsInMultiplayerMode()) {
157157
humanPlayerPosition += (Vector(static_cast<float>(g_FrameMan.GetPlayerFrameBufferWidth(screen)), static_cast<float>(g_FrameMan.GetPlayerFrameBufferHeight(screen))) / 2);
158158
}
159-
m_CurrentActivityHumanPlayerPositions.push_back(std::make_unique<const RTE::Vector>(humanPlayerPosition));
159+
m_CurrentActivityHumanPlayerPositions.push_back(std::make_unique<const Vector>(humanPlayerPosition));
160160
}
161161
}
162162

Source/Managers/NetworkClient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void NetworkClient::SendServerGUIDRequest(RakNet::SystemAddress address, std::st
192192
msg.Id = ID_NAT_SERVER_GET_SERVER_GUID;
193193
strncpy(msg.ServerName, serverName.c_str(), 62);
194194
strncpy(msg.ServerPassword, serverPassword.c_str(), 62);
195-
m_Client->Send((const char*)&msg, sizeof(RTE::MsgGetServerRequest), IMMEDIATE_PRIORITY, RELIABLE, 0, address, false);
195+
m_Client->Send((const char*)&msg, sizeof(MsgGetServerRequest), IMMEDIATE_PRIORITY, RELIABLE, 0, address, false);
196196
}
197197

198198
void NetworkClient::ReceiveServerGUIDAnswer(RakNet::Packet* packet) {

Source/Menus/AreaPickerGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
using namespace RTE;
2626

27-
BITMAP* RTE::AreaPickerGUI::s_pCursor = 0;
27+
BITMAP* AreaPickerGUI::s_pCursor = 0;
2828

2929
AreaPickerGUI::AreaPickerGUI() {
3030
Clear();

Source/Menus/BuyMenuGUI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
using namespace RTE;
3535

36-
BITMAP* RTE::BuyMenuGUI::s_pCursor = 0;
36+
BITMAP* BuyMenuGUI::s_pCursor = 0;
3737

3838
const std::string BuyMenuGUI::c_DefaultBannerImagePath = "Base.rte/GUIs/BuyMenu/BuyMenuBanner.png";
3939
const std::string BuyMenuGUI::c_DefaultLogoImagePath = "Base.rte/GUIs/BuyMenu/BuyMenuLogo.png";

0 commit comments

Comments
 (0)