From a6519b094415341e055852812856ecd90f29940d Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Thu, 12 Apr 2018 13:39:52 +0800
Subject: drop mini server

---
 src/fqterm/CMakeLists.txt   |  2 --
 src/fqterm/fqterm_frame.cpp | 29 -----------------------------
 src/fqterm/fqterm_frame.h   |  3 ---
 3 files changed, 34 deletions(-)

(limited to 'src/fqterm')

diff --git a/src/fqterm/CMakeLists.txt b/src/fqterm/CMakeLists.txt
index 2c770c6..7a9f92d 100644
--- a/src/fqterm/CMakeLists.txt
+++ b/src/fqterm/CMakeLists.txt
@@ -82,7 +82,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/../protocol
   ${CMAKE_CURRENT_SOURCE_DIR}/../terminal
   ${CMAKE_CURRENT_SOURCE_DIR}/../utilities
-  ${CMAKE_CURRENT_SOURCE_DIR}/../unite
   ${CMAKE_CURRENT_SOURCE_DIR}/../ui
   ${CMAKE_CURRENT_SOURCE_DIR}/../ui/imageviewer
   ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty
@@ -101,7 +100,6 @@ add_dependencies(fqterm_main
   fqterm_protocol
   fqterm_ui
   fqterm_utilities
-  fqterm_unite
 )
 
 if(USE_QT5)
diff --git a/src/fqterm/fqterm_frame.cpp b/src/fqterm/fqterm_frame.cpp
index 5143a56..a470595 100644
--- a/src/fqterm/fqterm_frame.cpp
+++ b/src/fqterm/fqterm_frame.cpp
@@ -78,7 +78,6 @@
 #include "statusBar.h"
 #include "sitemanager.h"
 #include "fqterm_shortcuthelper.h"
-#include "fqterm_mini_server.h"
 #include "shortcutdialog.h"
 #include "schemadialog.h"
 #include "fqterm_ip_location.h"
@@ -186,9 +185,6 @@ FQTermFrame::FQTermFrame()
 
   installEventFilter(this);
 
-  serverThread_ = new FQTermMiniServerThread();
-  if (FQTermPref::getInstance()->runServer_)
-    serverThread_->start();
 #ifdef HAVE_PYTHON
   pythonHelper_ = new FQTermPythonHelper;
 #endif
@@ -218,10 +214,6 @@ FQTermFrame::~FQTermFrame() {
   //  delete uaoCodec_;
   delete windowManager_;
   FQTermIPLocation::Destroy();
-  serverThread_->quit();
-  serverThread_->wait(1000);
-  delete serverThread_;
-  
 }
 
 //initialize setting from fqterm.cfg
@@ -330,9 +322,6 @@ void FQTermFrame::iniSetting() {
   if (FQTermPref::getInstance()->useStyleSheet_) {
     loadStyleSheetFromFile(FQTermPref::getInstance()->styleSheetFile_);
   }
-
-  strTmp = config_->getItemValue("global", "runserver");
-  FQTermPref::getInstance()->runServer_ = (strTmp != "0");
 }
 
 void FQTermFrame::loadPref() {
@@ -480,8 +469,6 @@ void FQTermFrame::saveSetting() {
   strTmp = QString(state);
   config_->setItemValue("global", "toolbarstate", strTmp);
 
-  config_->setItemValue("global", "runserver", FQTermPref::getInstance()->runServer_ ? "1" : "0");
-
   config_->save(getPath(USER_CONFIG) + "fqterm.cfg");
 }
 
@@ -1008,16 +995,6 @@ void FQTermFrame::bosscolor() {
 }
 
 
-void FQTermFrame::toggleServer(bool on) {
-  FQTermPref::getInstance()->runServer_ = on;
-  if (on) {
-    serverThread_->start();
-  } else {
-    serverThread_->quit();
-    serverThread_->wait(1000);
-  }
-}
-
 void FQTermFrame::themesMenuAboutToShow() {
   QVector<QChar> vectorShortcutKeys;
   menuThemes_->clear();
@@ -1351,12 +1328,6 @@ void FQTermFrame::addMainTool() {
 
   toolBarMdiTools_->addAction(getAction(FQTermShortcutHelper::QUICKLOGIN));
 
-  serverButton_ = new QToolButton(toolBarMdiTools_);
-  serverButton_->setCheckable(true);
-  serverButton_->setIcon(QPixmap(getPath(RESOURCE) + "pic/fqterm_32x32.png"));
-  serverButton_->setChecked(FQTermPref::getInstance()->runServer_);
-  FQ_VERIFY(connect(serverButton_, SIGNAL(toggled(bool)), this, SLOT(toggleServer(bool))));
-  toolBarMdiTools_->addWidget(serverButton_);
   // custom define
   toolBarSetupKeys_ = addToolBar("Custom Key");
   toolBarSetupKeys_->setObjectName("Custom Key");
diff --git a/src/fqterm/fqterm_frame.h b/src/fqterm/fqterm_frame.h
index fbe0be0..cdb1d01 100644
--- a/src/fqterm/fqterm_frame.h
+++ b/src/fqterm/fqterm_frame.h
@@ -55,7 +55,6 @@ class FQTermWindow;
 class StatusBar;
 class FQTermTimeLabel;
 class TranslatorInstaller;
-class FQTermMiniServerThread;
 class FQTermShortcutHelper;
 
 #ifdef HAVE_PYTHON
@@ -149,7 +148,6 @@ class FQTermFrame: public QMainWindow {
   void refreshScreen();
   void fullscreen();
   void bosscolor();
-  void toggleServer(bool on);
   void uiFont();
   void logRaw();
   void antiIdle();
@@ -231,7 +229,6 @@ class FQTermFrame: public QMainWindow {
   FQTermConfig * config_;
   FQTermShortcutHelper * shortcutHelper_;
   QAction* getAction(int shortcut);
-  FQTermMiniServerThread* serverThread_;
 
   UAOCodec* uaoCodec_;
 
-- 
cgit v1.2.3