From 26aff79a31fbe7721ef088cdc813b027609dca45 Mon Sep 17 00:00:00 2001
From: WandererFan <wandererfan@gmail.com>
Date: Fri, 1 Jul 2016 11:32:53 -0400
Subject: [PATCH] Fixes 1-3 per wmeyer

---
 src/Mod/TechDraw/App/DrawViewPart.h | 2 +-
 src/Mod/TechDraw/App/EdgeWalker.h   | 4 ++--
 src/Mod/TechDraw/Gui/Command.cpp    | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Mod/TechDraw/App/DrawViewPart.h b/src/Mod/TechDraw/App/DrawViewPart.h
index 1bb898a14..1aa479a21 100644
--- a/src/Mod/TechDraw/App/DrawViewPart.h
+++ b/src/Mod/TechDraw/App/DrawViewPart.h
@@ -37,7 +37,7 @@
 
 namespace TechDraw {
 class DrawHatch;
-class WalkerEdge;
+struct WalkerEdge;
 }
 
 namespace TechDraw
diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h
index 744a643e2..65277a42a 100644
--- a/src/Mod/TechDraw/App/EdgeWalker.h
+++ b/src/Mod/TechDraw/App/EdgeWalker.h
@@ -52,8 +52,8 @@ typedef adjacency_list
     graph;
 
 struct WalkerEdge {
-    int v1;
-    int v2;
+    std::size_t v1;
+    std::size_t v2;
     int idx;
 };
 
diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp
index 2eefda2b5..00f61bde1 100644
--- a/src/Mod/TechDraw/Gui/Command.cpp
+++ b/src/Mod/TechDraw/Gui/Command.cpp
@@ -217,7 +217,7 @@ void CmdTechDrawNewPage::activated(int iMsg)
     Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
         .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw");
 
-    std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/Templates";
+    std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Templates";
     QString templateDir = QString::fromStdString(hGrp->GetASCII("TemplateDir", defaultDir.c_str()));
     QString templateFileName = Gui::FileDialog::getOpenFileName(Gui::getMainWindow(),
                                                    QString::fromUtf8(QT_TR_NOOP("Select a Template File")),
@@ -225,9 +225,6 @@ void CmdTechDrawNewPage::activated(int iMsg)
                                                    QString::fromUtf8(QT_TR_NOOP("Template (*.svg *.dxf)")));
 
     if (templateFileName.isEmpty()) {
-        QMessageBox::critical(Gui::getMainWindow(),
-            QLatin1String("No template"),
-            QLatin1String("Must select a valid template file"));
         return;
     }