comparison DataController.cpp @ 9:b5943e4bf676

Fix up header includes. Introduce outer catch. Fix coding style. Remove spurious debug output.
author Tom Fredrik Blenning Klaussen <bfg@blenning.no>
date Wed, 22 Aug 2012 18:48:07 +0200
parents d7b384b4a834
children ec87a79770ee
comparison
equal deleted inserted replaced
8:d7b384b4a834 9:b5943e4bf676
1 #include "CompileTimeConstants.h" 1 #include "CompileTimeConstants.h"
2
3 #include "DataController.hpp" 2 #include "DataController.hpp"
4 3 #include "EditDistance.hpp"
5 #include "MemoryDBLink.hpp" 4 #include "MemoryDBLink.hpp"
5 #include "PermissionException.hpp"
6 #include "SqliteDBLink.hpp" 6 #include "SqliteDBLink.hpp"
7 7
8 #include "PermissionException.hpp"
9 #include "DataController.hpp"
10
11 #include <QtGui/QApplication>
12 #include <QtCore/QDir>
13 #include <QtCore/QUrl>
14
15 #include <QtCore/QDebug>
16 #include <QtCore/QTimer>
17 #include <QtCore/QCryptographicHash> 8 #include <QtCore/QCryptographicHash>
18 #include <QtCore/QDateTime> 9 #include <QtCore/QDateTime>
19 10 #include <QtCore/QDebug>
11 #include <QtCore/QDir>
12 #include <QtCore/QTimer>
13 #include <QtCore/QUrl>
14
15 #include <QtGui/QApplication>
16 #include <QtGui/QDesktopServices>
17 #include <QtGui/QDoubleSpinBox>
18 #include <QtGui/QHBoxLayout>
19 #include <QtGui/QHeaderView>
20 #include <QtGui/QLabel>
20 #include <QtGui/QMainWindow> 21 #include <QtGui/QMainWindow>
22 #include <QtGui/QMenuBar>
21 #include <QtGui/QMessageBox> 23 #include <QtGui/QMessageBox>
22 #include <QtGui/QDesktopServices> 24 #include <QtGui/QProgressBar>
25 #include <QtGui/QToolBar>
23 #include <QtGui/QTreeWidget> 26 #include <QtGui/QTreeWidget>
24 #include <QtGui/QHeaderView> 27
25 #include <QtGui/QMenuBar> 28 #include <iostream>
26 #include <QtGui/QToolBar>
27 #include <QtGui/QDoubleSpinBox>
28 #include <QtGui/QLabel>
29 #include <QtGui/QHBoxLayout>
30 #include <QtGui/QProgressBar>
31
32 #include "EditDistance.hpp"
33 #include <memory> 29 #include <memory>
34 30
35 void DataController::findFiles(const QDir& dir, QStringList& list) 31 void DataController::findFiles(const QDir& dir, QStringList& list)
36 { 32 {
37 foreach(QString filename, dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs)) { 33 foreach(QString filename, dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs)) {
38 filename = dir.absoluteFilePath(filename); 34 filename = dir.absoluteFilePath(filename);
39 findFiles(QDir(filename), list); 35 findFiles(QDir(filename), list);
40 } 36 }
41 37
42 qDebug() << dir.entryList(QDir::Files | QDir::NoSymLinks);
43
44 foreach(QString filename, dir.entryList(QDir::Files | QDir::NoSymLinks)) { 38 foreach(QString filename, dir.entryList(QDir::Files | QDir::NoSymLinks)) {
45 qDebug() << filename;
46 list << dir.absoluteFilePath(filename); 39 list << dir.absoluteFilePath(filename);
47 } 40 }
48 } 41 }
49 42
50 QStringList DataController::findFiles(const QDir& dir) 43 QStringList DataController::findFiles(const QDir& dir)
385 DataController::DataController(bool showGUI) 378 DataController::DataController(bool showGUI)
386 { 379 {
387 setup(QString(), QString(), showGUI); 380 setup(QString(), QString(), showGUI);
388 } 381 }
389 382
390 #include <iostream>
391
392 void DataController::progressUpdate(int p) 383 void DataController::progressUpdate(int p)
393 { 384 {
394 QString str; 385 QString str;
395 if (p == 0) 386 if (p == 0)
396 str.sprintf("Progress %6.2f%%", p * 100.0 / progressMax); 387 str.sprintf("Progress %6.2f%%", p * 100.0 / progressMax);