diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | dolphin.categories | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/dolphindebug.cpp | 22 | ||||
| -rw-r--r-- | src/dolphindebug.h | 27 |
5 files changed, 6 insertions, 50 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 390376e94..27f2de82e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(ECMQtDeclareLoggingCategory) ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX DOLPHIN VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h" @@ -132,5 +133,7 @@ configure_file(org.kde.dolphin.FileManager1.service.in install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) +install( FILES dolphin.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/dolphin.categories b/dolphin.categories new file mode 100644 index 000000000..8faeb2064 --- /dev/null +++ b/dolphin.categories @@ -0,0 +1 @@ +org.kde.dolphin dolphin IDENTIFIER [DolphinDebug] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5aff4b0fa..4a1f173d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -106,9 +106,10 @@ set(dolphinprivate_LIB_SRCS dolphinremoveaction.cpp middleclickactioneventfilter.cpp dolphinnewfilemenu.cpp - dolphindebug.cpp ) +ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin) + if(HAVE_BALOO) set(dolphinprivate_LIB_SRCS ${dolphinprivate_LIB_SRCS} diff --git a/src/dolphindebug.cpp b/src/dolphindebug.cpp deleted file mode 100644 index 17f108427..000000000 --- a/src/dolphindebug.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2015 by Emmanuel Pescosta <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * 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 * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ - -#include "dolphindebug.h" - -Q_LOGGING_CATEGORY(DolphinDebug, "org.kde.dolphin") diff --git a/src/dolphindebug.h b/src/dolphindebug.h deleted file mode 100644 index 9b4554b49..000000000 --- a/src/dolphindebug.h +++ /dev/null @@ -1,27 +0,0 @@ -/*************************************************************************** - * Copyright (C) 2015 by Emmanuel Pescosta <[email protected]> * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * 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 * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ - -#ifndef DOLPHIN_DEBUG_H -#define DOLPHIN_DEBUG_H - -#include <QLoggingCategory> - -Q_DECLARE_LOGGING_CATEGORY(DolphinDebug) - -#endif // DOLPHIN_DEBUG_H |