anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-10 20:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert r33533.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33543 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-02-23 03:51:49 +00:00
parent a7f63005f0
commit 06b4dfb24d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/frontends/qt4/GuiView.cpp
View File

@ -100,7 +100,6 @@
#include <QSplitter> #include <QSplitter>
#include <QStackedWidget> #include <QStackedWidget>
#include <QStatusBar> #include <QStatusBar>
#include <QThread>
#include <QTime> #include <QTime>
#include <QTimer> #include <QTimer>
#include <QToolBar> #include <QToolBar>
@ -109,15 +108,6 @@
#define EXPORT_in_THREAD 1 #define EXPORT_in_THREAD 1
struct Sleep : QThread
{
static void millisec(unsigned long ms)
{
QThread::usleep(ms * 1000);
}
};
// QtConcurrent was introduced in Qt 4.4 // QtConcurrent was introduced in Qt 4.4
#if (QT_VERSION >= 0x040400) #if (QT_VERSION >= 0x040400)
#include <QFuture> #include <QFuture>
@ -2610,6 +2600,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
// FIXME We need to call comparison feature here. // FIXME We need to call comparison feature here.
// This is quick and dirty code for testing VC. // This is quick and dirty code for testing VC.
// We need that comparison feature has some LFUN_COMPARE <FLAG> file1 file1 // We need that comparison feature has some LFUN_COMPARE <FLAG> file1 file1
// where <FLAG> specifies whether we want GUI dialog or just launch
// running with defaults.
/*
FileName initpath(lyxrc.document_path); FileName initpath(lyxrc.document_path);
Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences"))); Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences")));
CompareOptions options; CompareOptions options;
@ -2617,6 +2610,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd)
compare->start(QThread::LowPriority); compare->start(QThread::LowPriority);
Sleep::millisec(200); Sleep::millisec(200);
lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName())); lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName()));
*/
break; break;
} }