From 143e24fa04f0126d91b65b4035dd6ec556c79b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 28 Sep 2015 20:53:46 +0200 Subject: NOISSUE clean up some old cmake messes --- depends/util/include/cmdutils.h | 8 ++++---- depends/util/include/libutil_config.h | 28 ---------------------------- depends/util/include/modutils.h | 6 +++--- depends/util/include/pathutils.h | 26 +++++++++++++------------- depends/util/include/userutils.h | 6 +++--- 5 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 depends/util/include/libutil_config.h (limited to 'depends/util/include') diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h index 56ae4edb..8bf39eaa 100644 --- a/depends/util/include/cmdutils.h +++ b/depends/util/include/cmdutils.h @@ -25,7 +25,7 @@ #include #include -#include "libutil_config.h" +#include "multimc_util_export.h" /** * @file libutil/include/cmdutils.h @@ -42,7 +42,7 @@ namespace Commandline * @param args the argument string * @return a QStringList containing all arguments */ -LIBUTIL_EXPORT QStringList splitArgs(QString args); +MULTIMC_UTIL_EXPORT QStringList splitArgs(QString args); /** * @brief The FlagStyle enum @@ -85,7 +85,7 @@ enum Enum /** * @brief The ParsingError class */ -class LIBUTIL_EXPORT ParsingError : public std::runtime_error +class MULTIMC_UTIL_EXPORT ParsingError : public std::runtime_error { public: ParsingError(const QString &what); @@ -94,7 +94,7 @@ public: /** * @brief The Parser class */ -class LIBUTIL_EXPORT Parser +class MULTIMC_UTIL_EXPORT Parser { public: /** diff --git a/depends/util/include/libutil_config.h b/depends/util/include/libutil_config.h deleted file mode 100644 index 422001b8..00000000 --- a/depends/util/include/libutil_config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2013-2015 MultiMC Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include - -#ifdef LIBUTIL_STATIC -#define LIBUTIL_EXPORT -#else -#ifdef LIBUTIL_LIBRARY -#define LIBUTIL_EXPORT Q_DECL_EXPORT -#else -#define LIBUTIL_EXPORT Q_DECL_IMPORT -#endif -#endif diff --git a/depends/util/include/modutils.h b/depends/util/include/modutils.h index bc608f96..fde51881 100644 --- a/depends/util/include/modutils.h +++ b/depends/util/include/modutils.h @@ -3,7 +3,7 @@ #include #include -#include "libutil_config.h" +#include "multimc_util_export.h" class QUrl; @@ -107,7 +107,7 @@ private: void parse(); }; -LIBUTIL_EXPORT bool versionIsInInterval(const QString &version, const QString &interval); -LIBUTIL_EXPORT bool versionIsInInterval(const Version &version, const QString &interval); +MULTIMC_UTIL_EXPORT bool versionIsInInterval(const QString &version, const QString &interval); +MULTIMC_UTIL_EXPORT bool versionIsInInterval(const Version &version, const QString &interval); } diff --git a/depends/util/include/pathutils.h b/depends/util/include/pathutils.h index 82d55cd7..6d52097f 100644 --- a/depends/util/include/pathutils.h +++ b/depends/util/include/pathutils.h @@ -18,12 +18,12 @@ #include #include -#include "libutil_config.h" +#include "multimc_util_export.h" -LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2); -LIBUTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3); +MULTIMC_UTIL_EXPORT QString PathCombine(QString path1, QString path2); +MULTIMC_UTIL_EXPORT QString PathCombine(QString path1, QString path2, QString path3); -LIBUTIL_EXPORT QString AbsolutePath(QString path); +MULTIMC_UTIL_EXPORT QString AbsolutePath(QString path); /** * Normalize path @@ -35,37 +35,37 @@ LIBUTIL_EXPORT QString AbsolutePath(QString path); */ QString NormalizePath(QString path); -LIBUTIL_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-'); +MULTIMC_UTIL_EXPORT QString RemoveInvalidFilenameChars(QString string, QChar replaceWith = '-'); -LIBUTIL_EXPORT QString DirNameFromString(QString string, QString inDir = "."); +MULTIMC_UTIL_EXPORT QString DirNameFromString(QString string, QString inDir = "."); /** * Creates all the folders in a path for the specified path * last segment of the path is treated as a file name and is ignored! */ -LIBUTIL_EXPORT bool ensureFilePathExists(QString filenamepath); +MULTIMC_UTIL_EXPORT bool ensureFilePathExists(QString filenamepath); /** * Creates all the folders in a path for the specified path * last segment of the path is treated as a folder name and is created! */ -LIBUTIL_EXPORT bool ensureFolderPathExists(QString filenamepath); +MULTIMC_UTIL_EXPORT bool ensureFolderPathExists(QString filenamepath); /** * Copy a folder recursively */ -LIBUTIL_EXPORT bool copyPath(const QString &src, const QString &dst, bool follow_symlinks = true); +MULTIMC_UTIL_EXPORT bool copyPath(const QString &src, const QString &dst, bool follow_symlinks = true); /** * Delete a folder recursively */ -LIBUTIL_EXPORT bool deletePath(QString path); +MULTIMC_UTIL_EXPORT bool deletePath(QString path); /// Opens the given file in the default application. -LIBUTIL_EXPORT void openFileInDefaultProgram(QString filename); +MULTIMC_UTIL_EXPORT void openFileInDefaultProgram(QString filename); /// Opens the given directory in the default application. -LIBUTIL_EXPORT void openDirInDefaultProgram(QString dirpath, bool ensureExists = false); +MULTIMC_UTIL_EXPORT void openDirInDefaultProgram(QString dirpath, bool ensureExists = false); /// Checks if the a given Path contains "!" -LIBUTIL_EXPORT bool checkProblemticPathJava(QDir folder); +MULTIMC_UTIL_EXPORT bool checkProblemticPathJava(QDir folder); diff --git a/depends/util/include/userutils.h b/depends/util/include/userutils.h index 6ce08bce..aadc112e 100644 --- a/depends/util/include/userutils.h +++ b/depends/util/include/userutils.h @@ -2,16 +2,16 @@ #include -#include "libutil_config.h" +#include "multimc_util_export.h" namespace Util { // Get the Directory representing the User's Desktop -LIBUTIL_EXPORT QString getDesktopDir(); +MULTIMC_UTIL_EXPORT QString getDesktopDir(); // Create a shortcut at *location*, pointing to *dest* called with the arguments *args* // call it *name* and assign it the icon *icon* // return true if operation succeeded -LIBUTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args, +MULTIMC_UTIL_EXPORT bool createShortCut(QString location, QString dest, QStringList args, QString name, QString iconLocation); } -- cgit v1.2.3