tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
dockes
2006-01-20 10:01:59 +00:00
parent e93dd142d6
commit 8513847790
10 changed files with 204 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/idxthread.cpp
+5 -4
View File
@@ -41,9 +41,12 @@ void IdxThread::run()
static IdxThread idxthread;
void start_idxthread(RclConfig *cnf)
void start_idxthread(const RclConfig& cnf)
{
ConfIndexer *ix = new ConfIndexer(cnf);
// We have to make a copy of the config (setKeydir changes it during
// indexation)
RclConfig *myconf = new RclConfig(cnf);
ConfIndexer *ix = new ConfIndexer(myconf);
idxthread.indexer = ix;
idxthread.start();
}
@@ -53,5 +56,3 @@ void stop_idxthread()
stopidxthread = 1;
idxthread.wait();
}
src/qtgui/idxthread.h
+2 -2
View File
@@ -1,12 +1,12 @@
#ifndef _IDXTHREAD_H_INCLUDED_
#define _IDXTHREAD_H_INCLUDED_
/* @(#$Id: idxthread.h,v 1.1 2005-02-01 17:20:05 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: idxthread.h,v 1.2 2006-01-20 10:01:59 dockes Exp $ (C) 2004 J.F.Dockes */
class RclConfig;
// These two deal with starting / stopping the thread itself, not indexing
// sessions.
extern void start_idxthread(RclConfig *cnf);
extern void start_idxthread(const RclConfig& cnf);
extern void stop_idxthread();
extern int startindexing;
src/qtgui/main.cpp
+4 -4
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.29 2006-01-19 17:11:46 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: main.cpp,v 1.30 2006-01-20 10:01:59 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
#include <unistd.h>
@@ -149,9 +149,9 @@ int main( int argc, char ** argv )
// Create main window and set its size to previous session's
RecollMain w;
mainWindow = &w;
QSize s(prefs_mainwidth, prefs_mainheight);
w.resize(s);
w.allTermsCB->setChecked(prefs_ssall);
string reason;
rclconfig = recollinit(recollCleanup, sigcleanup, reason);
@@ -198,7 +198,7 @@ int main( int argc, char ** argv )
w.connect(timer, SIGNAL(timeout()), &w, SLOT(periodic100()));
timer->start(100);
if (!rcldb || !rcldb->open(dbdir, Rcl::Db::DbRO)) {
if (!rcldb->open(dbdir, Rcl::Db::DbRO)) {
startindexing = 1;
switch (QMessageBox::
question(0, "Recoll",
@@ -216,7 +216,7 @@ int main( int argc, char ** argv )
}
}
start_idxthread(rclconfig);
start_idxthread(*rclconfig);
// Let's go
w.show();