From a5469ae4e0668c36e4bf36bf7395fa25073b0bc6 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 8 Nov 2020 22:07:15 -0500
Subject: renamed SingleInstance to MOMultiProcess rewrote some comments to
 avoid using "instance"

---
 src/singleinstance.cpp | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

(limited to 'src/singleinstance.cpp')

diff --git a/src/singleinstance.cpp b/src/singleinstance.cpp
index bd7ccc43..401381fd 100644
--- a/src/singleinstance.cpp
+++ b/src/singleinstance.cpp
@@ -1,22 +1,3 @@
-/*
-Copyright (C) 2012 Sebastian Herbord. All rights reserved.
-
-This file is part of Mod Organizer.
-
-Mod Organizer is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Mod Organizer is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
 #include "singleinstance.h"
 #include "utility.h"
 #include <report.h>
@@ -28,7 +9,7 @@ static const int s_Timeout = 5000;
 
 using MOBase::reportError;
 
-SingleInstance::SingleInstance(bool allowMultiple, QObject *parent) :
+MOMultiProcess::MOMultiProcess(bool allowMultiple, QObject *parent) :
   QObject(parent), m_Ephemeral(false), m_OwnsSM(false)
 {
   m_SharedMem.setKey(s_Key);
@@ -58,7 +39,7 @@ SingleInstance::SingleInstance(bool allowMultiple, QObject *parent) :
 }
 
 
-void SingleInstance::sendMessage(const QString &message)
+void MOMultiProcess::sendMessage(const QString &message)
 {
   if (m_OwnsSM) {
     // nobody there to receive the message
@@ -72,19 +53,19 @@ void SingleInstance::sendMessage(const QString &message)
       Sleep(250);
     }
 
-    // other instance may be just starting up
+    // other process may be just starting up
     socket.connectToServer(s_Key, QIODevice::WriteOnly);
     connected = socket.waitForConnected(s_Timeout);
   }
 
   if (!connected) {
-    reportError(tr("failed to connect to running instance: %1").arg(socket.errorString()));
+    reportError(tr("failed to connect to running process: %1").arg(socket.errorString()));
     return;
   }
 
   socket.write(message.toUtf8());
   if (!socket.waitForBytesWritten(s_Timeout)) {
-    reportError(tr("failed to communicate with running instance: %1").arg(socket.errorString()));
+    reportError(tr("failed to communicate with running process: %1").arg(socket.errorString()));
     return;
   }
 
@@ -92,8 +73,7 @@ void SingleInstance::sendMessage(const QString &message)
   socket.waitForDisconnected();
 }
 
-
-void SingleInstance::receiveMessage()
+void MOMultiProcess::receiveMessage()
 {
   QLocalSocket *socket = m_Server.nextPendingConnection();
   if (!socket) {
@@ -108,10 +88,10 @@ void SingleInstance::receiveMessage()
 
     if (av <= 0) {
       MOBase::log::error(
-        "failed to receive data from secondary instance: {}",
+        "failed to receive data from secondary process: {}",
         socket->errorString());
 
-      reportError(tr("failed to receive data from secondary instance: %1").arg(socket->errorString()));
+      reportError(tr("failed to receive data from secondary process: %1").arg(socket->errorString()));
       return;
     }
   }
-- 
cgit v1.3.1