summaryrefslogtreecommitdiff
path: root/plugins/Folders/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Folders/src')
-rw-r--r--plugins/Folders/src/commonheaders.h32
-rw-r--r--plugins/Folders/src/dlg_handlers.cpp2
-rw-r--r--plugins/Folders/src/events.cpp2
-rw-r--r--plugins/Folders/src/folderItem.cpp2
-rw-r--r--plugins/Folders/src/folders.cpp15
-rw-r--r--plugins/Folders/src/foldersList.cpp2
-rw-r--r--plugins/Folders/src/hooked_events.cpp14
-rw-r--r--plugins/Folders/src/services.cpp2
-rw-r--r--plugins/Folders/src/stdafx.cpp18
-rw-r--r--plugins/Folders/src/utils.cpp2
-rw-r--r--plugins/Folders/src/version.h59
11 files changed, 55 insertions, 95 deletions
diff --git a/plugins/Folders/src/commonheaders.h b/plugins/Folders/src/commonheaders.h
index 1b5b1be6f2..0734f8db26 100644
--- a/plugins/Folders/src/commonheaders.h
+++ b/plugins/Folders/src/commonheaders.h
@@ -25,38 +25,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define MAX_FOLDER_SIZE 2048
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <windows.h>
-#include "newpluginapi.h"
-#include "m_utils.h"
-#include "m_folders.h"
+#include <newpluginapi.h>
+#include <m_database.h>
+#include <m_system_cpp.h>
+#include <m_options.h>
+
+#include <m_variables.h>
+#include <m_folders.h>
#include "version.h"
#include "utils.h"
#include "resource.h"
#include "foldersList.h"
#include "dlg_handlers.h"
-
-#include "m_database.h"
-#include "m_system.h"
-#include "m_system_cpp.h"
-#include "m_skin.h"
-#include "m_options.h"
-#include "m_clist.h"
-#include "m_langpack.h"
-#include "m_history.h"
-#include "m_contacts.h"
-#include "m_popup.h"
-#include "m_fontservice.h"
-#include "m_variables.h"
+#include "hooked_events.h"
+#include "services.h"
+#include "events.h"
+#include "folderItem.h"
#ifndef MS_DB_GETPROFILEPATH_BASIC //db3xSA
#define MS_DB_GETPROFILEPATH_BASIC "DB/GetProfilePathBasic"
#endif
+#define MS_FOLDERS_TEST_PLUGIN "Folders/Test/Plugin"
+
extern char ModuleName[];
extern HINSTANCE hInstance;
extern CFoldersList &lstRegisteredFolders;
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp
index 48ed983d11..d36a68ebc3 100644
--- a/plugins/Folders/src/dlg_handlers.cpp
+++ b/plugins/Folders/src/dlg_handlers.cpp
@@ -1,4 +1,4 @@
-#include "dlg_handlers.h"
+#include "commonheaders.h"
PFolderItem lastItem = NULL;
diff --git a/plugins/Folders/src/events.cpp b/plugins/Folders/src/events.cpp
index dae59e6d8f..c3e1d5c941 100644
--- a/plugins/Folders/src/events.cpp
+++ b/plugins/Folders/src/events.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "events.h"
+#include "commonheaders.h"
static HANDLE hPathChanged;
diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp
index fa40d855c9..fe16f30d7a 100644
--- a/plugins/Folders/src/folderItem.cpp
+++ b/plugins/Folders/src/folderItem.cpp
@@ -18,9 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "folderItem.h"
#include "commonheaders.h"
-#include "services.h"
CFolderItem::CFolderItem(const char *sectionName, const char *name, const TCHAR *format, const DWORD flags)
{
diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp
index 586510ae28..638f539143 100644
--- a/plugins/Folders/src/folders.cpp
+++ b/plugins/Folders/src/folders.cpp
@@ -19,13 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "commonheaders.h"
-#include "hooked_events.h"
-#include "services.h"
-#include "events.h"
-
-#include "m_folders.h"
-
-#define MS_FOLDERS_TEST_PLUGIN "Folders/Test/Plugin"
char ModuleName[] = "Folders";
HINSTANCE hInstance;
@@ -35,15 +28,15 @@ CFoldersList &lstRegisteredFolders = CFoldersList(10); //the list
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- __PLUGIN_DISPLAY_NAME,
- VERSION,
- __DESC,
+ __PLUGIN_NAME,
+ PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
+ __DESCRIPTION,
__AUTHOR,
__AUTHOREMAIL,
__COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- // {2f129563-2c7d-4a9a-b948-97dfcc0afdd7}
+ // {2F129563-2C7D-4A9A-B948-97DFCC0AFDD7}
{0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}}
};
diff --git a/plugins/Folders/src/foldersList.cpp b/plugins/Folders/src/foldersList.cpp
index b887264541..e003ad81ab 100644
--- a/plugins/Folders/src/foldersList.cpp
+++ b/plugins/Folders/src/foldersList.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "foldersList.h"
+#include "commonheaders.h"
CFoldersList::CFoldersList(int initialSize)
{
diff --git a/plugins/Folders/src/hooked_events.cpp b/plugins/Folders/src/hooked_events.cpp
index 77042f2879..cc939a4e7b 100644
--- a/plugins/Folders/src/hooked_events.cpp
+++ b/plugins/Folders/src/hooked_events.cpp
@@ -18,19 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "hooked_events.h"
-#include "events.h"
-
-#define HOST "http://eblis.tla.ro/projects"
-
-#if defined(WIN64) || defined(_WIN64)
-#define FOLDERS_VERSION_URL HOST "/miranda/Folders/updater/x64/Folders.html"
-#define FOLDERS_UPDATE_URL HOST "/miranda/Folders/updater/x64/Folders.zip"
-#else
-#define FOLDERS_VERSION_URL HOST "/miranda/Folders/updater/Folders.html"
-#define FOLDERS_UPDATE_URL HOST "/miranda/Folders/updater/Folders.zip"
-#endif
-#define FOLDERS_VERSION_PREFIX "Custom profile folders version "
+#include "commonheaders.h"
HANDLE hOptionsInitialize;
diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp
index 4ec1733b79..4178dd49e8 100644
--- a/plugins/Folders/src/services.cpp
+++ b/plugins/Folders/src/services.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "services.h"
+#include "commonheaders.h"
#define DEFAULT_SECTION "Unknown"
diff --git a/plugins/Folders/src/stdafx.cpp b/plugins/Folders/src/stdafx.cpp
new file mode 100644
index 0000000000..e7e41dae3c
--- /dev/null
+++ b/plugins/Folders/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)
+
+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 version 2
+of the License.
+
+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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "commonheaders.h" \ No newline at end of file
diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp
index df4131ff84..69d571990f 100644
--- a/plugins/Folders/src/utils.cpp
+++ b/plugins/Folders/src/utils.cpp
@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "utils.h"
+#include "commonheaders.h"
char *StrCopy(char *source, size_t index, const char *what, size_t count)
{
diff --git a/plugins/Folders/src/version.h b/plugins/Folders/src/version.h
index 6687b0a857..8287ace778 100644
--- a/plugins/Folders/src/version.h
+++ b/plugins/Folders/src/version.h
@@ -1,45 +1,14 @@
-/*
-Custom profile folders plugin for Miranda IM
-
-Copyright © 2005-2012 Cristian Libotean
-
-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.
-*/
-
-#ifndef M_FOLDERS_VERSION_H
-#define M_FOLDERS_VERSION_H
-
-#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 1
-#define __RELEASE_NUM 6
-#define __BUILD_NUM 1
-
-#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)
-
-#define __PLUGINVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __PLUGINVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM
-#define __STRINGIFY_(x) #x
-#define __STRINGIFY(x) __STRINGIFY_(x)
-#define __VERSION_STRING __STRINGIFY(__PLUGINVERSION_STRING_DOTS)
-
-#define __DESC "Service plugin. Allows plugins to save their data to user selected folders; supports variables."
-#define __AUTHOR "Cristian Libotean"
-#define __AUTHOREMAIL "eblis102@yahoo.com"
-#define __COPYRIGHT "© 2005-2012 Cristian Libotean"
-#define __AUTHORWEB "http://miranda-ng.org/"
-#define __PLUGIN_DISPLAY_NAME "Custom profile folders"
-
-
-#endif //M_FOLDERS_VERSION_H
+#define __MAJOR_VERSION 0
+#define __MINOR_VERSION 1
+#define __RELEASE_NUM 6
+#define __BUILD_NUM 1
+
+#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
+
+#define __PLUGIN_NAME "Custom profile folders"
+#define __FILENAME "Folders.dll"
+#define __DESCRIPTION "Allows plugins to save their data to user selected folders; supports variables."
+#define __AUTHOR "Cristian Libotean"
+#define __AUTHOREMAIL "eblis102@yahoo.com"
+#define __AUTHORWEB "http://miranda-ng.org/"
+#define __COPYRIGHT "© 2005-2012 Cristian Libotean"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:04:39 +0000