aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/EditTextWidget.cpp4
-rw-r--r--gui/EditTextWidget.h1
-rw-r--r--gui/ListWidget.cpp6
-rw-r--r--gui/ListWidget.h1
-rw-r--r--gui/PopUpWidget.cpp2
-rw-r--r--gui/TabWidget.cpp8
-rw-r--r--gui/browser.h3
-rw-r--r--gui/chooser.h1
-rw-r--r--gui/launcher.cpp6
-rw-r--r--gui/message.h6
-rw-r--r--gui/newgui.cpp4
11 files changed, 17 insertions, 25 deletions
diff --git a/gui/EditTextWidget.cpp b/gui/EditTextWidget.cpp
index dd451870a5..daa0bfd5b0 100644
--- a/gui/EditTextWidget.cpp
+++ b/gui/EditTextWidget.cpp
@@ -59,7 +59,7 @@ void EditTextWidget::handleMouseDown(int x, int y, int button, int clickCount){
x += _labelOffset;
int width = 0;
- int i;
+ uint i;
for (i = 0; i < _label.size(); ++i) {
width += gui->getCharWidth(_label[i]);
@@ -112,7 +112,7 @@ bool EditTextWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
}
break;
case 256 + 19: // right arrow
- if (_pos < _label.size()) {
+ if (_pos < (int)_label.size()) {
_pos++;
dirty = adjustOffset();
}
diff --git a/gui/EditTextWidget.h b/gui/EditTextWidget.h
index ccbc49c83b..505982743d 100644
--- a/gui/EditTextWidget.h
+++ b/gui/EditTextWidget.h
@@ -23,7 +23,6 @@
#include "gui/widget.h"
#include "common/str.h"
-#include "common/list.h"
namespace GUI {
diff --git a/gui/ListWidget.cpp b/gui/ListWidget.cpp
index afd7d37b15..aba5abcd23 100644
--- a/gui/ListWidget.cpp
+++ b/gui/ListWidget.cpp
@@ -97,7 +97,7 @@ void ListWidget::handleMouseDown(int x, int y, int button, int clickCount) {
if (isEnabled()) {
int oldSelectedItem = _selectedItem;
_selectedItem = (y - 1) / kLineHeight + _currentPos;
- if (_selectedItem > _list.size() - 1)
+ if (_selectedItem > (int)_list.size() - 1)
_selectedItem = -1;
if (oldSelectedItem != _selectedItem) {
@@ -183,7 +183,7 @@ bool ListWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
_selectedItem--;
break;
case 256+18: // down arrow
- if (_selectedItem < _list.size() - 1)
+ if (_selectedItem < (int)_list.size() - 1)
_selectedItem++;
break;
case 256+24: // pageup
@@ -193,7 +193,7 @@ bool ListWidget::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
break;
case 256+25: // pagedown
_selectedItem += _entriesPerPage - 1;
- if (_selectedItem >= _list.size() )
+ if (_selectedItem >= (int)_list.size() )
_selectedItem = _list.size() - 1;
break;
case 256+22: // home
diff --git a/gui/ListWidget.h b/gui/ListWidget.h
index 5522972a24..5a7827c57f 100644
--- a/gui/ListWidget.h
+++ b/gui/ListWidget.h
@@ -23,7 +23,6 @@
#include "gui/widget.h"
#include "common/str.h"
-#include "common/list.h"
namespace GUI {
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 34fce93b31..9527db6491 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -307,7 +307,7 @@ void PopUpWidget::clearEntries() {
void PopUpWidget::setSelected(int item) {
// FIXME
if (item != _selectedItem) {
- if (item >= 0 && item < _entries.size()) {
+ if (item >= 0 && item < (int)_entries.size()) {
_selectedItem = item;
} else {
_selectedItem = -1;
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp
index dc39d2a624..c914515adf 100644
--- a/gui/TabWidget.cpp
+++ b/gui/TabWidget.cpp
@@ -45,7 +45,7 @@ TabWidget::TabWidget(GuiObject *boss, int x, int y, int w, int h)
}
TabWidget::~TabWidget() {
- for (int i = 0; i < _tabs.size(); ++i) {
+ for (uint i = 0; i < _tabs.size(); ++i) {
delete _tabs[i].firstWidget;
_tabs[i].firstWidget = 0;
}
@@ -81,7 +81,7 @@ int TabWidget::addTab(const String &title) {
}
void TabWidget::setActiveTab(int tabID) {
- assert(0 <= tabID && tabID < _tabs.size());
+ assert(0 <= tabID && tabID < (int)_tabs.size());
if (_activeTab != tabID) {
// Exchange the widget lists, and switch to the new tab
if (_activeTab != -1)
@@ -101,7 +101,7 @@ void TabWidget::handleMouseDown(int x, int y, int button, int clickCount) {
x -= kTabLeftOffset;
if (x >= 0 && x % (_tabWidth + kTabSpacing) < _tabWidth) {
tabID = x / (_tabWidth + kTabSpacing);
- if (tabID >= _tabs.size())
+ if (tabID >= (int)_tabs.size())
tabID = -1;
}
@@ -126,7 +126,7 @@ void TabWidget::drawWidget(bool hilite) {
// Iterate over all tabs and draw them
int i, x = _x + kTabLeftOffset;
- for (i = 0; i < _tabs.size(); ++i) {
+ for (i = 0; i < (int)_tabs.size(); ++i) {
NewGuiColor color = (i == _activeTab) ? gui->_color : gui->_shadowcolor;
int yOffset = (i == _activeTab) ? 0 : 2;
gui->box(x, _y + yOffset, _tabWidth, kTabHeight - yOffset, color, color);
diff --git a/gui/browser.h b/gui/browser.h
index a6dd191764..10940fd94c 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -21,9 +21,8 @@
#ifndef BROWSER_DIALOG_H
#define BROWSER_DIALOG_H
-#include "dialog.h"
+#include "gui/dialog.h"
#include "common/str.h"
-#include "common/list.h"
#ifdef MACOSX
#include <Carbon/Carbon.h>
diff --git a/gui/chooser.h b/gui/chooser.h
index b79b138c8e..d2b84d64e0 100644
--- a/gui/chooser.h
+++ b/gui/chooser.h
@@ -22,7 +22,6 @@
#define CHOOSER_DIALOG_H
#include "common/str.h"
-#include "common/list.h"
#include "gui/dialog.h"
namespace GUI {
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 2510eb7a52..2a53406536 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -356,7 +356,7 @@ void LauncherDialog::updateListing() {
// Retrieve a list of all games defined in the config file
_domains.clear();
const ConfigManager::DomainMap &domains = ConfMan.getGameDomains();
- ConfigManager::DomainMap::ConstIterator iter = domains.begin();
+ ConfigManager::DomainMap::const_iterator iter = domains.begin();
for (iter = domains.begin(); iter != domains.end(); ++iter) {
String name(iter->_value.get("gameid"));
String description(iter->_value.get("description"));
@@ -417,14 +417,14 @@ void LauncherDialog::addGame() {
} else {
// Display the candidates to the user and let her/him pick one
StringList list;
- for (idx = 0; idx < candidates.size(); idx++)
+ for (idx = 0; idx < (int)candidates.size(); idx++)
list.push_back(candidates[idx].description);
ChooserDialog dialog("Pick the game:");
dialog.setList(list);
idx = dialog.runModal();
}
- if (0 <= idx && idx < candidates.size()) {
+ if (0 <= idx && idx < (int)candidates.size()) {
DetectedGame result = candidates[idx];
// The auto detector or the user made a choice.
diff --git a/gui/message.h b/gui/message.h
index 7760622bea..30a2c6bfa0 100644
--- a/gui/message.h
+++ b/gui/message.h
@@ -22,11 +22,7 @@
#define MESSAGE_DIALOG_H
#include "gui/dialog.h"
-
-namespace Common {
- class String;
- class StringList;
-}
+#include "common/str.h"
namespace GUI {
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index ed60deb024..1745ee3838 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -459,7 +459,7 @@ void NewGui::drawChar(byte chr, int xx, int yy, NewGuiColor color) {
int NewGui::getStringWidth(const String &str) {
int space = 0;
- for (int i = 0; i < str.size(); ++i)
+ for (uint i = 0; i < str.size(); ++i)
space += getCharWidth(str[i]);
return space;
}
@@ -483,7 +483,7 @@ int NewGui::getCharWidth(byte c) {
void NewGui::drawString(const String &s, int x, int y, int w, NewGuiColor color, int align, int deltax, bool useEllipsis) {
const int leftX = x, rightX = x + w;
- int i;
+ uint i;
int width = getStringWidth(s);
String str;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 18:46:39 +0000