diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt --- a/src/ioslaves/trash/CMakeLists.txt +++ b/src/ioslaves/trash/CMakeLists.txt @@ -19,11 +19,12 @@ ${CMAKE_CURRENT_SOURCE_DIR}/discspaceutil.cpp ${CMAKE_CURRENT_SOURCE_DIR}/trashsizecache.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kinterprocesslock.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/kiotrashdebug.cpp ) ########### next target ############### if(WIN32) - set(kio_trash_PART_SRCS kio_trash_win.cpp kio_trash_win.h) + set(kio_trash_PART_SRCS kio_trash_win.cpp kiotrashdebug.cpp) else() set(kio_trash_PART_SRCS kio_trash.cpp ${trashcommon_PART_SRCS}) endif() diff --git a/src/ioslaves/trash/discspaceutil.cpp b/src/ioslaves/trash/discspaceutil.cpp --- a/src/ioslaves/trash/discspaceutil.cpp +++ b/src/ioslaves/trash/discspaceutil.cpp @@ -20,6 +20,7 @@ */ #include "discspaceutil.h" +#include "kiotrashdebug.h" #include #include diff --git a/src/ioslaves/trash/kinterprocesslock.cpp b/src/ioslaves/trash/kinterprocesslock.cpp --- a/src/ioslaves/trash/kinterprocesslock.cpp +++ b/src/ioslaves/trash/kinterprocesslock.cpp @@ -19,6 +19,7 @@ */ #include "kinterprocesslock.h" +#include "kiotrashdebug.h" #include #include diff --git a/src/ioslaves/trash/kio_trash_win.cpp b/src/ioslaves/trash/kio_trash_win.cpp --- a/src/ioslaves/trash/kio_trash_win.cpp +++ b/src/ioslaves/trash/kio_trash_win.cpp @@ -21,11 +21,12 @@ #define QT_NO_CAST_FROM_ASCII #include "kio_trash_win.h" +#include "kiotrashdebug.h" #include "kioglobal_p.h" #include "kio/job.h" + #include -#include #include #include diff --git a/src/ioslaves/trash/kiotrashdebug.h b/src/ioslaves/trash/kiotrashdebug.h new file mode 100644 --- /dev/null +++ b/src/ioslaves/trash/kiotrashdebug.h @@ -0,0 +1,7 @@ +#ifndef KIOTRASHDEBUG_H +#define KIOTRASHDEBUG_H + +#include +Q_DECLARE_LOGGING_CATEGORY(KIO_TRASH) + +#endif // KIOTRASHDEBUG_H diff --git a/src/ioslaves/trash/kiotrashdebug.cpp b/src/ioslaves/trash/kiotrashdebug.cpp new file mode 100644 --- /dev/null +++ b/src/ioslaves/trash/kiotrashdebug.cpp @@ -0,0 +1,3 @@ +#include "kiotrashdebug.h" + +Q_LOGGING_CATEGORY(KIO_TRASH, "kf5.kio.trash") diff --git a/src/ioslaves/trash/trashimpl.h b/src/ioslaves/trash/trashimpl.h --- a/src/ioslaves/trash/trashimpl.h +++ b/src/ioslaves/trash/trashimpl.h @@ -27,9 +27,6 @@ #include #include -#include -Q_DECLARE_LOGGING_CATEGORY(KIO_TRASH) - namespace Solid { class Device; } diff --git a/src/ioslaves/trash/trashimpl.cpp b/src/ioslaves/trash/trashimpl.cpp --- a/src/ioslaves/trash/trashimpl.cpp +++ b/src/ioslaves/trash/trashimpl.cpp @@ -22,6 +22,7 @@ #include "trashimpl.h" #include "discspaceutil.h" #include "trashsizecache.h" +#include "kiotrashdebug.h" #include #include @@ -58,8 +59,6 @@ #include #include -Q_LOGGING_CATEGORY(KIO_TRASH, "kf5.kio.trash") - TrashImpl::TrashImpl() : QObject(), m_lastErrorCode(0), diff --git a/src/ioslaves/trash/trashsizecache.cpp b/src/ioslaves/trash/trashsizecache.cpp --- a/src/ioslaves/trash/trashsizecache.cpp +++ b/src/ioslaves/trash/trashsizecache.cpp @@ -23,6 +23,7 @@ #include "trashsizecache.h" #include "discspaceutil.h" +#include "kiotrashdebug.h" #include // QT_LSTAT, QT_STAT, QT_STATBUF #include