Skip to content

Commit 94f5a70

Browse files
committed
fix compiler warnings
1 parent 3ba4406 commit 94f5a70

File tree

11 files changed

+15
-19
lines changed

11 files changed

+15
-19
lines changed

src/Explorer/ContextMenu.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
3030
#include "Explorer.h"
3131
#include "ExplorerDialog.h"
3232
#include "FavesDialog.h"
33+
#include "NewDlg.h"
3334
#include "NppInterface.h"
3435
#include "QuickOpenDialog.h"
3536
#include "../NppPlugin/menuCmdID.h"

src/Explorer/ContextMenu.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2525

2626
#pragma once
2727

28-
#include "Explorer.h"
29-
#include "ExplorerResource.h"
30-
#include "NewDlg.h"
31-
#include "../NppPlugin/DockingFeature/Window.h"
32-
3328
#include <shlobj.h>
34-
#include <commctrl.h>
35-
36-
#include <malloc.h>
3729
#include <vector>
3830
#include <string>
3931

32+
#include "Explorer.h"
33+
4034
struct __declspec(uuid("000214e6-0000-0000-c000-000000000046")) IShellFolder;
4135

4236
class ContextMenu

src/Explorer/ExplorerDialog.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2626
#include <dbt.h>
2727
#include <algorithm>
2828
#include <filesystem>
29+
#include <list>
30+
#include <string>
2931

3032
#include "Explorer.h"
3133
#include "ExplorerResource.h"

src/Explorer/ExplorerDialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class ExplorerDialog : public DockingDlgInterface, public TreeHelper, public CID
6161

6262
void init(HINSTANCE hInst, HWND hParent, ExProp *prop);
6363
void redraw();
64-
void destroy() {};
64+
void destroy() override {};
6565
void doDialog(bool willBeShown = true);
6666
BOOL gotoPath();
6767
void gotoUserFolder();

src/Explorer/FavesDialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2626
#include "Explorer.h"
2727
#include "FavesModel.h"
2828
#include "TreeHelperClass.h"
29-
#include "Toolbar.h"
29+
#include "ToolBar.h"
3030
#include "../NppPlugin/DockingFeature/DockingDlgInterface.h"
3131

3232
enum MenuID {
@@ -60,7 +60,7 @@ class FavesDialog : public DockingDlgInterface, public TreeHelper
6060
ExpandElementsRecursive(TVI_ROOT);
6161
};
6262

63-
void destroy()
63+
void destroy() override
6464
{
6565
/* save settings and destroy the resources */
6666
SaveSettings();

src/Explorer/FileDlg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
#include <windows.h>
2121
#include <commdlg.h>
22-
#include <WCHAR.H>
2322

2423
#include <vector>
2524
#include <string>

src/Explorer/FileSystemWatcher.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// THE SOFTWARE.
2222
#pragma once
2323

24-
#include <Windows.h>
2524
#include <string>
2625
#include <functional>
2726
#include <filesystem>

src/Explorer/HelpDialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class HelpDlg : public StaticDialog
3232
public:
3333
HelpDlg() : StaticDialog() {};
3434

35-
void init(HINSTANCE hInst, HWND hParent)
35+
void init(HINSTANCE hInst, HWND hParent) override
3636
{
3737
Window::init(hInst, hParent);
3838
};
3939

4040
void doDialog();
4141

42-
virtual void destroy() {
42+
void destroy() override{
4343
_emailLink.destroy();
4444
_urlNppPlugins.destroy();
4545
};

src/Explorer/NewDlg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class NewDlg : public StaticDialog
4242

4343
INT_PTR doDialog(LPCTSTR pFileName, LPCTSTR pDesc);
4444

45-
virtual void destroy() {};
45+
void destroy() override {};
4646

4747

4848
protected :

src/Explorer/PropDlg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class PropDlg : public StaticDialog, public TreeHelper
4545
PropDlg();
4646
~PropDlg();
4747

48-
void init(HINSTANCE hInst, HWND hWnd) {
48+
void init(HINSTANCE hInst, HWND hWnd) override {
4949
Window::init(hInst, hWnd);
5050
};
51-
virtual void destroy() {};
51+
void destroy() override {};
5252

5353
INT_PTR doDialog(LPTSTR pName, LPTSTR pLink, LPTSTR pDesc, LinkDlg linkDlg = LinkDlg::NONE, BOOL fileMustExist = FALSE);
5454
void setRoot(FavesItemPtr pElem, INT iUserImagePos, BOOL bWithLink = FALSE);

0 commit comments

Comments
 (0)