unused shit removed

4 files changed, 5 insertions, 24 deletions

diff --git a/include/m_chat.h b/include/m_chat.h
index 93679fb1e1..6ddb8c5c50 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -133,7 +133,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define GC_ACKMSG          0x0020 // the protocol must acknowlege messages sent

 #define GC_TYPNOTIF        0x0040 // enable typing notifications.

 #define GC_CHANMGR         0x0080 // enable the 'channel settings' button

-#define GC_SINGLEFORMAT    0x0100 // the protocol supports only 1 formatting per message

 #define GC_FONTSIZE        0x0200 // enable font size selection

 

 // Error messages

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index b2912ac609..743078d476 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -89,7 +89,6 @@ struct GCModuleInfoBase
 	bool      bBkgColor;

 	bool      bChanMgr;

 	bool      bAckMsg;

-	bool      bSingleFormat;

 	bool      bFontSize;

 	int       nColorCount;

 	COLORREF* crColors;

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 3f77820882..ebdfc49dee 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1130,7 +1130,6 @@ void CChatRoomDlg::onClick_BIU(CCtrlButton *pButton)
 	if (!pButton->Enabled())

 		return;

 

-	MODULEINFO *pInfo = pci->MM_FindModule(m_si->pszModule);

 	CHARFORMAT2 cf;

 	cf.cbSize = sizeof(CHARFORMAT2);

 	cf.dwMask = CFM_BOLD | CFM_ITALIC | CFM_UNDERLINE;

@@ -1142,10 +1141,7 @@ void CChatRoomDlg::onClick_BIU(CCtrlButton *pButton)
 		cf.dwEffects |= CFE_ITALIC;

 	if (IsDlgButtonChecked(m_hwnd, IDC_UNDERLINE))

 		cf.dwEffects |= CFE_UNDERLINE;

-	if (pInfo->bSingleFormat)

-		m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

-	else

-		m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

+	m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 }

 

 void CChatRoomDlg::onClick_Color(CCtrlButton *pButton)

@@ -1164,10 +1160,7 @@ void CChatRoomDlg::onClick_Color(CCtrlButton *pButton)
 		else if (m_bFGSet) {

 			cf.dwMask = CFM_COLOR;

 			cf.crTextColor = pInfo->crColors[m_iFG];

-			if (pInfo->bSingleFormat)

-				m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

-			else

-				m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

+			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 		}

 	}

 	else {

@@ -1175,10 +1168,7 @@ void CChatRoomDlg::onClick_Color(CCtrlButton *pButton)
 		LoadMsgDlgFont(MSGFONTID_MESSAGEAREA, nullptr, &cr);

 		cf.dwMask = CFM_COLOR;

 		cf.crTextColor = cr;

-		if (pInfo->bSingleFormat)

-			m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

-		else

-			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

+		m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 	}

 }

 

@@ -1198,19 +1188,13 @@ void CChatRoomDlg::onClick_BkColor(CCtrlButton *pButton)
 		else if (m_bBGSet) {

 			cf.dwMask = CFM_BACKCOLOR;

 			cf.crBackColor = pInfo->crColors[m_iBG];

-			if (pInfo->bSingleFormat)

-				m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

-			else

-				m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

+			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 		}

 	}

 	else {

 		cf.dwMask = CFM_BACKCOLOR;

 		cf.crBackColor = (COLORREF)db_get_dw(0, SRMMMOD, SRMSGSET_INPUTBKGCOLOUR, SRMSGDEFSET_INPUTBKGCOLOUR);

-		if (pInfo->bSingleFormat)

-			m_message.SendMsg(EM_SETCHARFORMAT, SCF_ALL, (LPARAM)&cf);

-		else

-			m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

+		m_message.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 	}

 }

 

diff --git a/src/mir_app/src/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index 834a42c11d..3dc5539ce0 100644
--- a/src/mir_app/src/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -170,7 +170,6 @@ MIR_APP_DLL(int) Chat_Register(const GCREGISTER *gcr)
 	mi->bBkgColor = (gcr->dwFlags & GC_BKGCOLOR) != 0;

 	mi->bAckMsg = (gcr->dwFlags & GC_ACKMSG) != 0;

 	mi->bChanMgr = (gcr->dwFlags & GC_CHANMGR) != 0;

-	mi->bSingleFormat = (gcr->dwFlags & GC_SINGLEFORMAT) != 0;

 	mi->bFontSize = (gcr->dwFlags & GC_FONTSIZE) != 0;

 	mi->iMaxText = gcr->iMaxText;

 	mi->nColorCount = gcr->nColors;