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

Moved IconUtils.h to Interface Kit and therefor made it an "official" header. Since the class has no

Browse Source 
virtual but only static methods, it is not so likely that binary compatibility issues may arrise
from using it in new apps. Adjusted all the Jamfiles that included the private libicon headers. Note
that it was never necessary to link against libicon.a, since it's part of libbe anyway. There was one
instance where that was done. Hopefully it does not break the build, but I did this change a while ago,
tested it and then the harddrive began failing.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40679 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2011-02-25 09:12:38 +00:00
parent ed95053221
commit 4153964a10
23 changed files with 18 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/libs/icon/IconUtils.h → headers/os/interface/IconUtils.h
View File
src/add-ons/screen_savers/icons/Jamfile
+2 -3
View File
@@ -1,10 +1,9 @@
SubDir HAIKU_TOP src add-ons screen_savers icons ; SubDir HAIKU_TOP src add-ons screen_savers icons ;
UseLibraryHeaders icon ;
UsePrivateHeaders screen_saver ; UsePrivateHeaders screen_saver ;
# For BuildScreenSaverDefaultSettingsView # For BuildScreenSaverDefaultSettingsView
ScreenSaver Icons : ScreenSaver Icons :
IconDisplay.cpp IconsSaver.cpp : IconDisplay.cpp IconsSaver.cpp :
be libscreensaver.so libicon.a $(TARGET_LIBSUPC++) be libscreensaver.so $(TARGET_LIBSUPC++)
; ;
src/add-ons/translators/hvif/Jamfile
+1 -3
View File
@@ -1,7 +1,5 @@
SubDir HAIKU_TOP src add-ons translators hvif ; SubDir HAIKU_TOP src add-ons translators hvif ;
UseLibraryHeaders icon ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
AddResources HVIFTranslator : HVIFTranslator.rdef ; AddResources HVIFTranslator : HVIFTranslator.rdef ;
@@ -10,7 +8,7 @@ Translator HVIFTranslator :
HVIFMain.cpp HVIFMain.cpp
HVIFTranslator.cpp HVIFTranslator.cpp
HVIFView.cpp HVIFView.cpp
: be translation libtranslatorsutils.a $(TARGET_LIBSUPC++) : be translation libtranslatorsutils.a $(TARGET_LIBSUPC++)
$(HAIKU_LOCALE_LIBS) $(HAIKU_LOCALE_LIBS)
: true : true
; ;
src/apps/diskprobe/Jamfile
-1
View File
@@ -2,7 +2,6 @@ SubDir HAIKU_TOP src apps diskprobe ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders icon ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
Application DiskProbe : Application DiskProbe :
src/apps/expander/Jamfile
+1 -3
View File
@@ -1,8 +1,6 @@
SubDir HAIKU_TOP src apps expander ; SubDir HAIKU_TOP src apps expander ;
UseLibraryHeaders icon ; Application Expander :
Application Expander :
ExpanderApp.cpp ExpanderApp.cpp
ExpanderWindow.cpp ExpanderWindow.cpp
ExpanderThread.cpp ExpanderThread.cpp
src/apps/networkstatus/Jamfile
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src apps networkstatus ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders net shared ; UsePrivateHeaders net shared ;
UseLibraryHeaders agg icon ; UseLibraryHeaders agg ;
local icon_libs ; local icon_libs ;
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) { if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
src/apps/pairs/Jamfile
-2
View File
@@ -1,7 +1,5 @@
SubDir HAIKU_TOP src apps pairs ; SubDir HAIKU_TOP src apps pairs ;
UseLibraryHeaders icon ;
Application Pairs : Application Pairs :
Pairs.cpp Pairs.cpp
PairsWindow.cpp PairsWindow.cpp
src/apps/soundrecorder/Jamfile
-1
View File
@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src apps soundrecorder ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
UseLibraryHeaders icon ;
Application SoundRecorder : Application SoundRecorder :
DrawButton.cpp DrawButton.cpp
src/bin/Jamfile
-1
View File
@@ -11,7 +11,6 @@ UsePrivateSystemHeaders ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ; SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_cache ;
UseLibraryHeaders ncurses ; UseLibraryHeaders ncurses ;
UseLibraryHeaders termcap ; UseLibraryHeaders termcap ;
UseLibraryHeaders icon ;
local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ; local haiku-utils_rsrc = [ FGristFiles haiku-utils.rsrc ] ;
src/bin/desklink/Jamfile
-1
View File
@@ -2,7 +2,6 @@ SubDir HAIKU_TOP src bin desklink ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders icon ;
UsePrivateHeaders app interface shared ; UsePrivateHeaders app interface shared ;
BinCommand desklink : BinCommand desklink :
src/kits/interface/Jamfile
+1 -1
View File
@@ -24,7 +24,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
SetSubDirSupportedPlatforms haiku libbe_test ; SetSubDirSupportedPlatforms haiku libbe_test ;
UseLibraryHeaders agg icon ; UseLibraryHeaders agg ;
UsePrivateHeaders app input print interface libbe shared support tracker ; UsePrivateHeaders app input print interface libbe shared support tracker ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ;
src/kits/locale/Jamfile
+2 -3
View File
@@ -3,8 +3,7 @@ SubDir HAIKU_TOP src kits locale ;
AddSubDirSupportedPlatforms libbe_test ; AddSubDirSupportedPlatforms libbe_test ;
UsePrivateHeaders libbe locale shared ; UsePrivateHeaders libbe locale shared ;
UsePublicHeaders locale storage icon ; UsePublicHeaders locale storage ;
UseLibraryHeaders icon ;
local sources = local sources =
cat.cpp cat.cpp
@@ -75,5 +74,5 @@ DoCatalogs liblocale.so
AboutWindow.cpp AboutWindow.cpp
ColorControl.cpp ColorControl.cpp
StringForSize.cpp StringForSize.cpp
TextView.cpp TextView.cpp
; ;
src/kits/shared/Jamfile
+1 -1
View File
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src kits shared ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
AddSubDirSupportedPlatforms libbe_test ; AddSubDirSupportedPlatforms libbe_test ;
UseLibraryHeaders agg icon ; UseLibraryHeaders agg ;
UsePrivateHeaders shared libbe ; UsePrivateHeaders shared libbe ;
UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ; UseHeaders [ FDirName $(HAIKU_COMMON_DEBUG_OBJECT_DIR) servers input ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ; UseHeaders [ FDirName $(HAIKU_TOP) src kits ] ;
src/kits/storage/Jamfile
-2
View File
@@ -2,8 +2,6 @@ SubDir HAIKU_TOP src kits storage ;
SetSubDirSupportedPlatforms haiku libbe_test ; SetSubDirSupportedPlatforms haiku libbe_test ;
UseLibraryHeaders icon ;
UsePrivateHeaders app libroot shared storage ; UsePrivateHeaders app libroot shared storage ;
UsePrivateSystemHeaders ; UsePrivateSystemHeaders ;
src/kits/tracker/Jamfile
-2
View File
@@ -5,8 +5,6 @@ AddSubDirSupportedPlatforms libbe_test ;
UsePrivateHeaders interface mount shared storage support tracker ; UsePrivateHeaders interface mount shared storage support tracker ;
UseLibraryHeaders icon ;
AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ; AddResources libtracker.so : TrackerIcons.rdef libtracker.rdef ;
SubDirC++Flags SubDirC++Flags
src/preferences/media/Jamfile
+2 -3
View File
@@ -6,18 +6,17 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
SubDirC++Flags -fmultiple-symbol-spaces ; SubDirC++Flags -fmultiple-symbol-spaces ;
} }
UseLibraryHeaders icon ;
UsePrivateHeaders media shared ; UsePrivateHeaders media shared ;
Preference Media : Preference Media :
Media.cpp Media.cpp
MediaAlert.cpp MediaAlert.cpp
MediaIcons.cpp MediaIcons.cpp
MediaListItem.cpp MediaListItem.cpp
MediaViews.cpp MediaViews.cpp
MediaWindow.cpp MediaWindow.cpp
: media be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) : media be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
: media.rdef : media.rdef
; ;
DoCatalogs Media DoCatalogs Media
src/preferences/screen/Jamfile
-1
View File
@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src preferences screen ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
AddSubDirSupportedPlatforms libbe_test ; AddSubDirSupportedPlatforms libbe_test ;
UseLibraryHeaders icon ;
UsePrivateHeaders [ FDirName graphics radeon ] ; UsePrivateHeaders [ FDirName graphics radeon ] ;
UsePrivateHeaders interface ; UsePrivateHeaders interface ;
src/servers/bluetooth/Jamfile
+1 -2
View File
@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src servers bluetooth ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UsePrivateHeaders shared bluetooth net kernel ; UsePrivateHeaders shared bluetooth net kernel ;
UseLibraryHeaders icon ;
AddResources bluetooth_server : server-bluetooth.rdef ; AddResources bluetooth_server : server-bluetooth.rdef ;
@@ -15,7 +14,7 @@ Server bluetooth_server
HCIControllerAccessor.cpp HCIControllerAccessor.cpp
HCITransportAccessor.cpp HCITransportAccessor.cpp
LocalDeviceHandler.cpp LocalDeviceHandler.cpp
LocalDeviceImpl.cpp LocalDeviceImpl.cpp
Output.cpp Output.cpp
: be network libbluetooth.so : be network libbluetooth.so
$(TARGET_LIBSTDC++) $(TARGET_LIBSTDC++)
src/servers/mail/Jamfile
-1
View File
@@ -9,7 +9,6 @@ if $(TARGET_PLATFORM) != haiku {
UsePublicHeaders [ FDirName add-ons mail_daemon ] ; UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
UsePrivateHeaders mail ; UsePrivateHeaders mail ;
UsePrivateHeaders shared ; UsePrivateHeaders shared ;
UseLibraryHeaders icon ;
SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ; SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
src/servers/midi/Jamfile
+3 -4
View File
@@ -2,20 +2,19 @@ SubDir HAIKU_TOP src servers midi ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders icon ;
UsePrivateHeaders midi shared storage ; UsePrivateHeaders midi shared storage ;
Server midi_server : Server midi_server :
MidiServerApp.cpp MidiServerApp.cpp
DeviceWatcher.cpp DeviceWatcher.cpp
PortDrivers.cpp PortDrivers.cpp
# storage # storage
NodeMonitorHandler.cpp NodeMonitorHandler.cpp
: be midi2 libshared.a libicon.a $(TARGET_LIBSTDC++) : be midi2 libshared.a libicon.a $(TARGET_LIBSTDC++)
: midi_server.rdef : midi_server.rdef
; ;
SEARCH on [ FGristFiles NodeMonitorHandler.cpp ] SEARCH on [ FGristFiles NodeMonitorHandler.cpp ]
+= [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ; += [ FDirName $(SUBDIR) $(DOTDOT) $(DOTDOT) kits storage ] ;
src/servers/notification/Jamfile
-1
View File
@@ -1,7 +1,6 @@
SubDir HAIKU_TOP src servers notification ; SubDir HAIKU_TOP src servers notification ;
UsePrivateHeaders notification ; UsePrivateHeaders notification ;
UseLibraryHeaders icon ;
Server notification_server : Server notification_server :
AppGroupView.cpp AppGroupView.cpp
src/tests/kits/midi/patchbay/Jamfile
+2 -4
View File
@@ -2,10 +2,8 @@ SubDir HAIKU_TOP src tests kits midi patchbay ;
SetSubDirSupportedPlatformsBeOSCompatible ; SetSubDirSupportedPlatformsBeOSCompatible ;
UseLibraryHeaders icon ;
SimpleTest PatchBay SimpleTest PatchBay
: :
PatchApp.cpp PatchApp.cpp
PatchWin.cpp PatchWin.cpp
PatchView.cpp PatchView.cpp
@@ -13,7 +11,7 @@ SimpleTest PatchBay
EndpointInfo.cpp EndpointInfo.cpp
MidiEventMeter.cpp MidiEventMeter.cpp
TToolTip.cpp TToolTip.cpp
: :
midi midi2 be libicon.a $(TARGET_LIBSTDC++) midi midi2 be libicon.a $(TARGET_LIBSTDC++)
; ;
src/tests/kits/net/preflet/InterfacesAddOn/Jamfile
+1 -1
View File
@@ -6,7 +6,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src tests kits net preflet ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ; UseHeaders [ FDirName $(HAIKU_TOP) src servers net ] : true ;
UsePrivateHeaders net shared ; UsePrivateHeaders net shared ;
UseLibraryHeaders agg icon ; UseLibraryHeaders agg ;
AddResources Interfaces : AddResources Interfaces :