From b1874d193f5bb0b40055aec52e4fca1f32cc367a Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 12 Apr 2019 18:55:43 +0200 Subject: [PATCH] small fixes --- src/clientdlg.cpp | 5 ----- src/clientdlg.h | 2 +- src/server.h | 1 - src/serverlogging.cpp | 2 -- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index b5348005..bd7c10be 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1200,8 +1200,3 @@ rbtReverbSelR->setStyleSheet ( "" ); // also apply GUI design to child GUI controls MainMixerBoard->SetGUIDesign ( eNewDesign ); } - -void CClientDlg::accept() -{ - close(); -} diff --git a/src/clientdlg.h b/src/clientdlg.h index 1f58a81e..65326f05 100755 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -206,7 +206,7 @@ public slots: void OnNumClientsChanged ( int iNewNumClients ); void OnNewClientLevelChanged() { MainMixerBoard->iNewClientFaderLevel = pClient->iNewClientFaderLevel; } - void accept(); + void accept() { close(); } // introduced by pljones void keyPressEvent ( QKeyEvent *e ) // block escape key { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); } diff --git a/src/server.h b/src/server.h index c313d7c7..76dfb215 100755 --- a/src/server.h +++ b/src/server.h @@ -40,7 +40,6 @@ #include "util.h" #include "serverlogging.h" #include "serverlist.h" - #include "recorder/jamrecorder.h" diff --git a/src/serverlogging.cpp b/src/serverlogging.cpp index 344a0011..8876c099 100755 --- a/src/serverlogging.cpp +++ b/src/serverlogging.cpp @@ -346,7 +346,6 @@ void CServerLogging::AddNewConnection ( const QHostAddress& ClientInetAddr ) QTextStream tsConsoleStream ( stdout ); tsConsoleStream << strLogStr << endl; // on console #endif - *this << strLogStr; // in log file // add element to history @@ -362,7 +361,6 @@ void CServerLogging::AddServerStopped() QTextStream tsConsoleStream ( stdout ); tsConsoleStream << strLogStr << endl; // on console #endif - *this << strLogStr; // in log file // add element to history and update on server stop