From e1e922cbb1b8e72cbcfd3c637762d9496081a4db Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 29 Jan 2016 21:22:52 +0100 Subject: [PATCH] refs #584, removed unused function * fixed define in the same step --- src/blackgui/loginmodebuttons.cpp | 1 - src/blackgui/loginmodebuttons.h | 5 ++--- src/blackmisc/blackmiscfreefunctions.cpp | 6 ------ src/blackmisc/blackmiscfreefunctions.h | 3 --- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/blackgui/loginmodebuttons.cpp b/src/blackgui/loginmodebuttons.cpp index 0726d3a3c..208be8938 100644 --- a/src/blackgui/loginmodebuttons.cpp +++ b/src/blackgui/loginmodebuttons.cpp @@ -14,7 +14,6 @@ using namespace BlackCore; namespace BlackGui { - CLoginModeButtons::CLoginModeButtons(QWidget *parent) : QGroupBox(parent), ui(new Ui::CLoginModeButtons) diff --git a/src/blackgui/loginmodebuttons.h b/src/blackgui/loginmodebuttons.h index 6d37458f7..f125624c5 100644 --- a/src/blackgui/loginmodebuttons.h +++ b/src/blackgui/loginmodebuttons.h @@ -9,8 +9,8 @@ //! \file -#ifndef BLACKMISC_LOGINMODEBUTTONS_H -#define BLACKMISC_LOGINMODEBUTTONS_H +#ifndef BLACKGUI_LOGINMODEBUTTONS_H +#define BLACKGUI_LOGINMODEBUTTONS_H #include "blackgui/blackguiexport.h" #include "blackcore/network.h" @@ -43,7 +43,6 @@ namespace BlackGui private: QScopedPointer ui; }; - } #endif // guard diff --git a/src/blackmisc/blackmiscfreefunctions.cpp b/src/blackmisc/blackmiscfreefunctions.cpp index d8636181e..00629a9b8 100644 --- a/src/blackmisc/blackmiscfreefunctions.cpp +++ b/src/blackmisc/blackmiscfreefunctions.cpp @@ -72,9 +72,3 @@ uint BlackMisc::calculateHash(const QList &values, const char *className) } return calculateHash(list, className); } - -const QString &BlackMisc::localHostNameEnvVariable() -{ - static const QString hostName = QProcessEnvironment::systemEnvironment().value("COMPUTERNAME", QProcessEnvironment::systemEnvironment().value("HOSTNAME")); - return hostName; -} diff --git a/src/blackmisc/blackmiscfreefunctions.h b/src/blackmisc/blackmiscfreefunctions.h index 3a108411c..34f174e03 100644 --- a/src/blackmisc/blackmiscfreefunctions.h +++ b/src/blackmisc/blackmiscfreefunctions.h @@ -151,9 +151,6 @@ namespace BlackMisc //! Hash value, but with int list BLACKMISC_EXPORT uint calculateHash(const QList &values, const char *className); - //! Get local host name env.variable - BLACKMISC_EXPORT const QString &localHostNameEnvVariable(); - //! Own implementation of std::make_unique, a C++14 feature not provided by GCC in C++11 mode template std::unique_ptr make_unique(Args &&... args)