Fixed issue in method naturalCompare: strings having numbers with the same amount...

[dolphin.git] / src / progressindicator.cpp

diff --git a/src/progressindicator.cpp b/src/progressindicator.cpp
index a09552c066c54f6d73111521020802997c1521e6..6805788ebef907e3af3aed90638a128269778bff 100644 (file)
--- a/src/progressindicator.cpp
+++ b/src/progressindicator.cpp
@@ -15,23 +15,26 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
 #include "progressindicator.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "dolphinstatusbar.h"
+#include <QApplication>
 
-ProgressIndicator::ProgressIndicator(const QString& progressText,
+ProgressIndicator::ProgressIndicator(DolphinMainWindow* mainWindow,
+                                     const QString& progressText,
                                      const QString& finishedText,
                                      int operationsCount)
- :  m_showProgress(false),
+ :  m_mainWindow(mainWindow),
+    m_showProgress(false),
     m_operationsCount(operationsCount),
     m_operationsIndex(0),
     m_startTime(QTime::currentTime()),
     m_finishedText(finishedText)
 {
-    DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar();
+    DolphinStatusBar* statusBar = mainWindow->activeView()->statusBar();
     statusBar->clear();
     statusBar->setProgressText(progressText);
     statusBar->setProgress(0);
@@ -40,13 +43,13 @@ ProgressIndicator::ProgressIndicator(const QString& progressText,
 
 ProgressIndicator::~ProgressIndicator()
 {
-    DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar();
+    DolphinStatusBar* statusBar = m_mainWindow->activeView()->statusBar();
     statusBar->setProgressText(QString::null);
     statusBar->setProgress(100);
     statusBar->setMessage(m_finishedText, DolphinStatusBar::OperationCompleted);
 
     if (m_showProgress) {
-        Dolphin::mainWin().setEnabled(true);
+        m_mainWindow->setEnabled(true);
     }
 }
 
@@ -59,7 +62,7 @@ void ProgressIndicator::execOperation()
         if (elapsed > 500) {
             // the operations took already more than 500 milliseconds,
             // therefore show a progress indication
-            Dolphin::mainWin().setEnabled(false);
+            m_mainWindow->setEnabled(false);
             m_showProgress = true;
         }
     }
@@ -69,9 +72,10 @@ void ProgressIndicator::execOperation()
         if (m_startTime.msecsTo(currentTime) > 100) {
             m_startTime = currentTime;
 
-            DolphinStatusBar* statusBar = Dolphin::mainWin().activeView()->statusBar();
+            DolphinStatusBar* statusBar = m_mainWindow->activeView()->statusBar();
             statusBar->setProgress((m_operationsIndex * 100) / m_operationsCount);
-            kapp->processEvents();
+#warning "EVIL, DANGER, FIRE"
+            qApp->processEvents();
             statusBar->repaint();
         }
     }