summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Clist_modern/src/hdr/modern_clc.h2
-rw-r--r--plugins/Clist_modern/src/hdr/modern_statusbar.h2
-rw-r--r--plugins/Clist_modern/src/modern_clui.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_docking.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_skinbutton.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_skinselector.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_tbbutton.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_toolbar.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_viewmodebar.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_xptheme.cpp2
-rw-r--r--plugins/Clist_nicer/skineditor/skinedit_12.vcxproj8
-rw-r--r--plugins/Clist_nicer/skineditor/src/commonheaders.h3
-rw-r--r--plugins/Clist_nicer/src/Include/commonheaders.h2
-rw-r--r--plugins/ExternalAPI/m_cln_skinedit.h (renamed from plugins/Clist_nicer/src/Include/m_cln_skinedit.h)0
-rw-r--r--plugins/ExternalAPI/m_skinbutton.h (renamed from plugins/Clist_modern/src/m_api/m_skinbutton.h)0
-rw-r--r--plugins/ExternalAPI/m_xpTheme.h (renamed from plugins/Clist_modern/src/m_api/m_xpTheme.h)0
16 files changed, 17 insertions, 16 deletions
diff --git a/plugins/Clist_modern/src/hdr/modern_clc.h b/plugins/Clist_modern/src/hdr/modern_clc.h
index f5fb9b2222..6301cc1f9d 100644
--- a/plugins/Clist_modern/src/hdr/modern_clc.h
+++ b/plugins/Clist_modern/src/hdr/modern_clc.h
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _CLC_H_
#define _CLC_H_
#include "modern_image_array.h"
-#include "../m_api/m_xpTheme.h"
+#include "m_xpTheme.h"
#include "modern_defsettings.h"
#include "modern_clist.h"
diff --git a/plugins/Clist_modern/src/hdr/modern_statusbar.h b/plugins/Clist_modern/src/hdr/modern_statusbar.h
index 2339ed2c51..2ac385b6d4 100644
--- a/plugins/Clist_modern/src/hdr/modern_statusbar.h
+++ b/plugins/Clist_modern/src/hdr/modern_statusbar.h
@@ -4,7 +4,7 @@
#define modern_statusbar_h__
#include "modern_commonprototypes.h"
-#include "../m_api/m_xpTheme.h"
+#include "m_xpTheme.h"
int ModernDrawStatusBar(HWND hwnd, HDC hDC);
int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC);
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 3c4750bb19..ed66adfadf 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_commonheaders.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#include "hdr/modern_skinengine.h"
#include "hdr/modern_statusbar.h"
diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp
index b2c4e0f083..837bcfc797 100644
--- a/plugins/Clist_modern/src/modern_docking.cpp
+++ b/plugins/Clist_modern/src/modern_docking.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_clist.h"
#include "m_skin_eng.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#include "hdr/modern_commonprototypes.h"
#include "hdr/modern_sync.h"
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index d843175566..f9ba51083c 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -29,7 +29,7 @@ This file contains code related to new modern free positioned skinned buttons
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_skinengine.h"
#include "hdr/modern_clcpaint.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#define MODERNSKINBUTTONCLASS "MirandaModernSkinButtonClass"
BOOL ModernSkinButtonModuleIsLoaded = FALSE;
diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index 7264c6d359..7d62758208 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_skinselector.h"
#include "hdr/modern_skinengine.h"
#include "m_skin_eng.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#include "hdr/modern_commonprototypes.h"
/// IMPLEMENTATIONS
diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp
index a7b30af19f..d5c6843322 100644
--- a/plugins/Clist_modern/src/modern_tbbutton.cpp
+++ b/plugins/Clist_modern/src/modern_tbbutton.cpp
@@ -1,6 +1,6 @@
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_commonprototypes.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#include "hdr/modern_clcpaint.h"
#include <m_button_int.h>
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp
index 6db6d801dc..07195a35f2 100644
--- a/plugins/Clist_modern/src/modern_toolbar.cpp
+++ b/plugins/Clist_modern/src/modern_toolbar.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_commonprototypes.h"
-#include "./m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#include <m_toptoolbar.h>
#include "hdr/modern_sync.h"
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index cbaf820fd8..57ae8d4969 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -29,7 +29,7 @@ $Id: viewmodes.c 2998 2006-06-01 07:11:52Z nightwish2004 $
#include "hdr/modern_commonheaders.h"
#include "CLUIFrames/cluiframes.h"
-#include "m_api/m_skinbutton.h"
+#include "m_skinbutton.h"
#define TIMERID_VIEWMODEEXPIRE 100
diff --git a/plugins/Clist_modern/src/modern_xptheme.cpp b/plugins/Clist_modern/src/modern_xptheme.cpp
index ac8cecae7c..1d8fd910f5 100644
--- a/plugins/Clist_modern/src/modern_xptheme.cpp
+++ b/plugins/Clist_modern/src/modern_xptheme.cpp
@@ -1,6 +1,6 @@
#include "hdr/modern_commonheaders.h"
#include "hdr/modern_commonprototypes.h"
-#include "m_api/m_xpTheme.h"
+#include "m_xpTheme.h"
//statical
diff --git a/plugins/Clist_nicer/skineditor/skinedit_12.vcxproj b/plugins/Clist_nicer/skineditor/skinedit_12.vcxproj
index c8980ea262..c89759d6fa 100644
--- a/plugins/Clist_nicer/skineditor/skinedit_12.vcxproj
+++ b/plugins/Clist_nicer/skineditor/skinedit_12.vcxproj
@@ -78,7 +78,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -136,7 +136,7 @@
<Optimization>Full</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -165,7 +165,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
diff --git a/plugins/Clist_nicer/skineditor/src/commonheaders.h b/plugins/Clist_nicer/skineditor/src/commonheaders.h
index 1563e24d18..1fb84deb9f 100644
--- a/plugins/Clist_nicer/skineditor/src/commonheaders.h
+++ b/plugins/Clist_nicer/skineditor/src/commonheaders.h
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_protosvc.h>
-#include "../../src/include/m_cln_skinedit.h"
+#include "m_cln_skinedit.h"
+
#include "Version.h"
#include "skineditres.h"
diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h
index fd0d4fda8a..dfa289636b 100644
--- a/plugins/Clist_nicer/src/Include/commonheaders.h
+++ b/plugins/Clist_nicer/src/Include/commonheaders.h
@@ -58,8 +58,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_extraicons.h>
#include <m_metacontacts.h>
+#include <m_cln_skinedit.h>
-#include "m_cln_skinedit.h"
#include "resource.h"
#include "Version.h"
#include "extbackg.h"
diff --git a/plugins/Clist_nicer/src/Include/m_cln_skinedit.h b/plugins/ExternalAPI/m_cln_skinedit.h
index b98be9b2ba..b98be9b2ba 100644
--- a/plugins/Clist_nicer/src/Include/m_cln_skinedit.h
+++ b/plugins/ExternalAPI/m_cln_skinedit.h
diff --git a/plugins/Clist_modern/src/m_api/m_skinbutton.h b/plugins/ExternalAPI/m_skinbutton.h
index 1ca5c38e6d..1ca5c38e6d 100644
--- a/plugins/Clist_modern/src/m_api/m_skinbutton.h
+++ b/plugins/ExternalAPI/m_skinbutton.h
diff --git a/plugins/Clist_modern/src/m_api/m_xpTheme.h b/plugins/ExternalAPI/m_xpTheme.h
index 90925470f4..90925470f4 100644
--- a/plugins/Clist_modern/src/m_api/m_xpTheme.h
+++ b/plugins/ExternalAPI/m_xpTheme.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 09:41:15 +0000