From e7f1dacd6cacbbcb0c59bb7bfc2126d501b91c7a Mon Sep 17 00:00:00 2001 From: diger Date: Thu, 11 Sep 2014 08:44:25 +0600 Subject: [PATCH] Fix Qt5 support --- src/filesystemwatcher.h | 8 ++++---- src/fs_utils.cpp | 4 ++-- src/main.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/filesystemwatcher.h b/src/filesystemwatcher.h index 93a57d21d..2a821d2e3 100644 --- a/src/filesystemwatcher.h +++ b/src/filesystemwatcher.h @@ -16,7 +16,7 @@ #include #include #include -#elif !defined Q_WS_HAIKU +#elif !defined Q_OS_HAIKU #include #endif #endif @@ -56,7 +56,7 @@ private: QHash m_partialTorrents; QPointer m_partialTorrentTimer; -#if !defined Q_WS_WIN && !defined Q_WS_HAIKU +#if !defined Q_OS_WIN && !defined Q_OS_HAIKU private: static bool isNetworkFileSystem(QString path) { QString file = path; @@ -145,7 +145,7 @@ public: } void addPath(const QString & path) { -#if !defined Q_WS_WIN && !defined Q_WS_HAIKU +#if !defined Q_OS_WIN && !defined Q_OS_HAIKU QDir dir(path); if (!dir.exists()) return; @@ -167,7 +167,7 @@ public: qDebug("FS Watching is watching %s in normal mode", qPrintable(path)); QFileSystemWatcher::addPath(path); scanLocalFolder(path); -#if !defined Q_WS_WIN && !defined Q_WS_HAIKU +#if !defined Q_OS_WIN && !defined Q_OS_HAIKU } #endif } diff --git a/src/fs_utils.cpp b/src/fs_utils.cpp index 449387e2e..ab58b5b82 100644 --- a/src/fs_utils.cpp +++ b/src/fs_utils.cpp @@ -52,7 +52,7 @@ #if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) #include #include -#elif defined(Q_WS_HAIKU) +#elif defined(Q_OS_HAIKU) #include #else #include @@ -293,7 +293,7 @@ long long fsutils::freeDiskSpaceOnPath(QString path) { #ifndef Q_OS_WIN unsigned long long available; -#ifdef Q_WS_HAIKU +#ifdef Q_OS_HAIKU const QString statfs_path = dir_path.path()+"/."; dev_t device = dev_for_path (qPrintable(statfs_path)); if (device >= 0) { diff --git a/src/main.cpp b/src/main.cpp index 405ab383d..758ab5850 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -156,7 +156,7 @@ void sigtermHandler(int) { void sigsegvHandler(int) { signal(SIGABRT, 0); signal(SIGSEGV, 0); -#if !defined Q_WS_WIN && !defined Q_WS_HAIKU +#if !defined Q_OS_WIN && !defined Q_OS_HAIKU std::cerr << "\n\n*************************************************************\n"; std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n"; std::cerr << "qBittorrent version: " << VERSION << std::endl; @@ -173,7 +173,7 @@ void sigsegvHandler(int) { void sigabrtHandler(int) { signal(SIGABRT, 0); signal(SIGSEGV, 0); -#if !defined Q_WS_WIN && !defined Q_WS_HAIKU +#if !defined Q_OS_WIN && !defined Q_OS_HAIKU std::cerr << "\n\n*************************************************************\n"; std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n"; std::cerr << "qBittorrent version: " << VERSION << std::endl;