From 5ea1a4c3cc4e045411e73d2681b978abbb054819 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Sat, 18 Oct 2014 03:29:12 +0400 Subject: [PATCH] Remove inclusion of from misc.h --- src/misc.cpp | 16 ++++++++++++++++ src/misc.h | 12 ++---------- src/properties/propertieswidget.cpp | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/misc.cpp b/src/misc.cpp index 8ace9bbb3..c9b1987d3 100644 --- a/src/misc.cpp +++ b/src/misc.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #ifdef DISABLE_GUI #include @@ -631,3 +632,18 @@ QString misc::accurateDoubleToString(const double &n, const int &precision, bool else return QString::number(std::floor(n*prec)/prec, 'f', precision); } + +namespace { + // Trick to get a portable sleep() function + class SleeperThread : public QThread { + public: + static void msleep(unsigned long msecs) + { + QThread::msleep(msecs); + } + }; +} + +void misc::msleep(unsigned long msecs) { + SleeperThread::msleep(msecs); +} diff --git a/src/misc.h b/src/misc.h index 334c29d90..9e7cba903 100644 --- a/src/misc.h +++ b/src/misc.h @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -106,15 +105,8 @@ namespace misc #ifndef DISABLE_GUI bool naturalSort(QString left, QString right, bool& result); #endif -} -// Trick to get a portable sleep() function -class SleeperThread : public QThread { -public: - static void msleep(unsigned long msecs) - { - QThread::msleep(msecs); - } -}; + void msleep(unsigned long msecs); +} #endif diff --git a/src/properties/propertieswidget.cpp b/src/properties/propertieswidget.cpp index 36fb9b284..62486ac1f 100644 --- a/src/properties/propertieswidget.cpp +++ b/src/properties/propertieswidget.cpp @@ -666,7 +666,7 @@ void PropertiesWidget::renameSelectedFile() { int timeout = 10; while(!QDir().rmpath(old_folder.absolutePath()) && timeout > 0) { // XXX: We should not sleep here (freezes the UI for 1 second) - SleeperThread::msleep(100); + misc::msleep(100); --timeout; } }