GUI: rename methods, fix connect

danmar · danmar · commit 97a86313aaee · 2017-07-28T13:13:10.000+02:00
diff --git a/gui/threadhandler.cpp b/gui/threadhandler.cpp
@@ -38,7 +38,7 @@ ThreadHandler::ThreadHandler(QObject *parent) :
 
 ThreadHandler::~ThreadHandler()
 {
-    RemoveThreads();
+    removeThreads();
 }
 
 void ThreadHandler::clearFiles()
@@ -116,7 +116,7 @@ void ThreadHandler::setThreadCount(const int count)
     }
 
     //Remove unused old threads
-    RemoveThreads();
+    removeThreads();
     //Create new threads
     for (int i = mThreads.size(); i < count; i++) {
         mThreads << new CheckThread(mResults);
@@ -129,14 +129,14 @@ void ThreadHandler::setThreadCount(const int count)
 }
 
 
-void ThreadHandler::RemoveThreads()
+void ThreadHandler::removeThreads()
 {
     for (int i = 0; i < mThreads.size(); i++) {
         mThreads[i]->terminate();
         disconnect(mThreads.last(), SIGNAL(Done()),
-                   this, SLOT(ThreadDone()));
+                   this, SLOT(threadDone()));
         disconnect(mThreads.last(), SIGNAL(FileChecked(const QString &)),
-                   &mResults, SLOT(FileChecked(const QString &)));
+                   &mResults, SLOT(fileChecked(const QString &)));
 
         delete mThreads[i];
     }
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
@@ -215,7 +215,7 @@ protected slots:
     * @brief Function to delete all threads
     *
     */
-    void RemoveThreads();
+    void removeThreads();
 
     /**
     * @brief Thread results are stored here

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ ThreadHandler::ThreadHandler(QObject *parent) :`
`38`	`38`
`39`	`39`	`ThreadHandler::~ThreadHandler()`
`40`	`40`	`{`
`41`		`- RemoveThreads();`
	`41`	`+ removeThreads();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`void ThreadHandler::clearFiles()`
`@@ -116,7 +116,7 @@ void ThreadHandler::setThreadCount(const int count)`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`//Remove unused old threads`
`119`		`- RemoveThreads();`
	`119`	`+ removeThreads();`
`120`	`120`	`//Create new threads`
`121`	`121`	`for (int i = mThreads.size(); i < count; i++) {`
`122`	`122`	`mThreads << new CheckThread(mResults);`
`@@ -129,14 +129,14 @@ void ThreadHandler::setThreadCount(const int count)`
`129`	`129`	`}`
`130`	`130`
`131`	`131`
`132`		`-void ThreadHandler::RemoveThreads()`
	`132`	`+void ThreadHandler::removeThreads()`
`133`	`133`	`{`
`134`	`134`	`for (int i = 0; i < mThreads.size(); i++) {`
`135`	`135`	`mThreads[i]->terminate();`
`136`	`136`	`disconnect(mThreads.last(), SIGNAL(Done()),`
`137`		`- this, SLOT(ThreadDone()));`
	`137`	`+ this, SLOT(threadDone()));`
`138`	`138`	`disconnect(mThreads.last(), SIGNAL(FileChecked(const QString &)),`
`139`		`- &mResults, SLOT(FileChecked(const QString &)));`
	`139`	`+ &mResults, SLOT(fileChecked(const QString &)));`
`140`	`140`
`141`	`141`	`delete mThreads[i];`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ protected slots:`
`215`	`215`	`* @brief Function to delete all threads`
`216`	`216`	`*`
`217`	`217`	`*/`
`218`		`- void RemoveThreads();`
	`218`	`+ void removeThreads();`
`219`	`219`
`220`	`220`	`/**`
`221`	`221`	`* @brief Thread results are stored here`