Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-28 00:39:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use Q_OS_* defines instead of Q_WS_*.

Browse Source
This commit is contained in:
Felix Geyer 2012-07-12 13:58:40 +02:00
parent 13eb1f6330
commit 9de4cbbbd6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Config.cpp
View File

@ -52,7 +52,7 @@ Config::Config(QObject* parent)
QString userPath; QString userPath;
QString homePath = QDir::homePath(); QString homePath = QDir::homePath();
#if defined(Q_WS_X11) #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
// we can't use QDesktopServices on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME // we can't use QDesktopServices on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME
QByteArray env = qgetenv("XDG_CONFIG_HOME"); QByteArray env = qgetenv("XDG_CONFIG_HOME");
if (env.isEmpty()) { if (env.isEmpty()) {

6
src/core/DataPath.cpp
View File

@ -69,15 +69,15 @@ DataPath::DataPath()
else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) { else if (testSetDir(QString(KEEPASSX_SOURCE_DIR) + "/share")) {
} }
#endif #endif
#ifdef Q_WS_X11 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
else if (testSetDir(QCoreApplication::applicationDirPath() + "/../share/keepassx")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/../share/keepassx")) {
} }
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_OS_MACOS
else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/../Resources")) {
} }
#endif #endif
#ifdef Q_WS_WIN #ifdef Q_OS_WIN
else if (testSetDir(QCoreApplication::applicationDirPath() + "/share")) { else if (testSetDir(QCoreApplication::applicationDirPath() + "/share")) {
} }
#endif #endif

4
src/gui/Clipboard.cpp
View File

@ -21,7 +21,7 @@
#include <QtGui/QApplication> #include <QtGui/QApplication>
#include <QtGui/QClipboard> #include <QtGui/QClipboard>
#ifdef Q_WS_X11 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
#include <QtDBus/QDBusConnection> #include <QtDBus/QDBusConnection>
#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusMessage>
#endif #endif
@ -71,7 +71,7 @@ void Clipboard::clearClipboard()
clipboard->clear(QClipboard::Selection); clipboard->clear(QClipboard::Selection);
} }
#ifdef Q_WS_X11 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory"); QDBusMessage message = QDBusMessage::createMethodCall("org.kde.klipper", "/klipper", "", "clearClipboardHistory");
QDBusConnection::sessionBus().send(message); QDBusConnection::sessionBus().send(message);
#endif #endif