[haiku-commits] haiku: hrev46639 - in src: data/settings/tracker_new_templates preferences/keymap
- From: humdingerb@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 3 Jan 2014 10:40:51 +0100 (CET)
hrev46639 adds 2 changesets to branch 'master'
old head: de5c16f10ad133de6e8f864e3bbb16679d6ad900
new head: 346c9923524a469505f5b4b1cb9f29cadcdeee1d
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=346c992+%5Ede5c16f
----------------------------------------------------------------------------
4a3268e: Replaced "makefile" Tracker template. Fixes #10366.
* copied the correct, up-to-date makefile template from data/develop/
346c992: Cleanup of KeymapWindow.cpp
[ Humdinger <humdingerb@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 28 insertions(+), 9 deletions(-)
src/data/settings/tracker_new_templates/makefile | 24 ++++++++++++++++++--
src/preferences/keymap/KeymapWindow.cpp | 13 +++++------
############################################################################
Commit: 4a3268e14fff4dd5a456d824b48ce6503368e4c1
URL: http://cgit.haiku-os.org/haiku/commit/?id=4a3268e
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Fri Jan 3 09:25:08 2014 UTC
Ticket: https://dev.haiku-os.org/ticket/10366
Replaced "makefile" Tracker template. Fixes #10366.
* copied the correct, up-to-date makefile template from data/develop/
----------------------------------------------------------------------------
diff --git a/src/data/settings/tracker_new_templates/makefile
b/src/data/settings/tracker_new_templates/makefile
index e50b2b0..41c1ca2 100644
--- a/src/data/settings/tracker_new_templates/makefile
+++ b/src/data/settings/tracker_new_templates/makefile
@@ -1,4 +1,4 @@
-## BeOS Generic Makefile v2.3 ##
+## BeOS Generic Makefile v2.5 ##
## Fill in this file to specify the project being created, and the referenced
## makefile-engine will do all of the hard work for you. This handles both
@@ -16,6 +16,10 @@ NAME=
# DRIVER: Kernel Driver
TYPE=
+# if you plan to use localization features
+# specify the application MIME siganture
+APP_MIME_SIG=
+
# add support for new Pe and Eddie features
# to fill in generic makefile
@@ -51,6 +55,12 @@ RSRCS=
# - if your library follows the naming pattern of:
# libXXX.so or libXXX.a you can simply specify XXX
# library: libbe.so entry: be
+#
+# - for version-independent linking of standard C++ libraries
please add
+# $(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library
names
+#
+# - for localization support add following libs:
+# locale localestub
#
# - if your library does not follow the standard library
# naming scheme you need to specify the path to the library
@@ -80,6 +90,14 @@ LOCAL_INCLUDE_PATHS =
# NONE, SOME, FULL
OPTIMIZE=
+# specify here the codes for languages you are going
+# to support in this application. The default "en"
+# one must be provided too. "make catkeys" will recreate only
+# locales/en.catkeys file. Use it as template for creating other
+# languages catkeys. All localization files must be placed
+# in "locales" sub-directory.
+LOCALES=
+
# specify any preprocessor symbols to be defined. The symbols will not
# have their values set automatically; you must supply the value (if any)
# to use. For example, setting DEFINES to "DEBUG=1" will cause the
@@ -122,4 +140,6 @@ APP_VERSION =
DRIVER_PATH =
## include the makefile-engine
-include $(BUILDHOME)/etc/makefile-engine
+DEVEL_DIRECTORY := \
+ $(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
+include $(DEVEL_DIRECTORY)/etc/makefile-engine
############################################################################
Revision: hrev46639
Commit: 346c9923524a469505f5b4b1cb9f29cadcdeee1d
URL: http://cgit.haiku-os.org/haiku/commit/?id=346c992
Author: Humdinger <humdingerb@xxxxxxxxx>
Date: Fri Jan 3 09:39:06 2014 UTC
Cleanup of KeymapWindow.cpp
----------------------------------------------------------------------------
diff --git a/src/preferences/keymap/KeymapWindow.cpp
b/src/preferences/keymap/KeymapWindow.cpp
index 1f4f3d4..8e0be18 100644
--- a/src/preferences/keymap/KeymapWindow.cpp
+++ b/src/preferences/keymap/KeymapWindow.cpp
@@ -21,7 +21,6 @@
#include <Directory.h>
#include <File.h>
#include <FindDirectory.h>
-#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <ListView.h>
#include <Locale.h>
@@ -218,7 +217,7 @@ KeymapWindow::MessageReceived(BMessage* message)
case B_SAVE_REQUESTED:
{
entry_ref ref;
- const char *name;
+ const char* name;
if (message->FindRef("directory", &ref) == B_OK
&& message->FindString("name", &name) == B_OK) {
BDirectory directory(&ref);
@@ -261,7 +260,7 @@ KeymapWindow::MessageReceived(BMessage* message)
case kMsgMenuFontChanged:
{
- BMenuItem *item = fFontMenu->FindMarked();
+ BMenuItem* item = fFontMenu->FindMarked();
if (item != NULL) {
BFont font;
font.SetFamilyAndStyle(item->Label(), NULL);
@@ -467,7 +466,7 @@ KeymapWindow::_CreateMenu()
for (int32 i = 0; i < numFamilies; i++) {
if (get_font_family(i, &family, &flags) == B_OK) {
- BMenuItem *item =
+ BMenuItem* item =
new BMenuItem(family, new
BMessage(kMsgMenuFontChanged));
fFontMenu->AddItem(item);
@@ -850,7 +849,7 @@ KeymapWindow::_UseKeymap()
void
KeymapWindow::_FillSystemMaps()
{
- BListItem *item;
+ BListItem* item;
while ((item = fSystemListView->RemoveItem(static_cast<int32>(0))))
delete item;
@@ -1085,9 +1084,9 @@ KeymapWindow::_GetMarkedKeyboardLayoutPath(BMenu* menu)
return _GetMarkedKeyboardLayoutPath(submenu);
else {
if (item->IsMarked()
- && item->Message()->FindRef("ref", &ref) == B_OK) {
+ && item->Message()->FindRef("ref", &ref) ==
B_OK) {
path.SetTo(&ref);
- return path;
+ return path;
}
}
}
Other related posts:
