aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Container.cc17
-rw-r--r--src/FbTk/ImageControl.cc2
-rw-r--r--src/FbTk/Layer.hh2
-rw-r--r--src/FbTk/MacroCommand.cc2
-rw-r--r--src/FbTk/MacroCommand.hh2
-rw-r--r--src/FbTk/Menu.cc7
-rw-r--r--src/FbTk/Menu.hh2
-rw-r--r--src/FbTk/MenuItem.cc4
-rw-r--r--src/FbTk/MultLayers.cc4
-rw-r--r--src/FbTk/StringUtil.cc2
-rw-r--r--src/FbTk/TextButton.cc2
-rw-r--r--src/Gnome.cc6
-rw-r--r--src/Keys.cc7
-rw-r--r--src/Keys.hh4
-rw-r--r--src/Resources.cc6
-rw-r--r--src/Screen.cc6
-rw-r--r--src/Screen.hh2
-rw-r--r--src/Window.cc2
-rw-r--r--src/Workspace.cc2
-rw-r--r--src/WorkspaceCmd.cc2
-rw-r--r--src/fluxbox.cc4
21 files changed, 43 insertions, 44 deletions
diff --git a/src/Container.cc b/src/Container.cc
index 1a7ea34..6f811ef 100644
--- a/src/Container.cc
+++ b/src/Container.cc
@@ -127,7 +127,7 @@ void Container::insertItem(Item item, int pos) {
127void Container::moveItem(Item item, int movement) { 127void Container::moveItem(Item item, int movement) {
128 128
129 int index = find(item); 129 int index = find(item);
130 const int size = m_item_list.size(); 130 const size_t size = m_item_list.size();
131 131
132 if (index < 0 || (movement % size) == 0) { 132 if (index < 0 || (movement % size) == 0) {
133 return; 133 return;
@@ -286,7 +286,7 @@ void Container::setMaxTotalSize(unsigned int size) {
286 // this is a bit of duplication from repositionItems 286 // this is a bit of duplication from repositionItems
287 // for when we are allowed to grow ourself 287 // for when we are allowed to grow ourself
288 Alignment align = alignment(); 288 Alignment align = alignment();
289 unsigned int num_items = m_item_list.size(); 289 size_t num_items = m_item_list.size();
290 if (m_max_total_size && (align == RIGHT || align == LEFT) && 290 if (m_max_total_size && (align == RIGHT || align == LEFT) &&
291 num_items) { 291 num_items) {
292 unsigned int max_width_per_client = maxWidthPerClient(); 292 unsigned int max_width_per_client = maxWidthPerClient();
@@ -377,7 +377,7 @@ void Container::repositionItems() {
377 377
378 unsigned int max_width_per_client = maxWidthPerClient(); 378 unsigned int max_width_per_client = maxWidthPerClient();
379 unsigned int borderW = m_item_list.front()->borderWidth(); 379 unsigned int borderW = m_item_list.front()->borderWidth();
380 unsigned int num_items = m_item_list.size(); 380 size_t num_items = m_item_list.size();
381 381
382 unsigned int total_width; 382 unsigned int total_width;
383 unsigned int cur_width; 383 unsigned int cur_width;
@@ -480,18 +480,17 @@ unsigned int Container::maxWidthPerClient() const {
480 return m_max_size_per_client; 480 return m_max_size_per_client;
481 break; 481 break;
482 case RELATIVE: 482 case RELATIVE:
483 int count = size(); 483 if (size() == 0)
484 if (count == 0)
485 return width(); 484 return width();
486 else { 485 else {
487 int borderW = m_item_list.front()->borderWidth(); 486 int borderW = m_item_list.front()->borderWidth();
488 // there're count-1 borders to fit in with the windows 487 // there're count-1 borders to fit in with the windows
489 // -> 1 per window plus end 488 // -> 1 per window plus end
490 unsigned int w = width(); 489 unsigned int w = width();
491 if (w < (count-1)*borderW) 490 if (w < (size()-1)*borderW)
492 return 1; 491 return 1;
493 else 492 else
494 return (w - (count - 1) * borderW) / count; 493 return (w - (size() - 1) * borderW) / size();
495 } 494 }
496 break; 495 break;
497 } 496 }
@@ -502,8 +501,8 @@ unsigned int Container::maxWidthPerClient() const {
502 501
503void Container::for_each(std::mem_fun_t<void, FbTk::FbWindow> function) { 502void Container::for_each(std::mem_fun_t<void, FbTk::FbWindow> function) {
504 std::for_each(m_item_list.begin(), 503 std::for_each(m_item_list.begin(),
505 m_item_list.end(), 504 m_item_list.end(),
506 function); 505 function);
507} 506}
508 507
509void Container::setAlpha(unsigned char alpha) { 508void Container::setAlpha(unsigned char alpha) {
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 902bd55..7fe9154 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -258,7 +258,7 @@ Pixmap ImageControl::renderImage(unsigned int width, unsigned int height,
258 258
259 cache.push_back(tmp); 259 cache.push_back(tmp);
260 260
261 if ((unsigned) cache.size() > cache_max) 261 if (cache.size() > cache_max)
262 cleanCache(); 262 cleanCache();
263 263
264 return pixmap; 264 return pixmap;
diff --git a/src/FbTk/Layer.hh b/src/FbTk/Layer.hh
index 3e206b2..5c0c566 100644
--- a/src/FbTk/Layer.hh
+++ b/src/FbTk/Layer.hh
@@ -59,7 +59,7 @@ public:
59 /// @return layer item on specific position, on failure 0 59 /// @return layer item on specific position, on failure 0
60 ItemType *getItem(unsigned int position); 60 ItemType *getItem(unsigned int position);
61 /// @return number of elements in layer 61 /// @return number of elements in layer
62 unsigned int size() const { return m_list.size(); } 62 size_t size() const { return m_list.size(); }
63 /// @return layer list 63 /// @return layer list
64 const ListType &itemList() const { return m_list; } 64 const ListType &itemList() const { return m_list; }
65 /// @return layer list 65 /// @return layer list
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 84794e1..adee9cb 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -29,7 +29,7 @@ void MacroCommand::add(RefCount<Command> &com) {
29 m_commandlist.push_back(com); 29 m_commandlist.push_back(com);
30} 30}
31 31
32unsigned int MacroCommand::size() const { 32size_t MacroCommand::size() const {
33 return m_commandlist.size(); 33 return m_commandlist.size();
34} 34}
35 35
diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
index 97cc5d5..f29e05c 100644
--- a/src/FbTk/MacroCommand.hh
+++ b/src/FbTk/MacroCommand.hh
@@ -35,7 +35,7 @@ namespace FbTk {
35class MacroCommand:public Command { 35class MacroCommand:public Command {
36public: 36public:
37 void add(RefCount<Command> &com); 37 void add(RefCount<Command> &com);
38 unsigned int size() const; 38 size_t size() const;
39 virtual void execute(); 39 virtual void execute();
40 40
41private: 41private:
diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 5687be1..0616906 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -577,13 +577,13 @@ void Menu::clearWindow() {
577 menu.frame.clear(); 577 menu.frame.clear();
578 578
579 // clear foreground bits of frame items 579 // clear foreground bits of frame items
580 for (unsigned int i = 0; i < menuitems.size(); i++) { 580 for (size_t i = 0; i < menuitems.size(); i++) {
581 clearItem(i, false); // no clear 581 clearItem(i, false); // no clear
582 } 582 }
583} 583}
584 584
585void Menu::redrawFrame(FbDrawable &drawable) { 585void Menu::redrawFrame(FbDrawable &drawable) {
586 for (unsigned int i = 0; i < menuitems.size(); i++) { 586 for (size_t i = 0; i < menuitems.size(); i++) {
587 drawItem(drawable, i); 587 drawItem(drawable, i);
588 } 588 }
589 589
@@ -636,7 +636,8 @@ void Menu::redrawTitle(FbDrawable &drawable) {
636 const char *text = menu.label.c_str(); 636 const char *text = menu.label.c_str();
637 637
638 const FbTk::Font &font = theme().titleFont(); 638 const FbTk::Font &font = theme().titleFont();
639 int dx = theme().bevelWidth(), len = menu.label.size(); 639 int dx = theme().bevelWidth();
640 size_t len = menu.label.size();
640 unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2; 641 unsigned int l = font.textWidth(text, len) + theme().bevelWidth()*2;
641 642
642 switch (theme().titleFontJustify()) { 643 switch (theme().titleFontJustify()) {
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index bec76ac..fceec67 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -147,7 +147,7 @@ public:
147 inline int y() const { return menu.window.y(); } 147 inline int y() const { return menu.window.y(); }
148 inline unsigned int width() const { return menu.window.width(); } 148 inline unsigned int width() const { return menu.window.width(); }
149 inline unsigned int height() const { return menu.window.height(); } 149 inline unsigned int height() const { return menu.window.height(); }
150 inline unsigned int numberOfItems() const { return menuitems.size(); } 150 inline size_t numberOfItems() const { return menuitems.size(); }
151 inline int currentSubmenu() const { return m_which_sub; } 151 inline int currentSubmenu() const { return m_which_sub; }
152 bool hasSubmenu(unsigned int index) const; 152 bool hasSubmenu(unsigned int index) const;
153 bool isItemSelected(unsigned int index) const; 153 bool isItemSelected(unsigned int index) const;
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 93adc44..f39d03c 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -168,8 +168,8 @@ void MenuItem::draw(FbDrawable &draw,
168 // disable clip mask 168 // disable clip mask
169 XSetClipMask(disp, gc, None); 169 XSetClipMask(disp, gc, None);
170 } else if (isSelected()) { 170 } else if (isSelected()) {
171 draw.fillRectangle(theme.hiliteGC().gc(), 171 draw.fillRectangle(theme.hiliteGC().gc(),
172 sel_x+item_pm_height/4, sel_y+item_pm_height/4, item_pm_height/2, item_pm_height/2); 172 sel_x+item_pm_height/4, sel_y+item_pm_height/4, item_pm_height/2, item_pm_height/2);
173 } 173 }
174 } 174 }
175 175
diff --git a/src/FbTk/MultLayers.cc b/src/FbTk/MultLayers.cc
index 6a6dc18..439201a 100644
--- a/src/FbTk/MultLayers.cc
+++ b/src/FbTk/MultLayers.cc
@@ -180,8 +180,8 @@ void MultLayers::restack() {
180} 180}
181 181
182int MultLayers::size() { 182int MultLayers::size() {
183 int i = 0, num = 0; 183 int num = 0;
184 for (; i < static_cast<signed>(m_layers.size()); i++) { 184 for (size_t i = 0; i < m_layers.size(); i++) {
185 num += m_layers[i]->countWindows(); 185 num += m_layers[i]->countWindows();
186 } 186 }
187 return num; 187 return num;
diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc
index d8b64c9..1a6814c 100644
--- a/src/FbTk/StringUtil.cc
+++ b/src/FbTk/StringUtil.cc
@@ -123,7 +123,7 @@ string findExtension(const string &filename) {
123string replaceString(const string &original, 123string replaceString(const string &original,
124 const char *findthis, 124 const char *findthis,
125 const char *replace) { 125 const char *replace) {
126 int i=0; 126 size_t i = 0;
127 const int size_of_replace = strlen(replace); 127 const int size_of_replace = strlen(replace);
128 const int size_of_find = strlen(findthis); 128 const int size_of_find = strlen(findthis);
129 string ret_str(original); 129 string ret_str(original);
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 1d5936c..ad9de09 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -144,7 +144,7 @@ void TextButton::renderForeground(FbWindow &win, FbDrawable &drawable) {
144} 144}
145 145
146void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) { 146void TextButton::drawText(int x_offset, int y_offset, FbDrawable *drawable) {
147 unsigned int textlen = text().size(); 147 size_t textlen = text().size();
148 // do text alignment 148 // do text alignment
149 149
150 unsigned int textw = width(), texth = height(); 150 unsigned int textw = width(), texth = height();
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 95cf08e..96bf2fd 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -205,12 +205,12 @@ void Gnome::updateClientList(BScreen &screen) {
205 205
206void Gnome::updateWorkspaceNames(BScreen &screen) { 206void Gnome::updateWorkspaceNames(BScreen &screen) {
207 207
208 int number_of_desks = screen.getWorkspaceNames().size(); 208 size_t number_of_desks = screen.getWorkspaceNames().size();
209 const BScreen::WorkspaceNames &workspace_names = screen.getWorkspaceNames(); 209 const BScreen::WorkspaceNames &workspace_names = screen.getWorkspaceNames();
210 // convert our desktop names to a char * so we can send it 210 // convert our desktop names to a char * so we can send it
211 char *names[number_of_desks]; 211 char *names[number_of_desks];
212 212
213 for (int i = 0; i < number_of_desks; i++) { 213 for (size_t i = 0; i < number_of_desks; i++) {
214 names[i] = new char[workspace_names[i].size() + 1]; 214 names[i] = new char[workspace_names[i].size() + 1];
215 strcpy(names[i], workspace_names[i].c_str()); 215 strcpy(names[i], workspace_names[i].c_str());
216 } 216 }
@@ -223,7 +223,7 @@ void Gnome::updateWorkspaceNames(BScreen &screen) {
223 } 223 }
224 224
225 // destroy name buffers 225 // destroy name buffers
226 for (int i = 0; i < number_of_desks; i++) 226 for (size_t i = 0; i < number_of_desks; i++)
227 delete [] names[i]; 227 delete [] names[i];
228} 228}
229 229
diff --git a/src/Keys.cc b/src/Keys.cc
index ed134e5..4ef08e9 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -189,7 +189,7 @@ bool Keys::addBinding(const std::string &linebuffer) {
189 189
190 _FB_USES_NLS; 190 _FB_USES_NLS;
191 // for each argument 191 // for each argument
192 for (unsigned int argc=0; argc<val.size(); argc++) { 192 for (size_t argc = 0; argc < val.size(); argc++) {
193 193
194 if (val[argc][0] != ':') { // parse key(s) 194 if (val[argc][0] != ':') { // parse key(s)
195 keyarg++; 195 keyarg++;
@@ -289,7 +289,7 @@ void Keys::doAction(XKeyEvent &ke) {
289 289
290 if (!next_key) { 290 if (!next_key) {
291 291
292 for (unsigned int i=0; i<m_keylist.size(); i++) { 292 for (size_t i = 0; i < m_keylist.size(); i++) {
293 if (*m_keylist[i] == ke) { 293 if (*m_keylist[i] == ke) {
294 if (m_keylist[i]->keylist.size()) { 294 if (m_keylist[i]->keylist.size()) {
295 next_key = m_keylist[i]; 295 next_key = m_keylist[i];
@@ -335,8 +335,8 @@ bool Keys::reconfigure(const char *filename) {
335 @return true on success else false. 335 @return true on success else false.
336*/ 336*/
337bool Keys::mergeTree(t_key *newtree, t_key *basetree) { 337bool Keys::mergeTree(t_key *newtree, t_key *basetree) {
338 size_t baselit_i = 0;
338 if (basetree==0) { 339 if (basetree==0) {
339 unsigned int baselist_i=0;
340 for (; baselist_i<m_keylist.size(); baselist_i++) { 340 for (; baselist_i<m_keylist.size(); baselist_i++) {
341 if (m_keylist[baselist_i]->mod == newtree->mod && 341 if (m_keylist[baselist_i]->mod == newtree->mod &&
342 m_keylist[baselist_i]->key == newtree->key) { 342 m_keylist[baselist_i]->key == newtree->key) {
@@ -357,7 +357,6 @@ bool Keys::mergeTree(t_key *newtree, t_key *basetree) {
357 } 357 }
358 358
359 } else { 359 } else {
360 unsigned int baselist_i = 0;
361 for (; baselist_i<basetree->keylist.size(); baselist_i++) { 360 for (; baselist_i<basetree->keylist.size(); baselist_i++) {
362 if (basetree->keylist[baselist_i]->mod == newtree->mod && 361 if (basetree->keylist[baselist_i]->mod == newtree->mod &&
363 basetree->keylist[baselist_i]->key == newtree->key) { 362 basetree->keylist[baselist_i]->key == newtree->key) {
diff --git a/src/Keys.hh b/src/Keys.hh
index f83f6e8..3463795 100644
--- a/src/Keys.hh
+++ b/src/Keys.hh
@@ -86,14 +86,14 @@ private:
86 ~t_key(); 86 ~t_key();
87 87
88 inline t_key *find(unsigned int key_, unsigned int mod_) { 88 inline t_key *find(unsigned int key_, unsigned int mod_) {
89 for (unsigned int i=0; i<keylist.size(); i++) { 89 for (size_t i = 0; i < keylist.size(); i++) {
90 if (keylist[i]->key == key_ && keylist[i]->mod == FbTk::KeyUtil::instance().isolateModifierMask(mod_)) 90 if (keylist[i]->key == key_ && keylist[i]->mod == FbTk::KeyUtil::instance().isolateModifierMask(mod_))
91 return keylist[i]; 91 return keylist[i];
92 } 92 }
93 return 0; 93 return 0;
94 } 94 }
95 inline t_key *find(XKeyEvent &ke) { 95 inline t_key *find(XKeyEvent &ke) {
96 for (unsigned int i=0; i<keylist.size(); i++) { 96 for (size_t i = 0; i < keylist.size(); i++) {
97 if (keylist[i]->key == ke.keycode && 97 if (keylist[i]->key == ke.keycode &&
98 keylist[i]->mod == FbTk::KeyUtil::instance().isolateModifierMask(ke.state)) 98 keylist[i]->mod == FbTk::KeyUtil::instance().isolateModifierMask(ke.state))
99 return keylist[i]; 99 return keylist[i];
diff --git a/src/Resources.cc b/src/Resources.cc
index c6ddf3c..feab9ea 100644
--- a/src/Resources.cc
+++ b/src/Resources.cc
@@ -68,11 +68,10 @@ void FbTk::Resource<std::vector<WinButton::Type> >::
68setFromString(char const *strval) { 68setFromString(char const *strval) {
69 vector<std::string> val; 69 vector<std::string> val;
70 StringUtil::stringtok(val, strval); 70 StringUtil::stringtok(val, strval);
71 int size=val.size();
72 //clear old values 71 //clear old values
73 m_value.clear(); 72 m_value.clear();
74 73
75 for (int i=0; i<size; i++) { 74 for (size_t i = 0; i < val.size(); i++) {
76 if (strcasecmp(val[i].c_str(), "Maximize")==0) 75 if (strcasecmp(val[i].c_str(), "Maximize")==0)
77 m_value.push_back(WinButton::MAXIMIZE); 76 m_value.push_back(WinButton::MAXIMIZE);
78 else if (strcasecmp(val[i].c_str(), "Minimize")==0) 77 else if (strcasecmp(val[i].c_str(), "Minimize")==0)
@@ -138,8 +137,7 @@ template<>
138std::string FbTk::Resource<std::vector<WinButton::Type> >:: 137std::string FbTk::Resource<std::vector<WinButton::Type> >::
139getString() const { 138getString() const {
140 string retval; 139 string retval;
141 int size=m_value.size(); 140 for (size_t i = 0; i < m_value.size(); i++) {
142 for (int i=0; i<size; i++) {
143 switch (m_value[i]) { 141 switch (m_value[i]) {
144 case WinButton::SHADE: 142 case WinButton::SHADE:
145 retval.append("Shade"); 143 retval.append("Shade");
diff --git a/src/Screen.cc b/src/Screen.cc
index e139f74..4eae1b6 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -158,7 +158,9 @@ int anotherWMRunning(Display *display, XErrorEvent *) {
158 158
159class TabPlacementMenuItem: public FbTk::MenuItem { 159class TabPlacementMenuItem: public FbTk::MenuItem {
160public: 160public:
161 TabPlacementMenuItem(const char * label, BScreen &screen, FbWinFrame::TabPlacement place, FbTk::RefCount<FbTk::Command> &cmd): 161 TabPlacementMenuItem(const char * label, BScreen &screen,
162 FbWinFrame::TabPlacement place,
163 FbTk::RefCount<FbTk::Command> &cmd):
162 FbTk::MenuItem(label, cmd), 164 FbTk::MenuItem(label, cmd),
163 m_screen(screen), 165 m_screen(screen),
164 m_place(place) { } 166 m_place(place) { }
@@ -853,7 +855,7 @@ void BScreen::reconfigure() {
853 if (restore_menus) { 855 if (restore_menus) {
854 // restore submenus, no timestamp changed 856 // restore submenus, no timestamp changed
855 FbTk::Menu *menu = m_rootmenu.get(); 857 FbTk::Menu *menu = m_rootmenu.get();
856 for (unsigned int i = 0; i < remember_sub.size(); i++ ) { 858 for (size_t i = 0; i < remember_sub.size(); i++ ) {
857 int sub = remember_sub[i]; 859 int sub = remember_sub[i];
858 if (!menu || sub < 0) 860 if (!menu || sub < 0)
859 break; 861 break;
diff --git a/src/Screen.hh b/src/Screen.hh
index 2d20efd..13f2fb9 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -175,7 +175,7 @@ public:
175 inline int screenNumber() const { return rootWindow().screenNumber(); } 175 inline int screenNumber() const { return rootWindow().screenNumber(); }
176 176
177 /// @return number of workspaces 177 /// @return number of workspaces
178 unsigned int numberOfWorkspaces() const { return m_workspaces_list.size(); } 178 size_t numberOfWorkspaces() const { return m_workspaces_list.size(); }
179 179
180 inline const Icons &iconList() const { return m_icon_list; } 180 inline const Icons &iconList() const { return m_icon_list; }
181 inline Icons &iconList() { return m_icon_list; } 181 inline Icons &iconList() { return m_icon_list; }
diff --git a/src/Window.cc b/src/Window.cc
index a275e43..0fd9d8c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3947,7 +3947,7 @@ void FluxboxWindow::setupWindow() {
3947 3947
3948 3948
3949 3949
3950 for (char c = 0; c < 2 ; c++) { 3950 for (size_t c = 0; c < 2 ; c++) {
3951 // get titlebar configuration for current side 3951 // get titlebar configuration for current side
3952 const std::vector<WinButton::Type> &dir = *(*titlebar_side[c]); 3952 const std::vector<WinButton::Type> &dir = *(*titlebar_side[c]);
3953 3953
diff --git a/src/Workspace.cc b/src/Workspace.cc
index b874391..343772a 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -264,7 +264,7 @@ void Workspace::reconfigure() {
264 } 264 }
265} 265}
266 266
267int Workspace::numberOfWindows() const { 267size_t Workspace::numberOfWindows() const {
268 return m_windowlist.size(); 268 return m_windowlist.size();
269} 269}
270 270
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index e50913f..3673e17 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -144,7 +144,7 @@ void ArrangeWindowsCmd::execute() {
144 return; 144 return;
145 145
146 Workspace *space = screen->currentWorkspace(); 146 Workspace *space = screen->currentWorkspace();
147 unsigned int win_count = space->windowList().size(); 147 size_t win_count = space->windowList().size();
148 148
149 if (win_count == 0) 149 if (win_count == 0)
150 return; 150 return;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 061bf1f..fbb4203 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -360,7 +360,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
360 } 360 }
361 361
362 // init all "screens" 362 // init all "screens"
363 for(unsigned int s = 0; s < screens.size(); s++) 363 for(size_t s = 0; s < screens.size(); s++)
364 initScreen(screens[s]); 364 initScreen(screens[s]);
365 365
366 XAllowEvents(disp, ReplayPointer, CurrentTime); 366 XAllowEvents(disp, ReplayPointer, CurrentTime);
@@ -1593,7 +1593,7 @@ void Fluxbox::load_rc(BScreen &screen) {
1593 &value) && value.addr) { 1593 &value) && value.addr) {
1594 std::vector<std::string> paths; 1594 std::vector<std::string> paths;
1595 StringUtil::stringtok(paths, value.addr, ", "); 1595 StringUtil::stringtok(paths, value.addr, ", ");
1596 for (unsigned int i=0; i<paths.size(); ++i) 1596 for (size_t i = 0; i < paths.size(); ++i)
1597 FbTk::Image::addSearchPath(paths[i]); 1597 FbTk::Image::addSearchPath(paths[i]);
1598 } 1598 }
1599 1599