[haiku-commits] r38203 - in haiku/trunk: build/jam src/preferences/keymap
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 17 Aug 2010 19:37:16 +0200 (CEST)
Author: zooey
Date: 2010-08-17 19:37:15 +0200 (Tue, 17 Aug 2010)
New Revision: 38203
Changeset: http://dev.haiku-os.org/changeset/38203
Modified:
haiku/trunk/build/jam/BuildSetup
haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h
haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
Log:
* fix warnings in Keymap preflet about hidden virtual by renaming SetFont()
to SetBaseFont() (and fFont to fBaseFont)
* enabled -Werror for all preflets
Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup 2010-08-17 17:11:11 UTC (rev 38202)
+++ haiku/trunk/build/jam/BuildSetup 2010-08-17 17:37:15 UTC (rev 38203)
@@ -1390,33 +1390,7 @@
EnableWerror src kits textencoding ;
# EnableWerror src kits tracker ;
EnableWerror src kits translation ;
- EnableWerror src preferences appearance ;
- EnableWerror src preferences backgrounds ;
- EnableWerror src preferences bluetooth ;
- EnableWerror src preferences cpufrequency ;
- EnableWerror src preferences datatranslations ;
- EnableWerror src preferences deskbar ;
- EnableWerror src preferences filetypes ;
- EnableWerror src preferences fonts ;
- EnableWerror src preferences joysticks ;
- EnableWerror src preferences keyboard ;
-# EnableWerror src preferences keymap ;
- EnableWerror src preferences locale ;
- EnableWerror src preferences mail ;
- EnableWerror src preferences media ;
- EnableWerror src preferences mouse ;
- EnableWerror src preferences network ;
- EnableWerror src preferences notifications ;
- EnableWerror src preferences opengl ;
- EnableWerror src preferences print ;
- EnableWerror src preferences screen ;
- EnableWerror src preferences screensaver ;
- EnableWerror src preferences shortcuts ;
- EnableWerror src preferences sounds ;
- EnableWerror src preferences time ;
- EnableWerror src preferences touchpad ;
- EnableWerror src preferences tracker ;
- EnableWerror src preferences virtualmemory ;
+ EnableWerror src preferences ;
EnableWerror src servers app ;
# EnableWerror src servers bluetooth ;
EnableWerror src servers cddb_daemon ;
Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp 2010-08-17
17:11:11 UTC (rev 38202)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.cpp 2010-08-17
17:37:15 UTC (rev 38203)
@@ -77,14 +77,14 @@
void
-KeyboardLayoutView::SetFont(const BFont& font)
+KeyboardLayoutView::SetBaseFont(const BFont& font)
{
- fFont = font;
+ fBaseFont = font;
font_height fontHeight;
- fFont.GetHeight(&fontHeight);
+ fBaseFont.GetHeight(&fontHeight);
fBaseFontHeight = fontHeight.ascent + fontHeight.descent;
- fBaseFontSize = fFont.Size();
+ fBaseFontSize = fBaseFont.Size();
Invalidate();
}
@@ -95,7 +95,7 @@
{
SetViewColor(B_TRANSPARENT_COLOR);
- SetFont(*be_plain_font);
+ SetBaseFont(*be_plain_font);
fSpecialFont = *be_fixed_font;
fModifiers = modifiers();
}
@@ -277,7 +277,7 @@
BView* view = new BView(rect, "drag", B_FOLLOW_NONE, 0);
bitmap->AddChild(view);
-
+
view->SetHighColor(0, 0, 0, 0);
view->FillRect(view->Bounds());
view->SetDrawingMode(B_OP_ALPHA);
@@ -860,7 +860,7 @@
keyKind = kSymbolKey;
} else {
bool hasGlyphs;
- fFont.GetHasGlyphs(bytes, 1, &hasGlyphs);
+ fBaseFont.GetHasGlyphs(bytes, 1, &hasGlyphs);
if (hasGlyphs)
strlcpy(text, bytes, sizeof(text));
}
@@ -1062,8 +1062,8 @@
switch (keyKind) {
case kNormalKey:
- fFont.SetSize(fontSize);
- view->SetFont(&fFont);
+ fBaseFont.SetSize(fontSize);
+ view->SetFont(&fBaseFont);
break;
case kSpecialKey:
fSpecialFont.SetSize(fontSize * 0.7);
Modified: haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h
===================================================================
--- haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h 2010-08-17
17:11:11 UTC (rev 38202)
+++ haiku/trunk/src/preferences/keymap/KeyboardLayoutView.h 2010-08-17
17:37:15 UTC (rev 38203)
@@ -26,7 +26,7 @@
KeyboardLayout* GetKeyboardLayout() { return
fLayout; }
- void SetFont(const BFont&
font);
+ void SetBaseFont(const
BFont& font);
void SetEditable(bool
editable);
@@ -112,7 +112,7 @@
BPoint fDropPoint;
BSize fOldSize;
- BFont fFont;
+ BFont fBaseFont;
BFont fSpecialFont;
float fBaseFontHeight;
float fBaseFontSize;
Modified: haiku/trunk/src/preferences/keymap/KeymapWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2010-08-17 17:11:11 UTC
(rev 38202)
+++ haiku/trunk/src/preferences/keymap/KeymapWindow.cpp 2010-08-17 17:37:15 UTC
(rev 38203)
@@ -244,7 +244,7 @@
if (item != NULL) {
BFont font;
font.SetFamilyAndStyle(item->Label(), NULL);
- fKeyboardLayoutView->SetFont(font);
+ fKeyboardLayoutView->SetBaseFont(font);
fTextControl->TextView()->SetFontAndColor(&font);
}
break;
Other related posts:
- » [haiku-commits] r38203 - in haiku/trunk: build/jam src/preferences/keymap - zooey
