Update of /cvsroot/dcplusplus/dcplusplus/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10847/windows Modified Files: QueuePage.h WindowsPage.h FlatTabCtrl.h PropPage.h CertificatesPage.h NotepadFrame.h UCHandler.h MainFrm.h PublicHubsFrm.h GeneralPage.h TextFrame.h WinUtil.h WaitingUsersFrame.h DownloadPage.h PrivateFrame.cpp SearchFrm.cpp AppearancePage.h StatsFrame.h SpyFrame.cpp SearchFrm.h QueueFrame.h UsersFrame.h MagnetDlg.h AdvancedPage.h PublicHubsListDlg.h TransferView.cpp LineDlg.h Advanced3Page.h HubFrame.h FinishedFrame.h TypedListViewCtrl.h FavoritesFrm.h ADLSearchFrame.h PrivateFrame.h FavoriteDirsPage.h CommandDlg.h MainFrm.cpp FinishedULFrame.h TransferView.h UploadPage.h Appearance2Page.h LogPage.h SystemFrame.h WaitingUsersFrame.cpp ADLSProperties.h DirectoryListingFrm.h NetworkPage.h UCPage.h FinishedFrameBase.h HashProgressDlg.h HubFrame.cpp AboutDlg.h ExListViewCtrl.h FavHubProperties.h Appearance2Page.cpp Log Message: Pedantry Index: CommandDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/CommandDlg.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CommandDlg.h 11 Jan 2006 21:31:01 -0000 1.14 --- CommandDlg.h 19 Feb 2006 16:19:06 -0000 1.15 *************** *** 68,72 **** END_MSG_MAP() ! CommandDlg() : type(0), ctx(0) { }; LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 68,72 ---- END_MSG_MAP() ! CommandDlg() : type(0), ctx(0) { } LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { Index: PropPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PropPage.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** PropPage.h 24 Apr 2005 08:13:03 -0000 1.11 --- PropPage.h 19 Feb 2006 16:19:06 -0000 1.12 *************** *** 32,37 **** { public: ! PropPage(SettingsManager *src) : settings(src) { }; ! virtual ~PropPage() { }; virtual PROPSHEETPAGE *getPSP() = 0; --- 32,37 ---- { public: ! PropPage(SettingsManager *src) : settings(src) { } ! virtual ~PropPage() { } virtual PROPSHEETPAGE *getPSP() = 0; Index: QueueFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/QueueFrame.h,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** QueueFrame.h 1 Jan 2006 17:49:59 -0000 1.56 --- QueueFrame.h 19 Feb 2006 16:19:06 -0000 1.57 *************** *** 183,187 **** struct SourceInfo : public Flags { ! explicit SourceInfo(const QueueItem::Source& s) : Flags(s), user(s.getUser()) { }; SourceInfo& operator=(const QueueItem::Source& s) { --- 183,187 ---- struct SourceInfo : public Flags { ! explicit SourceInfo(const QueueItem::Source& s) : Flags(s), user(s.getUser()) { } SourceInfo& operator=(const QueueItem::Source& s) { *************** *** 190,194 **** return *this; } ! User::Ptr& getUser() { return user; }; User::Ptr user; --- 190,194 ---- return *this; } ! User::Ptr& getUser() { return user; } User::Ptr user; *************** *** 227,233 **** badSources.push_back(SourceInfo(*(*i))); } ! }; ! ~QueueItemInfo() { delete display; }; void update(); --- 227,233 ---- badSources.push_back(SourceInfo(*(*i))); } ! } ! ~QueueItemInfo() { delete display; } void update(); *************** *** 251,256 **** const tstring& getTargetFileName() { return getDisplay()->columns[COLUMN_TARGET]; } ! SourceList& getSources() { return sources; }; ! SourceList& getBadSources() { return badSources; }; Display* getDisplay() { --- 251,256 ---- const tstring& getTargetFileName() { return getDisplay()->columns[COLUMN_TARGET]; } ! SourceList& getSources() { return sources; } ! SourceList& getBadSources() { return badSources; } Display* getDisplay() { *************** *** 382,386 **** } ! bool isCurDir(const tstring& aDir) const { return Util::stricmp(curDir, aDir) == 0; }; void moveSelected(); --- 382,386 ---- } ! bool isCurDir(const tstring& aDir) const { return Util::stricmp(curDir, aDir) == 0; } void moveSelected(); *************** *** 407,418 **** if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || MessageBox(CTSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) removeDir(ctrlDirs.GetSelectedItem()); ! }; const tstring& getSelectedDir() { HTREEITEM ht = ctrlDirs.GetSelectedItem(); return ht == NULL ? Util::emptyStringT : getDir(ctrlDirs.GetSelectedItem()); ! }; ! const tstring& getDir(HTREEITEM ht) { dcassert(ht != NULL); return *((tstring*)ctrlDirs.GetItemData(ht)); }; virtual void on(QueueManagerListener::Added, QueueItem* aQI) throw(); --- 407,418 ---- if(!BOOLSETTING(CONFIRM_ITEM_REMOVAL) || MessageBox(CTSTRING(REALLY_REMOVE), _T(APPNAME) _T(" ") _T(VERSIONSTRING), MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) removeDir(ctrlDirs.GetSelectedItem()); ! } const tstring& getSelectedDir() { HTREEITEM ht = ctrlDirs.GetSelectedItem(); return ht == NULL ? Util::emptyStringT : getDir(ctrlDirs.GetSelectedItem()); ! } ! const tstring& getDir(HTREEITEM ht) { dcassert(ht != NULL); return *((tstring*)ctrlDirs.GetItemData(ht)); } virtual void on(QueueManagerListener::Added, QueueItem* aQI) throw(); Index: Appearance2Page.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Appearance2Page.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Appearance2Page.h 5 Jan 2006 00:11:31 -0000 1.5 --- Appearance2Page.h 19 Feb 2006 16:19:06 -0000 1.6 *************** *** 34,38 **** SetTitle(CTSTRING(SETTINGS_APPEARANCE2)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; virtual ~Appearance2Page(); --- 34,38 ---- SetTitle(CTSTRING(SETTINGS_APPEARANCE2)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } virtual ~Appearance2Page(); Index: SearchFrm.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SearchFrm.cpp,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** SearchFrm.cpp 9 Jan 2006 22:44:49 -0000 1.109 --- SearchFrm.cpp 19 Feb 2006 16:19:06 -0000 1.110 *************** *** 805,810 **** ClientManager::getInstance()->userCommand(sr->getUser(), uc, tmp, true); } ! return; ! }; LRESULT SearchFrame::onCtlColor(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) { --- 805,809 ---- ClientManager::getInstance()->userCommand(sr->getUser(), uc, tmp, true); } ! } LRESULT SearchFrame::onCtlColor(UINT /*uMsg*/, WPARAM wParam, LPARAM lParam, BOOL& /*bHandled*/) { *************** *** 822,826 **** return (LRESULT)WinUtil::bgBrush; } ! }; LRESULT SearchFrame::onChar(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled) { --- 821,825 ---- return (LRESULT)WinUtil::bgBrush; } ! } LRESULT SearchFrame::onChar(UINT uMsg, WPARAM wParam, LPARAM /*lParam*/, BOOL& bHandled) { Index: FinishedFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedFrame.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** FinishedFrame.h 12 Jan 2006 22:32:44 -0000 1.24 --- FinishedFrame.h 19 Feb 2006 16:19:06 -0000 1.25 *************** *** 34,39 **** columnOrder = SettingsManager::FINISHED_ORDER; columnWidth = SettingsManager::FINISHED_WIDTHS; ! }; ! virtual ~FinishedFrame() { }; DECLARE_FRAME_WND_CLASS_EX(_T("FinishedFrame"), IDR_FINISHED_DL, 0, COLOR_3DFACE); --- 34,39 ---- columnOrder = SettingsManager::FINISHED_ORDER; columnWidth = SettingsManager::FINISHED_WIDTHS; ! } ! virtual ~FinishedFrame() { } DECLARE_FRAME_WND_CLASS_EX(_T("FinishedFrame"), IDR_FINISHED_DL, 0, COLOR_3DFACE); Index: SpyFrame.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SpyFrame.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** SpyFrame.cpp 24 Apr 2005 08:13:05 -0000 1.37 --- SpyFrame.cpp 19 Feb 2006 16:19:06 -0000 1.38 *************** *** 204,208 **** SearchFrame::openWindow(searchString); return 0; ! }; void SpyFrame::on(ClientManagerListener::IncomingSearch, const string& s) throw() { --- 204,208 ---- SearchFrame::openWindow(searchString); return 0; ! } void SpyFrame::on(ClientManagerListener::IncomingSearch, const string& s) throw() { Index: SearchFrm.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SearchFrm.h,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** SearchFrm.h 3 Dec 2005 20:36:50 -0000 1.65 --- SearchFrm.h 19 Feb 2006 16:19:06 -0000 1.66 *************** *** 217,221 **** class SearchInfo; public: ! TypedListViewCtrl<SearchInfo, IDC_RESULTS>& getUserList() { return ctrlResults; }; private: --- 217,221 ---- class SearchInfo; public: ! TypedListViewCtrl<SearchInfo, IDC_RESULTS>& getUserList() { return ctrlResults; } private: *************** *** 242,249 **** SearchInfo(SearchResult* aSR) : UserInfoBase(aSR->getUser()), sr(aSR) { sr->incRef(); update(); ! }; ~SearchInfo() { sr->decRef(); ! }; void getList(); --- 242,249 ---- SearchInfo(SearchResult* aSR) : UserInfoBase(aSR->getUser()), sr(aSR) { sr->incRef(); update(); ! } ~SearchInfo() { sr->decRef(); ! } void getList(); *************** *** 252,271 **** void view(); struct Download { ! Download(const tstring& aTarget) : tgt(aTarget) { }; void operator()(SearchInfo* si); const tstring& tgt; }; struct DownloadWhole { ! DownloadWhole(const tstring& aTarget) : tgt(aTarget) { }; void operator()(SearchInfo* si); const tstring& tgt; }; struct DownloadTarget { ! DownloadTarget(const tstring& aTarget) : tgt(aTarget) { }; void operator()(SearchInfo* si); const tstring& tgt; }; struct CheckSize { ! CheckSize() : size(-1), op(true), firstHubs(true), hasTTH(false), firstTTH(true) { }; void operator()(SearchInfo* si); tstring ext; --- 252,271 ---- void view(); struct Download { ! Download(const tstring& aTarget) : tgt(aTarget) { } void operator()(SearchInfo* si); const tstring& tgt; }; struct DownloadWhole { ! DownloadWhole(const tstring& aTarget) : tgt(aTarget) { } void operator()(SearchInfo* si); const tstring& tgt; }; struct DownloadTarget { ! DownloadTarget(const tstring& aTarget) : tgt(aTarget) { } void operator()(SearchInfo* si); const tstring& tgt; }; struct CheckSize { ! CheckSize() : size(-1), op(true), firstHubs(true), hasTTH(false), firstTTH(true) { } void operator()(SearchInfo* si); tstring ext; *************** *** 332,336 **** struct HubInfo : public FastAlloc<HubInfo> { HubInfo(const tstring& aIpPort, const tstring& aName, bool aOp) : ipPort(aIpPort), ! name(aName), op(aOp) { }; const tstring& getText(int col) const { --- 332,336 ---- struct HubInfo : public FastAlloc<HubInfo> { HubInfo(const tstring& aIpPort, const tstring& aName, bool aOp) : ipPort(aIpPort), ! name(aName), op(aOp) { } const tstring& getText(int col) const { *************** *** 439,443 **** HubInfo* hubInfo = new HubInfo(Text::toT(aClient->getIpPort()), Text::toT(aClient->getHubName()), aClient->getMyIdentity().isOp()); PostMessage(WM_SPEAKER, WPARAM(s), LPARAM(hubInfo)); ! }; }; --- 439,443 ---- HubInfo* hubInfo = new HubInfo(Text::toT(aClient->getIpPort()), Text::toT(aClient->getHubName()), aClient->getMyIdentity().isOp()); PostMessage(WM_SPEAKER, WPARAM(s), LPARAM(hubInfo)); ! } }; Index: FinishedFrameBase.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedFrameBase.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FinishedFrameBase.h 12 Jan 2006 22:32:44 -0000 1.1 --- FinishedFrameBase.h 19 Feb 2006 16:19:06 -0000 1.2 *************** *** 41,46 **** { public: ! FinishedFrameBase() : totalBytes(0), totalTime(0), closed(false) { }; ! virtual ~FinishedFrameBase() { }; BEGIN_MSG_MAP(T) --- 41,46 ---- { public: ! FinishedFrameBase() : totalBytes(0), totalTime(0), closed(false) { } ! virtual ~FinishedFrameBase() { } BEGIN_MSG_MAP(T) Index: FavoritesFrm.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavoritesFrm.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** FavoritesFrm.h 12 Nov 2005 10:23:02 -0000 1.23 --- FavoritesFrm.h 19 Feb 2006 16:19:06 -0000 1.24 *************** *** 35,40 **** { public: ! FavoriteHubsFrame() : nosave(true) { }; ! virtual ~FavoriteHubsFrame() { }; DECLARE_FRAME_WND_CLASS_EX(_T("FavoriteHubsFrame"), IDR_FAVORITES, 0, COLOR_3DFACE); --- 35,40 ---- { public: ! FavoriteHubsFrame() : nosave(true) { } ! virtual ~FavoriteHubsFrame() { } DECLARE_FRAME_WND_CLASS_EX(_T("FavoriteHubsFrame"), IDR_FAVORITES, 0, COLOR_3DFACE); Index: UCHandler.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UCHandler.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** UCHandler.h 3 Dec 2005 00:18:08 -0000 1.12 --- UCHandler.h 19 Feb 2006 16:19:06 -0000 1.13 *************** *** 30,34 **** class UCHandler { public: ! UCHandler() : menuPos(0) { }; typedef UCHandler<T> thisClass; --- 30,34 ---- class UCHandler { public: ! UCHandler() : menuPos(0) { } typedef UCHandler<T> thisClass; Index: NotepadFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/NotepadFrame.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** NotepadFrame.h 12 Nov 2005 10:23:02 -0000 1.15 --- NotepadFrame.h 19 Feb 2006 16:19:06 -0000 1.16 *************** *** 65,69 **** bHandled = FALSE; return FALSE; ! }; --- 65,69 ---- bHandled = FALSE; return FALSE; ! } Index: PublicHubsListDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PublicHubsListDlg.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PublicHubsListDlg.h 9 Jan 2006 22:44:49 -0000 1.8 --- PublicHubsListDlg.h 19 Feb 2006 16:19:06 -0000 1.9 *************** *** 34,41 **** enum { IDD = IDD_HUB_LIST }; ! PublicHubListDlg() { }; ! virtual ~PublicHubListDlg() { ! ctrlList.Detach(); ! }; BEGIN_MSG_MAP(PublicHubListDlg) --- 34,39 ---- enum { IDD = IDD_HUB_LIST }; ! PublicHubListDlg() { } ! virtual ~PublicHubListDlg() { ctrlList.Detach(); } BEGIN_MSG_MAP(PublicHubListDlg) Index: LogPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/LogPage.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** LogPage.h 5 Jan 2006 00:11:31 -0000 1.5 --- LogPage.h 19 Feb 2006 16:19:06 -0000 1.6 *************** *** 34,40 **** SetTitle(CTSTRING(SETTINGS_LOGS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~LogPage() { }; BEGIN_MSG_MAP(LogPage) --- 34,40 ---- SetTitle(CTSTRING(SETTINGS_LOGS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~LogPage() { } BEGIN_MSG_MAP(LogPage) Index: FavoriteDirsPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavoriteDirsPage.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FavoriteDirsPage.h 5 Jan 2006 00:11:31 -0000 1.7 --- FavoriteDirsPage.h 19 Feb 2006 16:19:06 -0000 1.8 *************** *** 35,42 **** SetTitle(CTSTRING(SETTINGS_FAVORITE_DIRS_PAGE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; virtual ~FavoriteDirsPage() { ctrlDirectories.Detach(); ! }; BEGIN_MSG_MAP(FavoriteDirsPage) --- 35,42 ---- SetTitle(CTSTRING(SETTINGS_FAVORITE_DIRS_PAGE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } virtual ~FavoriteDirsPage() { ctrlDirectories.Detach(); ! } BEGIN_MSG_MAP(FavoriteDirsPage) Index: ExListViewCtrl.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ExListViewCtrl.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ExListViewCtrl.h 12 Jan 2006 22:32:44 -0000 1.17 --- ExListViewCtrl.h 19 Feb 2006 16:19:06 -0000 1.18 *************** *** 69,75 **** } ! bool isAscending() { return ascending; }; ! int getSortColumn() { return sortColumn; }; ! int getSortType() { return sortType; }; int insert(int nItem, TStringList& aList, int iImage = 0, LPARAM lParam = NULL); --- 69,75 ---- } ! bool isAscending() { return ascending; } ! int getSortColumn() { return sortColumn; } ! int getSortType() { return sortType; } int insert(int nItem, TStringList& aList, int iImage = 0, LPARAM lParam = NULL); *************** *** 112,116 **** } int moveItem(int oldPos, int newPos); ! void setSortDirection(bool aAscending) { setSort(sortColumn, sortType, aAscending, fun); }; static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { --- 112,116 ---- } int moveItem(int oldPos, int newPos); ! void setSortDirection(bool aAscending) { setSort(sortColumn, sortType, aAscending, fun); } static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { *************** *** 167,173 **** } ! ExListViewCtrl() : sortType(SORT_STRING), ascending(true), sortColumn(-1) { }; ! virtual ~ExListViewCtrl() { }; }; --- 167,173 ---- } ! ExListViewCtrl() : sortType(SORT_STRING), ascending(true), sortColumn(-1) { } ! virtual ~ExListViewCtrl() { } }; Index: WaitingUsersFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WaitingUsersFrame.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaitingUsersFrame.h 12 Nov 2005 10:23:02 -0000 1.2 --- WaitingUsersFrame.h 19 Feb 2006 16:19:06 -0000 1.3 *************** *** 95,99 **** bHandled = FALSE; return FALSE; ! }; // Update control layouts --- 95,99 ---- bHandled = FALSE; return FALSE; ! } // Update control layouts Index: NetworkPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/NetworkPage.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** NetworkPage.h 5 Jan 2006 00:11:31 -0000 1.6 --- NetworkPage.h 19 Feb 2006 16:19:06 -0000 1.7 *************** *** 33,39 **** SetTitle(CTSTRING(SETTINGS_NETWORK)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~NetworkPage() { }; ! BEGIN_MSG_MAP(NetworkPage) MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog) --- 33,39 ---- SetTitle(CTSTRING(SETTINGS_NETWORK)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~NetworkPage() { } ! BEGIN_MSG_MAP(NetworkPage) MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog) Index: UsersFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UsersFrame.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** UsersFrame.h 12 Dec 2005 08:43:01 -0000 1.28 --- UsersFrame.h 19 Feb 2006 16:19:06 -0000 1.29 *************** *** 34,39 **** public: ! UsersFrame() : closed(false), startup(true) { }; ! virtual ~UsersFrame() { }; DECLARE_FRAME_WND_CLASS_EX(_T("UsersFrame"), IDR_USERS, 0, COLOR_3DFACE); --- 34,39 ---- public: ! UsersFrame() : closed(false), startup(true) { } ! virtual ~UsersFrame() { } DECLARE_FRAME_WND_CLASS_EX(_T("UsersFrame"), IDR_USERS, 0, COLOR_3DFACE); *************** *** 95,99 **** UserInfo(const FavoriteUser& u) : UserInfoBase(u.getUser()) { update(u); ! }; const tstring& getText(int col) const { --- 95,99 ---- UserInfo(const FavoriteUser& u) : UserInfoBase(u.getUser()) { update(u); ! } const tstring& getText(int col) const { Index: CertificatesPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/CertificatesPage.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CertificatesPage.h 5 Jan 2006 00:11:31 -0000 1.2 --- CertificatesPage.h 19 Feb 2006 16:19:06 -0000 1.3 *************** *** 34,40 **** SetTitle(CTSTRING(SETTINGS_CERTIFICATES)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~CertificatesPage() { }; BEGIN_MSG_MAP(CertificatesPage) --- 34,40 ---- SetTitle(CTSTRING(SETTINGS_CERTIFICATES)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~CertificatesPage() { } BEGIN_MSG_MAP(CertificatesPage) Index: Advanced3Page.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Advanced3Page.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Advanced3Page.h 5 Jan 2006 00:11:31 -0000 1.4 --- Advanced3Page.h 19 Feb 2006 16:19:06 -0000 1.5 *************** *** 34,41 **** SetTitle(CTSTRING(SETTINGS_ADVANCED3)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~Advanced3Page() { ! }; BEGIN_MSG_MAP(Advanced3Page) --- 34,40 ---- SetTitle(CTSTRING(SETTINGS_ADVANCED3)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~Advanced3Page() { } BEGIN_MSG_MAP(Advanced3Page) Index: WaitingUsersFrame.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WaitingUsersFrame.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** WaitingUsersFrame.cpp 5 Feb 2006 17:02:38 -0000 1.8 --- WaitingUsersFrame.cpp 19 Feb 2006 16:19:06 -0000 1.9 *************** *** 177,181 **** } return 0; ! }; LRESULT WaitingUsersFrame::onAddToFavorites(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { --- 177,181 ---- } return 0; ! } LRESULT WaitingUsersFrame::onAddToFavorites(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { *************** *** 186,190 **** } return 0; ! }; // Load all searches from manager --- 186,190 ---- } return 0; ! } // Load all searches from manager Index: FlatTabCtrl.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FlatTabCtrl.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** FlatTabCtrl.h 28 Nov 2005 01:21:06 -0000 1.40 --- FlatTabCtrl.h 19 Feb 2006 16:19:06 -0000 1.41 *************** *** 51,55 **** FlatTabCtrlImpl() : closing(NULL), rows(1), height(0), active(NULL), moving(NULL), inTab(false) { black.CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); ! }; virtual ~FlatTabCtrlImpl() { } --- 51,55 ---- FlatTabCtrlImpl() : closing(NULL), rows(1), height(0), active(NULL), moving(NULL), inTab(false) { black.CreatePen(PS_SOLID, 1, RGB(0, 0, 0)); ! } virtual ~FlatTabCtrlImpl() { } *************** *** 277,285 **** } ! int getTabHeight() { return height; }; ! int getHeight() { return (getRows() * getTabHeight())+1; }; ! int getFill() { return (getTabHeight() + 1) / 2; }; ! int getRows() { return rows; }; void calcRows(bool inval = true) { --- 277,285 ---- } ! int getTabHeight() { return height; } ! int getHeight() { return (getRows() * getTabHeight())+1; } ! int getFill() { return (getTabHeight() + 1) / 2; } ! int getRows() { return rows; } void calcRows(bool inval = true) { *************** *** 326,330 **** chevron.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | BS_PUSHBUTTON , 0, IDC_CHEVRON); ! chevron.SetWindowText(_T("»")); mnu.CreatePopupMenu(); --- 326,330 ---- chevron.Create(m_hWnd, rcDefault, NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | BS_PUSHBUTTON , 0, IDC_CHEVRON); ! chevron.SetWindowText(_T("�")); mnu.CreatePopupMenu(); *************** *** 447,451 **** name[0] = 0; update(); ! }; HWND hWnd; --- 447,451 ---- name[0] = 0; update(); ! } HWND hWnd; *************** *** 484,488 **** ::ReleaseDC(hWnd, dc); return true; ! }; bool updateText(LPCTSTR text) { --- 484,488 ---- ::ReleaseDC(hWnd, dc); return true; ! } bool updateText(LPCTSTR text) { *************** *** 506,510 **** ::ReleaseDC(hWnd, dc); return true; ! }; int getWidth() { --- 506,510 ---- ::ReleaseDC(hWnd, dc); return true; ! } int getWidth() { *************** *** 624,628 **** dc.TextOut(pos + getFill() / 2 + FT_EXTRA_SPACE / 2, ypos + 1, tab->name, tab->len); } ! }; }; --- 624,628 ---- dc.TextOut(pos + getFill() / 2 + FT_EXTRA_SPACE / 2, ypos + 1, tab->name, tab->len); } ! } }; *************** *** 636,641 **** public: ! MDITabChildWindowImpl() : created(false) { }; ! FlatTabCtrl* getTab() { return WinUtil::tabCtrl; }; virtual void OnFinalMessage(HWND /*hWnd*/) { delete this; } --- 636,641 ---- public: ! MDITabChildWindowImpl() : created(false) { } ! FlatTabCtrl* getTab() { return WinUtil::tabCtrl; } virtual void OnFinalMessage(HWND /*hWnd*/) { delete this; } Index: DirectoryListingFrm.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/DirectoryListingFrm.h,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** DirectoryListingFrm.h 23 Jan 2006 08:00:50 -0000 1.60 --- DirectoryListingFrm.h 19 Feb 2006 16:19:06 -0000 1.61 *************** *** 254,258 **** if(f->getTTH() != NULL) columns[COLUMN_TTH] = Text::toT(f->getTTH()->toBase32()); ! }; ItemInfo(DirectoryListing::Directory* d, bool utf8) : type(DIRECTORY), dir(d) { if(utf8) { --- 254,258 ---- if(f->getTTH() != NULL) columns[COLUMN_TTH] = Text::toT(f->getTTH()->toBase32()); ! } ItemInfo(DirectoryListing::Directory* d, bool utf8) : type(DIRECTORY), dir(d) { if(utf8) { *************** *** 263,267 **** columns[COLUMN_EXACTSIZE] = Text::toT(Util::formatExactSize(d->getTotalSize())); columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(d->getTotalSize())); ! }; const tstring& getText(int col) { --- 263,267 ---- columns[COLUMN_EXACTSIZE] = Text::toT(Util::formatExactSize(d->getTotalSize())); columns[COLUMN_SIZE] = Text::toT(Util::formatBytes(d->getTotalSize())); ! } const tstring& getText(int col) { Index: PrivateFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PrivateFrame.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** PrivateFrame.h 22 Dec 2005 19:47:33 -0000 1.38 --- PrivateFrame.h 19 Feb 2006 16:19:06 -0000 1.39 *************** *** 40,44 **** static void gotMessage(const User::Ptr& from, const User::Ptr& to, const User::Ptr& replyTo, const tstring& aMessage); static void openWindow(const User::Ptr& replyTo, const tstring& aMessage = Util::emptyStringT); ! static bool isOpen(const User::Ptr u) { return frames.find(u) != frames.end(); }; enum { --- 40,44 ---- static void gotMessage(const User::Ptr& from, const User::Ptr& to, const User::Ptr& replyTo, const tstring& aMessage); static void openWindow(const User::Ptr& replyTo, const tstring& aMessage = Util::emptyStringT); ! static bool isOpen(const User::Ptr u) { return frames.find(u) != frames.end(); } enum { *************** *** 117,121 **** bHandled = FALSE; return FALSE; ! }; LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 117,121 ---- bHandled = FALSE; return FALSE; ! } LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { *************** *** 136,140 **** void sendMessage(const tstring& msg); ! User::Ptr& getUser() { return replyTo; }; private: PrivateFrame(const User::Ptr& replyTo_) : replyTo(replyTo_), --- 136,140 ---- void sendMessage(const tstring& msg); ! User::Ptr& getUser() { return replyTo; } private: PrivateFrame(const User::Ptr& replyTo_) : replyTo(replyTo_), Index: QueuePage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/QueuePage.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** QueuePage.h 5 Jan 2006 00:11:31 -0000 1.4 --- QueuePage.h 19 Feb 2006 16:19:06 -0000 1.5 *************** *** 34,41 **** SetTitle(CTSTRING(SETTINGS_QUEUE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! ! virtual ~QueuePage() { ! }; BEGIN_MSG_MAP(QueuePage) --- 34,39 ---- SetTitle(CTSTRING(SETTINGS_QUEUE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~QueuePage() { } BEGIN_MSG_MAP(QueuePage) Index: Appearance2Page.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/Appearance2Page.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Appearance2Page.cpp 19 Dec 2005 00:15:51 -0000 1.6 --- Appearance2Page.cpp 19 Feb 2006 16:19:06 -0000 1.7 *************** *** 164,168 **** default: break; ! }; return true; } --- 164,168 ---- default: break; ! } return true; } Index: UploadPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UploadPage.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** UploadPage.h 5 Jan 2006 00:11:31 -0000 1.18 --- UploadPage.h 19 Feb 2006 16:19:06 -0000 1.19 *************** *** 35,43 **** SetTitle(CTSTRING(SETTINGS_UPLOADS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; virtual ~UploadPage() { ctrlDirectories.Detach(); ctrlTotal.Detach(); ! }; BEGIN_MSG_MAP(UploadPage) --- 35,43 ---- SetTitle(CTSTRING(SETTINGS_UPLOADS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } virtual ~UploadPage() { ctrlDirectories.Detach(); ctrlTotal.Detach(); ! } BEGIN_MSG_MAP(UploadPage) Index: SystemFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/SystemFrame.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SystemFrame.h 6 Jan 2006 14:44:32 -0000 1.4 --- SystemFrame.h 19 Feb 2006 16:19:06 -0000 1.5 *************** *** 69,75 **** bHandled = FALSE; return FALSE; ! }; ! ! LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { ctrlPad.SetFocus(); --- 69,74 ---- bHandled = FALSE; return FALSE; ! } ! LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { ctrlPad.SetFocus(); Index: GeneralPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/GeneralPage.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GeneralPage.h 5 Jan 2006 00:11:31 -0000 1.15 --- GeneralPage.h 19 Feb 2006 16:19:06 -0000 1.16 *************** *** 33,39 **** SetTitle(CTSTRING(SETTINGS_GENERAL)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~GeneralPage() { }; ! BEGIN_MSG_MAP(GeneralPage) MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog) --- 33,39 ---- SetTitle(CTSTRING(SETTINGS_GENERAL)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~GeneralPage() { } ! BEGIN_MSG_MAP(GeneralPage) MESSAGE_HANDLER(WM_INITDIALOG, onInitDialog) Index: TransferView.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TransferView.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** TransferView.cpp 5 Feb 2006 17:02:38 -0000 1.63 --- TransferView.cpp 19 Feb 2006 16:19:06 -0000 1.64 *************** *** 147,152 **** ClientManager::getInstance()->userCommand(itemI->user, uc, tmp, true); } ! return; ! }; --- 147,151 ---- ClientManager::getInstance()->userCommand(itemI->user, uc, tmp, true); } ! } *************** *** 251,255 **** ::MoveToEx(cd->nmcd.hdc,rc.left+1,rc.top,(LPPOINT)NULL); ::LineTo(cd->nmcd.hdc,rc.right-2,rc.top); ! }; // draw status text --- 250,254 ---- ::MoveToEx(cd->nmcd.hdc,rc.left+1,rc.top,(LPPOINT)NULL); ::LineTo(cd->nmcd.hdc,rc.right-2,rc.top); ! } // draw status text *************** *** 346,350 **** columns[COLUMN_USER] = WinUtil::getNicks(u); columns[COLUMN_HUB] = WinUtil::getHubNames(u).first; ! }; void TransferView::ItemInfo::update(const UpdateInfo& ui) { --- 345,349 ---- columns[COLUMN_USER] = WinUtil::getNicks(u); columns[COLUMN_HUB] = WinUtil::getHubNames(u).first; ! } void TransferView::ItemInfo::update(const UpdateInfo& ui) { Index: TypedListViewCtrl.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TypedListViewCtrl.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** TypedListViewCtrl.h 12 Jan 2006 22:32:44 -0000 1.18 --- TypedListViewCtrl.h 19 Feb 2006 16:19:06 -0000 1.19 *************** *** 31,35 **** { public: ! TypedListViewCtrl() : sortColumn(-1), sortAscending(true) { }; typedef TypedListViewCtrl<T, ctrlId> thisClass; --- 31,35 ---- { public: ! TypedListViewCtrl() : sortColumn(-1), sortAscending(true) { } typedef TypedListViewCtrl<T, ctrlId> thisClass; *************** *** 56,61 **** } ! iterator& operator+=(int n) { cur += n; return *this; }; ! iterator& operator-=(int n) { return (cur += -n); }; T& operator*() { return *typedList->getItemData(cur); } --- 56,61 ---- } ! iterator& operator+=(int n) { cur += n; return *this; } ! iterator& operator-=(int n) { return (cur += -n); } T& operator*() { return *typedList->getItemData(cur); } *************** *** 186,191 **** SetItemText(i, j, LPSTR_TEXTCALLBACK); } ! void updateItem(T* item) { int i = findItem(item); if(i != -1) updateItem(i); }; ! void deleteItem(T* item) { int i = findItem(item); if(i != -1) DeleteItem(i); }; int getSortPos(T* a) { --- 186,191 ---- SetItemText(i, j, LPSTR_TEXTCALLBACK); } ! void updateItem(T* item) { int i = findItem(item); if(i != -1) updateItem(i); } ! void deleteItem(T* item) { int i = findItem(item); if(i != -1) DeleteItem(i); } int getSortPos(T* a) { Index: MainFrm.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.cpp,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** MainFrm.cpp 13 Feb 2006 21:13:28 -0000 1.111 --- MainFrm.cpp 19 Feb 2006 16:19:06 -0000 1.112 *************** *** 67,72 **** links.features = links.homepage + _T("bugs/"); links.bugs = links.homepage + _T("bugs/"); ! ! }; MainFrame::~MainFrame() { --- 67,71 ---- links.features = links.homepage + _T("bugs/"); links.bugs = links.homepage + _T("bugs/"); ! } MainFrame::~MainFrame() { Index: MainFrm.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MainFrm.h,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** MainFrm.h 13 Feb 2006 21:13:28 -0000 1.67 --- MainFrm.h 19 Feb 2006 16:19:06 -0000 1.68 *************** *** 215,219 **** updateTray(true); return 0; ! }; LRESULT onRowsChanged(UINT /*uMsg*/, WPARAM /* wParam */, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 215,219 ---- updateTray(true); return 0; ! } LRESULT onRowsChanged(UINT /*uMsg*/, WPARAM /* wParam */, LPARAM /*lParam*/, BOOL& /*bHandled*/) { *************** *** 301,305 **** class DirectoryListInfo { public: ! DirectoryListInfo(const User::Ptr& aUser, const tstring& aFile, int64_t aSpeed) : user(aUser), file(aFile), speed(aSpeed) { }; User::Ptr user; tstring file; --- 301,305 ---- class DirectoryListInfo { public: ! DirectoryListInfo(const User::Ptr& aUser, const tstring& aFile, int64_t aSpeed) : user(aUser), file(aFile), speed(aSpeed) { } User::Ptr user; tstring file; *************** *** 308,312 **** class DirectoryBrowseInfo { public: ! DirectoryBrowseInfo(const User::Ptr& ptr, string aText) : user(ptr), text(aText) { }; User::Ptr user; string text; --- 308,312 ---- class DirectoryBrowseInfo { public: ! DirectoryBrowseInfo(const User::Ptr& ptr, string aText) : user(ptr), text(aText) { } User::Ptr user; string text; *************** *** 368,375 **** void startSocket(); ! MainFrame(const MainFrame&) { dcassert(0); }; // LogManagerListener ! virtual void on(LogManagerListener::Message, time_t t, const string& m) throw() { PostMessage(WM_SPEAKER, STATUS_MESSAGE, (LPARAM)new pair<time_t, tstring>(t, tstring(Text::toT(m)))); }; // TimerManagerListener --- 368,375 ---- void startSocket(); ! MainFrame(const MainFrame&) { dcassert(0); } // LogManagerListener ! virtual void on(LogManagerListener::Message, time_t t, const string& m) throw() { PostMessage(WM_SPEAKER, STATUS_MESSAGE, (LPARAM)new pair<time_t, tstring>(t, tstring(Text::toT(m)))); } // TimerManagerListener Index: MagnetDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/MagnetDlg.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MagnetDlg.h 24 Apr 2005 08:13:03 -0000 1.7 --- MagnetDlg.h 19 Feb 2006 16:19:06 -0000 1.8 *************** *** 34,39 **** enum { IDD = IDD_MAGNET }; ! MagnetDlg(const tstring& aHash, const tstring& aFileName) : mHash(aHash), mFileName(aFileName) { }; ! virtual ~MagnetDlg() { }; BEGIN_MSG_MAP(MagnetDlg) --- 34,39 ---- enum { IDD = IDD_MAGNET }; ! MagnetDlg(const tstring& aHash, const tstring& aFileName) : mHash(aHash), mFileName(aFileName) { } ! virtual ~MagnetDlg() { } BEGIN_MSG_MAP(MagnetDlg) *************** *** 110,114 **** //::EnableWindow(GetDlgItem(IDC_MAGNET_REMEMBER), false); break; ! }; return 0; } --- 110,114 ---- //::EnableWindow(GetDlgItem(IDC_MAGNET_REMEMBER), false); break; ! } return 0; } Index: HubFrame.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HubFrame.cpp,v retrieving revision 1.129 retrieving revision 1.130 diff -C2 -d -r1.129 -r1.130 *** HubFrame.cpp 29 Jan 2006 18:48:26 -0000 1.129 --- HubFrame.cpp 19 Feb 2006 16:19:06 -0000 1.130 *************** *** 534,538 **** return 0; ! }; void HubFrame::UpdateLayout(BOOL bResizeBars /* = TRUE */) { --- 534,538 ---- return 0; ! } void HubFrame::UpdateLayout(BOOL bResizeBars /* = TRUE */) { *************** *** 818,823 **** } } ! return; ! }; void HubFrame::onTab() { --- 818,822 ---- } } ! } void HubFrame::onTab() { *************** *** 1126,1130 **** } } ! }; void HubFrame::on(TimerManagerListener::Second, DWORD /*aTick*/) throw() { --- 1125,1129 ---- } } ! } void HubFrame::on(TimerManagerListener::Second, DWORD /*aTick*/) throw() { Index: LineDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/LineDlg.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LineDlg.h 24 Apr 2005 08:13:04 -0000 1.10 --- LineDlg.h 19 Feb 2006 16:19:06 -0000 1.11 *************** *** 43,47 **** END_MSG_MAP() ! LineDlg() : password(false) { }; LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 43,47 ---- END_MSG_MAP() ! LineDlg() : password(false) { } LRESULT onFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { Index: ADLSProperties.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ADLSProperties.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ADLSProperties.h 24 Apr 2005 08:13:03 -0000 1.4 --- ADLSProperties.h 19 Feb 2006 16:19:06 -0000 1.5 *************** *** 36,41 **** // Constructor/destructor ! ADLSProperties::ADLSProperties(ADLSearch *_search) : search(_search) { }; ! virtual ~ADLSProperties() { }; // Dilaog unique id --- 36,41 ---- // Constructor/destructor ! ADLSProperties::ADLSProperties(ADLSearch *_search) : search(_search) { } ! virtual ~ADLSProperties() { } // Dilaog unique id Index: TextFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TextFrame.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TextFrame.h 12 Nov 2005 10:23:02 -0000 1.6 --- TextFrame.h 19 Feb 2006 16:19:06 -0000 1.7 *************** *** 60,65 **** bHandled = FALSE; return FALSE; ! }; ! LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 60,64 ---- bHandled = FALSE; return FALSE; ! } LRESULT OnFocus(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { Index: HashProgressDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HashProgressDlg.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** HashProgressDlg.h 24 Apr 2005 08:13:03 -0000 1.8 --- HashProgressDlg.h 19 Feb 2006 16:19:06 -0000 1.9 *************** *** 34,39 **** HashProgressDlg(bool aAutoClose) : autoClose(aAutoClose), startTime(GET_TICK()), startBytes(0), startFiles(0) { ! }; ! virtual ~HashProgressDlg() { }; BEGIN_MSG_MAP(HashProgressDlg) --- 34,39 ---- HashProgressDlg(bool aAutoClose) : autoClose(aAutoClose), startTime(GET_TICK()), startBytes(0), startFiles(0) { ! } ! virtual ~HashProgressDlg() { } BEGIN_MSG_MAP(HashProgressDlg) Index: DownloadPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/DownloadPage.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** DownloadPage.h 5 Jan 2006 00:11:31 -0000 1.15 --- DownloadPage.h 19 Feb 2006 16:19:06 -0000 1.16 *************** *** 33,38 **** SetTitle(CTSTRING(SETTINGS_DOWNLOADS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~DownloadPage() { }; BEGIN_MSG_MAP(DownloadPage) --- 33,38 ---- SetTitle(CTSTRING(SETTINGS_DOWNLOADS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~DownloadPage() { } BEGIN_MSG_MAP(DownloadPage) Index: HubFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/HubFrame.h,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** HubFrame.h 15 Jan 2006 18:40:43 -0000 1.73 --- HubFrame.h 19 Feb 2006 16:19:06 -0000 1.74 *************** *** 159,163 **** class UserInfo; public: ! TypedListViewCtrl<UserInfo, IDC_USERS>& getUserList() { return ctrlUsers; }; private: --- 159,163 ---- class UserInfo; public: ! TypedListViewCtrl<UserInfo, IDC_USERS>& getUserList() { return ctrlUsers; } private: *************** *** 188,192 **** User::Ptr user; Identity identity; ! }; --- 188,192 ---- User::Ptr user; Identity identity; ! } *************** *** 196,200 **** UserInfo(const UpdateInfo& u) : UserInfoBase(u.user) { update(u.identity, -1); ! }; const tstring& getText(int col) const { --- 196,200 ---- UserInfo(const UpdateInfo& u) : UserInfoBase(u.user) { update(u.identity, -1); ! } const tstring& getText(int col) const { *************** *** 224,228 **** class PMInfo { public: ! PMInfo(const User::Ptr& from_, const User::Ptr& to_, const User::Ptr& replyTo_, const string& m) : from(from_), to(to_), replyTo(replyTo_), msg(Text::toT(m)) { }; User::Ptr from; User::Ptr to; --- 224,228 ---- class PMInfo { public: ! PMInfo(const User::Ptr& from_, const User::Ptr& to_, const User::Ptr& replyTo_, const string& m) : from(from_), to(to_), replyTo(replyTo_), msg(Text::toT(m)) { } User::Ptr from; User::Ptr to; *************** *** 372,383 **** virtual void on(SearchFlood, Client*, const string&) throw(); ! void speak(Speakers s) { PostMessage(WM_SPEAKER, (WPARAM)s); }; ! void speak(Speakers s, const string& msg) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new tstring(Text::toT(msg))); }; void speak(Speakers s, const OnlineUser& u) { Lock l(updateCS); updateList.push_back(make_pair(UpdateInfo(u), s)); updateUsers = true; ! }; ! void speak(Speakers s, const OnlineUser& from, const OnlineUser& to, const OnlineUser& replyTo, const string& line) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new PMInfo(from, to, replyTo, line)); }; }; --- 372,383 ---- virtual void on(SearchFlood, Client*, const string&) throw(); ! void speak(Speakers s) { PostMessage(WM_SPEAKER, (WPARAM)s); } ! void speak(Speakers s, const string& msg) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new tstring(Text::toT(msg))); } void speak(Speakers s, const OnlineUser& u) { Lock l(updateCS); updateList.push_back(make_pair(UpdateInfo(u), s)); updateUsers = true; ! } ! void speak(Speakers s, const OnlineUser& from, const OnlineUser& to, const OnlineUser& replyTo, const string& line) { PostMessage(WM_SPEAKER, (WPARAM)s, (LPARAM)new PMInfo(from, to, replyTo, line)); } }; Index: TransferView.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/TransferView.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TransferView.h 15 Jan 2006 18:40:43 -0000 1.25 --- TransferView.h 19 Feb 2006 16:19:06 -0000 1.26 *************** *** 113,117 **** class ItemInfo; public: ! TypedListViewCtrl<ItemInfo, IDC_TRANSFERS>& getUserList() { return ctrlTransfers; }; private: enum { --- 113,117 ---- class ItemInfo; public: ! TypedListViewCtrl<ItemInfo, IDC_TRANSFERS>& getUserList() { return ctrlTransfers; } private: enum { Index: AboutDlg.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AboutDlg.h,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** AboutDlg.h 11 Feb 2006 21:01:55 -0000 1.57 --- AboutDlg.h 19 Feb 2006 16:19:06 -0000 1.58 *************** *** 32,35 **** --- 32,36 ---- _T("(www.stlport.org), a most excellent STL package. zlib is also used in this application. ") _T("This product includes GeoIP data created by MaxMind, available from http://maxmind.com/. ") + _T("This product uses yassl from www.yassl.com, thanks to Todd Ouska and Larry Stefonic.") _T("The following people have contributed code to ") _T("DC++ (I hope I haven't missed someone, they're in roughly chronological order...=):\r\n") *************** *** 37,41 **** _T("patbateman, xeroc, fusbar, vladimir marko, kenneth skovhede, ondrea, todd pederzani, who, ") _T("sedulus, sandos, henrik engstr?m, dwomac, robert777, saurod, atomicjo, bzbetty, orkblutt, ") ! _T("distiller, citruz, dan fulger, cologic, christer palm, twink, ilkka seppälä, johnny, ciber, ") _T("theparanoidone, gadget, naga, tremor, joakim tosteberg, pofis, psf8500, lauris ievins, ") _T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ") --- 38,42 ---- _T("patbateman, xeroc, fusbar, vladimir marko, kenneth skovhede, ondrea, todd pederzani, who, ") _T("sedulus, sandos, henrik engstr?m, dwomac, robert777, saurod, atomicjo, bzbetty, orkblutt, ") ! _T("distiller, citruz, dan fulger, cologic, christer palm, twink, ilkka sepp�l�, johnny, ciber, ") _T("theparanoidone, gadget, naga, tremor, joakim tosteberg, pofis, psf8500, lauris ievins, ") _T("defr, ullner, fleetcommand, liny, xan, olle svensson, mark gillespie, jeremy huddleston, ") *************** *** 50,55 **** enum { WM_VERSIONDATA = WM_APP + 53 }; ! AboutDlg() { }; ! virtual ~AboutDlg() { }; BEGIN_MSG_MAP(AboutDlg) --- 51,56 ---- enum { WM_VERSIONDATA = WM_APP + 53 }; ! AboutDlg() { } ! virtual ~AboutDlg() { } BEGIN_MSG_MAP(AboutDlg) *************** *** 61,65 **** LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { ! SetDlgItemText(IDC_VERSION, _T("DC++ v") _T(VERSIONSTRING) _T("\n(c) Copyright 2001-2005 Jacek Sieka\nCodeveloper: Per Lindén\nGraphics: Martin Skogevall\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/")); CEdit ctrl(GetDlgItem(IDC_THANKS)); ctrl.FmtLines(TRUE); --- 62,66 ---- LRESULT OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { ! SetDlgItemText(IDC_VERSION, _T("DC++ v") _T(VERSIONSTRING) _T("\n(c) Copyright 2001-2005 Jacek Sieka\nCodeveloper: Per Lind�n\nGraphics: Martin Skogevall\nDC++ is licenced under GPL\nhttp://dcplusplus.sourceforge.net/")); CEdit ctrl(GetDlgItem(IDC_THANKS)); ctrl.FmtLines(TRUE); *************** *** 97,101 **** HttpConnection c; ! AboutDlg(const AboutDlg&) { dcassert(0); }; virtual void on(HttpConnectionListener::Data, HttpConnection* /*conn*/, const u_int8_t* buf, size_t len) throw() { --- 98,102 ---- HttpConnection c; ! AboutDlg(const AboutDlg&) { dcassert(0); } virtual void on(HttpConnectionListener::Data, HttpConnection* /*conn*/, const u_int8_t* buf, size_t len) throw() { Index: UCPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/UCPage.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** UCPage.h 5 Jan 2006 00:11:30 -0000 1.9 --- UCPage.h 19 Feb 2006 16:19:06 -0000 1.10 *************** *** 36,44 **** SetTitle(CTSTRING(SETTINGS_USER_COMMANDS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~UCPage() { ! ctrlCommands.Detach(); ! }; BEGIN_MSG_MAP(UCPage) --- 36,42 ---- SetTitle(CTSTRING(SETTINGS_USER_COMMANDS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~UCPage() { ctrlCommands.Detach(); } BEGIN_MSG_MAP(UCPage) Index: PublicHubsFrm.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PublicHubsFrm.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** PublicHubsFrm.h 23 Jan 2006 08:00:50 -0000 1.33 --- PublicHubsFrm.h 19 Feb 2006 16:19:06 -0000 1.34 *************** *** 39,46 **** PublicHubsFrame() : users(0), hubs(0), closed(false), filterContainer(WC_EDIT, this, FILTER_MESSAGE_MAP) { ! }; ! virtual ~PublicHubsFrame() { ! }; DECLARE_FRAME_WND_CLASS_EX(_T("PublicHubsFrame"), IDR_PUBLICHUBS, 0, COLOR_3DFACE); --- 39,45 ---- PublicHubsFrame() : users(0), hubs(0), closed(false), filterContainer(WC_EDIT, this, FILTER_MESSAGE_MAP) { ! } ! virtual ~PublicHubsFrame() { } DECLARE_FRAME_WND_CLASS_EX(_T("PublicHubsFrame"), IDR_PUBLICHUBS, 0, COLOR_3DFACE); *************** *** 99,103 **** bHandled = FALSE; return FALSE; ! }; LRESULT onSetFocus(UINT /* uMsg */, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { --- 98,102 ---- bHandled = FALSE; return FALSE; ! } LRESULT onSetFocus(UINT /* uMsg */, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/) { Index: StatsFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/StatsFrame.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** StatsFrame.h 12 Nov 2005 10:23:02 -0000 1.11 --- StatsFrame.h 19 Feb 2006 16:19:06 -0000 1.12 *************** *** 85,90 **** struct Stat { ! Stat() : scroll(0), speed(0) { }; ! Stat(u_int32_t aScroll, int64_t aSpeed) : scroll(aScroll), speed(aSpeed) { }; u_int32_t scroll; int64_t speed; --- 85,90 ---- struct Stat { ! Stat() : scroll(0), speed(0) { } ! Stat(u_int32_t aScroll, int64_t aSpeed) : scroll(aScroll), speed(aSpeed) { } u_int32_t scroll; int64_t speed; Index: WinUtil.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WinUtil.h,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** WinUtil.h 10 Feb 2006 07:56:47 -0000 1.53 --- WinUtil.h 19 Feb 2006 16:19:06 -0000 1.54 *************** *** 44,48 **** class UserInfoBase { public: ! UserInfoBase(const User::Ptr& u) : user(u) { }; void getList(); --- 44,48 ---- class UserInfoBase { public: ! UserInfoBase(const User::Ptr& u) : user(u) { } void getList(); *************** *** 135,139 **** class StaticFrame { public: ! virtual ~StaticFrame() { frame = NULL; }; static T* frame; --- 135,139 ---- class StaticFrame { public: ! virtual ~StaticFrame() { frame = NULL; } static T* frame; Index: FavHubProperties.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FavHubProperties.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FavHubProperties.h 24 Apr 2005 08:13:05 -0000 1.7 --- FavHubProperties.h 19 Feb 2006 16:19:06 -0000 1.8 *************** *** 29,34 **** { public: ! FavHubProperties::FavHubProperties(FavoriteHubEntry *_entry) : entry(_entry) { }; ! virtual ~FavHubProperties() { }; enum { IDD = IDD_FAVORITEHUB }; --- 29,34 ---- { public: ! FavHubProperties::FavHubProperties(FavoriteHubEntry *_entry) : entry(_entry) { } ! virtual ~FavHubProperties() { } enum { IDD = IDD_FAVORITEHUB }; Index: PrivateFrame.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/PrivateFrame.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** PrivateFrame.cpp 5 Feb 2006 17:02:38 -0000 1.61 --- PrivateFrame.cpp 19 Feb 2006 16:19:06 -0000 1.62 *************** *** 290,294 **** ClientManager::getInstance()->userCommand(replyTo, uc, ucParams, true); ! }; LRESULT PrivateFrame::onGetList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { --- 290,294 ---- ClientManager::getInstance()->userCommand(replyTo, uc, ucParams, true); ! } LRESULT PrivateFrame::onGetList(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/) { Index: AdvancedPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AdvancedPage.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AdvancedPage.h 5 Jan 2006 00:11:31 -0000 1.15 --- AdvancedPage.h 19 Feb 2006 16:19:06 -0000 1.16 *************** *** 33,40 **** SetTitle(CTSTRING(SETTINGS_ADVANCED)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~AdvancedPage() { ! }; BEGIN_MSG_MAP(AdvancedPage) --- 33,39 ---- SetTitle(CTSTRING(SETTINGS_ADVANCED)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~AdvancedPage() { } BEGIN_MSG_MAP(AdvancedPage) Index: WindowsPage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/WindowsPage.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WindowsPage.h 5 Jan 2006 00:11:31 -0000 1.6 --- WindowsPage.h 19 Feb 2006 16:19:06 -0000 1.7 *************** *** 33,40 **** SetTitle(CTSTRING(SETTINGS_WINDOWS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; ! virtual ~WindowsPage() { ! }; BEGIN_MSG_MAP(WindowsPage) --- 33,39 ---- SetTitle(CTSTRING(SETTINGS_WINDOWS)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } ! virtual ~WindowsPage() { } BEGIN_MSG_MAP(WindowsPage) Index: ADLSearchFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/ADLSearchFrame.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ADLSearchFrame.h 12 Nov 2005 10:23:02 -0000 1.12 --- ADLSearchFrame.h 19 Feb 2006 16:19:06 -0000 1.13 *************** *** 19,23 **** /* * Automatic Directory Listing Search ! * Henrik Engström, henrikengstrom on home point se */ --- 19,23 ---- /* * Automatic Directory Listing Search ! * Henrik Engstr�m, henrikengstrom on home point se */ *************** *** 105,109 **** bHandled = FALSE; return FALSE; ! }; // Update control layouts --- 105,109 ---- bHandled = FALSE; return FALSE; ! } // Update control layouts Index: AppearancePage.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/AppearancePage.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AppearancePage.h 5 Jan 2006 00:11:31 -0000 1.15 --- AppearancePage.h 19 Feb 2006 16:19:06 -0000 1.16 *************** *** 34,38 **** SetTitle(CTSTRING(SETTINGS_APPEARANCE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! }; virtual ~AppearancePage(); --- 34,38 ---- SetTitle(CTSTRING(SETTINGS_APPEARANCE)); m_psp.dwFlags |= PSP_HASHELP | PSP_RTLREADING; ! } virtual ~AppearancePage(); Index: FinishedULFrame.h =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/windows/FinishedULFrame.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FinishedULFrame.h 12 Jan 2006 22:32:44 -0000 1.21 --- FinishedULFrame.h 19 Feb 2006 16:19:06 -0000 1.22 *************** *** 34,40 **** columnOrder = SettingsManager::FINISHED_UL_ORDER; columnWidth = SettingsManager::FINISHED_UL_WIDTHS; ! }; ! virtual ~FinishedULFrame() { }; DECLARE_FRAME_WND_CLASS_EX(_T("FinishedULFrame"), IDR_FINISHED_UL, 0, COLOR_3DFACE); --- 34,40 ---- columnOrder = SettingsManager::FINISHED_UL_ORDER; columnWidth = SettingsManager::FINISHED_UL_WIDTHS; ! } ! virtual ~FinishedULFrame() { } DECLARE_FRAME_WND_CLASS_EX(_T("FinishedULFrame"), IDR_FINISHED_UL, 0, COLOR_3DFACE); |