Fix passing stdout data

Author: hluk

src/app/applicationexceptionhandler.cpp

@@ -10,13 +10,11 @@
 
 void logException(const char *what)
 {
-    if ( canUseStandardOutput() ) {
-        QFile f;
-        f.open(stderr, QIODevice::WriteOnly);
-        f.write(what ? what : "Unknown exception");
-        f.write("\n");
-        f.close();
-    }
+    QFile f;
+    f.open(stderr, QIODevice::WriteOnly);
+    f.write(what ? what : "Unknown exception");
+    f.write("\n");
+    f.close();
 
     log( QString("Exception: ") + what, LogError );
 }

src/app/clipboardserver.cpp

@@ -91,9 +91,7 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName)
         qApp->setLayoutDirection(QLocale().textDirection());
     } else {
         App::installTranslator();
-        if ( canUseStandardOutput() ) {
-            log( tr("CopyQ server is already running."), LogWarning );
-        }
+        log( tr("CopyQ server is already running."), LogWarning );
         exit(0);
         return;
     }

src/common/log.cpp

@@ -220,9 +220,7 @@ void logAlways(const QByteArray &msgText, const LogLevel level)
     const bool writtenToLogFile = writeLogFile(msg);
 
     // Log to file and if needed to stderr.
-    if ( (!writtenToLogFile || level <= LogWarning || hasLogLevel(LogDebug))
-            && canUseStandardOutput() )
-    {
+    if ( !writtenToLogFile || level <= LogWarning || hasLogLevel(LogDebug) ) {
         QFile ferr;
         ferr.open(stderr, QIODevice::WriteOnly);
         const auto simpleMsg = createSimpleLogMessage(msgText, level);
@@ -328,9 +326,3 @@ QByteArray &logLabel()
     static QByteArray label;
     return label;
 }
-
-bool canUseStandardOutput()
-{
-    static const bool useOutput = qEnvironmentVariableIsEmpty("COPYQ_NO_OUTPUT");
-    return useOutput;
-}

src/common/log.h

@@ -36,6 +36,3 @@ void log(const QByteArray &text, LogLevel level = LogNote);
 void setLogLabel(const QByteArray &name);
 
 QByteArray &logLabel();
-
-/// True if stdout and stderr can be used.
-bool canUseStandardOutput();

src/main.cpp

@@ -54,7 +54,7 @@ int evaluate(
     const bool hasUncaughtException = result.isError() || scriptable.hasUncaughtException();
 
     const auto output = scriptable.fromString(result.toString());
-    if ( !output.isEmpty() && canUseStandardOutput() ) {
+    if ( !output.isEmpty() ) {
         QFile f;
         if (hasUncaughtException)
             f.open(stderr, QIODevice::WriteOnly);
@@ -126,16 +126,9 @@ int startServer(int argc, char *argv[], QString sessionName)
 
 void startServerInBackground(const QString &applicationPath, QString sessionName)
 {
-    const bool couldUseStandardOutput = canUseStandardOutput();
-    if (couldUseStandardOutput)
-        qputenv("COPYQ_NO_OUTPUT", QByteArrayLiteral("1"));
-
     const QStringList arguments{QStringLiteral("-s"), sessionName};
     const bool started = QProcess::startDetached(applicationPath, arguments);
 
-    if (!couldUseStandardOutput)
-        qunsetenv("COPYQ_NO_OUTPUT");
-
     if (!started)
         log("Failed to start the server", LogError);
 }

src/scriptable/scriptable.cpp

@@ -3442,7 +3442,7 @@ void Scriptable::print(const QByteArray &message)
 {
     if (m_action) {
         m_action->appendOutput(message);
-    } else if ( canUseStandardOutput() ) {
+    } else {
         QFile f;
         f.open(stdout, QIODevice::WriteOnly);
         f.write(message);
@@ -3453,7 +3453,7 @@ void Scriptable::printError(const QByteArray &message)
 {
     if (m_action) {
         m_action->appendErrorOutput(message);
-    } else if ( canUseStandardOutput() ) {
+    } else {
         QFile f;
         f.open(stderr, QIODevice::WriteOnly);
         f.write(message);