summaryrefslogtreecommitdiff
path: root/launcher
diff options
Diffstat (limited to 'launcher')
-rw-r--r--launcher/HudLauncherIcon.cpp2
-rw-r--r--launcher/SingleMonitorLauncherIcon.cpp6
-rw-r--r--launcher/SingleMonitorLauncherIcon.h9
3 files changed, 8 insertions, 9 deletions
diff --git a/launcher/HudLauncherIcon.cpp b/launcher/HudLauncherIcon.cpp
index 23882d632..1c223f627 100644
--- a/launcher/HudLauncherIcon.cpp
+++ b/launcher/HudLauncherIcon.cpp
@@ -34,7 +34,7 @@ namespace launcher
DECLARE_LOGGER(logger, "unity.launcher.icon.hud");
HudLauncherIcon::HudLauncherIcon(LauncherHideMode hide_mode)
- : SingleMonitorLauncherIcon(IconType::HUD, -1)
+ : SingleMonitorLauncherIcon(IconType::HUD)
, launcher_hide_mode_(hide_mode)
{
tooltip_text = _("HUD");
diff --git a/launcher/SingleMonitorLauncherIcon.cpp b/launcher/SingleMonitorLauncherIcon.cpp
index d0ad66179..cee5764d2 100644
--- a/launcher/SingleMonitorLauncherIcon.cpp
+++ b/launcher/SingleMonitorLauncherIcon.cpp
@@ -27,7 +27,7 @@ namespace unity
namespace launcher
{
-SingleMonitorLauncherIcon::SingleMonitorLauncherIcon(IconType type, unsigned monitor)
+SingleMonitorLauncherIcon::SingleMonitorLauncherIcon(IconType type, int monitor)
: SimpleLauncherIcon(type)
, monitor_(monitor)
{
@@ -40,7 +40,7 @@ void SingleMonitorLauncherIcon::UpdateMonitor()
SetVisibleOnMonitor(i, i == monitor_);
}
-void SingleMonitorLauncherIcon::SetMonitor(unsigned monitor)
+void SingleMonitorLauncherIcon::SetMonitor(int monitor)
{
if (monitor != monitor_)
{
@@ -49,7 +49,7 @@ void SingleMonitorLauncherIcon::SetMonitor(unsigned monitor)
}
}
-unsigned SingleMonitorLauncherIcon::GetMonitor() const
+int SingleMonitorLauncherIcon::GetMonitor() const
{
return monitor_;
}
diff --git a/launcher/SingleMonitorLauncherIcon.h b/launcher/SingleMonitorLauncherIcon.h
index 369aed51c..b24645e79 100644
--- a/launcher/SingleMonitorLauncherIcon.h
+++ b/launcher/SingleMonitorLauncherIcon.h
@@ -29,12 +29,11 @@ namespace launcher
class SingleMonitorLauncherIcon : public SimpleLauncherIcon
{
-
public:
- SingleMonitorLauncherIcon(IconType type, unsigned monitor);
+ SingleMonitorLauncherIcon(IconType type, int monitor = -1);
-void SetMonitor(unsigned monitor);
-unsigned GetMonitor() const;
+void SetMonitor(int monitor);
+int GetMonitor() const;
protected:
std::string GetName() const;
@@ -43,7 +42,7 @@ protected:
private:
void UpdateMonitor();
- unsigned monitor_;
+ int monitor_;
};
}