From abc1a67b29f305316cbb2b69a84d8cbb1a3d808a Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 6 Nov 2015 18:29:40 +0000 Subject: MirandaG15: Minor cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@15691 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirandaG15/src/CChatScreen.cpp | 70 +++++++++------------ plugins/MirandaG15/src/CContactList.cpp | 6 +- plugins/MirandaG15/src/CContactlistScreen.cpp | 2 +- plugins/MirandaG15/src/CCreditsScreen.cpp | 2 +- plugins/MirandaG15/src/CScreen.cpp | 3 +- plugins/MirandaG15/src/CScreensaverScreen.cpp | 3 +- plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp | 13 +--- plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp | 4 +- .../src/LCDFramework/CLCDOutputManager.cpp | 10 +-- .../MirandaG15/src/LCDFramework/CLCDTextObject.cpp | 4 +- plugins/MirandaG15/src/LCDFramework/ConStream.cpp | Bin 3625 -> 3637 bytes 11 files changed, 45 insertions(+), 72 deletions(-) (limited to 'plugins') diff --git a/plugins/MirandaG15/src/CChatScreen.cpp b/plugins/MirandaG15/src/CChatScreen.cpp index c25ce353a2..6a1224afe6 100644 --- a/plugins/MirandaG15/src/CChatScreen.cpp +++ b/plugins/MirandaG15/src/CChatScreen.cpp @@ -6,20 +6,12 @@ //************************************************************************ // Constructor //************************************************************************ -CChatScreen::CChatScreen() +CChatScreen::CChatScreen() : m_bTyping(false), m_bHideTitle(false), m_bContactTyping(false), + m_bHideLabels(false), m_bMaximizedTimer(false), m_bCloseTimer(false), + m_bIRCProtocol(false), m_dwCloseTimer(0), m_dwMaximizedTimer(0), + m_dwMaximizedDuration(0), m_eReplyState(REPLY_STATE_NONE), m_iStatus(ID_STATUS_OFFLINE), + m_hContact(NULL), m_hMessage(0) { - m_bTyping = false; - m_hContact = NULL; - m_bHideTitle = false; - m_bHideLabels = false; - - m_dwMaximizedTimer = 0; - m_bMaximizedTimer = false; - m_bCloseTimer = false; - m_dwCloseTimer = 0; - - m_eReplyState = REPLY_STATE_NONE; - m_iStatus = ID_STATUS_OFFLINE; } //************************************************************************ @@ -47,42 +39,38 @@ bool CChatScreen::Initialize() UpdateObjects(); // other attributes - m_InfoText.SetAlignment(DT_CENTER); - m_InfoText.SetWordWrap(TRUE); - m_InfoText.SetText(_T("")); - m_InfoText.Show(0); + m_InfoText.SetAlignment(DT_CENTER); + m_InfoText.SetWordWrap(TRUE); + m_InfoText.SetText(_T("")); + m_InfoText.Show(0); - m_UserName.SetAlignment(DT_CENTER); - m_UserName.SetWordWrap(TRUE); - m_UserName.SetText(_T("Proto")); + m_UserName.SetAlignment(DT_CENTER); + m_UserName.SetWordWrap(TRUE); + m_UserName.SetText(_T("Proto")); - m_UserStatus.SetAlignment(DT_LEFT); - m_UserStatus.SetWordWrap(TRUE); - m_UserStatus.SetText(_T("Status")); + m_UserStatus.SetAlignment(DT_LEFT); + m_UserStatus.SetWordWrap(TRUE); + m_UserStatus.SetText(_T("Status")); - m_UserProto.SetAlignment(DT_RIGHT); - m_UserProto.SetWordWrap(TRUE); - m_UserProto.SetText(_T("User")); + m_UserProto.SetAlignment(DT_RIGHT); + m_UserProto.SetWordWrap(TRUE); + m_UserProto.SetText(_T("User")); - m_Input.Show(0); + m_Input.Show(0); + m_TextLog.Show(1); - - m_TextLog.Show(1); - - - - m_TextLog.SetScrollbar(&m_Scrollbar); - - AddObject(&m_Scrollbar); - AddObject(&m_TextLog); - AddObject(&m_Input); - AddObject(&m_InfoText); - AddObject(&m_UserName); - AddObject(&m_UserStatus); - AddObject(&m_UserProto); + m_TextLog.SetScrollbar(&m_Scrollbar); + + AddObject(&m_Scrollbar); + AddObject(&m_TextLog); + AddObject(&m_Input); + AddObject(&m_InfoText); + AddObject(&m_UserName); + AddObject(&m_UserStatus); + AddObject(&m_UserProto); SetButtonBitmap(0,IDB_UP); diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp index d3e89bbef6..d15d1fcc5f 100644 --- a/plugins/MirandaG15/src/CContactList.cpp +++ b/plugins/MirandaG15/src/CContactList.cpp @@ -18,11 +18,9 @@ const int aiStatusPriority[] = { 0, // ID_STATUS_OFFLINE 40071 //************************************************************************ // constructor //************************************************************************ -CContactList::CContactList() +CContactList::CContactList() : m_bUseGroups(false), m_bUseMetaContacts(false), + m_dwLastScroll(0) { - m_bUseGroups = false; - m_bUseMetaContacts = false; - m_dwLastScroll = 0; } //************************************************************************ diff --git a/plugins/MirandaG15/src/CContactlistScreen.cpp b/plugins/MirandaG15/src/CContactlistScreen.cpp index 4a3efb282a..5aa16328ac 100644 --- a/plugins/MirandaG15/src/CContactlistScreen.cpp +++ b/plugins/MirandaG15/src/CContactlistScreen.cpp @@ -6,7 +6,7 @@ //************************************************************************ // Constructor //************************************************************************ -CContactlistScreen::CContactlistScreen() +CContactlistScreen::CContactlistScreen() : m_bLongPress(false) { } diff --git a/plugins/MirandaG15/src/CCreditsScreen.cpp b/plugins/MirandaG15/src/CCreditsScreen.cpp index 8219e5f353..8001426b9d 100644 --- a/plugins/MirandaG15/src/CCreditsScreen.cpp +++ b/plugins/MirandaG15/src/CCreditsScreen.cpp @@ -5,7 +5,7 @@ //************************************************************************ // Constructor //************************************************************************ -CCreditsScreen::CCreditsScreen() +CCreditsScreen::CCreditsScreen() : m_dwActivation(0), m_dwDuration(0), m_iPosition(0) { } diff --git a/plugins/MirandaG15/src/CScreen.cpp b/plugins/MirandaG15/src/CScreen.cpp index a731ab4d19..cf095aab76 100644 --- a/plugins/MirandaG15/src/CScreen.cpp +++ b/plugins/MirandaG15/src/CScreen.cpp @@ -5,9 +5,8 @@ //************************************************************************ // Constructor //************************************************************************ -CScreen::CScreen() +CScreen::CScreen() : m_bHideButtons(false) { - m_bHideButtons = false; } //************************************************************************ diff --git a/plugins/MirandaG15/src/CScreensaverScreen.cpp b/plugins/MirandaG15/src/CScreensaverScreen.cpp index a9d418f3e9..d50e1e856f 100644 --- a/plugins/MirandaG15/src/CScreensaverScreen.cpp +++ b/plugins/MirandaG15/src/CScreensaverScreen.cpp @@ -5,7 +5,8 @@ //************************************************************************ // Constructor //************************************************************************ -CScreensaverScreen::CScreensaverScreen() +CScreensaverScreen::CScreensaverScreen() : m_dwActivation(0), + m_dwDuration(0), m_iPosition(0) { } diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp index 0239c6b75f..547216ac09 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp @@ -5,19 +5,12 @@ //************************************************************************ // CLCDInput::CLCDInput //************************************************************************ -CLCDInput::CLCDInput() +CLCDInput::CLCDInput() : m_hKBHook(0), m_bShowSymbols(true), m_bShowMarker(false), + m_lInputTime(0), m_iLinePosition(0), m_iLineCount(0), m_iBreakKeys(KEYS_RETURN), + m_lBlinkTimer(0), m_pScrollbar(NULL) { - m_lInputTime = 0; - m_iLinePosition = 0; memset(&m_Marker, 0, sizeof(m_Marker)); - m_pScrollbar = NULL; - m_bShowSymbols = true; - m_iBreakKeys = KEYS_RETURN; - m_bShowMarker = false; - m_lBlinkTimer = 0; - - m_iLineCount = 0; // SetScrollbarAlignment(TOP); Reset(); } diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp index 06f4076e83..38daccc7bf 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp @@ -8,10 +8,10 @@ //************************************************************************ // constructor //************************************************************************ -CLCDLabel::CLCDLabel() +CLCDLabel::CLCDLabel() : m_bCutOff(true), m_bWordWrap(false), m_iCutOffIndex(0), + m_iLineCount(0) { m_strText = _T(""); - m_bCutOff = true; } //************************************************************************ diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp index d7107c888c..42bc3361de 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDOutputManager.cpp @@ -14,18 +14,14 @@ CLCDOutputManager *CLCDOutputManager::m_pInstance = NULL; //************************************************************************ // Constructor //************************************************************************ -CLCDOutputManager::CLCDOutputManager() +CLCDOutputManager::CLCDOutputManager() : m_dwButtonRepeatDelay(300), m_pGfx(0), + m_pdwButtonRepeatTimers(0), m_pdwButtonRepeatStarts(0), m_pbButtonStates(0), + m_pLcdConnection(0), m_bInitialized(false), m_dwLastUpdate(0), m_pActiveScreen(NULL) { ASSERT(m_pInstance == NULL); m_pInstance = this; m_strAppletName = _T(""); - m_pbButtonStates = NULL; - m_pActiveScreen = NULL; - m_bInitialized = false; - - m_dwButtonRepeatDelay = 300; - m_dwLastUpdate = 0; } //************************************************************************ diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp index bad6b61c75..ccbb420206 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDTextObject.cpp @@ -6,10 +6,8 @@ //************************************************************************ // constructor //************************************************************************ -CLCDTextObject::CLCDTextObject() +CLCDTextObject::CLCDTextObject() : m_bWordWrap(false), m_hFont(NULL), m_iFontHeight(0) { - m_hFont = NULL; - m_iFontHeight = 0; // Initialize DRAWTEXTPARAMS memset(&m_dtp, 0, sizeof(DRAWTEXTPARAMS)); m_dtp.cbSize = sizeof(DRAWTEXTPARAMS); diff --git a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp index f3c4048c01..c534b3268d 100644 Binary files a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp and b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp differ -- cgit v1.2.3