diff --git a/src/app/main.cpp b/src/app/main.cpp index 09ccd680a..7defc5293 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -31,6 +31,7 @@ #include #include +#include #ifndef DISABLE_GUI // GUI-only includes @@ -168,7 +169,7 @@ int main(int argc, char *argv[]) #endif qDebug("qBittorrent is already running for this user."); - Utils::Misc::msleep(300); + QThread::msleep(300); app->sendParams(params.torrents); return EXIT_SUCCESS; diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 800b22c30..79871e80b 100644 --- a/src/base/utils/misc.cpp +++ b/src/base/utils/misc.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include @@ -641,24 +640,6 @@ QSize Utils::Misc::largeIconSize() } #endif // DISABLE_GUI -namespace -{ - // Trick to get a portable sleep() function - class SleeperThread: public QThread - { - public: - static void msleep(unsigned long msecs) - { - QThread::msleep(msecs); - } - }; -} - -void Utils::Misc::msleep(unsigned long msecs) -{ - SleeperThread::msleep(msecs); -} - QString Utils::Misc::osName() { // static initialization for usage in signal handler diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h index 3129e0564..856ca52b2 100644 --- a/src/base/utils/misc.h +++ b/src/base/utils/misc.h @@ -98,8 +98,6 @@ namespace Utils QList intListfromStringList(const QStringList &l); QList boolListfromStringList(const QStringList &l); - void msleep(unsigned long msecs); - #ifndef DISABLE_GUI void openPath(const QString& absolutePath); void openFolderSelect(const QString& absolutePath); diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp index 5804a53f9..77466c748 100644 --- a/src/gui/properties/propertieswidget.cpp +++ b/src/gui/properties/propertieswidget.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include "base/bittorrent/session.h" #include "base/preferences.h" @@ -780,7 +781,7 @@ void PropertiesWidget::renameSelectedFile() int timeout = 10; while (!QDir().rmpath(old_folder.absolutePath()) && timeout > 0) { // FIXME: We should not sleep here (freezes the UI for 1 second) - Utils::Misc::msleep(100); + QThread::msleep(100); --timeout; } } diff --git a/src/gui/properties/speedwidget.cpp b/src/gui/properties/speedwidget.cpp index 44f4e2767..9b159da24 100644 --- a/src/gui/properties/speedwidget.cpp +++ b/src/gui/properties/speedwidget.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include @@ -40,7 +41,6 @@ #include "base/bittorrent/session.h" #include "base/bittorrent/sessionstatus.h" #include "base/preferences.h" -#include "base/utils/misc.h" ComboBoxMenuButton::ComboBoxMenuButton(QWidget *parent, QMenu *menu) : QComboBox(parent) @@ -152,7 +152,7 @@ void SpeedWidget::update() m_plot->pushPoint(point); QMetaObject::invokeMethod(this, "graphUpdate", Qt::QueuedConnection); - Utils::Misc::msleep(1000); + QThread::msleep(1000); } }