From 1b60fdaf9e55690bbfb5a6d8b3f6b970e6d4373f Mon Sep 17 00:00:00 2001 From: Mataes Date: Sun, 23 Dec 2018 20:24:43 +0300 Subject: cleanup --- plugins/AVS/src/main.cpp | 7 +------ plugins/AVS/src/stdafx.h | 4 ++++ plugins/AssocMgr/src/assoclist.h | 1 - plugins/BASS_interface/res/Bass.rc | 8 ++++---- plugins/BASS_interface/src/Resource.h | 4 ---- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 4f3d79647a..1ea2cadc6e 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -38,7 +38,7 @@ HANDLE hGlobalAvatarFolder; HANDLE hLoaderEvent, hShutdownEvent; HANDLE hEventChanged, hEventContactAvatarChanged, hMyAvatarChanged; -void InitServices(); +char *g_szMetaName = nullptr; ///////////////////////////////////////////////////////////////////////////////////////// @@ -72,13 +72,8 @@ static int ComparePicture(const protoPicCacheEntry *p1, const protoPicCacheEntry OBJLIST g_ProtoPictures(10, ComparePicture), g_MyAvatars(10, ComparePicture); -char *g_szMetaName = nullptr; - // Stores the id of the dialog -int OnDetailsInit(WPARAM wParam, LPARAM lParam); -int OptInit(WPARAM wParam, LPARAM lParam); - static int ProtocolAck(WPARAM, LPARAM lParam) { ACKDATA *ack = (ACKDATA*)lParam; diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index 21385e074e..351699a865 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -180,3 +180,7 @@ void Proto_GetAvatarMaxSize(const char *proto, int *width, int *height); int Proto_GetAvatarMaxFileSize(const char *proto); protoPicCacheEntry* GetProtoDefaultAvatar(MCONTACT hContact); + +int OnDetailsInit(WPARAM wParam, LPARAM lParam); +int OptInit(WPARAM wParam, LPARAM lParam); +void InitServices(); diff --git a/plugins/AssocMgr/src/assoclist.h b/plugins/AssocMgr/src/assoclist.h index 3be44d02cc..e285744514 100644 --- a/plugins/AssocMgr/src/assoclist.h +++ b/plugins/AssocMgr/src/assoclist.h @@ -66,7 +66,6 @@ void UninitAssocList(void); class COptionsDialog : public CDlgBase { - //CCtrlLabel m_lblHeaderText; CCtrlListView m_lvAssocList; CCtrlCheck m_chkAutoStart; CCtrlCheck m_chkOnlyRun; diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc index fd6f3142a8..360be28970 100644 --- a/plugins/BASS_interface/res/Bass.rc +++ b/plugins/BASS_interface/res/Bass.rc @@ -43,13 +43,13 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "Un4seen's BASS interface", IDC_STATIC, 5, 5, 302, 231 LTEXT "bass.dll loading error", IDC_BASSVERSION, 20, 20, 210, 8, SS_LEFT - LTEXT "Current bass.dll path:", IDC_CURRPATHLABEL, 20, 45, 210, 8, SS_LEFT + LTEXT "Current bass.dll path:", IDC_STATIC, 20, 45, 210, 8, SS_LEFT LTEXT "", IDC_CURRPATH, 20, 60, 210, 8, SS_LEFT | SS_PATHELLIPSIS - LTEXT "Maximum number of BASS internal channels:", IDC_MAXCHANNELLABEL, 20, 85, 210, 8, SS_LEFT + LTEXT "Maximum number of BASS internal channels:", IDC_STATIC, 20, 85, 210, 8, SS_LEFT COMBOBOX IDC_MAXCHANNEL, 20, 100, 48, 14, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP - LTEXT "Output device:", IDC_OUTDEVICELABEL, 20, 125, 240, 8, SS_LEFT + LTEXT "Output device:", IDC_STATIC, 20, 125, 240, 8, SS_LEFT COMBOBOX IDC_OUTDEVICE, 20, 140, 236, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_TABSTOP - LTEXT "Volume:", IDC_VOLUMELABEL, 20, 165, 165, 8, SS_LEFT + LTEXT "Volume:", IDC_STATIC, 20, 165, 165, 8, SS_LEFT CONTROL "", IDC_VOLUME, TRACKBAR_CLASS, WS_TABSTOP | TBS_BOTH | TBS_NOTICKS, 20, 180, 273, 10 AUTOCHECKBOX "Quiet time:", IDC_QUIETTIME, 20, 205, 55, 10 CONTROL "", IDC_TIME1, DATETIMEPICK_CLASS, WS_TABSTOP | WS_DISABLED | DTS_TIMEFORMAT | DTS_UPDOWN | DTS_RIGHTALIGN, 79, 202, 35, 15 diff --git a/plugins/BASS_interface/src/Resource.h b/plugins/BASS_interface/src/Resource.h index 8a5faaa1b4..9af71389a2 100644 --- a/plugins/BASS_interface/src/Resource.h +++ b/plugins/BASS_interface/src/Resource.h @@ -4,13 +4,9 @@ #define IDD_OPTIONS 101 #define IDC_BASSVERSION 1000 -#define IDC_VOLUMELABEL 1001 -#define IDC_CURRPATHLABEL 1002 -#define IDC_OUTDEVICELABEL 1004 #define IDC_OUTDEVICE 1005 #define IDC_QUIETTIME 1008 #define IDC_CURRPATH 1009 -#define IDC_MAXCHANNELLABEL 1010 #define IDC_MAXCHANNEL 1011 #define IDC_VOLUME 1012 #define IDC_GETBASS 1013 -- cgit v1.2.3