From 04791aa332c36211950057e3e6af4348f2e9c2f1 Mon Sep 17 00:00:00 2001 From: legatvs Date: Thu, 13 Aug 2009 16:00:36 +0300 Subject: [PATCH] move clive oriented code. --- src/mainwnd.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/mainwnd.cpp b/src/mainwnd.cpp index d522732..1bad163 100644 --- a/src/mainwnd.cpp +++ b/src/mainwnd.cpp @@ -353,16 +353,8 @@ MainWindow::onStart() { // Construct cclive/clive args QStringList args; - QStringList env; - - args << "--print-fname"; - if (!isCclive) { - args << "--stderr"; - // Set environment variables for clive - env << "COLUMNS=80" << "LINES=24" // Term::ReadKey - << QString("HOME=%1").arg(QDir::homePath()); // $env{HOME} - } + args << "--print-fname" << "--continue"; QString s = prefs->streamEdit->text(); if (!s.isEmpty() && streamBox->isChecked()) { @@ -399,16 +391,22 @@ MainWindow::onStart() { args << QString("--connect-timeout-socks=%1").arg(n); } - args << "--continue"; // default to continue + QStringList env; if (isCclive) { - // TODO: --regexp, --find-all s = regexpEdit->text(); if (!s.isEmpty()) args << QString("--regexp=%1").arg(s); if (findallBox->checkState()) args << QString("--find-all"); } else { + + args << "--stderr"; + + // Set environment variables for clive + env << "COLUMNS=80" << "LINES=24" // Term::ReadKey + << QString("HOME=%1").arg(QDir::homePath()); // $env{HOME} + s = cclassEdit->text(); if (!s.isEmpty()) args << QString("--cclass=%1").arg(s); -- 2.11.4.GIT