FreeRDP: modify log

KangLin · Apr 4, 2023 · 8a15fc7 · 8a15fc7
1 parent 5995906
commit 8a15fc7
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 85 deletions.
diff --git a/Plugins/FreeRDP/Client/ClipboardFreeRDP.h b/Plugins/FreeRDP/Client/ClipboardFreeRDP.h
@@ -110,6 +110,4 @@ public Q_SLOTS:
     BOOL m_bFileFormatsRegistered;
 };
 
-Q_DECLARE_LOGGING_CATEGORY(FreeRDPClipboard)
-
 #endif // CCLIPBOARDFREERDP_H
diff --git a/Plugins/FreeRDP/Client/ConnectFreeRDP.cpp b/Plugins/FreeRDP/Client/ConnectFreeRDP.cpp
diff --git a/Plugins/FreeRDP/Client/ConnecterFreeRDP.cpp b/Plugins/FreeRDP/Client/ConnecterFreeRDP.cpp
@@ -6,7 +6,8 @@
 #include "DlgSetFreeRDP.h"
 
 CConnecterFreeRDP::CConnecterFreeRDP(CPluginClient *parent)
-    : CConnecterDesktopThread(parent)
+    : CConnecterDesktopThread(parent),
+      m_Logger("FreeRDP.Connecter")
 {
     //WLog_SetLogLevel(WLog_GetRoot(), WLOG_TRACE);
     SetParameter(&m_ParameterFreeRdp);
@@ -17,7 +18,7 @@ CConnecterFreeRDP::CConnecterFreeRDP(CPluginClient *parent)
 
 CConnecterFreeRDP::~CConnecterFreeRDP()
 {
-    qDebug(FreeRDP) << "CConnecterFreeRdp::~CConnecterFreeRdp()";
+    qDebug(m_Logger) << "CConnecterFreeRdp::~CConnecterFreeRdp()";
 }
 
 qint16 CConnecterFreeRDP::Version()

diff --git a/Plugins/FreeRDP/Client/ConnecterFreeRDP.h b/Plugins/FreeRDP/Client/ConnecterFreeRDP.h
@@ -25,6 +25,7 @@ class CConnecterFreeRDP : public CConnecterDesktopThread
 
 private:
     CParameterFreeRDP m_ParameterFreeRdp;
+    QLoggingCategory m_Logger;
 };
 
 #endif // CCONNECTERFREERDP_H
diff --git a/Plugins/FreeRDP/Client/ConvertKeyCode.cpp b/Plugins/FreeRDP/Client/ConvertKeyCode.cpp
@@ -3,9 +3,7 @@
 #include "ConvertKeyCode.h"
 
 CConvertKeyCode::CConvertKeyCode()
-{
-
-}
+{}
 
 /**
  * @brief CConvertKeyCode::QtToScanCode

diff --git a/Plugins/FreeRDP/Client/CursorFreeRDP.cpp b/Plugins/FreeRDP/Client/CursorFreeRDP.cpp
@@ -5,7 +5,8 @@
 #include <freerdp/gdi/gdi.h>
 
 CCursorFreeRDP::CCursorFreeRDP(CConnectFreeRDP *parent) : QObject(parent),
-    m_pConnect(parent)
+    m_pConnect(parent),
+    m_Logger("FreeRDP.Cursor")
 {}
 
 int CCursorFreeRDP::RegisterPointer(rdpGraphics *graphics)
@@ -29,14 +30,14 @@ int CCursorFreeRDP::RegisterPointer(rdpGraphics *graphics)
 
 BOOL CCursorFreeRDP::cb_Pointer_New(rdpContext *context, rdpPointer *pointer)
 {
-    //qDebug(FreeRDP) << "cb_Pointer_New";
+    //qDebug(m_Logger) << "cb_Pointer_New";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     return pThis->m_Cursor.onNew(context, pointer);
 }
 
 void CCursorFreeRDP::cb_Pointer_Free(rdpContext* context, rdpPointer* pointer)
 {
-    //qDebug(FreeRDP) << "cb_Pointer_Free";
+    //qDebug(m_Logger) << "cb_Pointer_Free";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     pThis->m_Cursor.onFree(context, pointer);   
 }
@@ -49,29 +50,29 @@ BOOL CCursorFreeRDP::cb_Pointer_Set(rdpContext *context,
                                     #endif
                                     )
 {
-    //qDebug(FreeRDP) << "cb_Pointer_Set";
+    //qDebug(m_Logger) << "cb_Pointer_Set";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     return pThis->m_Cursor.onSet(context, pointer);
 }
 
 BOOL CCursorFreeRDP::cb_Pointer_SetNull(rdpContext *context)
 {
-    //qDebug(FreeRDP) << "cb_Pointer_SetNull";
+    //qDebug(m_Logger) << "cb_Pointer_SetNull";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     return pThis->m_Cursor.onSetNull(context);
 }
 
 BOOL CCursorFreeRDP::cb_Pointer_SetDefault(rdpContext *context)
 {
-    //qDebug(FreeRDP) << "cb_Pointer_SetDefault";
+    //qDebug(m_Logger) << "cb_Pointer_SetDefault";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     return pThis->m_Cursor.onSetDefault(context);
     return TRUE;
 }
 
 BOOL CCursorFreeRDP::cb_Pointer_SetPosition(rdpContext *context, UINT32 x, UINT32 y)
 {
-    //qDebug(FreeRDP) << "cb_Pointer_SetPosition";
+    //qDebug(m_Logger) << "cb_Pointer_SetPosition";
     CConnectFreeRDP* pThis = ((CConnectFreeRDP::ClientContext*)context)->pThis;
     return pThis->m_Cursor.onSetPosition(context, x, y);
     return TRUE;

diff --git a/Plugins/FreeRDP/Client/CursorFreeRDP.h b/Plugins/FreeRDP/Client/CursorFreeRDP.h
@@ -46,8 +46,7 @@ class CCursorFreeRDP : public QObject
     CConnectFreeRDP* m_pConnect;
 
     QImage m_Cursor;
+    QLoggingCategory m_Logger;
 };
 
-Q_DECLARE_LOGGING_CATEGORY(FreeRDP)
-
 #endif // CCURSOR_H
diff --git a/Plugins/FreeRDP/Client/PluginFreeRDP.cpp b/Plugins/FreeRDP/Client/PluginFreeRDP.cpp
@@ -7,20 +7,19 @@
 #include "ConnecterFreeRDP.h"
 #include "winpr/wlog.h"
 
-Q_LOGGING_CATEGORY(FreeRDP, "FreeRDP")
-
 CPluginFreeRDP::CPluginFreeRDP(QObject *parent)
-    : CPluginClient(parent)
+    : CPluginClient(parent),
+      m_Logger("FreeRDP.Plugin")
 {
-    //qDebug(FreeRDP) << "FreeRDP" << "build configure:" << freerdp_get_build_config() << "\n";
-    qInfo(FreeRDP) << "FreeRDP version:" << freerdp_get_version_string()
+    //qDebug(m_Logger) << "FreeRDP" << "build configure:" << freerdp_get_build_config() << "\n";
+    qInfo(m_Logger) << "FreeRDP version:" << freerdp_get_version_string()
                    << "Build version:" << freerdp_get_build_revision();
     //WLog_SetLogLevel(WLog_GetRoot(), WLOG_TRACE);
 }
 
 CPluginFreeRDP::~CPluginFreeRDP()
 {
-    qDebug(FreeRDP) << "CPluginFreeRDP::~CPluginFreeRDP()";
+    qDebug(m_Logger) << "CPluginFreeRDP::~CPluginFreeRDP()";
 }
 
 const QString CPluginFreeRDP::Name() const

diff --git a/Plugins/FreeRDP/Client/PluginFreeRDP.h b/Plugins/FreeRDP/Client/PluginFreeRDP.h
@@ -34,6 +34,7 @@ class CPluginFreeRDP : public CPluginClient
 
 private:
     QTranslator m_Translator;
+    QLoggingCategory m_Logger;
 };
 
 #endif // CPluginFreeRdp_H_KL_2021_07_23