diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libstate/libstate.cpp | 4 | ||||
-rw-r--r-- | src/mutex/qt_mutex/info.txt | 17 | ||||
-rw-r--r-- | src/mutex/qt_mutex/mux_qt.cpp | 35 | ||||
-rw-r--r-- | src/mutex/qt_mutex/mux_qt.h | 27 |
4 files changed, 0 insertions, 83 deletions
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp index 076b55fcf..3a5c0a9e7 100644 --- a/src/libstate/libstate.cpp +++ b/src/libstate/libstate.cpp @@ -25,8 +25,6 @@ #include <botan/internal/mux_pthr.h> #elif defined(BOTAN_HAS_MUTEX_WIN32) #include <botan/internal/mux_win32.h> -#elif defined(BOTAN_HAS_MUTEX_QT) - #include <botan/internal/mux_qt.h> #endif #if defined(BOTAN_HAS_ALLOC_MMAP) @@ -213,8 +211,6 @@ void Library_State::initialize(bool thread_safe) mutex_factory = new Pthread_Mutex_Factory; #elif defined(BOTAN_HAS_MUTEX_WIN32) mutex_factory = new Win32_Mutex_Factory; -#elif defined(BOTAN_HAS_MUTEX_QT) - mutex_factory Qt_Mutex_Factory; #else throw Invalid_State("Could not find a thread-safe mutex object to use"); #endif diff --git a/src/mutex/qt_mutex/info.txt b/src/mutex/qt_mutex/info.txt deleted file mode 100644 index 7b014f886..000000000 --- a/src/mutex/qt_mutex/info.txt +++ /dev/null @@ -1,17 +0,0 @@ -define MUTEX_QT - -load_on request - -<source> -mux_qt.cpp -</source> - -<header:internal> -mux_qt.h -</header:internal> - -# I think we want to always use qt-mt, not qt -- not much point in supporting -# mutexes in a single threaded application, after all. -<libs> -all -> qt-mt -</libs> diff --git a/src/mutex/qt_mutex/mux_qt.cpp b/src/mutex/qt_mutex/mux_qt.cpp deleted file mode 100644 index da4e5ce5c..000000000 --- a/src/mutex/qt_mutex/mux_qt.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* -* Qt Thread Mutex -* (C) 2004-2007 Justin Karneges -* 2004-2007 Jack Lloyd -* -* Distributed under the terms of the Botan license -*/ - -#include <botan/internal/mux_qt.h> -#include <qmutex.h> - -#if !defined(QT_THREAD_SUPPORT) - #error Your version of Qt does not support threads or mutexes -#endif - -namespace Botan { - -/* -* Qt Mutex Factory -*/ -Mutex* Qt_Mutex_Factory::make() - { - class Qt_Mutex : public Mutex - { - public: - void lock() { mutex.lock(); } - void unlock() { mutex.unlock(); } - private: - QMutex mutex; - }; - - return new Qt_Mutex(); - } - -} diff --git a/src/mutex/qt_mutex/mux_qt.h b/src/mutex/qt_mutex/mux_qt.h deleted file mode 100644 index 3805acc3b..000000000 --- a/src/mutex/qt_mutex/mux_qt.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -* Qt Mutex -* (C) 2004-2007 Justin Karneges -* 2004-2007 Jack Lloyd -* -* Distributed under the terms of the Botan license -*/ - -#ifndef BOTAN_MUTEX_QT_H__ -#define BOTAN_MUTEX_QT_H__ - -#include <botan/internal/mutex.h> - -namespace Botan { - -/** -* Qt Mutex -*/ -class Qt_Mutex_Factory : public Mutex_Factory - { - public: - Mutex* make(); - }; - -} - -#endif |