minus ModernOpt

4 files changed, 34 insertions, 36 deletions

diff --git a/plugins/NewAwaySysMod/NewAwaySys.log b/plugins/NewAwaySysMod/NewAwaySys.log
new file mode 100644
index 0000000000..06101a8f37
--- /dev/null
+++ b/plugins/NewAwaySysMod/NewAwaySys.log
@@ -0,0 +1,34 @@
+  stdafx.cxx
+  AwayOpt.cpp
+  AwaySys.cpp
+src\AwaySys.cpp(139): warning C4389: '==' : signed/unsigned mismatch
+  Client.cpp
+  ContactList.cpp
+src\ContactList.cpp(663): warning C4189: 'Res' : local variable is initialized but not referenced
+  CString.cpp
+  GroupCheckbox.cpp
+  MsgEventAdded.cpp
+src\MsgEventAdded.cpp(85): warning C4100: 'DefaultRetVal' : unreferenced formal parameter
+  MsgTree.cpp
+src\MsgTree.cpp(67): warning C4211: nonstandard extension used : redefined extern to static
+src\MsgTree.cpp(619): warning C4239: nonstandard extension used : 'argument' : conversion from 'CTreeItem' to 'CTreeItem &'
+          A non-const reference may only be bound to an lvalue
+src\MsgTree.cpp(638): warning C4239: nonstandard extension used : 'argument' : conversion from 'CTreeItem' to 'CTreeItem &'
+          A non-const reference may only be bound to an lvalue
+  Notification.cpp
+src\Notification.cpp(53): warning C4505: 'ShowContactMenu' : unreferenced local function has been removed
+  Options.cpp
+src\Options.cpp(266): warning C4512: 'sTreeReadEnumData' : assignment operator could not be generated
+          src\Options.cpp(257) : see declaration of 'sTreeReadEnumData'
+src\Options.cpp(645): warning C4512: 'sListReadEnumData' : assignment operator could not be generated
+          src\Options.cpp(636) : see declaration of 'sListReadEnumData'
+src\Options.cpp(763): warning C4189: 'Res' : local variable is initialized but not referenced
+src\Options.cpp(792): warning C4189: 'Res' : local variable is initialized but not referenced
+  Properties.cpp
+  ReadAwayMsg.cpp
+  Services.cpp
+  SetAwayMsg.cpp
+     Creating library W:\miranda-ng\bin10\Release\Obj\NewAwaySys\NewAwaySys.lib and object W:\miranda-ng\bin10\Release\Obj\NewAwaySys\NewAwaySys.exp
+  Generating code
+  Finished generating code
+  NewAwaySys.vcxproj -> W:\miranda-ng\bin10\Release\Plugins\NewAwaySys.dll
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index e0cefb3629..abb0e0516a 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -25,9 +25,6 @@
 #include "m_clc.h"

 #include "GroupCheckbox.h"

 

-//NightFox

-#include <m_modernopt.h>

-

 int g_Messages_RecentRootID, g_Messages_PredefinedRootID;

 CIconList g_IconList;

 

@@ -1360,32 +1357,3 @@ void InitOptions()
 	g_AutoreplyOptPage.Items.AddElem(new COptItem_Generic(IDC_REPLYDLG_VARS, IDC_REPLYDLG_ENABLEREPLY));

 	g_AutoreplyOptPage.Items.AddElem(new COptItem_Generic(IDC_REPLYDLG_STATIC_EXTRATEXT, IDC_REPLYDLG_ENABLEREPLY));

 }

-

-// NightFox

-int ModernOptInitialise(WPARAM wParam, LPARAM)

-{

-	static int iBoldControls[] =

-	{

-		IDC_TXT_TITLE1,

-		IDC_TXT_TITLE2,

-		IDC_TXT_TITLE3,

-		MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = { 0 };

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

-	obj.hInstance = g_hInstance;

-	obj.iSection = MODERNOPT_PAGE_STATUS;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.iBoldControls = iBoldControls;

-	//	obj.lpzClassicGroup = NULL;

-	obj.lpzClassicPage = "Status";

-	obj.lpzClassicTab = "Main options";

-	//	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_MESSAGES);

-	obj.pfnDlgProc = MessagesModernOptDlg;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index 217b55e729..f1e0e4794c 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -41,8 +41,6 @@
 #include "Services.h"

 #include "version.h"

 

-#include <m_modernopt.h>

-

 HINSTANCE g_hInstance;

 CLIST_INTERFACE *pcli;

 

@@ -707,7 +705,6 @@ int MirandaLoaded(WPARAM, LPARAM)
 		}

 	}

 

-	HookEvent(ME_MODERNOPT_INITIALIZE, ModernOptInitialise);

 	return 0;

 }

 

diff --git a/plugins/NewAwaySysMod/src/stdafx.h b/plugins/NewAwaySysMod/src/stdafx.h
index b8136f95c8..b64cb3a13f 100644
--- a/plugins/NewAwaySysMod/src/stdafx.h
+++ b/plugins/NewAwaySysMod/src/stdafx.h
@@ -294,7 +294,6 @@ extern MWindowList g_hReadWndList;
 INT_PTR GetContactStatMsg(WPARAM wParam, LPARAM lParam);

 

 // AwayOpt.cpp

-int ModernOptInitialise(WPARAM wParam, LPARAM lParam);

 int OptsDlgInit(WPARAM wParam, LPARAM); // called on opening of the options dialog

 void InitOptions(); // called once when plugin is loaded