diff options
Diffstat (limited to 'plugins/HistoryStats/src')
91 files changed, 155 insertions, 170 deletions
diff --git a/plugins/HistoryStats/src/_consts.cpp b/plugins/HistoryStats/src/_consts.cpp index ed401cbd2a..0221984803 100644 --- a/plugins/HistoryStats/src/_consts.cpp +++ b/plugins/HistoryStats/src/_consts.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#define HISTORYSTATS_CONST_DEFINE
#include "_consts.h"
diff --git a/plugins/HistoryStats/src/_consts.h b/plugins/HistoryStats/src/_consts.h index 9d3816c355..f1e8c8fa47 100644 --- a/plugins/HistoryStats/src/_consts.h +++ b/plugins/HistoryStats/src/_consts.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD__CONSTS_H)
#define HISTORYSTATS_GUARD__CONSTS_H
-#include "_globals.h"
+#include "stdafx.h"
#if defined(HISTORYSTATS_CONST_DEFINE)
#define CONST_T(nam, txt) extern const TCHAR* nam = _T(txt);
diff --git a/plugins/HistoryStats/src/_globals.cpp b/plugins/HistoryStats/src/_globals.cpp deleted file mode 100644 index 23220fc5e2..0000000000 --- a/plugins/HistoryStats/src/_globals.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "_globals.h"
diff --git a/plugins/HistoryStats/src/bandctrl.cpp b/plugins/HistoryStats/src/bandctrl.cpp index d1b6c00a7f..5569efbf3c 100644 --- a/plugins/HistoryStats/src/bandctrl.cpp +++ b/plugins/HistoryStats/src/bandctrl.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "bandctrl.h"
/*
diff --git a/plugins/HistoryStats/src/bandctrl.h b/plugins/HistoryStats/src/bandctrl.h index 6cc1346549..77f1b7d023 100644 --- a/plugins/HistoryStats/src/bandctrl.h +++ b/plugins/HistoryStats/src/bandctrl.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_BANDCTRL_H)
#define HISTORYSTATS_GUARD_BANDCTRL_H
-#include "_globals.h"
+#include "stdafx.h"
#include "bandctrldefs.h"
/*
diff --git a/plugins/HistoryStats/src/bandctrldefs.h b/plugins/HistoryStats/src/bandctrldefs.h index 99ccabbfe8..a48ac238e8 100644 --- a/plugins/HistoryStats/src/bandctrldefs.h +++ b/plugins/HistoryStats/src/bandctrldefs.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_BANDCTRLDEFS_H)
#define HISTORYSTATS_GUARD_BANDCTRLDEFS_H
-#include "_globals.h"
+#include "stdafx.h"
/*
* BandCtrlDefs
@@ -26,7 +26,7 @@ public: enum Notification {
BCN_CLICKED = NM_LAST - 1, // -> NMBANDCTRL
- BCN_DROPDOWN = NM_LAST - 2, // -> NMBANDCTRL
+ BCN_DROP_DOWN = NM_LAST - 2 // -> NMBANDCTRL
};
enum ButtonFlags {
diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index 2bbd98263f..227c514ed2 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "bandctrlimpl.h"
#include "main.h"
@@ -764,7 +764,7 @@ void BandCtrlImpl::onWMKeyDown(int nVirtKey) m_bCurPressedDD = true;
InvalidateRect(m_hWnd, &m_Items[m_nCurPressed].rItem, TRUE);
- fireEvent(BCN_DROPDOWN, m_nCurPressed);
+ fireEvent(BCN_DROP_DOWN, m_nCurPressed);
InvalidateRect(m_hWnd, &m_Items[m_nCurPressed].rItem, TRUE);
m_nCurPressed = -1;
@@ -845,7 +845,7 @@ void BandCtrlImpl::onWMLButtonDown(POINTS pts) ReleaseCapture();
m_bCurPressedDD = true;
- fireEvent(BCN_DROPDOWN, m_nCurPressed);
+ fireEvent(BCN_DROP_DOWN, m_nCurPressed);
InvalidateRect(m_hWnd, &m_Items[m_nCurPressed].rItem, TRUE);
m_nCurPressed = -1;
diff --git a/plugins/HistoryStats/src/bandctrlimpl.h b/plugins/HistoryStats/src/bandctrlimpl.h index 9b2b6e708c..31320a9e40 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.h +++ b/plugins/HistoryStats/src/bandctrlimpl.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_BANDCTRLIMPL_H)
#define HISTORYSTATS_GUARD_BANDCTRLIMPL_H
-#include "_globals.h"
+#include "stdafx.h"
#include "bandctrldefs.h"
#include <vector>
diff --git a/plugins/HistoryStats/src/canvas.cpp b/plugins/HistoryStats/src/canvas.cpp index e2b553d44a..5eb395f2b2 100644 --- a/plugins/HistoryStats/src/canvas.cpp +++ b/plugins/HistoryStats/src/canvas.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "canvas.h"
void Canvas::updateTrans(BYTE* pData)
diff --git a/plugins/HistoryStats/src/canvas.h b/plugins/HistoryStats/src/canvas.h index 022b71dc8a..81a69caed4 100644 --- a/plugins/HistoryStats/src/canvas.h +++ b/plugins/HistoryStats/src/canvas.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_CANVAS_H)
#define HISTORYSTATS_GUARD_CANVAS_H
-#include "_globals.h"
+#include "stdafx.h"
class Canvas
: private pattern::NotCopyable<Canvas>
diff --git a/plugins/HistoryStats/src/colbase_words.cpp b/plugins/HistoryStats/src/colbase_words.cpp index 74e03ef290..e266474d1c 100644 --- a/plugins/HistoryStats/src/colbase_words.cpp +++ b/plugins/HistoryStats/src/colbase_words.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "colbase_words.h"
/*
diff --git a/plugins/HistoryStats/src/colbase_words.h b/plugins/HistoryStats/src/colbase_words.h index d42803fdea..2d9ef4c667 100644 --- a/plugins/HistoryStats/src/colbase_words.h +++ b/plugins/HistoryStats/src/colbase_words.h @@ -44,7 +44,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual ext::string impl_contactDataGetUID() const;
virtual void impl_contactDataBeginAcquire();
virtual void impl_contactDataPrepare(Contact& contact) const;
diff --git a/plugins/HistoryStats/src/column.cpp b/plugins/HistoryStats/src/column.cpp index f44aa5c890..82c95c61ce 100644 --- a/plugins/HistoryStats/src/column.cpp +++ b/plugins/HistoryStats/src/column.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column.h"
#include "column_rank.h"
diff --git a/plugins/HistoryStats/src/column.h b/plugins/HistoryStats/src/column.h index cc44972325..7d8bd1d0c4 100644 --- a/plugins/HistoryStats/src/column.h +++ b/plugins/HistoryStats/src/column.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_COLUMN_H)
#define HISTORYSTATS_GUARD_COLUMN_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "contact.h"
@@ -224,7 +224,7 @@ protected: * Creates a exact copy of the column.
* [virtual/default: copy nothing]
*/
- virtual void impl_copyConfig(const Column* pSource) { }
+ virtual void impl_copyConfig(const Column*) { }
/*
* Queries for column's features.
@@ -237,22 +237,22 @@ protected: /*
* [virtual/default: do nothing]
*/
- virtual void impl_configRead(const SettingsTree& settings) { }
+ virtual void impl_configRead(const SettingsTree&) { }
/*
* [vurtual/default: do nothing]
*/
- virtual void impl_configWrite(SettingsTree& settings) const { }
+ virtual void impl_configWrite(SettingsTree&) const { }
/*
* [virtual/default: do nothing]
*/
- virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup) { }
+ virtual void impl_configToUI(OptionsCtrl&, OptionsCtrl::Item) { }
/*
* [virtual/default: do nothing]
*/
- virtual void impl_configFromUI(OptionsCtrl& Opt) { }
+ virtual void impl_configFromUI(OptionsCtrl&) { }
/*
* Check if current column options imply output restrictions.
@@ -287,28 +287,28 @@ protected: * data for given contact. Works on previously defined slot.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataPrepare(Contact& contact) const { }
+ virtual void impl_contactDataPrepare(Contact&) const { }
/*
* Frees all data structures associated with this column for the
* given contact. Works on previously defined slot.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataFree(Contact& contact) const { }
+ virtual void impl_contactDataFree(Contact&) const { }
/*
* Acquires data for this column and for the given contact. Works
* on previously defined slot.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataAcquireMessage(Contact& contact, Message& msg) { }
+ virtual void impl_contactDataAcquireMessage(Contact&, Message&) { }
/*
* Acquires data for this column and for the given contact. Works
* on previously defined slot.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration) { }
+ virtual void impl_contactDataAcquireChat(Contact&, bool, DWORD, DWORD) { }
/*** VIRTUAL/ABSTRACT *** DATA POSTPROCESSING ***/
@@ -317,20 +317,20 @@ protected: * column doesn't acquire any data.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataMerge(Contact& contact, const Contact& include) const { }
+ virtual void impl_contactDataMerge(Contact&, const Contact&) const { }
/*
* Perform any post processing for additional per-contact data. Will
* be called after merge but before sort.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataTransform(Contact& contact) const { }
+ virtual void impl_contactDataTransform(Contact&) const { }
/*
* Perform cleanup after post processing.
* [virtual/default: do nothing]
*/
- virtual void impl_contactDataTransformCleanup(Contact& contact) const { }
+ virtual void impl_contactDataTransformCleanup(Contact&) const { }
/*** VIRTUAL/ABSTRACT *** COLUMN SPECIFIC GLOBAL DATA ***/
@@ -351,7 +351,7 @@ protected: * column as a list of CSS selectors (first) and CSS styles (second).
* [virtual/default: empty list]
*/
- virtual StyleList impl_outputGetAdditionalStyles(IDProvider& idp) { return StyleList(); }
+ virtual StyleList impl_outputGetAdditionalStyles(IDProvider&) { return StyleList(); }
/*
* Returns number of columns and table rows (for header only) used by
diff --git a/plugins/HistoryStats/src/column_chatduration.cpp b/plugins/HistoryStats/src/column_chatduration.cpp index 9965686fab..719ba2efd0 100644 --- a/plugins/HistoryStats/src/column_chatduration.cpp +++ b/plugins/HistoryStats/src/column_chatduration.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_chatduration.h"
/*
diff --git a/plugins/HistoryStats/src/column_chatduration.h b/plugins/HistoryStats/src/column_chatduration.h index dad5d98ab0..b3f325692e 100644 --- a/plugins/HistoryStats/src/column_chatduration.h +++ b/plugins/HistoryStats/src/column_chatduration.h @@ -36,7 +36,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull | (m_bGraph ? crPNGFull : 0); }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull | (m_bGraph ? crPNGFull : 0); }
virtual void impl_columnDataAfterOmit();
virtual StyleList impl_outputGetAdditionalStyles(IDProvider& idp);
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
diff --git a/plugins/HistoryStats/src/column_events.cpp b/plugins/HistoryStats/src/column_events.cpp index b0fee0204c..657606ea1e 100644 --- a/plugins/HistoryStats/src/column_events.cpp +++ b/plugins/HistoryStats/src/column_events.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_events.h"
/*
@@ -75,7 +75,7 @@ void ColEvents::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) }
}
-void ColEvents::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColEvents::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
static int (Contact::*getData[6])() const = {
&Contact::getInUrls,
diff --git a/plugins/HistoryStats/src/column_events.h b/plugins/HistoryStats/src/column_events.h index 8ca4af81e4..09a045c92c 100644 --- a/plugins/HistoryStats/src/column_events.h +++ b/plugins/HistoryStats/src/column_events.h @@ -28,7 +28,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
};
diff --git a/plugins/HistoryStats/src/column_group.cpp b/plugins/HistoryStats/src/column_group.cpp index 46b984da7c..61db6bd224 100644 --- a/plugins/HistoryStats/src/column_group.cpp +++ b/plugins/HistoryStats/src/column_group.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_group.h"
/*
diff --git a/plugins/HistoryStats/src/column_group.h b/plugins/HistoryStats/src/column_group.h index 60aef1e071..caf7061500 100644 --- a/plugins/HistoryStats/src/column_group.h +++ b/plugins/HistoryStats/src/column_group.h @@ -15,7 +15,7 @@ protected: virtual const TCHAR* impl_getTitle() const { return LPGENT("Group"); }
virtual const TCHAR* impl_getDescription() const { return LPGENT("Column holding the contact list's group name the contact is in."); }
virtual int impl_getFeatures() const { return 0; }
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
};
diff --git a/plugins/HistoryStats/src/column_inout.cpp b/plugins/HistoryStats/src/column_inout.cpp index 62cb3d5a8f..7874e1c1b6 100644 --- a/plugins/HistoryStats/src/column_inout.cpp +++ b/plugins/HistoryStats/src/column_inout.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_inout.h"
/*
@@ -120,7 +120,7 @@ void ColInOut::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) }
}
-void ColInOut::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColInOut::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
if (m_bAbsolute)
{
diff --git a/plugins/HistoryStats/src/column_inout.h b/plugins/HistoryStats/src/column_inout.h index 5a65598f7d..1a5ff19d39 100644 --- a/plugins/HistoryStats/src/column_inout.h +++ b/plugins/HistoryStats/src/column_inout.h @@ -32,7 +32,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
};
diff --git a/plugins/HistoryStats/src/column_inoutgraph.cpp b/plugins/HistoryStats/src/column_inoutgraph.cpp index 3d8065929f..6b869598f1 100644 --- a/plugins/HistoryStats/src/column_inoutgraph.cpp +++ b/plugins/HistoryStats/src/column_inoutgraph.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_inoutgraph.h"
/*
@@ -168,7 +168,7 @@ void ColInOutGraph::impl_outputRenderHeader(ext::ostream& tos, int row, int rowS }
}
-void ColInOutGraph::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColInOutGraph::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
// fetch absolute values
static int (Contact::*getOut[3])() const = { &Contact::getOutBytes, &Contact::getOutMessages, &Contact::getOutChats };
diff --git a/plugins/HistoryStats/src/column_inoutgraph.h b/plugins/HistoryStats/src/column_inoutgraph.h index 673c1f4174..67089c260b 100644 --- a/plugins/HistoryStats/src/column_inoutgraph.h +++ b/plugins/HistoryStats/src/column_inoutgraph.h @@ -44,7 +44,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull | crPNGFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull | crPNGFull; }
virtual StyleList impl_outputGetAdditionalStyles(IDProvider& idp);
virtual SIZE impl_outputMeasureHeader() const;
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
diff --git a/plugins/HistoryStats/src/column_nick.cpp b/plugins/HistoryStats/src/column_nick.cpp index 291bc5c42d..95b6c2d23d 100644 --- a/plugins/HistoryStats/src/column_nick.cpp +++ b/plugins/HistoryStats/src/column_nick.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_nick.h"
/*
diff --git a/plugins/HistoryStats/src/column_nick.h b/plugins/HistoryStats/src/column_nick.h index e7558a68ec..6701aa1976 100644 --- a/plugins/HistoryStats/src/column_nick.h +++ b/plugins/HistoryStats/src/column_nick.h @@ -30,7 +30,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
};
diff --git a/plugins/HistoryStats/src/column_protocol.cpp b/plugins/HistoryStats/src/column_protocol.cpp index 3b194c5f01..e3a03368f8 100644 --- a/plugins/HistoryStats/src/column_protocol.cpp +++ b/plugins/HistoryStats/src/column_protocol.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_protocol.h"
/*
diff --git a/plugins/HistoryStats/src/column_protocol.h b/plugins/HistoryStats/src/column_protocol.h index b74d5a1772..611b4fbc7a 100644 --- a/plugins/HistoryStats/src/column_protocol.h +++ b/plugins/HistoryStats/src/column_protocol.h @@ -15,7 +15,7 @@ protected: virtual const TCHAR* impl_getTitle() const { return LPGENT("Protocol"); }
virtual const TCHAR* impl_getDescription() const { return LPGENT("Column holding the contact's protocol."); }
virtual int impl_getFeatures() const { return 0; }
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
};
diff --git a/plugins/HistoryStats/src/column_rank.cpp b/plugins/HistoryStats/src/column_rank.cpp index d65e730be9..140ae94adc 100644 --- a/plugins/HistoryStats/src/column_rank.cpp +++ b/plugins/HistoryStats/src/column_rank.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_rank.h"
/*
@@ -16,7 +16,7 @@ void ColRank::impl_outputBegin() m_nNextRank = 1;
}
-void ColRank::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColRank::impl_outputRenderRow(ext::ostream& tos, const Contact&, DisplayType display)
{
if (display == asContact)
tos << _T("<td class=\"num\">")
diff --git a/plugins/HistoryStats/src/column_rank.h b/plugins/HistoryStats/src/column_rank.h index 43f1b4af36..b0c152db84 100644 --- a/plugins/HistoryStats/src/column_rank.h +++ b/plugins/HistoryStats/src/column_rank.h @@ -18,7 +18,7 @@ protected: virtual const TCHAR* impl_getTitle() const { return LPGENT("Rank"); }
virtual const TCHAR* impl_getDescription() const { return LPGENT("Column holding the contact's placing according to your sorting criteria."); }
virtual int impl_getFeatures() const { return 0; }
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crHTMLFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crHTMLFull; }
virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const;
virtual void impl_outputBegin();
virtual void impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display);
diff --git a/plugins/HistoryStats/src/column_split.cpp b/plugins/HistoryStats/src/column_split.cpp index 7a21a97940..e7c834861e 100644 --- a/plugins/HistoryStats/src/column_split.cpp +++ b/plugins/HistoryStats/src/column_split.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_split.h"
/*
@@ -217,7 +217,7 @@ void ColSplit::impl_contactDataAcquireMessage(Contact& contact, Message& msg) }
}
-void ColSplit::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration)
+void ColSplit::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD)
{
if (m_nSource == 2 && (!bOutgoing && m_nSourceType == 0 || bOutgoing && m_nSourceType == 1 || m_nSourceType == 2))
{
@@ -340,7 +340,7 @@ ColSplit::SplitParams ColSplit::getParams() const return params;
}
-void ColSplit::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColSplit::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
SplitParams params = getParams();
diff --git a/plugins/HistoryStats/src/column_splittimeline.cpp b/plugins/HistoryStats/src/column_splittimeline.cpp index 77e1211241..eafa22647e 100644 --- a/plugins/HistoryStats/src/column_splittimeline.cpp +++ b/plugins/HistoryStats/src/column_splittimeline.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_splittimeline.h"
/*
@@ -229,7 +229,7 @@ void ColSplitTimeline::impl_contactDataAcquireMessage(Contact& contact, Message& }
}
-void ColSplitTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration)
+void ColSplitTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD)
{
if (m_nSource == 2)
{
@@ -420,7 +420,7 @@ ColSplitTimeline::SplitParams ColSplitTimeline::getParams() const return params;
}
-void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType)
{
SplitParams params = getParams();
const TimelineMap* pData = reinterpret_cast<const TimelineMap*>(contact.getSlot(contactDataSlotGet()));
@@ -554,7 +554,7 @@ void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& co tos << _T("</td>") << ext::endl;
}
-void ColSplitTimeline::outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColSplitTimeline::outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType)
{
SplitParams params = getParams();
const TimelineMap* pData = reinterpret_cast<const TimelineMap*>(contact.getSlot(contactDataSlotGet()));
diff --git a/plugins/HistoryStats/src/column_splittimeline.h b/plugins/HistoryStats/src/column_splittimeline.h index 664e6f603e..ad2d41548b 100644 --- a/plugins/HistoryStats/src/column_splittimeline.h +++ b/plugins/HistoryStats/src/column_splittimeline.h @@ -85,7 +85,7 @@ protected: virtual void impl_configWrite(SettingsTree& settings) const;
virtual void impl_configToUI(OptionsCtrl& Opt, OptionsCtrl::Item hGroup);
virtual void impl_configFromUI(OptionsCtrl& Opt);
- virtual int impl_configGetRestrictions(ext::string* pDetails) const { return crPNGFull; }
+ virtual int impl_configGetRestrictions(ext::string*) const { return crPNGFull; }
virtual ext::string impl_contactDataGetUID() const;
virtual void impl_contactDataBeginAcquire();
virtual void impl_contactDataPrepare(Contact& contact) const;
diff --git a/plugins/HistoryStats/src/column_timeline.cpp b/plugins/HistoryStats/src/column_timeline.cpp index df41c85a71..111104be4e 100644 --- a/plugins/HistoryStats/src/column_timeline.cpp +++ b/plugins/HistoryStats/src/column_timeline.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_timeline.h"
/*
@@ -141,7 +141,7 @@ void ColTimeline::impl_contactDataAcquireMessage(Contact& contact, Message& msg) }
}
-void ColTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration)
+void ColTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD)
{
if (m_nSource == 2)
{
@@ -242,7 +242,7 @@ void ColTimeline::impl_outputRenderRow(ext::ostream& tos, const Contact& contact }
}
-void ColTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType)
{
const TimelineMap* pData = reinterpret_cast<const TimelineMap*>(contact.getSlot(contactDataSlotGet()));
@@ -298,9 +298,7 @@ void ColTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact int from_left = 3 * ((curDay - m_nFirstDay) / m_nDays);
if (bar_len != 0)
- {
ExtTextOut(hDC, 0, 0, ETO_OPAQUE, &utils::rect(from_left, 24 - bar_len, from_left + 3, 25 + bar_len), NULL, 0, NULL);
- }
}
SetBkColor(hDC, con::ColorBarLine);
@@ -383,7 +381,7 @@ void ColTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& contact }
}
-void ColTimeline::outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColTimeline::outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType)
{
const TimelineMap* pData = reinterpret_cast<const TimelineMap*>(contact.getSlot(contactDataSlotGet()));
diff --git a/plugins/HistoryStats/src/column_wordcount.cpp b/plugins/HistoryStats/src/column_wordcount.cpp index f2a68056ca..d058b1bbe1 100644 --- a/plugins/HistoryStats/src/column_wordcount.cpp +++ b/plugins/HistoryStats/src/column_wordcount.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_wordcount.h"
#include <algorithm>
@@ -132,7 +132,7 @@ void ColWordCount::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSp }
}
-void ColWordCount::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColWordCount::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
const size_t* pWordCount = reinterpret_cast<const size_t*>(contact.getSlot(contactDataTransformSlotGet()));
diff --git a/plugins/HistoryStats/src/column_words.cpp b/plugins/HistoryStats/src/column_words.cpp index bae075d3c0..da16922fa9 100644 --- a/plugins/HistoryStats/src/column_words.cpp +++ b/plugins/HistoryStats/src/column_words.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "column_words.h"
#include <algorithm>
@@ -201,7 +201,7 @@ void ColWords::impl_contactDataTransformCleanup(Contact& contact) const }
}
-Column::StyleList ColWords::impl_outputGetAdditionalStyles(IDProvider& idp)
+Column::StyleList ColWords::impl_outputGetAdditionalStyles(IDProvider&)
{
StyleList l;
@@ -238,7 +238,7 @@ void ColWords::impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) }
}
-void ColWords::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display)
+void ColWords::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType)
{
const WordList* pWords = reinterpret_cast<const WordList*>(contact.getSlot(contactDataTransformSlotGet()));
diff --git a/plugins/HistoryStats/src/contact.cpp b/plugins/HistoryStats/src/contact.cpp index 830c782f91..ed7e35c91d 100644 --- a/plugins/HistoryStats/src/contact.cpp +++ b/plugins/HistoryStats/src/contact.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "contact.h"
#include "utils.h"
@@ -74,7 +74,7 @@ void Contact::addMessage(Message& msg) updateTime(msg.getTimestamp());
}
-void Contact::addChat(bool bOutgoing, DWORD localTimestampStarted, DWORD duration)
+void Contact::addChat(bool bOutgoing, DWORD, DWORD duration)
{
if (bOutgoing)
m_Chats.out++;
diff --git a/plugins/HistoryStats/src/contact.h b/plugins/HistoryStats/src/contact.h index a4031269de..5d73f1c91d 100644 --- a/plugins/HistoryStats/src/contact.h +++ b/plugins/HistoryStats/src/contact.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_CONTACT_H)
#define HISTORYSTATS_GUARD_CONTACT_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include <string>
@@ -130,7 +130,7 @@ protected: bool m_bAsc;
public:
- virtual bool cmp(const Contact& first, const Contact& second) { return m_bAsc; }
+ virtual bool cmp(const Contact&, const Contact&) { return m_bAsc; }
void setDir(bool bAsc) { m_bAsc = bAsc; }
explicit ContactCompareBase() : m_bAsc(true) { }
};
diff --git a/plugins/HistoryStats/src/dlgconfigure.cpp b/plugins/HistoryStats/src/dlgconfigure.cpp index 7edc52c919..63e21d6c3c 100644 --- a/plugins/HistoryStats/src/dlgconfigure.cpp +++ b/plugins/HistoryStats/src/dlgconfigure.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgconfigure.h"
#include "main.h"
@@ -76,7 +76,7 @@ INT_PTR CALLBACK DlgConfigure::staticConfigureProc(HWND hDlg, UINT msg, WPARAM w return FALSE;
}
-int DlgConfigure::staticEventPreShutdown(WPARAM wParam, LPARAM lParam)
+int DlgConfigure::staticEventPreShutdown(WPARAM, LPARAM)
{
if (IsWindow(m_hCfgWnd)) {
DestroyWindow(m_hCfgWnd);
diff --git a/plugins/HistoryStats/src/dlgconfigure.h b/plugins/HistoryStats/src/dlgconfigure.h index d1f8b1c22f..8c1d9c98c3 100644 --- a/plugins/HistoryStats/src/dlgconfigure.h +++ b/plugins/HistoryStats/src/dlgconfigure.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_DLGCONFIGURE_H)
#define HISTORYSTATS_GUARD_DLGCONFIGURE_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
class DlgConfigure
diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index be60d0bbf2..0bbeb29b7f 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgfilterwords.h"
#include "main.h"
@@ -136,7 +136,7 @@ void DlgFilterWords::onWMDestroy() m_Sets.deleteAllItems();
}
-void DlgFilterWords::onBandClicked(HANDLE hButton, INT_PTR dwData)
+void DlgFilterWords::onBandClicked(HANDLE, INT_PTR dwData)
{
switch (dwData) {
case saAdd:
diff --git a/plugins/HistoryStats/src/dlgfilterwords.h b/plugins/HistoryStats/src/dlgfilterwords.h index 13a4e4671a..6f6202d349 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.h +++ b/plugins/HistoryStats/src/dlgfilterwords.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_DLGFILTERWORDS_H)
#define HISTORYSTATS_GUARD_DLGFILTERWORDS_H
-#include "_globals.h"
+#include "stdafx.h"
#include "bandctrl.h"
#include "optionsctrl.h"
diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp index 68e93fe56e..b164d29319 100644 --- a/plugins/HistoryStats/src/dlgoption.cpp +++ b/plugins/HistoryStats/src/dlgoption.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "bandctrl.h"
@@ -9,7 +9,7 @@ * DlgOption
*/
-INT_PTR CALLBACK DlgOption::staticDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgOption::staticDlgProc(HWND hDlg, UINT msg, WPARAM, LPARAM lParam)
{
DlgOption* pDlg = reinterpret_cast<DlgOption*>(GetWindowLongPtr(hDlg, DWLP_USER));
@@ -43,7 +43,7 @@ INT_PTR CALLBACK DlgOption::staticDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP pDlg->onBandClicked(pNM->hButton, pNM->dwData);
}
- else if (p->code == BandCtrl::BCN_DROPDOWN) {
+ else if (p->code == BandCtrl::BCN_DROP_DOWN) {
BandCtrl::NMBANDCTRL* pNM = reinterpret_cast<BandCtrl::NMBANDCTRL*>(lParam);
pDlg->onBandDropDown(pNM->hButton, pNM->dwData);
diff --git a/plugins/HistoryStats/src/dlgoption.h b/plugins/HistoryStats/src/dlgoption.h index ab3b866d70..03b882eb24 100644 --- a/plugins/HistoryStats/src/dlgoption.h +++ b/plugins/HistoryStats/src/dlgoption.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_DLGOPTION_H)
#define HISTORYSTATS_GUARD_DLGOPTION_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include <map>
diff --git a/plugins/HistoryStats/src/dlgoption_subbase.cpp b/plugins/HistoryStats/src/dlgoption_subbase.cpp index 1e920e437d..8c971434d4 100644 --- a/plugins/HistoryStats/src/dlgoption_subbase.cpp +++ b/plugins/HistoryStats/src/dlgoption_subbase.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index aef8ca4771..e7a7368eda 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "column.h"
@@ -9,7 +9,7 @@ * DlgOption::SubColumns
*/
-INT_PTR CALLBACK DlgOption::SubColumns::staticAddProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgOption::SubColumns::staticAddProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)
{
HWND hWndList = GetDlgItem(hDlg, IDC_COLUMN);
@@ -39,12 +39,7 @@ INT_PTR CALLBACK DlgOption::SubColumns::staticAddProc(HWND hDlg, UINT msg, WPARA case IDOK:
{
int nIndex = SendMessage(hWndList, LB_GETCURSEL, 0, 0);
- if (nIndex != LB_ERR) {
- int nData = SendMessage(hWndList, LB_GETITEMDATA, nIndex, 0);
-
- EndDialog(hDlg, nIndex);
- }
- else EndDialog(hDlg, -1);
+ EndDialog(hDlg, nIndex);
}
return TRUE;
@@ -104,7 +99,7 @@ BOOL DlgOption::SubColumns::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam) BandCtrl::NMBANDCTRL* pNM = reinterpret_cast<BandCtrl::NMBANDCTRL*>(lParam);
if (pNM->hdr.code == BandCtrl::BCN_CLICKED)
onBandClicked(pNM->hButton, pNM->dwData);
- else if (pNM->hdr.code == BandCtrl::BCN_DROPDOWN)
+ else if (pNM->hdr.code == BandCtrl::BCN_DROP_DOWN)
onBandDropDown(pNM->hButton, pNM->dwData);
}
break;
@@ -340,7 +335,7 @@ void DlgOption::SubColumns::addCol(int nCol) }
}
-void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, INT_PTR dwData)
+void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, INT_PTR)
{
if (hItem) {
Column* pCol = reinterpret_cast<Column*>(m_Columns.getItemData(hItem));
@@ -374,7 +369,7 @@ void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, INT_PTR dwData) TreeView_DeleteAllItems(hInfo);
}
-void DlgOption::SubColumns::onColSelChanged(HANDLE hItem, INT_PTR dwData)
+void DlgOption::SubColumns::onColSelChanged(HANDLE hItem, INT_PTR)
{
m_Options.setRedraw(false);
m_Options.deleteAllItems();
@@ -511,7 +506,7 @@ void DlgOption::SubColumns::onColItemDropped(HANDLE hItem, HANDLE hDropTarget, B getParent()->settingsChanged();
}
-void DlgOption::SubColumns::onBandClicked(HANDLE hButton, INT_PTR dwData)
+void DlgOption::SubColumns::onBandClicked(HANDLE, INT_PTR dwData)
{
switch (dwData) {
case caAdd:
@@ -635,7 +630,7 @@ void DlgOption::SubColumns::onMoveDown() getParent()->settingsChanged();
}
-void DlgOption::SubColumns::onColumnButton(HANDLE hButton, INT_PTR dwData)
+void DlgOption::SubColumns::onColumnButton(HANDLE, INT_PTR dwData)
{
if (dwData == Settings::biFilterWords) {
HANDLE hSel = m_Columns.getSelection();
diff --git a/plugins/HistoryStats/src/dlgoption_subexclude.cpp b/plugins/HistoryStats/src/dlgoption_subexclude.cpp index ae81f88bec..d0748d71f8 100644 --- a/plugins/HistoryStats/src/dlgoption_subexclude.cpp +++ b/plugins/HistoryStats/src/dlgoption_subexclude.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "iconlib.h"
@@ -19,7 +19,7 @@ DlgOption::SubExclude::~SubExclude() g_bExcludeLock = false;
}
-BOOL DlgOption::SubExclude::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam)
+BOOL DlgOption::SubExclude::handleMsg(UINT msg, WPARAM, LPARAM lParam)
{
switch (msg) {
case WM_WINDOWPOSCHANGED:
diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index a68e661e77..c2b0054cf5 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/dlgoption_subinput.cpp b/plugins/HistoryStats/src/dlgoption_subinput.cpp index d499f8d6de..68a3a9d2e9 100644 --- a/plugins/HistoryStats/src/dlgoption_subinput.cpp +++ b/plugins/HistoryStats/src/dlgoption_subinput.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
#include "protocol.h"
@@ -29,7 +29,7 @@ DlgOption::SubInput::~SubInput() {
}
-BOOL DlgOption::SubInput::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam)
+BOOL DlgOption::SubInput::handleMsg(UINT msg, WPARAM, LPARAM lParam)
{
switch (msg) {
case WM_WINDOWPOSCHANGED:
diff --git a/plugins/HistoryStats/src/dlgoption_suboutput.cpp b/plugins/HistoryStats/src/dlgoption_suboutput.cpp index d1fbca4edd..a4b5de4231 100644 --- a/plugins/HistoryStats/src/dlgoption_suboutput.cpp +++ b/plugins/HistoryStats/src/dlgoption_suboutput.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "dlgoption.h"
/*
@@ -53,7 +53,7 @@ DlgOption::SubOutput::~SubOutput() {
}
-BOOL DlgOption::SubOutput::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam)
+BOOL DlgOption::SubOutput::handleMsg(UINT msg, WPARAM, LPARAM lParam)
{
switch (msg) {
case WM_WINDOWPOSCHANGED:
diff --git a/plugins/HistoryStats/src/iconlib.cpp b/plugins/HistoryStats/src/iconlib.cpp index 3b7fe5d035..5c8ae3df8f 100644 --- a/plugins/HistoryStats/src/iconlib.cpp +++ b/plugins/HistoryStats/src/iconlib.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "iconlib.h"
#include "main.h"
@@ -38,7 +38,7 @@ ext::string IconLib::m_Section; ext::a::string IconLib::m_IconName;
IconLib::CallbackSet IconLib::m_Callbacks;
-int IconLib::handleCallbacks(WPARAM wParam, LPARAM lParam)
+int IconLib::handleCallbacks(WPARAM, LPARAM)
{
citer_each_(CallbackSet, i, m_Callbacks)
{
diff --git a/plugins/HistoryStats/src/iconlib.h b/plugins/HistoryStats/src/iconlib.h index 94180e939e..6586d1284e 100644 --- a/plugins/HistoryStats/src/iconlib.h +++ b/plugins/HistoryStats/src/iconlib.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_ICONLIB_H)
#define HISTORYSTATS_GUARD_ICONLIB_H
-#include "_globals.h"
+#include "stdafx.h"
#include <set>
diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp index c6c63d6287..4d9ed3a552 100644 --- a/plugins/HistoryStats/src/main.cpp +++ b/plugins/HistoryStats/src/main.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "main.h"
#include <clocale>
@@ -53,7 +53,7 @@ static HANDLE g_hHistoryCopyContact = NULL; * services (see m_historystats.h for details)
*/
-static INT_PTR SvcIsExcluded(WPARAM hContact, LPARAM lParam)
+static INT_PTR SvcIsExcluded(WPARAM hContact, LPARAM)
{
if (hContact) {
MirandaSettings db;
@@ -98,7 +98,7 @@ static INT_PTR SvcSetExclude(WPARAM hContact, LPARAM lParam) * global menu stuff
*/
-static void MenuIconsChanged(LPARAM lParam)
+static void MenuIconsChanged(LPARAM)
{
if (g_hMenuCreateStatistics)
{
@@ -125,13 +125,13 @@ static void MenuIconsChanged(LPARAM lParam) * main menu related stuff
*/
-static INT_PTR MenuCreateStatistics(WPARAM wParam, LPARAM lParam)
+static INT_PTR MenuCreateStatistics(WPARAM, LPARAM)
{
Statistic::run(*g_pSettings, Statistic::fromMenu, g_hInst);
return 0;
}
-static INT_PTR MenuShowStatistics(WPARAM wParam, LPARAM lParam)
+static INT_PTR MenuShowStatistics(WPARAM, LPARAM)
{
if (g_pSettings->canShowStatistics())
{
@@ -147,7 +147,7 @@ static INT_PTR MenuShowStatistics(WPARAM wParam, LPARAM lParam) return 0;
}
-static INT_PTR MenuConfigure(WPARAM wParam, LPARAM lParam)
+static INT_PTR MenuConfigure(WPARAM, LPARAM)
{
DlgConfigure::showModal();
return 0;
@@ -200,7 +200,7 @@ void AddMainMenu() * contact menu related stuff
*/
-static INT_PTR MenuToggleExclude(WPARAM hContact, LPARAM lParam)
+static INT_PTR MenuToggleExclude(WPARAM hContact, LPARAM)
{
if (hContact) {
MirandaSettings db;
@@ -302,7 +302,7 @@ static INT_PTR MenuHistoryPaste(WPARAM wParam, LPARAM lParam) }
#endif
-static int EventPreBuildContactMenu(WPARAM hContact, LPARAM lParam)
+static int EventPreBuildContactMenu(WPARAM hContact, LPARAM)
{
if (hContact)
{
@@ -380,7 +380,7 @@ void AddContactMenu() * options integration
*/
-static int EventOptInitialise(WPARAM wParam, LPARAM lParam)
+static int EventOptInitialise(WPARAM wParam, LPARAM)
{
mu::opt::addPage(
wParam,
@@ -398,7 +398,7 @@ static int EventOptInitialise(WPARAM wParam, LPARAM lParam) * second initialization phase
*/
-static int EventModulesLoaded(WPARAM wParam, LPARAM lParam)
+static int EventModulesLoaded(WPARAM, LPARAM)
{
// register all known columns
Column::registerColumns();
@@ -429,7 +429,7 @@ static int EventModulesLoaded(WPARAM wParam, LPARAM lParam) * external interface
*/
-extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
+extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)
{
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
@@ -441,7 +441,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe return TRUE;
}
-extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
OutputDebugString(_T("HistoryStats: MirandaPluginInfoEx() was called.\n"));
diff --git a/plugins/HistoryStats/src/main.h b/plugins/HistoryStats/src/main.h index 51b5ea21f9..7f34285023 100644 --- a/plugins/HistoryStats/src/main.h +++ b/plugins/HistoryStats/src/main.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_MAIN_H)
#define HISTORYSTATS_GUARD_MAIN_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "settingsserializer.h"
diff --git a/plugins/HistoryStats/src/message.cpp b/plugins/HistoryStats/src/message.cpp index 505d1b8e87..f4112637e3 100644 --- a/plugins/HistoryStats/src/message.cpp +++ b/plugins/HistoryStats/src/message.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "message.h"
#include <algorithm>
diff --git a/plugins/HistoryStats/src/message.h b/plugins/HistoryStats/src/message.h index 5d4cd97d99..b355c49056 100644 --- a/plugins/HistoryStats/src/message.h +++ b/plugins/HistoryStats/src/message.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_MESSAGE_H)
#define HISTORYSTATS_GUARD_MESSAGE_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/mirandacontact.cpp b/plugins/HistoryStats/src/mirandacontact.cpp index b6b299714f..f9e9a2d02e 100644 --- a/plugins/HistoryStats/src/mirandacontact.cpp +++ b/plugins/HistoryStats/src/mirandacontact.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "mirandacontact.h"
#include "_consts.h"
diff --git a/plugins/HistoryStats/src/mirandacontact.h b/plugins/HistoryStats/src/mirandacontact.h index 7c7876b915..3155e69eca 100644 --- a/plugins/HistoryStats/src/mirandacontact.h +++ b/plugins/HistoryStats/src/mirandacontact.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_MIRANDACONTACT_H)
#define HISTORYSTATS_GUARD_MIRANDACONTACT_H
-#include "_globals.h"
+#include "stdafx.h"
#include <vector>
#include <list>
diff --git a/plugins/HistoryStats/src/mirandahistory.cpp b/plugins/HistoryStats/src/mirandahistory.cpp index 656ce08870..498e414d8d 100644 --- a/plugins/HistoryStats/src/mirandahistory.cpp +++ b/plugins/HistoryStats/src/mirandahistory.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "mirandahistory.h"
#include "mirandasettings.h"
diff --git a/plugins/HistoryStats/src/mirandahistory.h b/plugins/HistoryStats/src/mirandahistory.h index 6d344de891..f67540dece 100644 --- a/plugins/HistoryStats/src/mirandahistory.h +++ b/plugins/HistoryStats/src/mirandahistory.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_MIRANDAHISTORY_H)
#define HISTORYSTATS_GUARD_MIRANDAHISTORY_H
-#include "_globals.h"
+#include "stdafx.h"
#include <vector>
diff --git a/plugins/HistoryStats/src/mirandasettings.cpp b/plugins/HistoryStats/src/mirandasettings.cpp index a6707a2cc0..f27f5896ee 100644 --- a/plugins/HistoryStats/src/mirandasettings.cpp +++ b/plugins/HistoryStats/src/mirandasettings.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "mirandasettings.h"
diff --git a/plugins/HistoryStats/src/mirandasettings.h b/plugins/HistoryStats/src/mirandasettings.h index e58b379fad..bb5cb07f56 100644 --- a/plugins/HistoryStats/src/mirandasettings.h +++ b/plugins/HistoryStats/src/mirandasettings.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_MIRANDASETTINGS_H)
#define HISTORYSTATS_GUARD_MIRANDASETTINGS_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 42e29069ff..17c84e7eee 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "mu_common.h"
#include <map>
diff --git a/plugins/HistoryStats/src/optionsctrl.cpp b/plugins/HistoryStats/src/optionsctrl.cpp index a203a577a5..157464195f 100644 --- a/plugins/HistoryStats/src/optionsctrl.cpp +++ b/plugins/HistoryStats/src/optionsctrl.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrl.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/optionsctrl.h b/plugins/HistoryStats/src/optionsctrl.h index 7743c1baf3..29b802bf2f 100644 --- a/plugins/HistoryStats/src/optionsctrl.h +++ b/plugins/HistoryStats/src/optionsctrl.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_OPTIONSCTRL_H)
#define HISTORYSTATS_GUARD_OPTIONSCTRL_H
-#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrldefs.h"
/*
diff --git a/plugins/HistoryStats/src/optionsctrldefs.h b/plugins/HistoryStats/src/optionsctrldefs.h index fd9f220ed1..837a41924e 100644 --- a/plugins/HistoryStats/src/optionsctrldefs.h +++ b/plugins/HistoryStats/src/optionsctrldefs.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_OPTIONSCTRLDEFS_H)
#define HISTORYSTATS_GUARD_OPTIONSCTRLDEFS_H
-#include "_globals.h"
+#include "stdafx.h"
/*
* OptionsCtrlDefs
diff --git a/plugins/HistoryStats/src/optionsctrlimpl.cpp b/plugins/HistoryStats/src/optionsctrlimpl.cpp index c128f4062d..71929f166f 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
@@ -350,7 +350,7 @@ void OptionsCtrlImpl::staticFreeStateImages() }
}
-void OptionsCtrlImpl::staticUpdateStateImages(LPARAM lParam)
+void OptionsCtrlImpl::staticUpdateStateImages(LPARAM)
{
static const IconLib::IconIndex StateIcons[18] = {
IconLib::iiTreeCheck1,
@@ -735,7 +735,7 @@ void OptionsCtrlImpl::onCPNColorChanged() }
}
-void OptionsCtrlImpl::onTreeWMLButtonDown(UINT nFlags, POINTS point)
+void OptionsCtrlImpl::onTreeWMLButtonDown(UINT, POINTS point)
{
TVHITTESTINFO hti = { { point.x, point.y } };
@@ -743,7 +743,7 @@ void OptionsCtrlImpl::onTreeWMLButtonDown(UINT nFlags, POINTS point) getItem(hti.hItem)->onToggle();
}
-void OptionsCtrlImpl::onTreeWMChar(UINT nChar, UINT nRepCnt, UINT nFlags)
+void OptionsCtrlImpl::onTreeWMChar(UINT nChar, UINT, UINT)
{
if (nChar == VK_SPACE) {
HTREEITEM hItem = TreeView_GetSelection(m_hTree);
@@ -752,7 +752,7 @@ void OptionsCtrlImpl::onTreeWMChar(UINT nChar, UINT nRepCnt, UINT nFlags) }
}
-void OptionsCtrlImpl::onTreeWMKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
+void OptionsCtrlImpl::onTreeWMKeyDown(UINT nChar, UINT, UINT)
{
if (nChar == VK_RIGHT) {
HTREEITEM hItem = TreeView_GetSelection(m_hTree);
diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h index 218a28718a..b2a2ee4d37 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.h +++ b/plugins/HistoryStats/src/optionsctrlimpl.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_OPTIONSCTRLIMPL_H)
#define HISTORYSTATS_GUARD_OPTIONSCTRLIMPL_H
-#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrldefs.h"
#include <vector>
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_button.cpp b/plugins/HistoryStats/src/optionsctrlimpl_button.cpp index 63176f146a..5c56523322 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_button.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_button.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp index b70ebcc0e8..351c77b1d0 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
/*
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_color.cpp b/plugins/HistoryStats/src/optionsctrlimpl_color.cpp index acaf2ca817..a8991041f1 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_color.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_color.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
@@ -32,7 +32,6 @@ void OptionsCtrlImpl::Color::onSelect() return;
}
- HFONT hTreeFront = reinterpret_cast<HFONT>(SendMessage(m_pCtrl->m_hTree, WM_GETFONT, 0, 0));
RECT r;
if (m_pCtrl->getItemFreeRect(m_hItem, r))
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp b/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp index 304ec8e9d4..d158c40659 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp index 0f56c8e5a4..3601a5175f 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp b/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp index a70cb0d4b5..3684f59cc9 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
#include "main.h"
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_group.cpp b/plugins/HistoryStats/src/optionsctrlimpl_group.cpp index 46a5b7b927..b92a88a42d 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_group.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_group.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
/*
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_item.cpp b/plugins/HistoryStats/src/optionsctrlimpl_item.cpp index 01df06d643..b628b834a5 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_item.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_item.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
/*
diff --git a/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp b/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp index ab1f165fed..f3ee55cb17 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "optionsctrlimpl.h"
/*
diff --git a/plugins/HistoryStats/src/protocol.cpp b/plugins/HistoryStats/src/protocol.cpp index d657b698ec..8914310740 100644 --- a/plugins/HistoryStats/src/protocol.cpp +++ b/plugins/HistoryStats/src/protocol.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "protocol.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/protocol.h b/plugins/HistoryStats/src/protocol.h index 6ea9a44a41..2d1e6ee072 100644 --- a/plugins/HistoryStats/src/protocol.h +++ b/plugins/HistoryStats/src/protocol.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_PROTOCOL_H)
#define HISTORYSTATS_GUARD_PROTOCOL_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include <set>
diff --git a/plugins/HistoryStats/src/settings.cpp b/plugins/HistoryStats/src/settings.cpp index 7b0aca9b57..722e298a4f 100644 --- a/plugins/HistoryStats/src/settings.cpp +++ b/plugins/HistoryStats/src/settings.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "settings.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/settings.h b/plugins/HistoryStats/src/settings.h index 450ab1b8ff..2c91882230 100644 --- a/plugins/HistoryStats/src/settings.h +++ b/plugins/HistoryStats/src/settings.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_SETTINGS_H)
#define HISTORYSTATS_GUARD_SETTINGS_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "canvas.h"
diff --git a/plugins/HistoryStats/src/settingsserializer.cpp b/plugins/HistoryStats/src/settingsserializer.cpp index 5b3b428481..265ecb3d03 100644 --- a/plugins/HistoryStats/src/settingsserializer.cpp +++ b/plugins/HistoryStats/src/settingsserializer.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "settingsserializer.h"
#include "settingstree.h"
diff --git a/plugins/HistoryStats/src/settingsserializer.h b/plugins/HistoryStats/src/settingsserializer.h index c5477bc96f..6f967f20ca 100644 --- a/plugins/HistoryStats/src/settingsserializer.h +++ b/plugins/HistoryStats/src/settingsserializer.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_SETTINGSSERIALIZER_H)
#define HISTORYSTATS_GUARD_SETTINGSSERIALIZER_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include "settings.h"
diff --git a/plugins/HistoryStats/src/settingstree.cpp b/plugins/HistoryStats/src/settingstree.cpp index 30d5df7e20..a13d82ac3c 100644 --- a/plugins/HistoryStats/src/settingstree.cpp +++ b/plugins/HistoryStats/src/settingstree.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "settingstree.h"
#include "utils.h"
diff --git a/plugins/HistoryStats/src/settingstree.h b/plugins/HistoryStats/src/settingstree.h index e70198e7ce..c96261390b 100644 --- a/plugins/HistoryStats/src/settingstree.h +++ b/plugins/HistoryStats/src/settingstree.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_SETTINGSTREE_H)
#define HISTORYSTATS_GUARD_SETTINGSTREE_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include <map>
diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 85ee17b7be..d4590f5f9e 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "statistic.h"
#include <algorithm>
@@ -285,7 +285,7 @@ void Statistic::handleAddChat(Contact& contact, bool bOutgoing, DWORD localTimes }
}
-INT_PTR CALLBACK Statistic::staticProgressProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK Statistic::staticProgressProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM)
{
Statistic* pStats = reinterpret_cast<Statistic*>(GetWindowLongPtr(hDlg, GWLP_USERDATA));
@@ -1376,9 +1376,6 @@ DWORD WINAPI Statistic::threadProc(LPVOID lpParameter) SetEvent(pStats->m_hThreadPushEvent);
- // perform action
- bool bSuccess = pStats->createStatistics();
-
// check for errors
if (!pStats->m_ErrorText.empty() && !mu::system::terminated())
MessageBox(0, pStats->m_ErrorText.c_str(), TranslateT("HistoryStats - Error"), MB_ICONERROR | MB_OK);
@@ -1465,7 +1462,7 @@ Statistic::~Statistic() }
}
-void Statistic::run(const Settings& settings, InvocationSource invokedFrom, HINSTANCE hInst, HWND hWndParent /* = NULL */)
+void Statistic::run(const Settings& settings, InvocationSource invokedFrom, HINSTANCE hInst, HWND)
{
// check if running and make running
if (m_bRunning) {
diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h index 10b649e4eb..e5ca7e6f4f 100644 --- a/plugins/HistoryStats/src/statistic.h +++ b/plugins/HistoryStats/src/statistic.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_STATISTIC_H)
#define HISTORYSTATS_GUARD_STATISTIC_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
#include <vector>
diff --git a/plugins/HistoryStats/src/stdafx.cpp b/plugins/HistoryStats/src/stdafx.cxx index f621eb8cb6..0c766ea07f 100644 --- a/plugins/HistoryStats/src/stdafx.cpp +++ b/plugins/HistoryStats/src/stdafx.cxx @@ -15,4 +15,4 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "_globals.h"
\ No newline at end of file +#include "stdafx.h"
diff --git a/plugins/HistoryStats/src/_globals.h b/plugins/HistoryStats/src/stdafx.h index 2eeb39fe3e..6e49afefe2 100644 --- a/plugins/HistoryStats/src/_globals.h +++ b/plugins/HistoryStats/src/stdafx.h @@ -7,14 +7,11 @@ * nicer interface for miranda
*/
-#define _CRT_SECURE_NO_WARNINGS
#define _CRT_NON_CONFORMING_SWPRINTFS
+#define _WIN32_WINDOWS 0x0500 // for WM_MOUSEWHEEL
#pragma warning(disable:4267)
-#define _WIN32_WINDOWS 0x0500 // for WM_MOUSEWHEEL
-#define _WIN32_WINNT 0x0501 // for WM_THEMECHANGED
-
#include <windows.h>
#include <commctrl.h>
#include <Uxtheme.h>
diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp index 7bf6146b8c..5b6a781784 100644 --- a/plugins/HistoryStats/src/utils.cpp +++ b/plugins/HistoryStats/src/utils.cpp @@ -1,4 +1,4 @@ -#include "_globals.h"
+#include "stdafx.h"
#include "utils.h"
#include <ctime>
diff --git a/plugins/HistoryStats/src/utils.h b/plugins/HistoryStats/src/utils.h index c68d124b45..7112389d37 100644 --- a/plugins/HistoryStats/src/utils.h +++ b/plugins/HistoryStats/src/utils.h @@ -1,7 +1,7 @@ #if !defined(HISTORYSTATS_GUARD_UTILS_H)
#define HISTORYSTATS_GUARD_UTILS_H
-#include "_globals.h"
+#include "stdafx.h"
#include "_consts.h"
namespace utils
|