Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -bur keymapswitcher(haiku)/app.makefile keymapswitcher/app.makefile
- --- keymapswitcher(haiku)/app.makefile 2012-08-21 01:10:13.007602176 +0600
- +++ keymapswitcher/app.makefile 2012-12-25 09:55:56.628359168 +0600
- @@ -61,7 +61,7 @@
- # naming scheme you need to specify the path to the library
- # and it's name
- # library: my_lib.a entry: my_lib.a or path/my_lib.a
- -LIBS=be $(STDCPPLIBS) localestub
- +LIBS=be $(STDCPPLIBS) localestub stdc++
- # specify additional paths to directories following the standard
- # libXXX.so or libXXX.a naming scheme. You can specify full paths
- diff -bur keymapswitcher(haiku)/DeskView.cpp keymapswitcher/DeskView.cpp
- --- keymapswitcher(haiku)/DeskView.cpp 2012-11-16 01:25:25.006029312 +0600
- +++ keymapswitcher/DeskView.cpp 2012-12-25 09:45:39.104071168 +0600
- @@ -159,8 +159,8 @@
- BList *teams = new BList;
- be_roster->GetAppList(teams);
- int32 teams_count = teams->CountItems();
- - for (int i=0; i<teams_count; i++) {
- - team_id team = (team_id) teams->ItemAt(i);
- + for ( int32 i=0; i<teams_count; i++) {
- + team_id team = (team_id)(addr_t)teams->ItemAt(i);
- app_info info;
- be_roster->GetRunningAppInfo(team, &info);
- @@ -184,11 +184,11 @@
- DELETE(settings);
- if (NULL != app_list)
- while (!app_list->IsEmpty())
- - delete (static_cast<team_keymap*> (app_list->RemoveItem(0L)));
- + delete (static_cast<team_keymap*> (app_list->RemoveItem((int32)0)));
- DELETE(app_list);
- if (NULL != keymaps) {
- while (!keymaps->IsEmpty())
- - delete (static_cast<BString*> (keymaps->RemoveItem(0L)));
- + delete (static_cast<BString*> (keymaps->RemoveItem((int32)0)));
- DELETE(keymaps);
- }
- }
- Only in keymapswitcher: install
- diff -bur keymapswitcher(haiku)/SettingsWindow.cpp keymapswitcher/SettingsWindow.cpp
- --- keymapswitcher(haiku)/SettingsWindow.cpp 2012-11-16 00:15:24.007077888 +0600
- +++ keymapswitcher/SettingsWindow.cpp 2012-12-25 09:53:36.794296320 +0600
- @@ -414,9 +414,9 @@
- SettingsWindow::~SettingsWindow()
- {
- while(0 < available_list->CountItems())
- - delete (dynamic_cast<KeymapItem*> (available_list->RemoveItem(0L)));
- + delete available_list->RemoveItem((int32)0);
- while(0 < selected_list->CountItems())
- - delete (dynamic_cast<KeymapItem*> (selected_list->RemoveItem(0L)));
- + delete selected_list->RemoveItem((int32)0);
- delete settings;
- delete settingsOrg;
- }
- @@ -713,7 +713,8 @@
- if(!IsEmpty()) {
- // first clean the list
- while(0 < CountItems())
- - delete (dynamic_cast<KeymapItem*> (RemoveItem(0L)));
- + //delete (dynamic_cast<KeymapItem*> (RemoveItem(0)));
- + delete RemoveItem((int32)0);
- MakeEmpty();
- }
- @@ -820,7 +821,7 @@
- Window()->PostMessage(¬ify);
- int32 index = -1;
- message->FindInt32("index", &index);
- - delete (dynamic_cast<KeymapItem*> (RemoveItem(index)));
- + delete (RemoveItem(index));
- // restore selection after delete
- int32 count = CountItems();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement