summaryrefslogtreecommitdiff
path: root/ui/taskbar.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:59 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:24:59 +0200
commita1c91f4695e208d5a8f80dc37b1818169b7829ff (patch)
tree52f5134376d17c99b6c9e53133a2eb5cf171377c /ui/taskbar.cpp
parent5.16 (diff)
downloadFreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.gz
FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.tar.bz2
FreeFileSync-a1c91f4695e208d5a8f80dc37b1818169b7829ff.zip
5.17
Diffstat (limited to 'ui/taskbar.cpp')
-rw-r--r--ui/taskbar.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/taskbar.cpp b/ui/taskbar.cpp
index 8613643e..0e019d04 100644
--- a/ui/taskbar.cpp
+++ b/ui/taskbar.cpp
@@ -6,7 +6,7 @@
#include "taskbar.h"
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
#include <zen/dll.h>
#include <zen/win_ver.h>
#include "Taskbar_Seven/taskbar.h"
@@ -14,7 +14,7 @@
#elif defined HAVE_UBUNTU_UNITY
#include <unity/unity/unity.h>
-#elif defined FFS_MAC
+#elif defined ZEN_MAC
#include <zen/basic_math.h>
#include <zen/string_tools.h>
#include "osx_dock.h"
@@ -23,7 +23,7 @@
using namespace zen;
-#ifdef FFS_WIN
+#ifdef ZEN_WIN
using namespace tbseven;
@@ -129,7 +129,7 @@ private:
UnityLauncherEntry* tbEntry;
};
-#elif defined FFS_MAC
+#elif defined ZEN_MAC
class Taskbar::Pimpl
{
public:
@@ -150,9 +150,9 @@ private:
{
try
{
- osx::dockIconSetText(str); //throw OsxError
+ osx::dockIconSetText(str); //throw SysError
}
- catch (const osx::OsxError& e) { assert(false); }
+ catch (const zen::SysError& e) { assert(false); }
}
};
bgstack15