From 06b4dfb24d10d1e78564275d104a8b5c5c243111 Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Tue, 23 Feb 2010 03:51:49 +0000 Subject: [PATCH] Revert r33533. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33543 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiView.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index aaba193d7c..25540eaf03 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -100,7 +100,6 @@ #include #include #include -#include #include #include #include @@ -109,15 +108,6 @@ #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 #if (QT_VERSION >= 0x040400) #include @@ -2610,6 +2600,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd) // FIXME We need to call comparison feature here. // This is quick and dirty code for testing VC. // We need that comparison feature has some LFUN_COMPARE file1 file1 + // where specifies whether we want GUI dialog or just launch + // running with defaults. + /* FileName initpath(lyxrc.document_path); Buffer * dest = newUnnamedFile(initpath, to_utf8(_("differences"))); CompareOptions options; @@ -2617,6 +2610,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd) compare->start(QThread::LowPriority); Sleep::millisec(200); lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH, dest->absFileName())); + */ break; } -- 2.39.2