summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--protocols/IcqOscarJ/icqoscar8_10.vcxproj1
-rw-r--r--protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters3
-rw-r--r--protocols/IcqOscarJ/icqoscar8_11.vcxproj1
-rw-r--r--protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters3
-rw-r--r--protocols/IcqOscarJ/icqoscar8_12.vcxproj1
-rw-r--r--protocols/IcqOscarJ/icqoscar8_12.vcxproj.filters3
-rw-r--r--protocols/IcqOscarJ/src/changeinfo/db.cpp1
-rw-r--r--protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp1
-rw-r--r--protocols/IcqOscarJ/src/changeinfo/editstring.cpp2
-rw-r--r--protocols/IcqOscarJ/src/changeinfo/main.cpp28
-rw-r--r--protocols/IcqOscarJ/src/changeinfo/upload.cpp2
11 files changed, 4 insertions, 42 deletions
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
index 85c3535c60..beb563d158 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj
@@ -269,7 +269,6 @@
<ClCompile Include="src\changeinfo\dlgproc.cpp" />
<ClCompile Include="src\changeinfo\editlist.cpp" />
<ClCompile Include="src\changeinfo\editstring.cpp" />
- <ClCompile Include="src\changeinfo\main.cpp" />
<ClCompile Include="src\changeinfo\upload.cpp" />
<ClCompile Include="src\capabilities.cpp" />
<ClCompile Include="src\cookies.cpp" />
diff --git a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
index a7087f164f..fbf0c89c29 100644
--- a/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
+++ b/protocols/IcqOscarJ/icqoscar8_10.vcxproj.filters
@@ -234,9 +234,6 @@
<ClCompile Include="src\changeinfo\editstring.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
- <ClCompile Include="src\changeinfo\main.cpp">
- <Filter>Changeinfo</Filter>
- </ClCompile>
<ClCompile Include="src\changeinfo\upload.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
diff --git a/protocols/IcqOscarJ/icqoscar8_11.vcxproj b/protocols/IcqOscarJ/icqoscar8_11.vcxproj
index 88ace6f4aa..f0a626f26b 100644
--- a/protocols/IcqOscarJ/icqoscar8_11.vcxproj
+++ b/protocols/IcqOscarJ/icqoscar8_11.vcxproj
@@ -272,7 +272,6 @@
<ClCompile Include="src\changeinfo\dlgproc.cpp" />
<ClCompile Include="src\changeinfo\editlist.cpp" />
<ClCompile Include="src\changeinfo\editstring.cpp" />
- <ClCompile Include="src\changeinfo\main.cpp" />
<ClCompile Include="src\changeinfo\upload.cpp" />
<ClCompile Include="src\capabilities.cpp" />
<ClCompile Include="src\cookies.cpp" />
diff --git a/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters
index a7087f164f..fbf0c89c29 100644
--- a/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters
+++ b/protocols/IcqOscarJ/icqoscar8_11.vcxproj.filters
@@ -234,9 +234,6 @@
<ClCompile Include="src\changeinfo\editstring.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
- <ClCompile Include="src\changeinfo\main.cpp">
- <Filter>Changeinfo</Filter>
- </ClCompile>
<ClCompile Include="src\changeinfo\upload.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
diff --git a/protocols/IcqOscarJ/icqoscar8_12.vcxproj b/protocols/IcqOscarJ/icqoscar8_12.vcxproj
index 46cdfb4baa..ae5330bd65 100644
--- a/protocols/IcqOscarJ/icqoscar8_12.vcxproj
+++ b/protocols/IcqOscarJ/icqoscar8_12.vcxproj
@@ -272,7 +272,6 @@
<ClCompile Include="src\changeinfo\dlgproc.cpp" />
<ClCompile Include="src\changeinfo\editlist.cpp" />
<ClCompile Include="src\changeinfo\editstring.cpp" />
- <ClCompile Include="src\changeinfo\main.cpp" />
<ClCompile Include="src\changeinfo\upload.cpp" />
<ClCompile Include="src\capabilities.cpp" />
<ClCompile Include="src\cookies.cpp" />
diff --git a/protocols/IcqOscarJ/icqoscar8_12.vcxproj.filters b/protocols/IcqOscarJ/icqoscar8_12.vcxproj.filters
index a7087f164f..fbf0c89c29 100644
--- a/protocols/IcqOscarJ/icqoscar8_12.vcxproj.filters
+++ b/protocols/IcqOscarJ/icqoscar8_12.vcxproj.filters
@@ -234,9 +234,6 @@
<ClCompile Include="src\changeinfo\editstring.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
- <ClCompile Include="src\changeinfo\main.cpp">
- <Filter>Changeinfo</Filter>
- </ClCompile>
<ClCompile Include="src\changeinfo\upload.cpp">
<Filter>Changeinfo</Filter>
</ClCompile>
diff --git a/protocols/IcqOscarJ/src/changeinfo/db.cpp b/protocols/IcqOscarJ/src/changeinfo/db.cpp
index 07807549cd..1403518297 100644
--- a/protocols/IcqOscarJ/src/changeinfo/db.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/db.cpp
@@ -25,6 +25,7 @@
// ChangeInfo Plugin stuff
//
// -----------------------------------------------------------------------------
+
#include "icqoscar.h"
void ChangeInfoData::LoadSettingsFromDb(int keepChanged)
diff --git a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
index e8d71f869f..946857cbb4 100644
--- a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
@@ -25,6 +25,7 @@
// ChangeInfo Plugin stuff
//
// -----------------------------------------------------------------------------
+
#include "icqoscar.h"
#define DM_PROTOACK (WM_USER+10)
diff --git a/protocols/IcqOscarJ/src/changeinfo/editstring.cpp b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
index 2f99e4731f..191b933cf3 100644
--- a/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/editstring.cpp
@@ -25,8 +25,8 @@
// ChangeInfo Plugin stuff
//
// -----------------------------------------------------------------------------
-#include "icqoscar.h"
+#include "icqoscar.h"
static ChangeInfoData *dataStringEdit = NULL;
static HWND hwndEdit = NULL, hwndExpandButton = NULL, hwndUpDown = NULL;
diff --git a/protocols/IcqOscarJ/src/changeinfo/main.cpp b/protocols/IcqOscarJ/src/changeinfo/main.cpp
deleted file mode 100644
index 22669be3aa..0000000000
--- a/protocols/IcqOscarJ/src/changeinfo/main.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// ---------------------------------------------------------------------------80
-// ICQ plugin for Miranda Instant Messenger
-// ________________________________________
-//
-// Copyright © 2001-2004 Richard Hughes, Martin Öberg
-// Copyright © 2004-2008 Joe Kucera, Bio
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-// -----------------------------------------------------------------------------
-// DESCRIPTION:
-//
-// ChangeInfo Plugin stuff
-//
-// -----------------------------------------------------------------------------
-#include "icqoscar.h"
diff --git a/protocols/IcqOscarJ/src/changeinfo/upload.cpp b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
index b619f099e2..fe5258c8ee 100644
--- a/protocols/IcqOscarJ/src/changeinfo/upload.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
@@ -25,8 +25,8 @@
// ChangeInfo Plugin stuff
//
// -----------------------------------------------------------------------------
-#include "icqoscar.h"
+#include "icqoscar.h"
int CIcqProto::StringToListItemId(const char *szSetting,int def)
{