diff options
Diffstat (limited to 'plugins/Boltun/src/Engine')
| -rw-r--r-- | plugins/Boltun/src/Engine/CriticalSection.h | 2 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/Mind.cpp | 10 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/Mind.h | 2 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/MyCodeCvt.cpp | 2 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/MyCodeCvt.h | 4 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/PerContactData.h | 4 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/TalkEngine.cpp | 4 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/UnrecentChooser.cpp | 18 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/UnrecentChooser.h | 5 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/ValueChooser.h | 3 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/WordsList.cpp | 2 | ||||
| -rw-r--r-- | plugins/Boltun/src/Engine/WordsList.h | 4 |
12 files changed, 14 insertions, 46 deletions
diff --git a/plugins/Boltun/src/Engine/CriticalSection.h b/plugins/Boltun/src/Engine/CriticalSection.h index 59bc91beb9..550aa32696 100644 --- a/plugins/Boltun/src/Engine/CriticalSection.h +++ b/plugins/Boltun/src/Engine/CriticalSection.h @@ -21,8 +21,6 @@ #ifndef CriticalSectionH
#define CriticalSectionH
-#include <windows.h>
-
class CriticalSection
{
CRITICAL_SECTION csQueue;
diff --git a/plugins/Boltun/src/Engine/Mind.cpp b/plugins/Boltun/src/Engine/Mind.cpp index fc4520de55..6f558e002b 100644 --- a/plugins/Boltun/src/Engine/Mind.cpp +++ b/plugins/Boltun/src/Engine/Mind.cpp @@ -18,15 +18,7 @@ //
//***********************************************************
-#include "Mind.h"
-#include <fstream>
-#include <algorithm>
-#include "tstring.h"
-#include "assert.h"
-
-#include <windows.h>
-
-#include "MyCodeCvt.h"
+#include "..\boltun.h"
using namespace std;
diff --git a/plugins/Boltun/src/Engine/Mind.h b/plugins/Boltun/src/Engine/Mind.h index 23e0a41bd3..cdee200002 100644 --- a/plugins/Boltun/src/Engine/Mind.h +++ b/plugins/Boltun/src/Engine/Mind.h @@ -21,12 +21,10 @@ #ifndef MindH
#define MindH
-#include <string>
#include <vector>
#include <map>
#include <set>
#include "WordsList.h"
-#include <tchar.h>
#include "tstring.h"
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.cpp b/plugins/Boltun/src/Engine/MyCodeCvt.cpp index 5d7baf4d88..e34575f811 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.cpp +++ b/plugins/Boltun/src/Engine/MyCodeCvt.cpp @@ -18,7 +18,7 @@ //
//***********************************************************
-#include "MyCodeCvt.h"
+#include "..\boltun.h"
using namespace std;
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.h b/plugins/Boltun/src/Engine/MyCodeCvt.h index b4508c66de..40ca093795 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.h +++ b/plugins/Boltun/src/Engine/MyCodeCvt.h @@ -21,10 +21,6 @@ #ifndef MYCODECVT_H
#define MYCODECVT_H
-#include <locale>
-#include <xlocale>
-#include <cwchar>
-
typedef std::codecvt<wchar_t, char, std::mbstate_t> MyCodeCvtBase;
class MyCodeCvt
diff --git a/plugins/Boltun/src/Engine/PerContactData.h b/plugins/Boltun/src/Engine/PerContactData.h index 14b17784b9..d130a03838 100644 --- a/plugins/Boltun/src/Engine/PerContactData.h +++ b/plugins/Boltun/src/Engine/PerContactData.h @@ -21,10 +21,6 @@ #ifndef PerContactDataH
#define PerContactDataH
-#include <map>
-#include <time.h>
-#include <assert.h>
-
#include "CriticalSection.h"
static std::map<unsigned, void*> perContactDataObjects;
diff --git a/plugins/Boltun/src/Engine/TalkEngine.cpp b/plugins/Boltun/src/Engine/TalkEngine.cpp index 550aac66cf..0c711ab652 100644 --- a/plugins/Boltun/src/Engine/TalkEngine.cpp +++ b/plugins/Boltun/src/Engine/TalkEngine.cpp @@ -18,9 +18,7 @@ //
//***********************************************************
-#include "TalkEngine.h"
-#include <fstream>
-#include <windows.h>
+#include "..\boltun.h"
#ifdef _DEBUG
diff --git a/plugins/Boltun/src/Engine/UnrecentChooser.cpp b/plugins/Boltun/src/Engine/UnrecentChooser.cpp index b2e5303f5a..d11806503b 100644 --- a/plugins/Boltun/src/Engine/UnrecentChooser.cpp +++ b/plugins/Boltun/src/Engine/UnrecentChooser.cpp @@ -18,12 +18,12 @@ //
//***********************************************************
-#include "UnrecentChooser.h"
+#include "..\boltun.h"
using namespace std;
UnRecentChooser::UnRecentChooser()
- :last(-1), min(-1), newItemsPrio(-1), maxOldPrio(-1)
+ :last(-1), minimum(-1), newItemsPrio(-1), maxOldPrio(-1)
{
}
@@ -34,8 +34,8 @@ void UnRecentChooser::AddChoice(tstring value, float prio) int val = (int)items[value];
oldItems.insert(make_pair(val, value));
oldPrios.insert(make_pair(value, prio));
- if (min > val || min == -1)
- min = val;
+ if (minimum > val || minimum == -1)
+ minimum = val;
if (maxOldPrio < prio)
maxOldPrio = prio;
}
@@ -59,17 +59,17 @@ tstring UnRecentChooser::Choose() res = newItems[num];
}
else
- if (min == -1)
+ if (minimum == -1)
res = _T("");
else
{
float minprio = maxOldPrio / 1.5F;
- while (oldPrios[oldItems[min]] < minprio)
- min++;
- res = oldItems[min];
+ while (oldPrios[oldItems[minimum]] < minprio)
+ minimum++;
+ res = oldItems[minimum];
}
//Clean items
- min = -1;
+ minimum = -1;
newItemsPrio = -1;
maxOldPrio = -1;
oldItems.clear();
diff --git a/plugins/Boltun/src/Engine/UnrecentChooser.h b/plugins/Boltun/src/Engine/UnrecentChooser.h index 91a961e307..e815a6ec96 100644 --- a/plugins/Boltun/src/Engine/UnrecentChooser.h +++ b/plugins/Boltun/src/Engine/UnrecentChooser.h @@ -21,9 +21,6 @@ #ifndef UnRecentChooserH
#define UnRecentChooserH
-#include <map>
-#include <vector>
-#include <string>
#include "tstring.h"
class UnRecentChooser
@@ -35,7 +32,7 @@ class UnRecentChooser std::map<size_t, tstring> oldItems;
std::map<tstring, float> oldPrios;
size_t last;
- int min;
+ int minimum;
static const size_t maxItems = 100;
public:
UnRecentChooser();
diff --git a/plugins/Boltun/src/Engine/ValueChooser.h b/plugins/Boltun/src/Engine/ValueChooser.h index 219a55a8f2..8a3add430a 100644 --- a/plugins/Boltun/src/Engine/ValueChooser.h +++ b/plugins/Boltun/src/Engine/ValueChooser.h @@ -21,9 +21,6 @@ #ifndef StringChooserH
#define StringChooserH
-#include <vector>
-#include <string>
-
template<class container = std::vector<tstring> >
class ValueChooser
{
diff --git a/plugins/Boltun/src/Engine/WordsList.cpp b/plugins/Boltun/src/Engine/WordsList.cpp index 3209bf2db6..08cd150aaf 100644 --- a/plugins/Boltun/src/Engine/WordsList.cpp +++ b/plugins/Boltun/src/Engine/WordsList.cpp @@ -18,7 +18,7 @@ //
//***********************************************************
-#include "WordsList.h"
+#include "..\boltun.h"
using namespace std;
diff --git a/plugins/Boltun/src/Engine/WordsList.h b/plugins/Boltun/src/Engine/WordsList.h index bd74b2007b..b6e0792101 100644 --- a/plugins/Boltun/src/Engine/WordsList.h +++ b/plugins/Boltun/src/Engine/WordsList.h @@ -21,10 +21,6 @@ #ifndef WordsListH
#define WordsListH
-#include <set>
-#include <vector>
-#include <string>
-#include "tchar.h"
#include "tstring.h"
class WordsList
|