From 9c87c73db25456f54ffa4dd30b7c217f0ce071d1 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Mon, 22 Jun 2020 22:54:59 +0300
Subject: [PATCH] [win-nix] refactoring

---
 win-linux/ASCDocumentEditor.pro                   |  2 +-
 win-linux/src/cmainpanel.cpp                      | 10 ++--------
 win-linux/src/csplash.cpp                         |  2 +-
 win-linux/src/prop/{csplash_p.cpp => csplash_p.h} |  0
 4 files changed, 4 insertions(+), 10 deletions(-)
 rename win-linux/src/prop/{csplash_p.cpp => csplash_p.h} (100%)

diff --git a/win-linux/ASCDocumentEditor.pro b/win-linux/ASCDocumentEditor.pro
index 749dadcb3..f45239cf9 100644
--- a/win-linux/ASCDocumentEditor.pro
+++ b/win-linux/ASCDocumentEditor.pro
@@ -8,11 +8,11 @@ INCLUDEPATH += $$PWD/src/prop \
                 $$PWD/src
 
 HEADERS += \
+    src/prop/csplash_p.h \
     src/prop/defines_p.h \
     src/prop/version_p.h
 
 SOURCES += \
-    src/prop/csplash_p.cpp \
     src/prop/cmainpanelimpl.cpp \
     src/prop/cascapplicationmanagerwrapper_private.h \
     src/prop/utils.cpp
diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp
index fda335ee7..55aef0cc0 100644
--- a/win-linux/src/cmainpanel.cpp
+++ b/win-linux/src/cmainpanel.cpp
@@ -222,13 +222,7 @@ CMainPanel::CMainPanel(QWidget *parent, bool isCustomWindow, uchar dpi_ratio)
 //    m_pTabs->addEditor("editor3", etSpreadsheet, L"http://google.com");
 //    m_pTabs->updateIcons();
 
-    QString params = QString("lang=%1&username=%3&location=%2")
-                        .arg(CLangater::getCurrentLangCode(), Utils::systemLocationCode());
-    wstring wparams = params.toStdWString();
-    wstring user_name = Utils::appUserName();
 
-    wparams.replace(wparams.find(L"%3"), 2, user_name);
-    AscAppManager::getInstance().InitAdditionalEditorParams(wparams);
 }
 
 void CMainPanel::RecalculatePlaces()
@@ -647,7 +641,7 @@ void CMainPanel::onLocalFileRecent(void * d)
                         tr("%1 doesn't exists!<br>Remove file from the list?").arg(_info.fileName()));
 
             if (modal_res == MODAL_RESULT_CUSTOM) {
-                AscAppManager::sendCommandTo(QCEF_CAST(m_pMainWidget), "file:skip", QString::number(opts.id));
+                AscAppManager::sendCommandTo(SEND_TO_ALL_START_PAGE, "file:skip", QString::number(opts.id));
             }
 
             return;
@@ -819,7 +813,7 @@ void CMainPanel::onDocumentReady(int uid)
             refreshAboutVersion();
             emit mainPageReady();
 
-            AscAppManager::sendCommandTo( QCEF_CAST(m_pMainWidget), "app:ready" );
+            AscAppManager::sendCommandTo(SEND_TO_ALL_START_PAGE, L"app:ready");
         });
     } else {
         m_pTabs->applyDocumentChanging(uid, DOCUMENT_CHANGED_LOADING_FINISH);
diff --git a/win-linux/src/csplash.cpp b/win-linux/src/csplash.cpp
index fa96096e7..194ecbd32 100644
--- a/win-linux/src/csplash.cpp
+++ b/win-linux/src/csplash.cpp
@@ -32,13 +32,13 @@
 
 
 #include "csplash.h"
+#include "csplash_p.h"
 #include "defines.h"
 #include <QApplication>
 #include <QScreen>
 #include <QSettings>
 #include <QStyle>
 #include "utils.h"
-#include "csplash_p.cpp"
 
 CSplash * _splash;
 
diff --git a/win-linux/src/prop/csplash_p.cpp b/win-linux/src/prop/csplash_p.h
similarity index 100%
rename from win-linux/src/prop/csplash_p.cpp
rename to win-linux/src/prop/csplash_p.h