i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Removed TypedGroupListModel - without GCC2's covariant return type handling,

Browse Source 
it's not really worth the effort.
* Added missing libstdc++ to the build.
* This fixes the GCC4 build.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41803 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2011-05-29 08:17:27 +00:00
parent cb23dea57a
commit 105fd85c3a
3 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/switcher/GroupListView.h
-10
View File
@@ -21,16 +21,6 @@ public:
}; };
template<typename ItemType, typename GroupType>
class TypedGroupListModel : public GroupListModel {
public:
virtual ItemType* ItemAt(int32 index) = 0;
virtual GroupType* GroupAt(int32 index) = 0;
virtual GroupType* GroupForItemAt(int32 index) = 0;
};
class ListItemRenderer { class ListItemRenderer {
public: public:
virtual void SetTo(BView* owner, void* item) = 0; virtual void SetTo(BView* owner, void* item) = 0;
src/apps/switcher/Jamfile
+2 -1
View File
@@ -11,6 +11,7 @@ Application Switcher :
Switcher.cpp Switcher.cpp
WindowsView.cpp WindowsView.cpp
: be translation $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) libshared.a : be translation $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
$(HAIKU_LOCALE_LIBS) libshared.a
: Switcher.rdef : Switcher.rdef
; ;
src/apps/switcher/WindowsView.cpp
+3 -3
View File
@@ -24,7 +24,7 @@
static const uint32 kMsgActivateWindow = 'AcWn'; static const uint32 kMsgActivateWindow = 'AcWn';
class WindowModel : public TypedGroupListModel<client_window_info, void> { class WindowModel : public GroupListModel {
public: public:
WindowModel(team_id team) WindowModel(team_id team)
: :
@@ -86,7 +86,7 @@ public:
return fWindows.CountItems(); return fWindows.CountItems();
} }
virtual client_window_info* ItemAt(int32 index) virtual void* ItemAt(int32 index)
{ {
return fWindows.ItemAt(index); return fWindows.ItemAt(index);
} }
@@ -103,7 +103,7 @@ public:
virtual void* GroupForItemAt(int32 index) virtual void* GroupForItemAt(int32 index)
{ {
client_window_info* info = ItemAt(index); client_window_info* info = fWindows.ItemAt(index);
return (void*)(_NthSetBit(0, info->workspaces) + 1); return (void*)(_NthSetBit(0, info->workspaces) + 1);
} }