5 files changed, 3 insertions, 9 deletions
diff --git a/gui/main.cpp b/gui/main.cpp
index b422a374..f4cf06af 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -84,7 +84,7 @@ void add_win32_path()
         lib_path.replace("/", "\\");
         const QByteArray lib_path_ = QFile::encodeName(lib_path);
 
-        QString mod_path = OPENTRACK_BASE_PATH + QString(OPENTRACK_LIBRARY_PATH);
+        QString mod_path = OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH;
         mod_path.replace("/", "\\");
         const QByteArray mod_path_ = QFile::encodeName(mod_path);
 
diff --git a/options/bundle.cpp b/options/bundle.cpp
index c78df274..401fce86 100644
--- a/options/bundle.cpp
+++ b/options/bundle.cpp
@@ -179,7 +179,6 @@ std::shared_ptr<bundler::v> bundler::make_bundle(const bundler::k& key)
     auto shr = shared(new v(key), [this, key](v* ptr) {
         QMutexLocker l(&implsgl_mtx);
 
-
         auto it = implsgl_data.find(key);
         if (it != implsgl_data.end())
             implsgl_data.erase(it);
diff --git a/options/bundle.hpp b/options/bundle.hpp
index 63ee82d0..00f2aed6 100644
--- a/options/bundle.hpp
+++ b/options/bundle.hpp
@@ -48,8 +48,6 @@ class OTR_OPTIONS_EXPORT bundle final : public QObject, public connector
     };
 
 private:
-    friend struct bundler;
-
     mutex mtx;
     const QString group_name;
     group saved;
@@ -106,11 +104,11 @@ public:
 };
 
 OTR_OPTIONS_EXPORT bundler& singleton();
-}
+} // ns options::detail
 
 using bundle_ = detail::bundle;
 using bundle = std::shared_ptr<bundle_>;
 
 OTR_OPTIONS_EXPORT std::shared_ptr<bundle_> make_bundle(const QString& name);
 
-}
+} // ns options
diff --git a/pose-widget/pose-widget.hpp b/pose-widget/pose-widget.hpp
index a27bf4b9..fc606e13 100644
--- a/pose-widget/pose-widget.hpp
+++ b/pose-widget/pose-widget.hpp
@@ -42,8 +42,6 @@ struct pose_transform final : private QThread
     pose_transform(QWidget* dst);
     ~pose_transform();
 
-    friend class pose_widget;
-
     void rotate_async(double xAngle, double yAngle, double zAngle, double x, double y, double z);
     void rotate_sync(double xAngle, double yAngle, double zAngle, double x, double y, double z);
 
diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index b3a780e7..b1b8ecef 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -27,7 +27,6 @@ wine::~wine()
         shm->stop = true;
         wrapper.waitForFinished(100);
     }
-    wrapper.kill();
     wrapper.close();
     //shm_unlink("/" WINE_SHM_NAME);
 }