← Back to branch summary

~3v1n0/unity/overlay-border-scale

~3v1n0/unity/overlay-border-scale

« back to all changes in this revision

Viewing changes to unity-shared/IconLoader.cpp

Committer: Gord Allott
Date: 2012-05-06 23:48:38 UTC
mto: This revision was merged to the branch mainline in revision 2352.
Revision ID: gord.allott@canonical.com-20120506234838-abh00p9gdw09n0rv

panel and dash moved to subdirectories

files added:
dash

dash/CMakeLists.txt

panel

panel/CMakeLists.txt

unity-shared

unity-shared/CMakeLists.txt

files renamed:
plugins/unityshell/src/AbstractPlacesGroup.cpp => dash/AbstractPlacesGroup.cpp

plugins/unityshell/src/AbstractPlacesGroup.h => dash/AbstractPlacesGroup.h

plugins/unityshell/src/AbstractSeparator.cpp => dash/AbstractSeparator.cpp

plugins/unityshell/src/AbstractSeparator.h => dash/AbstractSeparator.h

plugins/unityshell/src/DashController.cpp => dash/DashController.cpp

plugins/unityshell/src/DashController.h => dash/DashController.h

plugins/unityshell/src/DashView.cpp => dash/DashView.cpp

plugins/unityshell/src/DashView.h => dash/DashView.h

plugins/unityshell/src/DashViewPrivate.cpp => dash/DashViewPrivate.cpp

plugins/unityshell/src/DashViewPrivate.h => dash/DashViewPrivate.h

plugins/unityshell/src/FilterAllButton.cpp => dash/FilterAllButton.cpp

plugins/unityshell/src/FilterAllButton.h => dash/FilterAllButton.h

plugins/unityshell/src/FilterBar.cpp => dash/FilterBar.cpp

plugins/unityshell/src/FilterBar.h => dash/FilterBar.h

plugins/unityshell/src/FilterBasicButton.cpp => dash/FilterBasicButton.cpp

plugins/unityshell/src/FilterBasicButton.h => dash/FilterBasicButton.h

plugins/unityshell/src/FilterExpanderLabel.cpp => dash/FilterExpanderLabel.cpp

plugins/unityshell/src/FilterExpanderLabel.h => dash/FilterExpanderLabel.h

plugins/unityshell/src/FilterFactory.cpp => dash/FilterFactory.cpp

plugins/unityshell/src/FilterFactory.h => dash/FilterFactory.h

plugins/unityshell/src/FilterGenreButton.cpp => dash/FilterGenreButton.cpp

plugins/unityshell/src/FilterGenreButton.h => dash/FilterGenreButton.h

plugins/unityshell/src/FilterGenreWidget.cpp => dash/FilterGenreWidget.cpp

plugins/unityshell/src/FilterGenreWidget.h => dash/FilterGenreWidget.h

plugins/unityshell/src/FilterMultiRangeButton.cpp => dash/FilterMultiRangeButton.cpp

plugins/unityshell/src/FilterMultiRangeButton.h => dash/FilterMultiRangeButton.h

plugins/unityshell/src/FilterMultiRangeWidget.cpp => dash/FilterMultiRangeWidget.cpp

plugins/unityshell/src/FilterMultiRangeWidget.h => dash/FilterMultiRangeWidget.h

plugins/unityshell/src/FilterRatingsButton.cpp => dash/FilterRatingsButton.cpp

plugins/unityshell/src/FilterRatingsButton.h => dash/FilterRatingsButton.h

plugins/unityshell/src/FilterRatingsWidget.cpp => dash/FilterRatingsWidget.cpp

plugins/unityshell/src/FilterRatingsWidget.h => dash/FilterRatingsWidget.h

plugins/unityshell/src/LensBar.cpp => dash/LensBar.cpp

plugins/unityshell/src/LensBar.h => dash/LensBar.h

plugins/unityshell/src/LensBarIcon.cpp => dash/LensBarIcon.cpp

plugins/unityshell/src/LensBarIcon.h => dash/LensBarIcon.h

plugins/unityshell/src/LensView.cpp => dash/LensView.cpp

plugins/unityshell/src/LensView.h => dash/LensView.h

plugins/unityshell/src/LensViewPrivate.cpp => dash/LensViewPrivate.cpp

plugins/unityshell/src/LensViewPrivate.h => dash/LensViewPrivate.h

plugins/unityshell/src/LineSeparator.cpp => dash/LineSeparator.cpp

plugins/unityshell/src/LineSeparator.h => dash/LineSeparator.h

plugins/unityshell/src/PlacesGroup.cpp => dash/PlacesGroup.cpp

plugins/unityshell/src/PlacesGroup.h => dash/PlacesGroup.h

plugins/unityshell/src/PlacesSimpleTile.cpp => dash/PlacesSimpleTile.cpp

plugins/unityshell/src/PlacesSimpleTile.h => dash/PlacesSimpleTile.h

plugins/unityshell/src/PlacesTile.cpp => dash/PlacesTile.cpp

plugins/unityshell/src/PlacesTile.h => dash/PlacesTile.h

plugins/unityshell/src/PlacesVScrollBar.cpp => dash/PlacesVScrollBar.cpp

plugins/unityshell/src/PlacesVScrollBar.h => dash/PlacesVScrollBar.h

plugins/unityshell/src/PreviewApplications.cpp => dash/PreviewApplications.cpp

plugins/unityshell/src/PreviewApplications.h => dash/PreviewApplications.h

plugins/unityshell/src/PreviewBase.cpp => dash/PreviewBase.cpp

plugins/unityshell/src/PreviewBase.h => dash/PreviewBase.h

plugins/unityshell/src/PreviewBasicButton.cpp => dash/PreviewBasicButton.cpp

plugins/unityshell/src/PreviewBasicButton.h => dash/PreviewBasicButton.h

plugins/unityshell/src/PreviewGeneric.cpp => dash/PreviewGeneric.cpp

plugins/unityshell/src/PreviewGeneric.h => dash/PreviewGeneric.h

plugins/unityshell/src/PreviewMusic.cpp => dash/PreviewMusic.cpp

plugins/unityshell/src/PreviewMusic.h => dash/PreviewMusic.h

plugins/unityshell/src/PreviewMusicTrack.cpp => dash/PreviewMusicTrack.cpp

plugins/unityshell/src/PreviewMusicTrack.h => dash/PreviewMusicTrack.h

plugins/unityshell/src/PreviewMusicTrackWidget.cpp => dash/PreviewMusicTrackWidget.cpp

plugins/unityshell/src/PreviewMusicTrackWidget.h => dash/PreviewMusicTrackWidget.h

plugins/unityshell/src/ResultRenderer.cpp => dash/ResultRenderer.cpp

plugins/unityshell/src/ResultRenderer.h => dash/ResultRenderer.h

plugins/unityshell/src/ResultRendererHorizontalTile.cpp => dash/ResultRendererHorizontalTile.cpp

plugins/unityshell/src/ResultRendererHorizontalTile.h => dash/ResultRendererHorizontalTile.h

plugins/unityshell/src/ResultRendererTile.cpp => dash/ResultRendererTile.cpp

plugins/unityshell/src/ResultRendererTile.h => dash/ResultRendererTile.h

plugins/unityshell/src/ResultView.cpp => dash/ResultView.cpp

plugins/unityshell/src/ResultView.h => dash/ResultView.h

plugins/unityshell/src/ResultViewGrid.cpp => dash/ResultViewGrid.cpp

plugins/unityshell/src/ResultViewGrid.h => dash/ResultViewGrid.h

plugins/unityshell/src/SearchBar.cpp => dash/SearchBar.cpp

plugins/unityshell/src/SearchBar.h => dash/SearchBar.h

plugins/unityshell/src/SearchBarSpinner.cpp => dash/SearchBarSpinner.cpp

plugins/unityshell/src/SearchBarSpinner.h => dash/SearchBarSpinner.h

standalone-clients/standalone_dash.cpp => dash/StandaloneDash.cpp

plugins/unityshell/src/PanelController.cpp => panel/PanelController.cpp

plugins/unityshell/src/PanelController.h => panel/PanelController.h

plugins/unityshell/src/PanelIndicatorEntryView.cpp => panel/PanelIndicatorEntryView.cpp

plugins/unityshell/src/PanelIndicatorEntryView.h => panel/PanelIndicatorEntryView.h

plugins/unityshell/src/PanelIndicatorsView.cpp => panel/PanelIndicatorsView.cpp

plugins/unityshell/src/PanelIndicatorsView.h => panel/PanelIndicatorsView.h

plugins/unityshell/src/PanelMenuView.cpp => panel/PanelMenuView.cpp

plugins/unityshell/src/PanelMenuView.h => panel/PanelMenuView.h

plugins/unityshell/src/PanelStyle.cpp => panel/PanelStyle.cpp

plugins/unityshell/src/PanelStyle.h => panel/PanelStyle.h

plugins/unityshell/src/PanelTitlebarGrabAreaView.cpp => panel/PanelTitlebarGrabAreaView.cpp

plugins/unityshell/src/PanelTitlebarGrabAreaView.h => panel/PanelTitlebarGrabAreaView.h

plugins/unityshell/src/PanelTray.cpp => panel/PanelTray.cpp

plugins/unityshell/src/PanelTray.h => panel/PanelTray.h

plugins/unityshell/src/PanelView.cpp => panel/PanelView.cpp

plugins/unityshell/src/PanelView.h => panel/PanelView.h

standalone-clients/TestPanel.cpp => panel/StandalonePanel.cpp

plugins/unityshell/src/WindowButtons.cpp => panel/WindowButtons.cpp

plugins/unityshell/src/WindowButtons.h => panel/WindowButtons.h

plugins/unityshell/src/WindowManager.cpp => panel/WindowManager.cpp

plugins/unityshell/src/WindowManager.h => panel/WindowManager.h

plugins/unityshell/src/Animator.cpp => unity-shared/Animator.cpp

plugins/unityshell/src/Animator.h => unity-shared/Animator.h

plugins/unityshell/src/BGHash.cpp => unity-shared/BGHash.cpp

plugins/unityshell/src/BGHash.h => unity-shared/BGHash.h

plugins/unityshell/src/BackgroundEffectHelper.cpp => unity-shared/BackgroundEffectHelper.cpp

plugins/unityshell/src/BackgroundEffectHelper.h => unity-shared/BackgroundEffectHelper.h

plugins/unityshell/src/DashSettings.cpp => unity-shared/DashSettings.cpp

plugins/unityshell/src/DashSettings.h => unity-shared/DashSettings.h

plugins/unityshell/src/DashStyle.cpp => unity-shared/DashStyle.cpp

plugins/unityshell/src/DashStyle.h => unity-shared/DashStyle.h

plugins/unityshell/src/FontSettings.cpp => unity-shared/FontSettings.cpp

plugins/unityshell/src/FontSettings.h => unity-shared/FontSettings.h

plugins/unityshell/src/IMTextEntry.cpp => unity-shared/IMTextEntry.cpp

plugins/unityshell/src/IMTextEntry.h => unity-shared/IMTextEntry.h

plugins/unityshell/src/IconLoader.cpp => unity-shared/IconLoader.cpp

plugins/unityshell/src/IconLoader.h => unity-shared/IconLoader.h

plugins/unityshell/src/IconTexture.cpp => unity-shared/IconTexture.cpp

plugins/unityshell/src/IconTexture.h => unity-shared/IconTexture.h

plugins/unityshell/src/Introspectable.cpp => unity-shared/Introspectable.cpp

plugins/unityshell/src/Introspectable.h => unity-shared/Introspectable.h

plugins/unityshell/src/IntrospectableWrappers.cpp => unity-shared/IntrospectableWrappers.cpp

plugins/unityshell/src/IntrospectableWrappers.h => unity-shared/IntrospectableWrappers.h

plugins/unityshell/src/JSONParser.cpp => unity-shared/JSONParser.cpp

plugins/unityshell/src/JSONParser.h => unity-shared/JSONParser.h

plugins/unityshell/src/OverlayRenderer.cpp => unity-shared/OverlayRenderer.cpp

plugins/unityshell/src/OverlayRenderer.h => unity-shared/OverlayRenderer.h

plugins/unityshell/src/StaticCairoText.cpp => unity-shared/StaticCairoText.cpp

plugins/unityshell/src/StaticCairoText.h => unity-shared/StaticCairoText.h

plugins/unityshell/src/TextureCache.cpp => unity-shared/TextureCache.cpp

plugins/unityshell/src/TextureCache.h => unity-shared/TextureCache.h

plugins/unityshell/src/TimeUtil.h => unity-shared/TimeUtil.h

plugins/unityshell/src/Timer.cpp => unity-shared/Timer.cpp

plugins/unityshell/src/Timer.h => unity-shared/Timer.h

plugins/unityshell/src/UBusMessages.h => unity-shared/UBusMessages.h

plugins/unityshell/src/UBusWrapper.cpp => unity-shared/UBusWrapper.cpp

plugins/unityshell/src/UBusWrapper.h => unity-shared/UBusWrapper.h

plugins/unityshell/src/UScreen.cpp => unity-shared/UScreen.cpp

plugins/unityshell/src/UScreen.h => unity-shared/UScreen.h

plugins/unityshell/src/ubus-server.cpp => unity-shared/ubus-server.cpp

plugins/unityshell/src/ubus-server.h => unity-shared/ubus-server.h

files modified:
CMakeLists.txt

standalone-clients/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

unity-shared/IconLoader.cpp

29

29

#include <UnityCore/GLibWrapper.h>

30

30

#include <string.h>

31

31

32

#include "Timer.h"

32

#include "unity-shared/Timer.h"

33

33

34

34

namespace unity

35

35

{

Older »