bump version 3.1.4 and clean code

Author: samsonwang

src/CMakeLists.txt

@@ -9,7 +9,7 @@ set (CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set (CMAKE_BUILD_PARALLEL_LEVEL 4)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 
 get_filename_component (SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ ABSOLUTE)
 get_filename_component (DEPS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../deps/ ABSOLUTE)
@@ -30,9 +30,10 @@ if (WIN32)
   find_package (Qt6 COMPONENTS Widgets Network LinguistTools REQUIRED)
 else ()
   find_package (Qt6 COMPONENTS Widgets X11Extras Network LinguistTools REQUIRED)
-  find_package(PkgConfig REQUIRED)
-  pkg_check_modules(X11 x11 xcb REQUIRED)
+  find_package (PkgConfig REQUIRED)
+  pkg_check_modules (X11 x11 xcb REQUIRED)
 endif ()
+
 set (CMAKE_AUTOUIC ON)
 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)

src/Launchy/GlobalVar.cpp

@@ -44,8 +44,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 namespace launchy {
 
-const int LAUNCHY_VERSION = 313;
-const char* LAUNCHY_VERSION_STRING = "3.1.3";
+const int LAUNCHY_VERSION = 314;
+const char* LAUNCHY_VERSION_STRING = "3.1.4";
 
 #if defined(ENVIRONMENT64)
 const char* LAUNCHY_BIT_STRING = "64";

src/Launchy/InputDataList.cpp

@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
@@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "InputDataList.h"
 #include "GlobalVar.h"
+
 namespace launchy {
 
 QString InputDataList::s_separator = QString(" ") + QChar(0x25ba) + QString(" ");
@@ -70,4 +71,6 @@ QString InputDataList::toString(bool omitLast) const {
     }
     return result;
 }
-}
+
+} // namespace launchy
+

src/Launchy/InputDataList.h

@@ -9,7 +9,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
@@ -20,9 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QList>
 #include <QString>
+
 #include "LaunchyLib/InputData.h"
 
 namespace launchy {
+
 class InputDataList : public QList<InputData> {
 public:
     void parse(const QString& text);
@@ -33,4 +35,5 @@ class InputDataList : public QList<InputData> {
 private:
     static QString s_separator;
 };
+
 } // namespace launchy

src/Launchy/Logger.cpp

@@ -1,10 +1,12 @@
 
 #include "Logger.h"
+
 #include <QDir>
 #include <QString>
 #include <QDateTime>
 
 namespace launchy {
+
 FILE* Logger::s_logFile = nullptr;
 QtMsgType Logger::s_logLevel;
 
@@ -79,4 +81,5 @@ void Logger::messageHandler(QtMsgType type,
     }
     fflush(s_logFile);
 }
+
 } // namespace launchy

src/Launchy/Logger.h

@@ -1,8 +1,11 @@
 
 #pragma once
+
 #include <QtGlobal>
 #include <cstdio>
+
 namespace launchy {
+
 class Logger {
 public:
     static void stopLogging();
@@ -19,4 +22,5 @@ class Logger {
     static FILE* s_logFile;
     static QtMsgType s_logLevel;
 };
-}
+
+} // namespace launchy

src/Launchy/UpdateChecker.h

@@ -25,6 +25,7 @@ class QTimer;
 class QNetworkReply;
 
 namespace launchy {
+
 class UpdateChecker : public QObject {
     Q_OBJECT
 public:
@@ -47,4 +48,4 @@ private slots:
     bool m_manualCheck;
 };
 
-}
+} // namespace launchy